From 7926287dd8442ed925c3ded4c91545bb20e1d312 Mon Sep 17 00:00:00 2001
From: wu <2468489804@qq.com>
Date: Sat, 20 Aug 2022 17:02:26 +0800
Subject: [PATCH] =?UTF-8?q?scada=E8=8A=82=E7=82=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=8D=95=E5=85=83=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=8F=AF=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                     |  6 +++++-
 src/views/scada/scadaConfigure/index.vue | 27 ++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 10e25a0..5fa6c26 100644
--- a/.env
+++ b/.env
@@ -15,4 +15,8 @@ VUE_APP_I18N_FALLBACK_LOCALE=en
 
 # element 颜色
 VUE_APP_ELEMENT_COLOR=#409EFF
-VUE_APP_HSLSERVER_PASSWORD=123456
\ No newline at end of file
+VUE_APP_HSLSERVER_PASSWORD=123456
+
+#==true出现下拉，数据来源于MES
+#==false 手动输入，以及不渲染mes的设备编码
+VUE_APP_CHOOSABLE=true
\ No newline at end of file
diff --git a/src/views/scada/scadaConfigure/index.vue b/src/views/scada/scadaConfigure/index.vue
index a3a00cf..7cd4ed1 100644
--- a/src/views/scada/scadaConfigure/index.vue
+++ b/src/views/scada/scadaConfigure/index.vue
@@ -41,12 +41,14 @@
 <script>
 import tips from './tips.md'
 import jschardet from 'jschardet'
-import { assign, each, pick, pickBy, startsWith, includes, every } from 'lodash'
+import { assign, each, map, pick, pickBy, startsWith, includes, every } from 'lodash'
+//import { getWorkingsubclassAll } from '@/api/basic/device'
 
 export default {
   data () {
     return {
       tips,
+      choosable: process.env.VUE_APP_CHOOSABLE,
       columns: [
         {
           title: '序号',
@@ -176,7 +178,14 @@ export default {
           }
         },
         working_subclass: {
-          title: '工序单元'
+          title: '工序单元',
+          component: {
+            name: 'el-select',
+            filterable: true,
+            allowCreate: true,
+            options: this.WorkingsubclassData,
+            span: 12
+          }
         },
         note: {
           title: '备注'
@@ -225,6 +234,10 @@ export default {
     },
     // 普通的新增
     addRow () {
+      this.$nextTick(() => {
+        this.$refs.d2Crud.handleFormTemplateMode('working_subclass').component.options = this.WorkingsubclassData
+        this.$refs.d2Crud.$forceUpdate()
+      })
       this.$refs.d2Crud.showDialog({
         mode: 'add'
       })
@@ -313,9 +326,19 @@ export default {
         type: 'warning'
       })
       done()
+    },
+    getWorkingsubclassAll () {
+      // getWorkingsubclassAll().then(res=>{
+      //   this.WorkingsubclassData = map(res.data, (o) => {
+      //     return { value: o.code, label: o.name }
+      //   })
+      // })
     }
   },
   mounted () {
+    if (this.choosable === 'true') {
+      this.getWorkingsubclassAll()
+    }
     this.getNodes()
   }
 }