Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-V32-XuHaoJie

@@ -101,7 +101,7 @@
     margin-top:20px;
 }
 .detail_linechart {
-    height: 400px !important;
+    height: 450px !important;
 }
 .line-filter-content{
     display: flex;

@@ -226,7 +226,7 @@ export default {
                 intervalGroup:checkedId.value,
                 keys:keysVal
             }
-            proxy.$http.get(`/api-web/cm-data-range/loadPerformanceCustom`, params, function (res) {
+            proxy.$http.get(`/api-web/cm-date-range/loadPerformanceCustom`, params, function (res) {
                 emit('callbacksure',res)
             })
         }
@@ -292,6 +292,9 @@ export default {
             proxy.$http.get(`/api-web/ContrastAnalysis/selectTogetherRate`, param, function (res) {
                 if (res && res.data) {
                     frequencyData.value = res.data;
+                    if(frequencyData.value.length>0){
+                        checkedId.value=frequencyData.value[0].ddicDesc
+                    }
 
                 }
                 sureBtn();

@@ -15,7 +15,7 @@
             <div v-if="interval!='custom'" @click="changeInterval('MONTH')" :class="['line-filter-item', {'active':interval=='MONTH'}]"  data-value="MONTH">一月</div>
             <div v-if="interval!='custom'" @click="changeInterval('YEAR')" :class="['line-filter-item', {'active':interval=='YEAR'}]"  data-value="YEAR">一年</div>
             <div v-if="interval!='custom'" @click="changeInterval('custom')" :class="['line-filter-item', {'active':interval=='custom'}]"  data-value="custom">自定义</div>
-            <div v-if="interval=='custom'" @click="changeInterval('DAY')" :class="['line-filter-item', {'active':interval=='custom'}]"  data-value="custom">取消自定义</div>
+            <div v-if="interval=='custom'" @click="changeInterval('DAY')" :class="['line-filter-item', {'active':interval=='custom'}]"  data-value="custom">返 回</div>
           </div>
         </div>
 

@@ -230,7 +230,7 @@ export default {
                     top: '10%',
                     left: '3%',
                     right: '4%',
-                    bottom: '3%',
+                    bottom: '15%',
                     containLabel: true
                 },
                 toolbox: {
@@ -279,6 +279,16 @@ export default {
                         }
                     }
                 },
+                // x轴拖动
+                dataZoom: [
+                    {
+                        type: "slider",
+                        realtime: true, //拖动滚动条时是否动态的更新图表数据
+                        height: 25, //滚动条高度
+                        start: 40, //滚动条开始位置（共100等份）
+                        end: 65 //结束位置（共100等份）
+                    }
+                ],
                 series:series.value
             };
         }