Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/views/factoryModel/plant/index.vue

@@ -216,7 +216,8 @@ export default {
       getFactoryarea () {
       let par = {
         type: 1,
-        size: 9999
+        size: 9999,
+        enable:1
       };
       getFactoryarea(par).then((res) => {
         this.dict.factory = res.list;

src/views/factoryModel/productionLine/components/edit.vue

@@ -600,7 +600,9 @@
         const { list } = await getFactoryarea({
           pageNum: 1,
           size: 999,
-          type: 1
+          type: 1,
+          enable: 1
+
         });
         this.factoryList = list || [];
       },
@@ -619,7 +621,9 @@
         let par = {
           type: 2,
           parentId: this.form.factoryId,
-          size: 9999
+          size: 9999,
+          enable: 1
+
         };
         getFactoryarea(par).then((res) => {
           this.workshopPlanList = res.list;

src/views/factoryModel/station/components/edit.vue

@@ -668,7 +668,9 @@
         const { list } = await getFactoryarea({
           pageNum: 1,
           size: 999,
-          type: 1
+          type: 1,
+        enable:1
+
         });
         this.factoryList = list || [];
       },
@@ -811,7 +813,9 @@
         let par = {
           type: 2,
           parentId: this.form.extInfo.factoryId,
-          size: 9999
+          size: 9999,
+        enable:1
+
         };
         getFactoryarea(par).then((res) => {
           this.workshopPlanList = res.list;

src/views/factoryModel/workshop/components/edit.vue

@@ -298,7 +298,8 @@
         const { list } = await getFactoryarea({
           pageNum: 1,
           size: 999,
-          type: 1
+          type: 1,
+          enable: 1
         });
         this.factoryList = list || [];
       },
@@ -314,7 +315,8 @@
         let par = {
           type: 2,
           parentId: this.form.factoryId,
-          size: 9999
+          size: 9999,
+          enable: 1
         };
         getFactoryarea(par).then((res) => {
           this.workshopPlanList = res.list;