服务编辑页面修改

src/views/systemSettings/views/serviceManagement/mixins/operate.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-04-29 09:17:55
- * @LastEditTime: 2022-04-29 14:21:27
+ * @LastEditTime: 2022-04-29 16:00:18
  * @LastEditors: your name
  * @Description: 服务相关操作
  * have a nice day!
@@ -40,8 +40,15 @@ export default {
     async updateServiceNode(operate, deployNodeID) {
       const params = {
         operate: operateMap[operate],
-        serviceID: this.serviceID,
-        deployNodeID
+        serviceID: this.serviceID
+      }
+      if (['update', 'delete'].includes(operate)) {
+        const { DeployID } = this.serviceAndNodeList.find(
+          element => element.serviceID === this.serviceID && element.deployNodeID === deployNodeID
+        )
+        params.DeployID = DeployID
+      } else {
+        params.deployNodeID = deployNodeID
       }
       try {
         const result = await GeneralDataReception({
@@ -49,7 +56,7 @@ export default {
           dataContent: JSON.stringify(params)
         })
         if (Number(result.code) === 0) {
-          return result.returnData
+          return result.message
         } else {
           return Promise.reject(result.message)
         }
@@ -60,8 +67,15 @@ export default {
     async updateServiceSource(operate, sourceDataID) {
       const params = {
         operate: operateMap[operate],
-        serviceID: this.serviceID,
-        sourceDataID
+        serviceID: this.serviceID
+      }
+      if (['update', 'delete'].includes(operate)) {
+        const { serviceInputSourceDataID } = this.serviceAndSourceList.find(
+          element => element.serviceID === this.serviceID && element.sourceDataID === sourceDataID
+        )
+        params.serviceInputSourceDataID = serviceInputSourceDataID
+      } else {
+        params.sourceDataID = sourceDataID
       }
       try {
         const result = await GeneralDataReception({
@@ -69,7 +83,7 @@ export default {
           dataContent: JSON.stringify(params)
         })
         if (Number(result.code) === 0) {
-          return result.returnData
+          return result.message
         } else {
           return Promise.reject(result.message)
         }
@@ -77,11 +91,11 @@ export default {
         console.log('错误', error)
       }
     },
-    async updateServiceOutput(operate, outputTarget) {
+    async updateServiceOutput(operate, serviceOutputID) {
       const params = {
         operate: operateMap[operate],
         serviceID: this.serviceID,
-        ...outputTarget
+        serviceOutputID
       }
       try {
         const result = await GeneralDataReception({

src/views/systemSettings/views/serviceManagement/mixins/query.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-04-27 15:54:38
- * @LastEditTime: 2022-04-29 13:56:03
+ * @LastEditTime: 2022-04-29 15:57:40
  * @LastEditors: your name
  * @Description: 服务相关数据查询
  * have a nice day!
@@ -37,7 +37,11 @@ export default {
     return {}
   },
   mounted() {
-    this.serviceID && this.queryAll(this.serviceID)
+    if (this.serviceID) {
+      this.queryAll()
+    } else {
+      this.$router.push('/systemSettings')
+    }
   },
   methods: {
     async myQuery(type, queryID) {
@@ -137,35 +141,44 @@ export default {
     queryOutputListByServiceId(serviceID) {
       return this.myQuery(queryMap.outputListByServiceID, serviceID)
     },
-    async queryAll(serviceID) {
+    async queryAll(serviceID = this.serviceID) {
       try {
         const [
           [serviceInfo],
           nodeList,
           checkedNodeList,
+          serviceAndNodeList,
           protocolList,
           sourceList,
           checkedSourceList,
+          serviceAndSourceList,
           outputList,
           targetList
         ] = await Promise.all([
           this.queryServiceByID(serviceID),
           this.queryNodeList(),
           this.queryNodeListByServiceId(serviceID),
+          this.queryServiceAndNodeList(),
           this.queryProtocolList(),
           this.querySourceList(),
           this.querySourceListByServiceId(serviceID),
+          this.queryServiceAndSourceList(),
           this.queryOutputListByServiceId(serviceID),
           this.queryTargetList()
         ])
         Object.keys(this.serviceForm).forEach(key => {
           this.serviceForm[key] = serviceInfo[key]
         })
+        Object.keys(this.inputForm).forEach(key => {
+          this.inputForm[key] = serviceInfo[key]
+        })
         this.nodeList = nodeList
         this.checkedNodeKeys = checkedNodeList.map(node => node.deployNodeID)
+        this.serviceAndNodeList = serviceAndNodeList
         this.protocolList = protocolList
         this.sourceList = sourceList
         this.checkedSourceKeys = checkedSourceList.map(source => source.sourceDataID)
+        this.serviceAndSourceList = serviceAndSourceList
         this.outputList = outputList
         this.targetList = targetList
       } catch (error) {

src/views/systemSettings/views/serviceManagement/serviceEdit.vue

@@ -1,6 +1,6 @@
 <!--
  * @Date: 2022-03-24 09:55:13
- * @LastEditTime: 2022-04-29 14:21:16
+ * @LastEditTime: 2022-04-29 15:49:40
  * @LastEditors: your name
  * @Description: 服务管理-编辑服务
  * have a nice day!
@@ -461,15 +461,7 @@ const keyMap = {
     checked: 'checkedSourceKeys',
     operate: 'updateServiceSource'
   },
-  process: {
-    title: '数据处理',
-    deleteTitle: '数据处理流程',
-    key: 'processID',
-    label: 'processName',
-    list: 'processList',
-    checked: 'checkedProcessKeys',
-    operate: 'updateServiceProcess'
-  },
+  process: {},
   output: {
     deleteTitle: '输出目标',
     key: 'serviceOutputID',
@@ -483,7 +475,7 @@ export default {
   mixins: [query, operate],
   data() {
     return {
-      serviceID: this.$route.query.serviceID,
+      serviceID: Number(this.$route.query.serviceID),
       operateDialogType: null,
       delObj: {},
       deleteDialogType: null,
@@ -508,8 +500,10 @@ export default {
       protocolList: [],
       nodeList: [],
       checkedNodeKeys: [],
+      serviceAndNodeList: [],
       sourceList: [],
       checkedSourceKeys: [],
+      serviceAndSourceList: [],
       processList: [],
       checkedProcessKeys: [],
       outputList: []
@@ -590,7 +584,7 @@ export default {
       try {
         await Promise.all([...createArr, ...deleteArr])
         this.$message.success('成功')
-        this.queryAll()
+        await this.queryAll()
         this.hideOperateDialog()
       } catch (error) {
         this.$message.error(error)
@@ -605,18 +599,24 @@ export default {
       } else {
         await this.updateServiceOutput('create', outputTarget)
       }
-      this.queryAll()
+      await this.queryAll()
       this.hideOperateDialog()
     },
     hideOperateDialog() {
+      if (this.operateDialogType === 'output') {
+        this.$refs['outputForm'].resetFields()
+      }
       this.operateDialogType = null
     },
     showDeleteDialog(obj, type) {
       this.delObj = obj
       this.deleteDialogType = type
     },
-    deleteSubmitHandler() {
-      this.dataInMap(this.deleteDialogType, 'operate')('delete', this.delObj)
+    async deleteSubmitHandler() {
+      const message = await this.dataInMap(this.deleteDialogType, 'operate')('delete', this.delObj[this.dataInMap(this.deleteDialogType, 'key')])
+      this.$message.success(message ?? '成功')
+      await this.queryAll()
+      this.deleteDialogType = null
     },
     hideDeleteDialog() {
       this.deleteDialogType = null