'拉取'

src/views/site/Device_motore.vue

@@ -152,6 +152,7 @@
                     ? false
                     : true
                 "
+                @click="DataReportExport()"
                 >导出</el-button
               >
             </div>
@@ -357,6 +358,7 @@ export default {
   methods: {
     //最外层tabs切换事件触发
     handleClick(tab, event) {
+      this.th_tableData = [];
       this.ac_content = "model"; //将实时数据->恢复默认内部tabs选中
       this.se_content = "I"; //将历史趋势->恢复默认内部tabs选中
       for (let i in event.path) {
@@ -428,6 +430,35 @@ export default {
           }
         });
     },
+    /**
+     * @数据报表导出
+     */
+    DataReportExport() {
+      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
+        .DataReportExport({
+          siteId: this.$store.state.siteId,
+          startTime: time[0],
+          endTime: time[1],
+          queryType: queryType,
+        })
+        .then((requset) => {
+          if (requset.status === "SUCCESS") {
+            window.location.href =
+              window.PLATFROM_CONFIG.fileUrl + requset.data;
+          } else {
+            ElMessage.success({
+              message: requset.msg,
+              type: "success",
+            });
+          }
+        });
+    },
     /**
      * @实时数据api请求
      */
@@ -589,27 +620,6 @@ export default {
         [h.column.label]
       );
     },
-    DataReportExport() {
-      api
-        .DataReportExport({
-          siteId: 3,
-          startTime: "2020-01-14 00:00:00",
-          endTime: "2021-07-11 00:00:00",
-          queryType: "V",
-        })
-        .then((requset) => {
-          if (requset.status === "SUCCESS") {
-            window.location.href =
-              window.PLATFROM_CONFIG.fileUrl + requset.data;
-          } else {
-            ElMessage.success({
-              message: requset.msg,
-              type: "success",
-            });
-          }
-        });
-    },
-    // rtAnalogData/DataReportExport?
   },
   watch: {
     /**

src/views/site/Overview.vue

@@ -152,6 +152,11 @@ export default {
       this.show = data;
     },
   },
+  watch: {
+    "$store.state.siteId"() {
+      this.show = false
+    },
+  },
 };
 </script>
 

src/views/site/components/Overview/modalBox.vue

@@ -29,7 +29,7 @@
       </div>
       <div class="infoLine">
         <span>监控类型：</span>
-        <p>电力、视频</p>
+        <p>{{ deviceType }}</p>
       </div>
       <div class="infoLine">
         <span>联系人：</span>
@@ -58,6 +58,7 @@ export default {
       deviceType: "", //监控类型
     };
   },
+
   mounted() {
     api.siteOne({ siteId: this.$store.state.siteId }).then((requset) => {
       if (requset.status === "SUCCESS") {
@@ -68,7 +69,9 @@ export default {
         this.siteName = data.siteName;
         this.siteAddress = data.siteAddress;
         this.createTime = data.createTime;
-        this.deviceType = data.deviceType;
+        data.deviceType.map((val) => {
+          return (this.deviceType += val);
+        });
       } else {
         ElMessage.success({
           message: requset.msg,
@@ -89,5 +92,4 @@ export default {
 </script>
 
 <style scoped lang="scss">
-
 </style>