LIU 3.22

ui/src/views/ehs/fireapproval/index.vue

@@ -873,9 +873,9 @@ export default {
       this.doc.queryParams.pId = row.id
       this.doc.pId = row.id
       this.getFileList()
-      // this.$nextTick(() => {
-      //   this.$refs.doc.clearFiles()
-      // })
+      this.$nextTick(() => {
+        this.$refs.doc.clearFiles()
+      })
     },
     getFileList (){
       allFileList(this.doc.queryParams).then(response => {

ui/src/views/monitor/elec/elecindex.vue

@@ -356,7 +356,7 @@ export default {
         ///调取接口获取数据
         this.getList1();
       }, 0)
-    }, 20000)
+    }, 30000)
 
     // 一天请求一次数据
     window.setInterval(() => {

ui/src/views/monitor/elec/index.vue

@@ -353,15 +353,15 @@
       window.setInterval(() => {
           ///调取接口获取数据
           this.getList();
-      }, 5000)
+      }, 30000)
 
-      // // 一天请求一次数据
-      // window.setInterval(() => {
-      //   setTimeout(() => {
-      //     ///调取接口获取数据
-      //     this.getMonthList();
-      //   }, 0)
-      // }, 1000 * 10 * 6 * 60 * 6)
+      // 一天请求一次数据
+      window.setInterval(() => {
+        setTimeout(() => {
+          ///调取接口获取数据
+          this.getMonthList();
+        }, 0)
+      }, 1000 * 10 * 6 * 60 * 6)
     },
     beforeDestroy(){
       if(this.timer){

ui/src/views/system/notice/index.vue

@@ -390,9 +390,9 @@ export default {
         commonfileList: null,
         queryParams: {
           pId: null,
-          pType: 'notice'
+          pType: 'Notice'
         },
-        pType: 'notice',
+        pType: 'Notice',
         pId: null
       },
       pdf : {
@@ -598,11 +598,11 @@ export default {
 
     /** 报告附件按钮操作 */
     handleDoc(row) {
-      this.doc.id = row.id;
+      this.doc.id = row.noticeId;
       this.doc.title = row.filename;
       this.doc.open = true;
-      this.doc.queryParams.pId = row.id
-      this.doc.pId = row.id
+      this.doc.queryParams.pId = row.noticeId
+      this.doc.pId = row.noticeId
       this.getFileList()
       this.$nextTick(() => {
         this.$refs.doc.clearFiles()
@@ -631,6 +631,11 @@ export default {
       this.pdf.pdfUrl = process.env.VUE_APP_BASE_API +'/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl
     },
 
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+
     getFileList (){
       allFileList(this.doc.queryParams).then(response => {
         this.doc.commonfileList = response;