时间和修改功能部分修改

src/main/resources/static/js/layui/css/modules/index.css

@@ -52,4 +52,4 @@ body{
 .banner .userinfo .logOut{
     margin-left: 30px;
     cursor: pointer;
-}
+}

src/main/resources/templates/template.html

@@ -74,6 +74,7 @@
         #column{
             width: 100%;
         }
+
     </style>
 </head>
 
@@ -95,6 +96,7 @@
             <div class="grid-demo grid-demo-bg1">
                 <button type="button" class="layui-btn layui-btn-sm" onclick="addTemplate()">添加指标模板</button>
                 <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="deleteTemplate()">删除指标模板</button>
+                <button type="button" class="layui-btn layui-btn-sm layui-btn-normal" onclick="editTemplate()" style="margin-left: 0px;margin-top: 10px;">修改指标模板</button>
                 <div id="allArea"></div>
                 <div id="allMetrics"></div>
                 <div id="indicatorTemplate"></div>
@@ -128,9 +130,8 @@
             <div class="row layui-form row2">
                 <div style="width:100%;float: left;">
                     <div class="c1 label"> 粒度:</div>
-        
                     <div class="timeTypeDiv c1" style="width: 10%;">
-                        <select name="timeType" id="timeType">
+                        <select name="timeType" id="timeType" onchange="handleChange(this)">
                             <option value="QUATER">15分钟</option>
                             <option value="HOUR">小时</option>
                             <option value="DAY">天</option>
@@ -204,10 +205,27 @@
                     table.exportFile(obj.config.id, dataA, 'csv')
                 }
             });
+            let dateArray = '';
+            let timeType = $('#timeType').val()
+            console.log('timeType: ', timeType);
+            let date = new Date();
+            if(timeType == 'QUATER'){ 
+                dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '00:15:00';
+                console.log('dateArray: ', dateArray);
+            }
+            if(timeType == 'HOUR'){ 
+                console.log('xiaoshi')
+                // dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '00:15:00';
+                // console.log('dateArray: ', dateArray);
+            }
             laydate.render({
                 elem: '#time1',
                 type: 'datetime',
                 range: true,
+                value: dateArray,
+                ready: function(date){
+                    console.log(date); //得到初始的日期时间对象：{year: 2017, month: 8, date: 18, hours: 0, minutes: 0, seconds: 0}
+                }
             });
             initTreeCity(tree)
             initTreeIndicator(tree)
@@ -219,6 +237,47 @@
                 setTimeout(() => window.location.href = '/login', 1000)
             }
         })
+            function handleChange(){
+                console.log('5555')
+                console.log($('#timeType').val())
+                let timeType = $('#timeType').val()
+                console.log('timeType: ', timeType);
+                let date = new Date();
+                if(timeType == 'QUATER'){ 
+                    dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '00:15:00';
+                    console.log('dateArray: ', dateArray);
+                }
+                if(timeType == 'HOUR'){ 
+                    console.log('xiaoshi')
+                    dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '01:00:00';
+                    console.log('dateArray: ', dateArray);
+                }
+                if(timeType == 'DAY'){ 
+                    console.log('xiaoshi')
+                    dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '23:59:59';
+                    console.log('dateArray: ', dateArray);
+                }
+            }
+            // $('#timeType').first().change(function(){
+            //     handleChange()
+            // })
+            // $(document).on('change','#timeType',function(){
+            //     console.log('55556666')
+            //     handleChange()
+            // })
+            $('#timeType').on('change',function(){
+                console.log('change: ', change);
+                handleChange()
+            });
+
+        function  formatDate  (date) {  
+            var y = date.getFullYear();  
+            var m = date.getMonth() + 1;  
+            m = m < 10 ? '0' + m : m;  
+            var d = date.getDate();  
+            d = d < 10 ? ('0' + d) : d;  
+            return y + '-' + m + '-' + d;  
+        };  
 
         var treeCity;
         function initTreeCity(tree) {
@@ -255,7 +314,17 @@
                             showCheckbox: true,
                             accordion: true,
                             id: 'Id3',
+                            // edit: ['update'],
                             data: r?.data,
+                            // customOperate: true,
+                            // operate:function(obj){
+                            //     console.log('obj: ', obj);
+                            //     $('.layui-tree-editInput').remove();
+                            //     if(obj.type == "update"){
+                            //         // addTemplate()
+                            //     }
+
+                            // },
                             oncheck: function(obj){
                                 // console.log(obj);
                                 if(obj.checked) {
@@ -275,7 +344,7 @@
                 }
             });
         }
-
+        // 全部指标
         function initAllIndicator(tree) {
             $.ajax({
                 type: "POST",
@@ -436,6 +505,7 @@
             indicators.add('sdate')
             let timeType = $('#timeType').val()
             let sdate = $('#time1').val()
+            console.log('sdate: ', sdate);
             const [startTime, endTime] = sdate.split(' - ')
             renderTable(condition, searchType, table, citys, quxians, indicators, timeType, startTime, endTime)
             return false;
@@ -490,6 +560,71 @@
             });
         }
 
+        // 修改指标模板
+        var templateId;
+        function editTemplate() {
+            console.log('xiugai')
+            const checkedData = tree?.getChecked('Id3')?.[0]?.children
+            console.log('checkedData: ', checkedData);
+            if(!checkedData || checkedData.length <= 0){
+                alert('请选择要修改的指标模板！')
+                return
+            }else if(checkedData.length > 1){
+                alert('请选择一个要修改的指标模板！')
+                return
+            }else{
+                layer.open({
+                type: 1,
+                title:"修改指标模板",
+                content: $("#add-template"),
+                area: ['600px', '600px'],
+                btn: ['确定'],
+                shadeClose: true,
+                success: function(layero, index){
+                    console.log(layero, index);
+                },
+                yes: function(index, layero){
+                    const templateName = $('#templateName').val()
+                    if (!templateName || templateName.length <= 0) {
+                        alert('请输入模板名称！')
+                        return
+                    }
+                    const checkedData = tree?.getChecked('Id2')?.[0]?.children
+                    if (!checkedData || checkedData.length <= 0) {
+                        alert('请选择指标！')
+                        return
+                    }
+                    const indicators = new Set()
+                    checkedData.forEach(eee => {
+                        eee.children.forEach(ee => {
+                            indicators.add(ee.id)
+                        })
+                    });
+                    const dataJson = JSON.stringify({
+                        "id": templateId,
+                        "templateName": templateName,
+                        "indicators": [...indicators],
+                    })
+                    $.ajax({
+                        type: "POST",
+                        contentType: "application/json;charset=UTF-8",
+                        url: '/api/updateTemplate',
+                        data: dataJson,
+                        success: function (r) {
+                            if (r?.success) {
+                                initTreeIndicatorTemplate(tree)
+                                layer.msg('添加成功')
+                                layer.close(index)
+                                return
+                            }
+                            alert(r?.message ?? '发生错误了');
+                        }
+                    });
+                },
+            });
+            }
+        }
+
         // 删除指标模板
         function deleteTemplate() {
             const checkedData = tree?.getChecked('Id3')?.[0]?.children
@@ -544,7 +679,6 @@
                 }
             });
         }
-
         // 
         $(document).ready(function(){
             setTimeout(()=>{
@@ -554,6 +688,7 @@
                     // console.log('this.text(): ', $(this).text());
                 });
             },1000)
+
         });
         window.onbeforeunload=function(e){     
             logOutFun()