Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/anji-plus-re…

…port into master-500-dev-lushangqing

@@ -333,7 +333,14 @@ export default {
               if (data && (data.code == 200 || data.code == 0)) {
               if (data && (data.code == 200 || data.code == 0)) {
                 resolve(data);
                 resolve(data);
               } else if (data && data.code == 401) {
               } else if (data && data.code == 401) {
-                console.log('token过期，请重新登录！', data);
+                let msg = 'token过期，请重新登录！';
+                let data401 = {
+                  code: 401,
+                  success: false,
+                  msg:msg
+                }
+                resolve(data401);
+                console.log(msg, data);
               }
               }
             });
             });
           }
           }

@@ -2,18 +2,61 @@
 -->
 -->
 <template>
 <template>
   <div :style="styleObj">
   <div :style="styleObj">
+    <div style="padding: 6px;text-align: right;">
+      <el-date-picker
+        v-model="dataRange"
+        type="datetimerange"
+        format="yyyy-MM-dd HH:mm:ss"
+        :picker-options="pickerOptions"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        align="right">
+      </el-date-picker>
+      <el-button icon="el-icon-search" size="medium" style="height: 38px; width: 55px;" @click="reloadChart"></el-button>
+    </div>
     <div :id="id" style="width: 100%;height: 100%;padding: 10px"></div>
     <div :id="id" style="width: 100%;height: 100%;padding: 10px"></div>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
 import commonWeight from '@/mixins/commonWeight'
 import commonWeight from '@/mixins/commonWeight'
+import dayjs from 'dayjs'
+
 
 
 export default {
 export default {
   name: "monitorCustomScatterWeight",
   name: "monitorCustomScatterWeight",
   mixins: [commonWeight],
   mixins: [commonWeight],
   data() {
   data() {
     return {
     return {
+      dataRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
       chartInfo: null,
       chartInfo: null,
       scatterWeightOptions: {
       scatterWeightOptions: {
         title: {
         title: {
@@ -34,7 +77,8 @@ export default {
               '<br/>' + params.name + ' ' + params.value[2] + ' :<br/>' +
               '<br/>' + params.name + ' ' + params.value[2] + ' :<br/>' +
               // '最大' + params.value[2] + ': ' + params.value[3] + '% ' + '<br/>' +
               // '最大' + params.value[2] + ': ' + params.value[3] + '% ' + '<br/>' +
               // '最小' + params.value[2] + ': ' + params.value[4] + '% ' + '<br/>' +
               // '最小' + params.value[2] + ': ' + params.value[4] + '% ' + '<br/>' +
-              '平均' + params.value[2] + ': ' + params.value[5] + '% ' + '<br/>'
+              // '平均' + params.value[2] + ': ' + params.value[5] + '% ' + '<br/>'
+              '平均值：' + params.value[5] + '% ' + '<br/>'
             );
             );
           },
           },
           axisPointer: {
           axisPointer: {
@@ -150,6 +194,11 @@ export default {
   },
   },
   mounted() {
   mounted() {
     this.initChart();
     this.initChart();
+    const end = new Date();
+    const start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+
+    this.dataRange = [start,end];
   },
   },
   methods: {
   methods: {
     /**
     /**
@@ -174,8 +223,8 @@ export default {
     getChartData(callback) {
     getChartData(callback) {
       let that = this;
       let that = this;
 
 
-      var startTime = that.getOffsetDate(-30) + " 00:00:00";
-      var endTime = that.getOffsetDate(0) + " 23:59:59";
+      var startTime = dayjs(that.dataRange[0]).format('YYYY-MM-DD HH:mm:ss');
+      var endTime =  dayjs(that.dataRange[1]).format('YYYY-MM-DD HH:mm:ss');
 
 
       // 默认条件
       // 默认条件
       let defaultParams = {
       let defaultParams = {
@@ -185,8 +234,16 @@ export default {
         pageSize: 1000
         pageSize: 1000
       }
       }
 
 
+      if (that.chartInfo) {
+        that.chartInfo.showLoading({
+          text : '正在加载数据'
+        });
+      }
+
       that.handlerData(defaultParams).then((res) => {
       that.handlerData(defaultParams).then((res) => {
-        debugger
+        if (that.chartInfo) {
+          that.chartInfo.hideLoading();
+        }
         if(res && res.success){
         if(res && res.success){
           let list = res.data;
           let list = res.data;
           if (list) {
           if (list) {