新增公共处理时区时间段方法/对接接口202107160859

src/api/site/Device_motore.js

@@ -34,6 +34,13 @@ export default {
             method: 'GET',
             params: params
         })
-    }
-    
+    },
+    // 获取数据报表列表数据
+    DataReport(params) {
+        return request({
+            url: `rtAnalogData/DataReport`,
+            method: 'GET',
+            params: params
+        })
+    },
 }

src/store/index.js

@@ -4,6 +4,99 @@ export default createStore({
     state: {
         siteId: 1,//公共api请求参数->siteId
         Time_Data: [],//公共api请求参数->Time_Data
+        queryType: '',//监控设备->数据报表api请求参数->queryType
+        table_list: [
+            {
+                name: "电流",
+                list: [
+                    { name: "A相电流", value: "Ia" },
+                    { name: "B相电流", value: "Ib" },
+                    { name: "C相电流", value: "Ic" },
+                ],
+            },
+            {
+                name: "功率",
+                list: [
+                    { name: "A相有功功率 kW", value: "Pa" },
+                    { name: "A相无功功率 kVar", value: "Qa" },
+                    { name: "B相有功功率 kW", value: "Pb" },
+                    { name: "B相无功功率 kVar", value: "Qb" },
+                    { name: "C相有功功率 kW", value: "Pc" },
+                    { name: "C相无功功率 kVar", value: "Qc" },
+                    { name: "总有功功率 kW", value: "P" },
+                    { name: "总无功功率 kW", value: "Q" },
+                    { name: "实时需量 kW", value: "Demand" },
+                ],
+            },
+            {
+                name: "电度",
+                list: [
+                    { name: "正有功电度 kWh", value: "Epp" },
+                    { name: "负有功电度 kWh", value: "Epn" },
+                    { name: "正无功电度 kvarh", value: "Eqp" },
+                    { name: "负无功电度 kvarh", value: "Eqn" },
+                ],
+            },
+            {
+                name: "电压",
+                list: [
+                    { name: "A相电压 kV", value: "Ua" },
+                    { name: "B相电压 kV", value: "Ub" },
+                    { name: "C相电压 kV", value: "Uc" },
+                    { name: "回路电压 V", value: "Ul" },
+                    { name: "AB线电压 V", value: "Uab" },
+                    { name: "BC线电压 V", value: "Ubc" },
+                    { name: "CA线电压 V", value: "Uca" },
+                ],
+            },
+            {
+                name: "温度 ℃",
+                list: [
+                    { name: "外接温度1", value: "T1" },
+                    { name: "外接温度2", value: "T2" },
+                    { name: "外接温度3", value: "T3" },
+                    { name: "外接温度4", value: "T4" },
+                    { name: "环境温度", value: "Ic" },
+                ],
+            },
+            {
+                name: "频率 Hz",
+                list: [{ name: "频率", value: "F" }],
+            },
+            {
+                name: "功率因数",
+                list: [
+                    { name: "A相功率因数", value: "COSa" },
+                    { name: "B相功率因数", value: "COSb" },
+                    { name: "C相功率因数", value: "COSc" },
+                    { name: "功率因数", value: "COS" },
+                ],
+            },
+            {
+                name: "谐波电流有效值 A",
+                list: [
+                    { name: "Ia总谐波电流", value: "IHa" },
+                    { name: "Ib总谐波电流", value: "IHa" },
+                    { name: "Ic总谐波电流", value: "IHc" },
+                ],
+            },
+            {
+                name: "通讯参数",
+                list: [{ name: "设备信号强度", value: "SignalIntensity" }],
+            },
+            {
+                name: "电压突变 次",
+                list: [
+                    { name: "电压暂升次数", value: "Upt" },
+                    { name: "电压暂降次数", value: "Udt" },
+                    { name: "电压中断次数", value: "Ust" },
+                ],
+            },
+        ],//数据报表->默认tabs数据
+
+        run_off_Status: null,//运行状态统计->echarts->OFF次数分布和运行状态曲线图表 api信息存储
+
+        timearr: [],//公共处理开始时间和结束时间中的时间段天数 值存储
     },
     mutations: {
         increment(state, val) {
@@ -13,6 +106,7 @@ export default createStore({
          * @公共处理时区方法
          */
         TimeAll_function(state, time) {
+            state.Time_Data = []
             for (let i in time) {
                 var Y = time[i].getFullYear() < 10 ? '0' + time[i].getFullYear() : time[i].getFullYear()
                 var M = (time[i].getMonth() + 1) < 10 ? '0' + (time[i].getMonth() + 1) : (time[i].getMonth() + 1)
@@ -23,6 +117,135 @@ export default createStore({
                 // console.log(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
                 state.Time_Data.push(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
             }
-        }
+        },
+        /**
+         * @数据报表 —> 多选按钮数据处理
+         * @param {*} state 
+         * @param {*} checked_list 
+         */
+        checkedCities_all(state, checked_list) {
+            state.queryType = ''
+            var checked = ''
+            for (let i in checked_list) {
+                checked_list[i] === "电流"
+                    ? checked = "I"
+                    : checked_list[i] === "功率"
+                        ? checked = "P"
+                        : checked_list[i] === "电度"
+                            ? checked = "KWh"
+                            : checked_list[i] === "电压"
+                                ? checked = "V"
+                                : checked_list[i] === "温度"
+                                    ? checked = "C"
+                                    : checked_list[i] === "频率"
+                                        ? checked = "HZ"
+                                        : checked_list[i] === "功率因数"
+                                            ? checked = "PS"
+                                            : checked_list[i] === "谐波电流有效值"
+                                                ? checked = "RMS"
+                                                : checked_list[i] === "通讯参数"
+                                                    ? checked = "DDB"
+                                                    : checked_list[i] === "电压突变"
+                                                        ? checked = "VT"
+                                                        : ""
+                state.queryType += checked_list.length > 1 ? checked + "," : checked;
+            }
+            state.queryType = checked_list.length > 1 ? state.queryType.slice(0, state.queryType.length - 1) : state.queryType
+        },
+        /**
+         * @运行状态统计 -> echarts -> OFF次数分布和运行状态曲线图表 api信息存储
+         */
+        run_off_Status(state, data) {
+            state.run_off_Status = data
+        },
+        /**
+         * @公共处理开始时间和结束时间中的时间段天数
+         * @param {*} state 
+         * @param {*} begin 开始时间和结束时间
+         */
+        getAll(state, begin) {
+            let arr1 = begin[0].split("-");
+            let arr2 = begin[1].split("-");
+            let arr1_ = new Date();
+            let arrTime = [];
+            arr1_.setUTCFullYear(arr1[0], arr1[1] - 1, arr1[2]);
+            let arr2_ = new Date();
+            arr2_.setUTCFullYear(arr2[0], arr2[1] - 1, arr2[2]);
+            let unixDb = arr1_.getTime();
+            let unixDe = arr2_.getTime();
+            for (let k = unixDb; k <= unixDe;) {
+                arrTime.push(datetimeparse(k, "YY-MM-DD"));
+                k = k + 24 * 60 * 60 * 1000;
+            }
+            state.timearr = arrTime
+            // return arrTime;
+            // 时间格式处理
+            function datetimeparse(timestamp, format, prefix) {
+                if (typeof timestamp == "string") {
+                    timestamp = Number(timestamp);
+                }
+                //转换时区
+                let currentZoneTime = new Date(timestamp);
+                let currentTimestamp = currentZoneTime.getTime();
+                let offsetZone = currentZoneTime.getTimezoneOffset() / 60; //如果offsetZone>0是西区，西区晚
+                let offset = null;
+                //客户端时间与服务器时间保持一致，固定北京时间东八区。
+                offset = offsetZone + 8;
+                currentTimestamp = currentTimestamp + offset * 3600 * 1000;
+
+                let newtimestamp = null;
+                if (currentTimestamp) {
+                    if (currentTimestamp.toString().length === 13) {
+                        newtimestamp = currentTimestamp.toString();
+                    } else if (currentTimestamp.toString().length === 10) {
+                        newtimestamp = currentTimestamp + "000";
+                    } else {
+                        newtimestamp = null;
+                    }
+                } else {
+                    newtimestamp = null;
+                }
+                let dateobj = newtimestamp
+                    ? new Date(parseInt(newtimestamp))
+                    : new Date();
+                let YYYY = dateobj.getFullYear();
+                let MM =
+                    dateobj.getMonth() > 8
+                        ? dateobj.getMonth() + 1
+                        : "0" + (dateobj.getMonth() + 1);
+                let DD =
+                    dateobj.getDate() > 9 ? dateobj.getDate() : "0" + dateobj.getDate();
+                let HH =
+                    dateobj.getHours() > 9 ? dateobj.getHours() : "0" + dateobj.getHours();
+                let mm =
+                    dateobj.getMinutes() > 9
+                        ? dateobj.getMinutes()
+                        : "0" + dateobj.getMinutes();
+                let ss =
+                    dateobj.getSeconds() > 9
+                        ? dateobj.getSeconds()
+                        : "0" + dateobj.getSeconds();
+                let output = "";
+                let separator = "/";
+                if (format) {
+                    separator = format.match(/-/) ? "-" : "/";
+                    output += format.match(/yy/i) ? YYYY : "";
+                    output += format.match(/MM/)
+                        ? (output.length ? separator : "") + MM
+                        : "";
+                    output += format.match(/dd/i)
+                        ? (output.length ? separator : "") + DD
+                        : "";
+                    output += format.match(/hh/i) ? (output.length ? " " : "") + HH : "";
+                    output += format.match(/mm/) ? (output.length ? ":" : "") + mm : "";
+                    output += format.match(/ss/i) ? (output.length ? ":" : "") + ss : "";
+                } else {
+                    output += YYYY + separator + MM + separator + DD;
+                }
+                output = prefix ? prefix + output : output;
+                return newtimestamp ? output : "";
+            }
+        },
+
     }
 })

src/views/site/Device_motore.vue

@@ -163,7 +163,7 @@
                 type="primary"
                 class="query"
                 :disabled="checkedCities.length > 0 ? false : true"
-                @click="Time_all"
+                @click="Data_report_api($store.state.siteId)"
                 >查询</el-button
               >
               <el-button
@@ -203,13 +203,16 @@
               show
             >
               <el-table-column
-                prop="time"
+                prop="dataTime"
                 label="时间"
                 :render-header="labelHead"
                 fixed
               >
               </el-table-column>
-              <template v-for="(table, index) in table_list" :key="index">
+              <template
+                v-for="(table, index) in $store.state.table_list"
+                :key="index"
+              >
                 <el-table-column
                   :label="table.name"
                   v-if="columnHeaders[index].isShow"
@@ -270,6 +273,7 @@
                 end-placeholder="结束日期"
                 range-separator="~"
                 :disabledDate="disabledDate"
+                @change="If_tabs_api($store.state.siteId)"
               >
               </el-date-picker>
             </div>
@@ -332,7 +336,6 @@ export default {
   },
   data() {
     return {
-      siteId: 0, //请求api时传入的siteid
       activeName: "first", //最外层tabs切换name
       ac_content: "model", //实时数据tabs切换name
       se_content: "flow", //历史趋势tabs切换name
@@ -355,10 +358,10 @@ export default {
       day_count: 0, //运行状态统计->本日off次数
 
       value: "",
-      checkAll: false,
-      checkedCities: [],
-      cities: cityOptions,
-      isIndeterminate: false,
+      checkAll: false, //数据报表->全选按钮是否选中
+      checkedCities: [], //数据报表->多选按钮信息存储
+      cities: cityOptions, //数据报表->多选按钮信息存储
+      isIndeterminate: false, //数据报表->全选按钮是否选中
 
       columnHeaders: [
         { index: 0, title: "电流", isShow: false },
@@ -371,260 +374,11 @@ export default {
         { index: 7, title: "谐波电流有效值", isShow: false },
         { index: 8, title: "通讯参数", isShow: false },
         { index: 9, title: "电压突变", isShow: false },
-      ],
-
-      table_list: [
-        {
-          name: "电流",
-          list: [
-            { name: "A相电流", value: "name" },
-            { name: "B相电流", value: "name" },
-            { name: "C相电流", value: "name" },
-          ],
-        },
-        {
-          name: "功率",
-          list: [
-            { name: "A相有功功率 kW", value: "name" },
-            { name: "A相无功功率 kVar", value: "name" },
-            { name: "B相有功功率 kW", value: "name" },
-            { name: "B相无功功率 kVar", value: "name" },
-            { name: "C相有功功率 kW", value: "name" },
-            { name: "C相无功功率 kVar", value: "name" },
-            { name: "总有功功率 kW", value: "name" },
-            { name: "总无功功率 kW", value: "name" },
-            { name: "实时需量 kW", value: "name" },
-          ],
-        },
-        {
-          name: "电度",
-          list: [
-            { name: "正有功电度 kWh", value: "name" },
-            { name: "负有功电度 kWh", value: "name" },
-            { name: "正无功电度 kvarh", value: "name" },
-            { name: "负无功电度 kvarh", value: "name" },
-          ],
-        },
-        {
-          name: "电压",
-          list: [
-            { name: "A相电压 kV", value: "name" },
-            { name: "B相电压 kV", value: "name" },
-            { name: "C相电压 kV", value: "name" },
-            { name: "回路电压 V", value: "name" },
-            { name: "AB线电压 V", value: "name" },
-            { name: "BC线电压 V", value: "name" },
-            { name: "CA线电压 V", value: "name" },
-          ],
-        },
-        {
-          name: "温度 ℃",
-          list: [
-            { name: "外接温度1", value: "name" },
-            { name: "外接温度2", value: "name" },
-            { name: "外接温度3", value: "name" },
-            { name: "外接温度4", value: "name" },
-            { name: "环境温度", value: "name" },
-          ],
-        },
-        {
-          name: "频率 Hz",
-          list: [{ name: "频率", value: "name" }],
-        },
-        {
-          name: "功率因数",
-          list: [
-            { name: "A相功率因数", value: "name" },
-            { name: "B相功率因数", value: "name" },
-            { name: "C相功率因数", value: "name" },
-            { name: "功率因数", value: "name" },
-          ],
-        },
-        {
-          name: "谐波电流有效值 A",
-          list: [
-            { name: "Ia总谐波电流", value: "name" },
-            { name: "Ib总谐波电流	", value: "name" },
-            { name: "Ic总谐波电流", value: "name" },
-          ],
-        },
-        {
-          name: "通讯参数",
-          list: [{ name: "设备信号强度", value: "name" }],
-        },
-        {
-          name: "电压突变 次",
-          list: [
-            { name: "电压暂升次数", value: "name" },
-            { name: "电压暂降次数	", value: "name" },
-            { name: "电压中断次数", value: "name" },
-          ],
-        },
-      ],
+      ], //数据报表->控制table表格是否显示隐藏
     };
   },
   mounted() {},
   methods: {
-    Time_all() {
-      // console.log(this.defaultTime)
-      // console.log("bbbbbbb",data)
-      // this.$emit("func", this.defaultTime);
-      this.th_tableData = [
-        {
-          time: "2016-05-03",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "1518",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-02",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-04",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-01",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-08",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-06",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-        {
-          time: "2016-05-07",
-          name: "1",
-          province: "2",
-          city: "3",
-          address: "2市3金沙江路 1518 弄",
-          zip: 200333,
-        },
-      ];
-    },
-
     //最外层tabs切换事件触发
     handleClick(tab, event) {
       //   console.log(tab, event);
@@ -651,22 +405,55 @@ export default {
     },
     //历史趋势 内部tabs 点击事件触发
     handleClick2(tab, event) {
-      console.log(tab, event);
+      tab || event;
+      // console.log(tab, event);
       this.se_label = tab.props.label;
     },
     //数据报表全选按钮事件
     handleCheckAllChange(val) {
+      this.th_tableData = [];
       this.checkedCities = val ? cityOptions : [];
       this.isIndeterminate = false;
     },
     //数据报表多选按钮事件
     handleCheckedCitiesChange(value) {
+      this.th_tableData = [];
       let checkedCount = value.length;
       this.checkAll = checkedCount === this.cities.length;
       this.isIndeterminate =
         checkedCount > 0 && checkedCount < this.cities.length;
     },
-    //实时数据api请求
+    /**
+     * @数据报表api请求
+     */
+    Data_report_api(siteid) {
+      var _this = this;
+      _this.$store.commit("TimeAll_function", _this.th_defaultTime);
+      var time = _this.$store.state.Time_Data;
+      _this.$store.commit("checkedCities_all", _this.checkedCities);
+      var queryType = _this.$store.state.queryType;
+
+      api
+        .DataReport({
+          startTime: time[0],
+          endTime: time[1],
+          queryType: queryType,
+          siteId: siteid,
+        })
+        .then((requset) => {
+          if (requset.status === "SUCCESS") {
+            _this.th_tableData = requset.data;
+          } else {
+            ElMessage.success({
+              message: requset.msg,
+              type: "success",
+            });
+          }
+        });
+    },
+    /**
+     * @实时数据api请求
+     */
     Real_time_api(siteid) {
       var _this = this;
       //模拟量api请求
@@ -706,11 +493,16 @@ export default {
         ? rtSwitchData()
         : "";
     },
-    //运行状态统计api请求
-    Operation_status_api(siteId) {
+    /**
+     * @运行状态统计api请求
+     */
+    Operation_status_api(siteid) {
       var _this = this;
+      _this.$store.commit("TimeAll_function", _this.fh_defaultTime);
+      var time = _this.$store.state.Time_Data;
+
       function LoopStatus() {
-        api.LoopStatus({ siteId: siteId }).then((requset) => {
+        api.LoopStatus({ siteId: siteid }).then((requset) => {
           // console.log(requset);
           if (requset.status === "SUCCESS") {
             _this.loadLive = requset.data[0].LoadLive == 1 ? "ON" : "OFF";
@@ -724,15 +516,13 @@ export default {
           }
         });
       }
-      function runStatus() {
-        _this.$store.commit("TimeAll_function", _this.fh_defaultTime);
-        var time = _this.$store.state.Time_Data;
-
-        api
-          .runStatus({ startTime: time[0], endTime: time[1], siteId: siteId })
+      async function runStatus() {
+        await api
+          .runStatus({ startTime: time[0], endTime: time[1], siteId: siteid })
           .then((requset) => {
             if (requset.status === "SUCCESS") {
-              console.log(requset);
+              _this.$store.commit("run_off_Status", requset.data);
+              // console.log(requset);
             } else {
               ElMessage.success({
                 message: requset.msg,

src/views/site_ehcarts/Device_StateCurve.vue

@@ -77,26 +77,51 @@ export default {
         },
       ],
       msgFormSon: null,
+      data_time: [],
+      data: [],
     };
   },
   mounted() {
-    this.$nextTick(() => {
-      this.initChart();
-      console.log(this.defaul_tTime);
-    });
+    // this.$nextTick(() => {
+    //   this.initChart();
+    //   // console.log(this.defaul_tTime);
+    // });
   },
   beforeUnmount() {
     window.removeEventListener("resize", this.chart);
   },
+  watch: {
+    "$store.state.run_off_Status"() {
+      // this.chart.resize();
+      this.initChart();
+    },
+  },
   methods: {
     //次数分布折线图
     initChart() {
+      var _this = this;
       var chart = echarts.init(this.$refs.statecurve);
-      var data_time = ["2021-07-01 00:00:00", "2021-07-14 16:03:00"];
 
-      var data = [1, 1].map((val, ind) => {
-        return [data_time[ind], val];
-      });
+      var time = _this.$store.state.Time_Data;
+
+      var run_off_Status = _this.$store.state.run_off_Status;
+      for (let i in run_off_Status) {
+        if (run_off_Status[i].name === "runStates") {
+          if (run_off_Status[i].list.length <= 0) {
+            _this.data_time = time;
+            _this.data = [1, 1].map((val, ind) => {
+              return [_this.data_time[ind], val];
+            });
+          } else {
+            _this.data_time = run_off_Status[i].listDate;
+            _this.data = run_off_Status[i].list.map((val, ind) => {
+              return [_this.data_time[ind], val];
+            });
+          }
+        }
+      }
+      // console.log(_this.data_time,_this.data,run_off_Status)
+
       var option;
       option = {
         title: [
@@ -169,9 +194,9 @@ export default {
               day: `{MM}-{dd}\n{yyyy}`,
               hour: "{HH}:{mm}\n{MM}-{dd}",
               minute: "{HH}:{mm}\n{MM}-{dd}",
-              second: "{HH}:{mm}:{ss}",
-              millisecond: "{hh}:{mm}:{ss} {SSS}",
-              none: "{yyyy}-{MM}-{dd} {hh}:{mm}:{ss} {SSS}",
+              second: "{HH}:{mm}\n{MM}-{dd}",
+              millisecond: "{HH}:{mm}\n{MM}-{dd}",
+              none: "{yyyy}-{MM}-{dd} {hh}:{mm}:{ss}",
             },
           },
           axisLine: {
@@ -217,7 +242,7 @@ export default {
             name: "回路带电/停电",
             type: "line",
             smooth: true,
-            data: data,
+            data: this.data,
           },
         ],
       };

src/views/site_ehcarts/Device_distion.vue

@@ -42,33 +42,25 @@ export default {
       chart: null,
       color_XY: "rgba(0, 244, 253, 0.1)",
       msgFormSon: null,
-      data_time: [
-        "2021-07-01 00:00:00",
-        "2021-07-02 00:00:00",
-        "2021-07-03 00:00:00",
-        "2021-07-04 00:00:00",
-        "2021-07-05 00:00:00",
-        "2021-07-06 00:00:00",
-        "2021-07-07 00:00:00",
-        "2021-07-08 00:00:00",
-        "2021-07-09 00:00:00",
-        "2021-07-10 00:00:00",
-        "2021-07-11 00:00:00",
-        "2021-07-12 00:00:00",
-        "2021-07-13 00:00:00",
-        "2021-07-14 00:00:00",
-      ],
+      data_time: [],
+      data: [],
     };
   },
   mounted() {
-    this.$nextTick(() => {
-      this.initChart();
-      console.log(this.defaul_tTime);
-    });
+    // this.$nextTick(() => {
+    //   this.initChart();
+    //   // console.log(this.defaul_tTime);
+    // });
   },
   beforeUnmount() {
     window.removeEventListener("resize", this.chart);
   },
+  watch: {
+    "$store.state.run_off_Status"() {
+      // this.chart.resize();
+      this.initChart();
+    },
+  },
   methods: {
     //次数分布折线图
     initChart() {
@@ -76,9 +68,36 @@ export default {
       var chart = echarts.init(this.$refs.distion);
       var option;
 
-      var data = [0, 0, 0, 0, 0, 1, 1,1,1,1,1,1,1,1].map((val, ind) => {
-        return [_this.data_time[ind], val];
-      });
+      var time = _this.$store.state.Time_Data;
+
+      this.$store.commit("getAll", [
+        time[0].split(" ")[0],
+        time[1].split(" ")[0],
+      ]);
+
+      var timeall = this.$store.state.timearr;
+      var dataall = [];
+      for (let i in timeall) {
+        i;
+        dataall.push(0);
+      }
+
+      var run_off_Status = _this.$store.state.run_off_Status;
+      for (let i in run_off_Status) {
+        if (run_off_Status[i].name === "offCount") {
+          if (run_off_Status[i].list.length <= 0) {
+            _this.data_time = timeall;
+            _this.data = dataall.map((val, ind) => {
+              return [_this.data_time[ind], val];
+            });
+          } else {
+            _this.data_time = run_off_Status[i].listDate;
+            _this.data = run_off_Status[i].list.map((val, ind) => {
+              return [_this.data_time[ind], val];
+            });
+          }
+        }
+      }
 
       option = {
         title: [
@@ -116,15 +135,9 @@ export default {
             for (let i in params) {
               res += `
               <div style="display:flex">
-                  <div style="width:10px;height:10px;background:${
-                    params[i].color
-                  };border-radius: 10px;margin:10px 0;"></div>
-                  <div style="padding:4px 0px 0px 10px;">${
-                    params[i].seriesName
-                  }:</div>
-                  <div style="padding:4px 0px 0px 10px;">${
-                    params[i].data[1]
-                  }</div>
+                  <div style="width:10px;height:10px;background:${params[i].color};border-radius: 10px;margin:10px 0;"></div>
+                  <div style="padding:4px 0px 0px 10px;">${params[i].seriesName}:</div>
+                  <div style="padding:4px 0px 0px 10px;">${params[i].data[1]}</div>
               </div>`; //可以在这个方法中做改变
             }
             return res;
@@ -139,9 +152,8 @@ export default {
             color: "#fff",
             fontWeight: "bold",
           },
-
           axisLabel: {
-            showMaxLabel: true,
+            // showMaxLabel: true,
             textStyle: {
               color: "#fff", //坐标值得具体的颜色
             },
@@ -150,9 +162,9 @@ export default {
               month: `{MM}-{dd}\n{yyyy}`,
               day: `{MM}-{dd}\n{yyyy}`,
               hour: "{HH}:{mm}\n{MM}-{dd}",
-              minute: "{HH}:{mm}",
-              second: "{HH}:{mm}:{ss}",
-              millisecond: "{hh}:{mm}:{ss} {SSS}",
+              minute: "{HH}:{mm}\n{MM}-{dd}",
+              second: "{HH}:{mm}\n{MM}-{dd}",
+              millisecond: "{HH}:{mm}\n{MM}-{dd}",
               none: "{yyyy}-{MM}-{dd} {hh}:{mm}:{ss} {SSS}",
             },
           },
@@ -190,7 +202,7 @@ export default {
             name: `OFF次数`,
             type: "line",
             smooth: true,
-            data: data,
+            data: this.data,
           },
         ],
       };

src/views/site_ehcarts/Device_second.vue

@@ -82,7 +82,7 @@ export default {
   mounted() {
     this.$nextTick(() => {
       this.initChart();
-      console.log(this.defaul_tTime);
+      // console.log(this.defaul_tTime);
     });
   },
   beforeUnmount() {