完善opc

src/views/opc/OpcInfo.vue

@@ -20,7 +20,7 @@
         >
           <a-tooltip>
             <template slot="title">
-              {{ item.description }}
+              {{ item.description + '(' + item.time + ')' }}
             </template>
             <div class="info" @click="handleInfo(item)" @click.right.prevent="handleView(item)">
               <span :style="{'color':item.warnFirstColor}" v-if="(+item.result)<=item.warnFirst&&item.warnFirst!==null">{{ item.result }}</span>
@@ -145,6 +145,7 @@ export default {
     this.getOpcInfo(this.positionId)
     querySbPosition({ parentId: this.parentId }).then(res => {
       this.list = res.data
+      this.getOpcInfoFromRedis(this.positionId)
     })
     this.getImg()
     getSbPositionTree({ opcFlag: 1 }).then(res => {
@@ -192,7 +193,7 @@ export default {
           this.dotList.forEach(item => {
             item.isActive = false
             if (item.result == null) {
-              item.result = '无'
+              item.result = '-'
             }
           })
         })
@@ -207,7 +208,7 @@ export default {
             res.data.forEach(data => {
               if (item.positionNum === data.positionNum) {
                 item.result = data.result
-                return
+                item.time = data.time
               }
             })
           })

src/views/remote/opc-log/modules/Detail.vue

@@ -211,8 +211,10 @@ export default {
       })
     },
     doExport () {
+      this.confirmLoading = true
       exportRemoteOpcLogOneDay(this.model).then(file => {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
+        this.confirmLoading = false
       })
     },
     handleCancel () {