opc优化

src/views/opc/Opc.vue

@@ -21,9 +21,9 @@
         @dragstop="resize">
         <a-tooltip>
           <template slot="title">
-            {{ item.positionNum }}
+            {{ item.description }}
           </template>
-          <div class="info" @click.right.prevent="handleEdit(item)"> {{ item.positionNum }}</div>
+          <div class="info" @click.right.prevent="handleEdit(item)"> {{ item.description }}</div>
         </a-tooltip>
       </VueDragResize>
     </div>
@@ -94,8 +94,8 @@ export default {
       columns: [
         {
           title: '位号',
-          dataIndex: 'positionNum',
-          key: 'positionNum'
+          dataIndex: 'description',
+          key: 'description'
         },
         {
           title: '操作',
@@ -171,7 +171,7 @@ export default {
       model.base(val)
     },
     handleOk () {
-
+      this.getOpcInfo()
     }
   }
 }

src/views/remote/opc/OpcPositionForProducer.vue

@@ -35,7 +35,7 @@ export default {
   methods: {
     showScreen (position) {
       const a = document.createElement('a')
-      a.href = '/quality/quality-screen.html?name=' + position.key
+      a.href = '/opc/info?line=' + position.key
       a.target = '_blank'
       a.click()
     }

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

@@ -52,15 +52,25 @@
           </a-form-item>
         </row-item>
         <row-item>
-
           <a-form-item
             label="点位"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
+              v-decorator="['description', {rules: [{required: true, message: '描述不能为空'}]}]"/>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="OPC实际点位"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              disabled
               style="width: 100%"
-              v-decorator="['positionNum', {rules: [{required: true, message: '点位不能为空'}]}]"/>
+              v-decorator="['positionNum', {rules: [{required: false, message: '点位不能为空'}]}]"/>
           </a-form-item>
         </row-item>
         <row-item>
@@ -190,17 +200,6 @@
               v-decorator="['height', {initialValue:20, rules: [{ required: true, message: '位置高度不能为空'}]}]"/>
           </a-form-item>
         </row-item>
-        <row-item>
-
-          <a-form-item
-            label="描述"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['description', {rules: [{required: true, message: '描述不能为空'}]}]"/>
-          </a-form-item>
-        </row-item>
         <!--        <row-item>
 
           <a-form-item
@@ -215,7 +214,7 @@
         <row-item>
 
           <a-form-item
-            label="量程下限"
+            label="量程上限"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -224,13 +223,13 @@
               :min="0"
               :formatter="BaseTool.Amount.formatter"
               :parser="BaseTool.Amount.parser"
-              v-decorator="['low', {rules: [{required: false, message: '量程下限不能为空'}]}]"/>
+              v-decorator="['high', {initialValue:100,rules: [{required: false, message: '量程上限不能为空'}]}]"/>
           </a-form-item>
         </row-item>
         <row-item>
 
           <a-form-item
-            label="量程上限"
+            label="量程下限"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -239,7 +238,7 @@
               :min="0"
               :formatter="BaseTool.Amount.formatter"
               :parser="BaseTool.Amount.parser"
-              v-decorator="['high', {rules: [{required: false, message: '量程上限不能为空'}]}]"/>
+              v-decorator="['low', {initialValue:0,rules: [{required: false, message: '量程下限不能为空'}]}]"/>
           </a-form-item>
         </row-item>
         <row-item>