Merge remote-tracking branch 'origin/demo_' into demo_

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

@@ -370,7 +370,7 @@
 
 <script>
 import pick from 'lodash.pick'
-import { addRemoteOpc, updateRemoteOpc, fetchRemoteOpcByPositionNum } from '@/api/remote/opc'
+import { addRemoteOpc, updateRemoteOpc, fetchRemoteOpcByPositionNumAndLine } from '@/api/remote/opc'
 import SbInfoSelectModal from '@/views/sb/info/modules/SbInfoSelectModal'
 import { getSbPositionTree } from '@/api/sb/position'
 export default {
@@ -508,9 +508,10 @@ export default {
       }
     },
     checkPoint (e) {
-      const { form: { setFieldsValue } } = this
-      fetchRemoteOpcByPositionNum({
-        positionNum: e.target.value
+      const { form: { setFieldsValue, getFieldValue } } = this
+      fetchRemoteOpcByPositionNumAndLine({
+        positionNum: e.target.value,
+        line: getFieldValue('line')
       }).then(res => {
         if (res.data === null) {
           this.isExisting = false