Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/privateComponents/components/MBOMConfig/config.js

@@ -17,7 +17,6 @@ export default {
     setColumnsConfig() {
       this.gantt.config.columns = this.columns
     },
-
     usePlugins() {
       this.gantt.plugins({
         tooltip: true,

applications/dee-mes/src/privateComponents/components/MBOMConfig/data.js

@@ -5,18 +5,20 @@ export default {
     }
   },
   watch: {
-    showFlag(val) {
-      if (!val) {
-        return
-      }
-      if (!this.node) {
-        return
-      }
-      if (this.node.id === this.currentId) {
-        return
-      }
-      this.getData()
-    },
+    showFlag: {
+      immediate: true,
+      handler(val) {
+        if (!val) {
+          return
+        }
+        if (!this.node) {
+          return
+        }
+        if (this.node.id === this.currentId) {
+          return
+        }
+        this.getData()
+      } },
     node: {
       immediate: true,
       deep: true,

applications/dee-mes/src/privateComponents/components/MBOMConfig/step.vue

@@ -60,67 +60,6 @@ export default {
 
   },
   methods: {
-    refreshGantt() {
-      const val = this.ganttData
-      if (!val || !val.length) {
-        this.gantt.parse({ data: [] })
-        return
-      }
-      const params = {
-        data: [],
-        links: []
-      }
-      val.forEach((item, index) => {
-        const link = item.extProcessExecutorRoutes && item.extProcessExecutorRoutes[0]
-        params.data.push({
-          index: index + 1,
-          text: item.serialNumber,
-          id: item.id,
-          parenId: link && link.prevNodeId || '',
-          start_date: '2007-1-1',
-          type: 'task',
-          duration: item.workHour ? Number(item.workHour / 8) : 0
-        })
-        if (link) {
-          params.links.push({
-            cid: link.id,
-            tid: link.currNodeId,
-            source: link.prevNodeId,
-            target: link.currNodeId,
-            type: '0',
-            isCritical: link.isCritical
-
-          })
-        }
-      })
-      this.params = params
-      this.gantt.clearAll()
-      this.gantt.parse(this.params)
-    },
-    getData() {
-      this.currentId = this.node.id
-      const params = {
-        'searchItems': { 'items': [{ 'fieldName': 'aircraftSortiesId', 'operator': 'EQ', 'value': this.node.id }] },
-        'sortItem': [{ 'fieldName': 'serialNumber', 'sortOrder': 'asc' }],
-        'openProps': [
-          {
-            'name': 'extProcessExecutorRoutes'
-          }
-        ]
-      }
-
-      this.$api.searchApi('ExtPosition', params).then(res => {
-        if (res.items.content) {
-          this.ganttData = res.items.content
-        } else {
-          this.ganttData = []
-        }
-        this.refreshGantt()
-      }).catch(() => {
-        this.ganttData = []
-        this.refreshGantt()
-      })
-    },
     configLayout() {
       const ganttAg = this.gantt
       const getInput = function(node) {
@@ -310,6 +249,67 @@ export default {
         ganttAg.init(this.ganttElId)
       })
     },
+    refreshGantt() {
+      const val = this.ganttData
+      if (!val || !val.length) {
+        this.gantt.parse({ data: [] })
+        return
+      }
+      const params = {
+        data: [],
+        links: []
+      }
+      val.forEach((item, index) => {
+        const link = item.extProcessExecutorRoutes && item.extProcessExecutorRoutes[0]
+        params.data.push({
+          index: index + 1,
+          text: item.serialNumber,
+          id: item.id,
+          parenId: link && link.prevNodeId || '',
+          start_date: '2007-1-1',
+          type: 'task',
+          duration: item.workHour ? Number(item.workHour / 8) : 0
+        })
+        if (link) {
+          params.links.push({
+            cid: link.id,
+            tid: link.currNodeId,
+            source: link.prevNodeId,
+            target: link.currNodeId,
+            type: '0',
+            isCritical: link.isCritical
+
+          })
+        }
+      })
+      this.params = params
+      this.gantt.clearAll()
+      this.gantt.parse(this.params)
+    },
+    getData() {
+      this.currentId = this.node.id
+      const params = {
+        'searchItems': { 'items': [{ 'fieldName': 'aircraftSortiesId', 'operator': 'EQ', 'value': this.node.id }] },
+        'sortItem': [{ 'fieldName': 'serialNumber', 'sortOrder': 'asc' }],
+        'openProps': [
+          {
+            'name': 'extProcessExecutorRoutes'
+          }
+        ]
+      }
+
+      this.$api.searchApi('ExtPosition', params).then(res => {
+        if (res.items.content) {
+          this.ganttData = res.items.content
+        } else {
+          this.ganttData = []
+        }
+        this.refreshGantt()
+      }).catch(() => {
+        this.ganttData = []
+        this.refreshGantt()
+      })
+    },
     export(mode) {
       if (mode === 'png') {
         this.gantt.exportToPNG({
@@ -391,12 +391,12 @@ export default {
     }
     .gantt_critical_task{
       background: #f39c4f;
-    border: 1px solid #f39c4f;
+      border: 1px solid #f39c4f;
     }
     .gantt_task_line{
       &.workday_over{
         background: #f39c4f;
-      border: 1px solid #f39c4f;
+        border: 1px solid #f39c4f;
       }
     }
 }