完善opc

src/views/opc/Opc.vue

@@ -255,7 +255,7 @@ export default {
   position: relative;
 }
 .info{
-  font-size: 12px;
+  font-size: 13px;
   font-weight: bold;
   color: blue;
   // transform: scale(0.5);

src/views/opc/OpcInfo.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="main">
     <img :src="imgUrl" width="1920px" alt="">
-    <div class="icon" style="right:20px">
+    <!--    <div class="icon" style="right:20px">
       <a-button type="primary" icon="appstore" size="large" @click="visibleRight=true" />
-    </div>
+    </div>-->
     <div v-if="dotList !=null && dotList.length>0">
       <div v-for="item in dotList" :key="item.id">
         <VueDragResize
@@ -23,11 +23,11 @@
               {{ item.description }}
             </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>
-              <span :style="{'color':item.warnSecondColor}" v-else-if="item.warnFirst<(+item.result)&&(+item.result)<item.warnSecond">{{ item.result }}</span>
-              <span :style="{'color':item.warnThirdColor}" v-else-if="item.warnThird<(+item.result)&&(+item.result)<item.warnFour">{{ item.result }}</span>
-              <span :style="{'color':item.warnFourColor}" v-else-if="(+item.result)>=item.warnFour&&item.warnFirst!==null">{{ item.result }}</span>
-              <span v-else>{{ item.result }}</span>
+              <span :style="{'color':item.warnFirstColor}" v-if="(+item.result)<=item.warnFirst&&item.warnFirst!==null">{{ item.result + item.unit }}</span>
+              <span :style="{'color':item.warnSecondColor}" v-else-if="item.warnFirst<(+item.result)&&(+item.result)<item.warnSecond">{{ item.result + item.unit }}</span>
+              <span :style="{'color':item.warnThirdColor}" v-else-if="item.warnThird<(+item.result)&&(+item.result)<item.warnFour">{{ item.result + item.unit }}</span>
+              <span :style="{'color':item.warnFourColor}" v-else-if="(+item.result)>=item.warnFour&&item.warnFirst!==null">{{ item.result + item.unit }}</span>
+              <span v-else>{{ item.result + item.unit }}</span>
             </div>
           </a-tooltip>
         </VueDragResize>
@@ -142,6 +142,7 @@ export default {
   created () {
     this.parentId = this.$route.query.parentId
     this.positionId = this.$route.query.line
+    this.getOpcInfo(this.positionId)
     querySbPosition({ parentId: this.parentId }).then(res => {
       this.list = res.data
     })
@@ -190,6 +191,9 @@ export default {
           this.dotList = res.data
           this.dotList.forEach(item => {
             item.isActive = false
+            if (item.result == null) {
+              item.result = '-'
+            }
           })
         })
       this.getImg()
@@ -225,10 +229,10 @@ export default {
   position: relative;
 }
 .info{
-  font-size: 12px;
+  font-size: 13px;
   font-weight: bold;
   color: blue;
-  padding:0 10px;
+  padding:0 2px;
   // transform: scale(0.5);
 }
 .icon{