Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-joke

@@ -47,8 +47,13 @@ export default {
             window.addEventListener('message',function(e){
                 if(e.data.type=='detail'){
                     proxy.$global.openDetail(e.data.data.resId, e.data.data.resType, proxy);
+                }else if(e.data.type=='topology'){
+                    //子页面点击拓扑图标进入拓扑页面
+                    proxy.$global.viewResTopo(e.data.data.resId);
                 }else{
+
                 }
+
             })
             //end lsq 2022-03-15
         })

@@ -4,10 +4,10 @@
             <div class="condition">
                 <el-form-item>
                     <el-button-group class="ml-4">
-                        <el-button :type="search.status == 0 ? 'primary' : ''" @click="getDataList(0)">草稿</el-button>
                         <el-button :type="search.status == 1 ? 'primary' : ''" @click="getDataList(1)">审批中</el-button>
                         <el-button :type="search.status == 2 ? 'primary' : ''" @click="getDataList(2)">已审批</el-button>
                         <el-button :type="search.status == 3 ? 'primary' : ''" @click="getDataList(3)">驳回</el-button>
+                        <el-button :type="search.status == 0 ? 'primary' : ''" @click="getDataList(0)">草稿</el-button>
                     </el-button-group>
                 </el-form-item>
 

@@ -14,7 +14,7 @@ export default {
         const {proxy} = Vue.getCurrentInstance();
         let height = Vue.ref(window.innerHeight);
         let search = Vue.ref({
-            status:0,
+            status:1,
             keyword:'',
             page:1,
             limit:10,
@@ -80,7 +80,7 @@ export default {
         let statusVal=Vue.ref(0);
         let getDataList=(status)=>{
             if(status == undefined){
-                status = 0
+                status = 1
             }
             statusVal.value=status;
             search.value.status = status;

@@ -20,6 +20,8 @@ export default {
         let kpiName = Vue.ref('');//指标名称
         let startTime=Vue.ref('');
         let endTime=Vue.ref('');
+        let startSlide=Vue.ref(0);
+        let endSlide=Vue.ref(100);
         let  colorsArr=Vue.ref([
             {
                 start: '#46d6d8',
@@ -226,6 +228,11 @@ export default {
 
         const changeInterval=(val)=>{
             interval.value=val;
+            if (val=='DAY'){
+                startSlide.value=0;
+            }else {
+                startSlide.value=75;
+            }
             if(val=='custom'){
             }else{
                 getLineChart();
@@ -372,8 +379,8 @@ export default {
                         type: "slider",
                         realtime: true, //拖动滚动条时是否动态的更新图表数据
                         height: 25, //滚动条高度
-                        start: 40, //滚动条开始位置（共100等份）
-                        end: 65 //结束位置（共100等份）
+                        start: startSlide, //滚动条开始位置（共100等份）
+                        end: endSlide //结束位置（共100等份）
                     }
                 ],
                 series:series.value
@@ -404,7 +411,9 @@ export default {
             getOptionData,
             getInfluxOption,
             getLineChart,
-            changeInterval
+            changeInterval,
+            startSlide,
+            endSlide
         }
     }
 }