hfxc226 1 жил өмнө
parent
commit
e29bbe9483

BIN
src/assets/kg_green_left.png


BIN
src/assets/kg_green_right.png


BIN
src/assets/kg_green_top.png


BIN
src/assets/kg_red_left.png


BIN
src/assets/kg_red_right.png


BIN
src/assets/kg_red_top.png


BIN
src/assets/red.png


+ 23 - 3
src/views/opc/Opc.vue

@@ -29,7 +29,7 @@
           </a-tooltip>
         </VueDragResize>
         <VueDragResize
-          v-if="item.type===2 && item.fetchFlag===1"
+          v-if="item.type===2"
           :isActive="item.isActive"
           :w="35"
           :h="35"
@@ -45,11 +45,11 @@
             <template slot="title">
               {{ item.description }}
             </template>
-            <img src="@/assets/stop.png" alt="" width="35px" height="35px">
+            <img src="@/assets/kg_red_left.png" alt="" width="35px" height="35px">
           </a-tooltip>
         </VueDragResize>
         <VueDragResize
-          v-if="item.type===2 && item.fetchFlag===0"
+          v-if="item.type===3"
           :isActive="item.isActive"
           :w="35"
           :h="35"
@@ -68,6 +68,26 @@
             <img src="@/assets/green.png" alt="" width="35px" height="35px">
           </a-tooltip>
         </VueDragResize>
+        <VueDragResize
+          v-if="item.type===4"
+          :isActive="item.isActive"
+          :w="35"
+          :h="35"
+          :minh="20"
+          :x="item.imgXPosition"
+          :y="item.imgYPosition"
+          :isDraggable="item.isActive"
+          :isResizable="item.isActive"
+          :stickSize="4"
+          @dragging="handleOpt(item)"
+          @dragstop="resizeImg">
+          <a-tooltip>
+            <template slot="title">
+              {{ item.description }}
+            </template>
+            <img src="@/assets/stop.png" alt="" width="35px" height="35px">
+          </a-tooltip>
+        </VueDragResize>
         <VueDragResize
           v-if="item.type===5"
           :isActive="item.isActive"

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

@@ -33,7 +33,7 @@
           </a-tooltip>
         </VueDragResize>
         <VueDragResize
-          v-if="item.type===2 && item.fetchFlag===1 "
+          v-if="item.type===2"
           v-show="item.result===0"
           :isActive="item.isActive"
           :w="35"
@@ -49,11 +49,31 @@
             <template slot="title">
               {{ item.description }}
             </template>
-            <img src="@/assets/stop.png" @click="handleInfo(item)" alt="" width="35px" height="35px">
+            <img src="@/assets/kg_red_left.png" @click="handleInfo(item)" alt="" width="35px" height="35px">
           </a-tooltip>
         </VueDragResize>
         <VueDragResize
-          v-if="item.type===2 && item.fetchFlag===0 "
+          v-if="item.type===2"
+          v-show="item.result===1"
+          :isActive="item.isActive"
+          :w="35"
+          :h="35"
+          :minh="20"
+          :x="item.imgXPosition"
+          :y="item.imgYPosition"
+          :isDraggable="item.isActive"
+          :isResizable="item.isActive"
+          :stickSize="5"
+        >
+          <a-tooltip>
+            <template slot="title">
+              {{ item.description }}
+            </template>
+            <img src="@/assets/kg_green_left.png" @click="handleInfo(item)" alt="" width="35px" height="35px">
+          </a-tooltip>
+        </VueDragResize>
+        <VueDragResize
+          v-if="item.type===3"
           v-show="item.result===1"
           :isActive="item.isActive"
           :w="35"
@@ -78,6 +98,32 @@
               height="35px">
           </a-tooltip>
         </VueDragResize>
+        <VueDragResize
+          v-if="item.type===4"
+          v-show="item.result===0"
+          :isActive="item.isActive"
+          :w="35"
+          :h="35"
+          :minh="20"
+          :x="item.imgXPosition"
+          :y="item.imgYPosition"
+          :isDraggable="item.isActive"
+          :isResizable="item.isActive"
+          :stickSize="5"
+        >
+          <a-tooltip>
+            <template slot="title">
+              {{ item.description }}
+            </template>
+            <img
+              style="z-index: 100"
+              @click="handleInfo(item)"
+              src="@/assets/stop.png"
+              alt=""
+              width="35px"
+              height="35px">
+          </a-tooltip>
+        </VueDragResize>
         <VueDragResize
           v-if="item.type===5"
           :isActive="item.isActive"