whj 2 years ago
parent
commit
6dbb80ed6e
3 changed files with 9 additions and 10 deletions
  1. 4 4
      src/components/LiquidLevel/index.vue
  2. 2 2
      src/views/opc/Opc.vue
  3. 3 4
      src/views/opc/OpcInfo.vue

+ 4 - 4
src/components/LiquidLevel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <chart-view :chartOption="chartOption" width="30px" height="120px"></chart-view>
+    <chart-view :chartOption="chartOption" width="40px" height="170px"></chart-view>
   </div>
 </template>
 
@@ -47,8 +47,8 @@ export default {
           show: true,
           left: '90%',
           right: '90%',
-          top: '8%',
-          bottom: '10%',
+          top: '0%',
+          bottom: '0%',
           borderWidth: 2, // 图标外边框大小
           borderColor: '#011737' // 图标边框颜色
         },
@@ -72,7 +72,7 @@ export default {
             // name:"aaa",
             type: 'value',
             // axisLabel: { show: false },
-            min: 0,
+            min: this.value.low,
             max: this.value.high,
             splitNumber: 10,
             show: false,

+ 2 - 2
src/views/opc/Opc.vue

@@ -91,8 +91,8 @@
         <VueDragResize
           v-if="item.type===5"
           :isActive="item.isActive"
-          :w="30"
-          :h="120"
+          :w="40"
+          :h="170"
           :minh="20"
           :x="item.imgXPosition"
           :y="item.imgYPosition"

+ 3 - 4
src/views/opc/OpcInfo.vue

@@ -7,7 +7,6 @@
     <div v-if="dotList !=null && dotList.length>0">
       <div v-for="item in dotList" :key="item.id">
         <VueDragResize
-          v-show="item.positionFlag"
           :isActive="item.isActive"
           :w="item.width"
           :h="item.height"
@@ -23,7 +22,7 @@
               {{ item.description + '(' + item.time + ')' }}
             </template>
             <!--            <div class="info" @click="handleInfo(item)" @click.right.prevent="handleView(item)">-->
-            <div v-if="item.type===1" class="info" @click="handleInfo(item)">
+            <div v-if="item.type===1||item.type===5" class="info" @click="handleInfo(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>
@@ -127,8 +126,8 @@
         <VueDragResize
           v-if="item.type===5"
           :isActive="item.isActive"
-          :w="30"
-          :h="120"
+          :w="40"
+          :h="170"
           :minh="20"
           :x="item.imgXPosition"
           :y="item.imgYPosition"