opc优化

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

@@ -18,15 +18,30 @@
       <row-list :col="2">
         <row-item>
           <a-form-item
-            label="设备名称"
+            label="车间位置"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-tree-select
+              style="width: 100%"
+              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+              :treeData="treeData"
+              :treeNodeFilterProp="'title'"
+              :showSearch="true"
+              v-decorator="['line', {rules: [{required: false, message: '车间位置不能为空'}]}]"
+              placeholder="请选择"
+            >
+            </a-tree-select>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="点位名称"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              style="width: 70%"
-              disabled
-              v-decorator="['sbName', {rules: [{required: true, message: '设备名称不能为空'}]}]" />
-            <a-button style="width: 30%" type="primary" @click="handleSbSelect">选择</a-button>
+              v-decorator="['sbName', {rules: [{required: true, message: '点位名称不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <row-item>
@@ -224,6 +239,7 @@
 import pick from 'lodash.pick'
 import { addRemoteOpc, updateRemoteOpc } from '@/api/remote/opc'
 import SbInfoSelectModal from '@/views/sb/info/modules/SbInfoSelectModal'
+import { getSbPositionTree } from '@/api/sb/position'
 export default {
   name: 'BaseRemoteOpc',
   components: {
@@ -234,6 +250,7 @@ export default {
       confirmLoading: false,
       modalTitle: null,
       map: {},
+      treeData: [],
       yesNoMap: {},
       form: this.$form.createForm(this),
       visible: false
@@ -245,6 +262,9 @@ export default {
     // 下拉框map
     this.map = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REMOTE_OPC)
     this.yesNoMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    getSbPositionTree({ opcFlag: 1 }).then(res => {
+      this.treeData = res.data
+    })
   },
   methods: {
     base (record) {

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

@@ -8,8 +8,9 @@
       </a-col>
     </a-row>
     <detail-list title="" :col="2">
-      <detail-list-item term="设备id">{{ model.sbId }}</detail-list-item>
-      <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
+      <detail-list-item term="opc点位id">{{ model.sbId }}</detail-list-item>
+      <detail-list-item term="opc点位名称">{{ model.sbName }}</detail-list-item>
+      <detail-list-item term="车间">{{ model.positionName }}</detail-list-item>
       <detail-list-item term="点位">{{ model.positionNum }}</detail-list-item>
       <detail-list-item term="类型">{{ BaseTool.Object.getField(map,model.type) }}</detail-list-item>
       <detail-list-item term="是否模拟量">{{ BaseTool.Object.getField(yesNoMap,model.avFlag) }}</detail-list-item>
@@ -53,6 +54,8 @@ export default {
       model: {
         'sbId': null,
         'sbName': null,
+        'positionName': null,
+        'line': null,
         'positionNum': null,
         'type': null,
         'description': null,

yarn.lock

@@ -12476,6 +12476,13 @@ vue-cropper@0.4.9:
   resolved "https://registry.yarnpkg.com/vue-cropper/-/vue-cropper-0.4.9.tgz#fe650f32516ecf29014bbd4a9079191c8dc5a5ae"
   integrity sha512-Uf1i/sCh+ZqSM9hb2YTGRENzJFH+mvDuv8N2brGLjK7UBuF7XDP7zbis8g/dcqZiMojAcBDtObFCn4ERFbRMxQ==
 
+vue-drag-resize@^1.5.0-rc3, vue-drag-resize@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.npmmirror.com/vue-drag-resize/-/vue-drag-resize-1.5.4.tgz#f583f40f356e5792aa89109b3d13ba4407c25198"
+  integrity sha512-SR3U7n6TAZEBgP7zw7bR9mjtAlYBjqIoaWTDPz5HXN/nYhOxKSA31aD7p71fmq1jtyt9reAnCx62valNL9ZAcg==
+  dependencies:
+    vue-drag-resize "^1.5.0-rc3"
+
 vue-eslint-parser@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"