完成除数据查询前端功能的EDataCapture开发

src/api/modules/scada.configure.api.js

@@ -1,23 +1,18 @@
+const handlePost = (request, data) => (request({
+  url: '',
+  method: 'post',
+  data
+}))
+
 export default ({ service, request, serviceForMock, requestForMock, mock, faker, tools }) => ({
   /**
    * @description 方法名称
    * @param {Object} data 请求携带的信息
    */
-  ADD_NODE (data) {
-    return request({
-      url: '',
-      method: 'post',
-      data
-    })
-  },
 
-  UPDATE_NODE (data) {
-    return request({
-      url: '',
-      method: 'post',
-      data
-    })
-  },
+  ADD_NODE: (data) => handlePost(request, data),
+  UPDATE_NODE: (data) => handlePost(request, data),
+  REMOVE_NODE: (data) => handlePost(request, data),
 
   QUERY_NODE () {
     return request({ url: '?query=nodes' })

src/views/scada/scadaConfigure/index.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { assign, each, pickBy, startsWith } from 'lodash'
+import { assign, each, pick, pickBy, startsWith } from 'lodash'
 
 export default {
   data () {
@@ -48,8 +48,8 @@ export default {
           key: 'flow_code'
         },
         {
-          title: '工序编码',
-          key: 'process_code'
+          title: '工序单元',
+          key: 'working_subclass'
         },
         {
           title: '工作站',
@@ -57,7 +57,7 @@ export default {
         },
         {
           title: '创建时间',
-          key: 'create_time'
+          key: 'create_date'
         },
         {
           title: '备注',
@@ -127,8 +127,8 @@ export default {
         flow_code: {
           title: '流程'
         },
-        process_code: {
-          title: '工序编码'
+        working_subclass: {
+          title: '工序单元'
         },
         workstation: {
           title: '工作站'
@@ -160,7 +160,7 @@ export default {
         code: [{ required: true, type: 'string', message: '节点编码必须填写', trigger: 'blur' }],
         name: [{ required: true, type: 'string', message: '节点名称必须填写', trigger: 'blur' }],
         type: [{ required: true, message: '必须指定节点类型', trigger: 'blur' }],
-        process_code: [{ required: true, type: 'string', message: '工序编码必须填写', trigger: 'blur' }]
+        working_subclass: [{ required: true, type: 'string', message: '工序单元必须填写', trigger: 'blur' }]
       }
     }
   },
@@ -184,38 +184,42 @@ export default {
         mode: 'add'
       })
     },
-    async handleRowAdd (row) {
+    async handleRowAdd (row, done) {
       this.formOptions.saveLoading = true
-      await this.$api.ADD_NODE(assign(row, { action: 'add_node' }))
-      this.$message({
-        message: '添加成功',
-        type: 'success'
-      })
+      try {
+        await this.$api.ADD_NODE(assign(row, { action: 'add_node' }))
+        this.$message({
+          message: '添加成功',
+          type: 'success'
+        })
+      } catch (e) {
+        console.log(e)
+      }
+      this.getNodes()
+      done()
       this.formOptions.saveLoading = false
     },
-    async handleRowEdit ({ index, row }) {
+    async handleRowEdit ({ index, row }, done) {
       this.formOptions.saveLoading = true
       await this.$api.UPDATE_NODE(assign(pickBy(row, (v, k) => (!startsWith(k, 'show'))), { action: 'update_node' }))
       this.$message({
         message: '编辑成功',
         type: 'success'
       })
+      done()
       this.formOptions.saveLoading = false
     },
-    handleRowRemove ({ index, row }, done) {
-      setTimeout(() => {
-        console.log(index)
-        console.log(row)
-        this.$message({
-          message: '删除成功',
-          type: 'success'
-        })
-        done()
-      }, 300)
+    async handleRowRemove ({ index, row }, done) {
+      await this.$api.REMOVE_NODE(assign(pick(row, ['code', 'working_subclass']), { action: 'remove_node' }))
+      this.$message({
+        message: '删除成功',
+        type: 'success'
+      })
+      done()
     },
     handleDialogCancel (done) {
       this.$message({
-        message: '取消保存',
+        message: '用户放弃改动',
         type: 'warning'
       })
       done()