M点位

src/views/opc/Opc.vue

@@ -45,7 +45,7 @@
             <template slot="title">
               {{ item.description }}
             </template>
-            <img src="@/assets/green.png" alt="" width="35px" height="35px">
+            <img src="@/assets/stop.png" alt="" width="35px" height="35px">
           </a-tooltip>
         </VueDragResize>
         <VueDragResize
@@ -65,7 +65,7 @@
             <template slot="title">
               {{ item.description }}
             </template>
-            <img src="@/assets/stop.png" alt="" width="35px" height="35px">
+            <img src="@/assets/green.png" alt="" width="35px" height="35px">
           </a-tooltip>
         </VueDragResize>
       </div>

src/views/opc/OpcInfo.vue

@@ -34,7 +34,7 @@
         </VueDragResize>
         <VueDragResize
           v-if="item.type===2 && item.fetchFlag===1 "
-          v-show="item.result===1"
+          v-show="item.result===0"
           :isActive="item.isActive"
           :w="35"
           :h="35"
@@ -49,12 +49,12 @@
             <template slot="title">
               {{ item.description }}
             </template>
-            <img src="@/assets/green.png" @click="handleInfo(item)" alt="" width="35px" height="35px">
+            <img src="@/assets/stop.png" @click="handleInfo(item)" alt="" width="35px" height="35px">
           </a-tooltip>
         </VueDragResize>
         <VueDragResize
           v-if="item.type===2 && item.fetchFlag===0 "
-          v-show="item.result===0"
+          v-show="item.result===1"
           :isActive="item.isActive"
           :w="35"
           :h="35"
@@ -69,7 +69,13 @@
             <template slot="title">
               {{ item.description }}
             </template>
-            <img style="z-index: 100" @click="handleInfo(item)" src="@/assets/stop.png" alt="" width="35px" height="35px">
+            <img
+              style="z-index: 100"
+              @click="handleInfo(item)"
+              src="@/assets/green.png"
+              alt=""
+              width="35px"
+              height="35px">
           </a-tooltip>
         </VueDragResize>
       </div>
@@ -116,7 +122,7 @@
     </div>
     <detail ref="detailModal" @ok="handleOk" />
     <detail-log ref="detailLogModal" @ok="handleOk" />
-<!--    <remote-opc-warn></remote-opc-warn>-->
+    <!--    <remote-opc-warn></remote-opc-warn>-->
   </div>
 </template>
 

src/views/remote/opc/RemoteOpc.vue

@@ -140,9 +140,9 @@
               type="vertical" />
             <a
               v-if="record.type == 2"
-              @click="handleAddFetch(record)">就地点位
+              @click="handleAddFetch(record)">设置M点位
             </a>
-            <a
+<!--            <a
               style="margin-left: 8px"
               @click="doTestAdd(record)">测试写入
             </a>
@@ -155,7 +155,7 @@
             <a
               style="margin-left: 8px"
               @click="doTestSelect(record)">测试查询
-            </a>
+            </a>-->
           </template>
         </span>
       </s-table>

src/views/remote/opc/modules/BaseForm.vue

@@ -66,7 +66,7 @@
               @blur="checkPoint"
               style="width: 60%"
               v-decorator="['description', {rules: [{required: true, message: '点位不能为空'}]}]"/>
-            <a-button type="primary" style="width: 40%" @click="handleAddFetch()">设置就地点位</a-button>
+            <a-button type="primary" style="width: 40%" @click="handleAddFetch()">设置M点位</a-button>
           </a-form-item>
         </row-item>
         <row-item>
@@ -102,11 +102,11 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="是否开关点位"
+            label="是否禁止图片"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['fetchFlag', {initialValue:1, rules: [{required: true, message: '是否开关点位'}]}]" placeholder="请选择">
+            <a-select v-decorator="['fetchFlag', {initialValue:1, rules: [{required: true, message: '是否禁止图片'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in yesNoMap"
                 :key="value"