Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

 Conflicts:
	hg-monitor-web-zj/src/main/resources/static/vue3/src/views/pieDetailLine/index.js

@@ -1262,9 +1262,26 @@ layui.define(['xmSelect', 'md5'], function (exports) {
                 param = "=" + encodeURIComponent(layHref.split('=')[1]);
             }
             alink.setAttribute("lay-href",layHref.split('=')[0] + param);
-            document.body.appendChild(alink);
-            alink.click();
-            document.body.removeChild(alink);
+            admin.req({
+                url: obj.domainName + '/api-web/mxgraph/getJtopoInfoById/'+layHref.split('=')[2],
+                success(response) {
+                    //LH 修改 弹框展示子拓扑
+                    layer.open({
+                        title:response.object.topoName,
+                        type: 2,
+                        area:['80%','80%'],
+                        content:  obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id='+layHref.split('=')[2] + "&layout=organic",
+                    })
+                },
+                error() {
+                    layer.closeAll('loading');
+                    layer.msg('生成资源拓扑失败...', {icon: 2});
+                }
+            });
+
+            // document.body.appendChild(alink);
+            // alink.click();
+            // document.body.removeChild(alink);
         },
 
         /**

@@ -9,8 +9,8 @@
                         range-separator="--"
                         start-placeholder="开始时间"
                         end-placeholder="结束时间"
-                        format="YYYY-MM-DD hh:mm:ss"
-                        value-format="YYYY-MM-DD hh:mm:ss"
+                        format="YYYY-MM-DD HH:mm:ss"
+                        value-format="YYYY-MM-DD HH:mm:ss"
                         :shortcuts="shortcuts"
                         @change="changeDate"
                         size="small"

@@ -61,7 +61,7 @@ export default {
         //自定义选择时间
         let dateValue=Vue.ref([]);
         //选中的聚合频率
-        let checkedId=Vue.ref();
+        let checkedId=Vue.ref(0);
         let commandVal=Vue.ref('聚合频率')
         //聚合频率选择
         // const changeItem=(val,name)=>{
@@ -160,15 +160,7 @@ export default {
                     const start = formatDate(12,'M');
                     return [start, end]
                 },
-            },
-            {
-                text: '全部',
-                value: () => {
-                    const end = new Date();
-                    const start = ''
-                    return [start, end]
-                },
-            },
+            }
         ])
         //开始时间
         let startTime=Vue.ref();
@@ -192,18 +184,16 @@ export default {
         //计算需要传参的code值
         const calcCode=(val)=>{
             let code='';
-            if(val>0 && val<7){
+            if(val>0 && val<3){
                 code='time_scope_DAY';
-            }else if(val>=7 && val<30){
+            }else if(val>=3 && val<7){
                 code='time_scope_WEEK';
-            }else if(val>=30 && val<90){
+            }else if(val>=7 && val<30){
                 code='time_scope_MONTH';
-            }else if(val>=90 && val<180){
+            }else if(val>=30){
                 code='time_scope_QUARTER';
-            }else if(val>=180 && val<365){
-                code='time_scope_SEMESTER';
-            }else if(val>=365){
-                code='time_scope_YEAR';
+            }else{
+                code='time_scope_MIN';
             }
             return code;
         }
@@ -285,12 +275,96 @@ export default {
             }else{
                 oneDay();
             }
+            if(props.intervalGroup){
                 checkedId.value=props.intervalGroup;
             }
+        }
 
         //获取聚合频率数据
         const getRate=(defCode)=>{
-            let param = {
+
+            let resData=[
+                {
+                    ddicId:'001',
+                    ddicDesc:'0',
+                    ddicName:'不聚合',
+                    code:'time_scope_MIN'
+                },
+                {
+                    ddicId:'002',
+                    ddicDesc:'5',
+                    ddicName:'5分钟',
+                    code:'time_scope_MIN'
+                },
+                {
+                    ddicId:'003',
+                    ddicDesc:'10',
+                    ddicName:'10分钟',
+                    code:'time_scope_MIN'
+                },
+                {
+                    ddicId:'004',
+                    ddicDesc:'15',
+                    ddicName:'15分钟',
+                    code:'time_scope_MIN'
+                },
+                {
+                    ddicId:'005',
+                    ddicDesc:'30',
+                    ddicName:'30分钟',
+                    code:'time_scope_DAY'
+                },
+                {
+                    ddicId:'006',
+                    ddicDesc:'60',
+                    ddicName:'1小时',
+                    code:'time_scope_DAY'
+                },
+                {
+                    ddicId:'007',
+                    ddicDesc:'180',
+                    ddicName:'3小时',
+                    code:'time_scope_WEEK'
+                },
+                {
+                    ddicId:'008',
+                    ddicDesc:'360',
+                    ddicName:'6小时',
+                    code:'time_scope_WEEK'
+                },
+                {
+                    ddicId:'009',
+                    ddicDesc:'720',
+                    ddicName:'12小时',
+                    code:'time_scope_MONTH'
+                },
+                {
+                    ddicId:'010',
+                    ddicDesc:'1440',
+                    ddicName:'1天',
+                    code:'time_scope_MONTH'
+                },
+                {
+                    ddicId:'011',
+                    ddicDesc:'1440',
+                    ddicName:'1天',
+                    code:'time_scope_QUARTER'
+                }
+            ]
+            let resDataArr=[];
+            resData.map(item=>{
+                if(defCode==item.code){
+                    resDataArr.push(item)
+                }
+            })
+            frequencyData.value = resDataArr;
+            if(frequencyData.value.length>0){
+                if(!props.intervalGroup){
+                    checkedId.value=frequencyData.value[0].ddicDesc
+                }
+            }
+            sureBtn();
+            /*let param = {
                 ddicName: defCode
             }
             proxy.$http.get(`/api-web/ContrastAnalysis/selectTogetherRate`, param, function (res) {
@@ -304,7 +378,7 @@ export default {
 
                 }
                 sureBtn();
-            });
+            });*/
         }
 
         const oneDay=()=>{

@@ -12,7 +12,7 @@ export default {
     setup(props, {attrs, slots, emit}) {
         const {proxy} = Vue.getCurrentInstance();
         let interval=Vue.ref('DAY');
-        let optionData=Vue.ref({});
+        let optionData=Vue.ref('');
         let names = Vue.ref(['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00']);
         let series = Vue.ref([]);
         let rateData = Vue.ref([]);
@@ -104,7 +104,6 @@ export default {
             ])
         let keys=Vue.ref('');
         let getOptionData=(res)=>{
-            debugger
             let nameArr=[];
             let dataArr=[];
             if(res && res.success){
@@ -115,8 +114,8 @@ export default {
                         Object.keys(resData[key]).sort(function (a, b) {
                             return a<b?1:-1;
                         }).forEach(function(time){
-                            nameArr.push(time);
-                            dataArr.push(resData[key][time])
+                            nameArr.unshift(time);
+                            dataArr.unshift(resData[key][time])
                         })
                     })
                     rateData.value = {
@@ -373,7 +372,6 @@ export default {
             keys,
             optionDataInit,
             getOptionData,
-            getInfluxOption,
             getLineChart,
             changeInterval
         }

@@ -95,7 +95,7 @@ export default {
                  }
              };*/
 
-            option && myChart.setOption(option);
+            option && myChart.setOption(option,true);
         }
 
 
@@ -111,7 +111,7 @@ export default {
                     }
                 }
             }
-            proxy.myChart.setOption(adapterOption)
+            proxy.myChart.setOption(adapterOption,true)
             proxy.myChart.resize()
         }