zhongxiaoyu 2 жил өмнө
parent
commit
f0f6b90b4e
32 өөрчлөгдсөн 85 нэмэгдсэн , 1143 устгасан
  1. 2 2
      src/components/rolelist/index.vue
  2. 1 1
      src/layout/index.vue
  3. 3 3
      src/views/accountManagement/components/accountAuth.vue
  4. 4 4
      src/views/accountManagement/components/accountEdit.vue
  5. 4 4
      src/views/accountManagement/components/accountHome.vue
  6. 2 18
      src/views/advancedQuery/views/advancedHome.vue
  7. 1 1
      src/views/authorityManagement/components/authorityAppAdd.vue
  8. 4 4
      src/views/authorityManagement/components/authorityAppEdit.vue
  9. 2 2
      src/views/authorityManagement/components/authorityHome.vue
  10. 5 5
      src/views/authorityManagement/components/authorityPowerAdd.vue
  11. 5 5
      src/views/authorityManagement/components/authorityPowerEdit.vue
  12. 2 2
      src/views/authorityManagement/components/authorityRoleAdd.vue
  13. 3 3
      src/views/authorityManagement/components/authorityRoleEdit.vue
  14. 1 1
      src/views/authorityManagement/components/authorityRoleHome.vue
  15. 2 2
      src/views/authorityManagement/minixs/roleData.js
  16. 2 2
      src/views/baggageManagement/components/arrival/index.vue
  17. 3 3
      src/views/baggageManagement/components/baggage/index.vue
  18. 2 2
      src/views/baggageManagement/components/departure/index.vue
  19. 1 1
      src/views/baggageManagement/components/flight/index.vue
  20. 4 4
      src/views/baggageManagement/components/transferArrival/index.vue
  21. 4 4
      src/views/baggageManagement/components/transferDeparture/index.vue
  22. 1 1
      src/views/statisticsCharts/components/commonStatisticsCharts.vue
  23. 6 6
      src/views/statisticsCharts/components/statisticsHeader.vue
  24. 11 3
      src/views/statisticsCharts/views/nodeStatisticsCharts.vue
  25. 1 1
      src/views/systemSettings/views/queryTemplate/queryTemplateadd.vue
  26. 1 1
      src/views/systemSettings/views/queryTemplate/queryTemplateedit.vue
  27. 4 4
      src/views/systemSettings/views/serviceManagement/mixins/operate.js
  28. 0 149
      src/views/systemSettings/views/serviceManagement/mixins/query.js
  29. 0 1
      src/views/systemSettings/views/serviceManagement/serviceAdd.vue
  30. 0 899
      src/views/systemSettings/views/serviceManagement/serviceEdit copy.vue
  31. 1 2
      src/views/systemSettings/views/serviceManagement/serviceEdit.vue
  32. 3 3
      src/views/systemSettings/views/serviceManagement/serviceHome.vue

+ 2 - 2
src/components/rolelist/index.vue

@@ -296,7 +296,7 @@ export default {
           this.loading = false
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
         this.loading = false
       }
     },
@@ -331,7 +331,7 @@ export default {
           this.loading = false
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
         this.loading = false
       }
     },

+ 1 - 1
src/layout/index.vue

@@ -169,7 +169,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
   },

+ 3 - 3
src/views/accountManagement/components/accountAuth.vue

@@ -147,7 +147,7 @@ export default {
           this.loading = false;
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
         this.loading = false;
       }
     },
@@ -218,7 +218,7 @@ export default {
           this.permission = false;
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
         this.permission = false;
       }
     },
@@ -241,7 +241,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
   },

+ 4 - 4
src/views/accountManagement/components/accountEdit.vue

@@ -445,7 +445,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 随机生成密码
@@ -502,7 +502,7 @@ export default {
           this.$message.error(result.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 修改权限规则
@@ -554,7 +554,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 新增账号
@@ -571,7 +571,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     }
   }

+ 4 - 4
src/views/accountManagement/components/accountHome.vue

@@ -214,7 +214,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 新增账号
@@ -233,7 +233,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 获取当前账号信息
@@ -304,7 +304,7 @@ export default {
           this.$message.error(result.$message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     deleteUser (user) {
@@ -361,7 +361,7 @@ export default {
           this.$message.error(result.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
 

+ 2 - 18
src/views/advancedQuery/views/advancedHome.vue

@@ -1188,7 +1188,7 @@ export default {
         }
       } catch (error) {
         this.page--
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
       this.loading = false
     },
@@ -1198,25 +1198,9 @@ export default {
         const result = await myQuery(DATACONTENT_ID.baggageTypeId)
         this.baggageTypeList = result
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
-    // 简单查询 废弃
-    // async sempleQueryByStatMain(dataContent) {
-    //   try {
-    //     const res = await getQuery({
-    //       id: 31,
-    //       dataContent
-    //     })
-    //     if (res.code == 0) {
-    //       this.tableData = res.returnData
-    //     } else {
-    //       this.$message.error(res.message)
-    //     }
-    //   } catch (error) {
-    //     console.log('出错了', error)
-    //   }
-    // },
     // 统计行数
     summaryRow(num) {
       return function () {

+ 1 - 1
src/views/authorityManagement/components/authorityAppAdd.vue

@@ -97,7 +97,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     /**

+ 4 - 4
src/views/authorityManagement/components/authorityAppEdit.vue

@@ -129,7 +129,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //应用状态变更
@@ -145,7 +145,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //应用状态变更
@@ -165,7 +165,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //应用删除
@@ -183,7 +183,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
   },

+ 2 - 2
src/views/authorityManagement/components/authorityHome.vue

@@ -369,7 +369,7 @@ export default {
           }
         });
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
         this.childrenData[index].flag = !flag;
       }
     },
@@ -479,7 +479,7 @@ export default {
           }
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
         if (type === 1) {
           this.currDataArr[0].flag = !flag;
         } else {

+ 5 - 5
src/views/authorityManagement/components/authorityPowerAdd.vue

@@ -243,7 +243,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //角色列表
@@ -262,7 +262,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //账号列表
@@ -281,7 +281,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //角色选取
@@ -315,7 +315,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //删除权限
@@ -333,7 +333,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
   },

+ 5 - 5
src/views/authorityManagement/components/authorityPowerEdit.vue

@@ -243,7 +243,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //角色列表
@@ -262,7 +262,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //账号列表
@@ -281,7 +281,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //角色选取
@@ -316,7 +316,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //删除权限
@@ -334,7 +334,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
   },

+ 2 - 2
src/views/authorityManagement/components/authorityRoleAdd.vue

@@ -154,7 +154,7 @@ export default {
           this.permission = false;
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
         this.permission = false;
       }
     },
@@ -197,7 +197,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
   },

+ 3 - 3
src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -151,7 +151,7 @@ export default {
           this.loading = false;
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
         this.loading = false;
       }
     },
@@ -217,7 +217,7 @@ export default {
           this.loading = false;
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     //保存
@@ -350,7 +350,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
   },

+ 1 - 1
src/views/authorityManagement/components/authorityRoleHome.vue

@@ -221,7 +221,7 @@ export default {
         }
       } catch (error) {
         this.flag = false;
-        console.log("出错了", error);
+        console.log("出错了", error.message || error);
       }
     },
     // 角色授权

+ 2 - 2
src/views/authorityManagement/minixs/roleData.js

@@ -43,7 +43,7 @@ export default {
           this.loading = false
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
         this.loading = false
       }
     },
@@ -65,7 +65,7 @@ export default {
         }
       } catch (error) {
         this.flag = false
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     }
   }

+ 2 - 2
src/views/baggageManagement/components/arrival/index.vue

@@ -397,7 +397,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     tableRowClassName ({ row, rowIndex }) {
@@ -457,7 +457,7 @@ export default {
           this.loopEvent = null
         }
         this.loading = false
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     initTableData (tableData) {

+ 3 - 3
src/views/baggageManagement/components/baggage/index.vue

@@ -673,7 +673,7 @@ export default {
           this.$message.error(message ?? '失败')
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     async queryBaggageAll(queryData = this.queryData) {
@@ -716,7 +716,7 @@ export default {
         })
         this.initTableData(this.baggageTableData)
       } catch (error) {
-        console.log('错误', error)
+        console.log('出错了', error.message || error)
       }
     },
     async baggageMessageQuery() {
@@ -730,7 +730,7 @@ export default {
           return message
         })
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     }
   }

+ 2 - 2
src/views/baggageManagement/components/departure/index.vue

@@ -346,7 +346,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     tableRowClassName ({ row, rowIndex }) {
@@ -409,7 +409,7 @@ export default {
           this.loopEvent = null
         }
         this.loading = false
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     initTableData (tableData) {

+ 1 - 1
src/views/baggageManagement/components/flight/index.vue

@@ -983,7 +983,7 @@ export default {
         })
         setTableFilters(this.flightBaggageTableData, this.flightBaggageTableFilters)
       } catch (error) {
-        console.log('错误', error)
+        console.log('出错了', error.message || error)
       }
       this.fullscreenLoading = false
     }

+ 4 - 4
src/views/baggageManagement/components/transferArrival/index.vue

@@ -462,7 +462,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 选择航司
@@ -478,7 +478,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 选择航司
@@ -494,7 +494,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 获取表单下拉框数据
@@ -546,7 +546,7 @@ export default {
           this.loopEvent = null
         }
         this.loading = false
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     initTableData (tableData) {

+ 4 - 4
src/views/baggageManagement/components/transferDeparture/index.vue

@@ -437,7 +437,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 选择航司
@@ -453,7 +453,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 选择航司
@@ -469,7 +469,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     // 获取表单下拉框数据
@@ -521,7 +521,7 @@ export default {
           this.loopEvent = null
         }
         this.loading = false
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     initTableData (tableData) {

+ 1 - 1
src/views/statisticsCharts/components/commonStatisticsCharts.vue

@@ -325,7 +325,7 @@ export default {
           this.$message.error(message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     setChartHeight() {

+ 6 - 6
src/views/statisticsCharts/components/statisticsHeader.vue

@@ -364,7 +364,7 @@ export default {
           this.$message.error(message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     }
     // async getInOrOut(data) {
@@ -387,7 +387,7 @@ export default {
     //       this.$message.error(res.message)
     //     }
     //   } catch (error) {
-    //     console.log('出错了', error)
+    //     console.log('出错了', error.message || error)
     //   }
     // },
     // async getAirline() {
@@ -410,7 +410,7 @@ export default {
     //       this.$message.error(res.message)
     //     }
     //   } catch (error) {
-    //     console.log('出错了', error)
+    //     console.log('出错了', error.message || error)
     //   }
     // },
     // async getCompany() {
@@ -433,7 +433,7 @@ export default {
     //       this.$message.error(res.message)
     //     }
     //   } catch (error) {
-    //     console.log('出错了', error)
+    //     console.log('出错了', error.message || error)
     //   }
     // },
     // async getAirport() {
@@ -456,7 +456,7 @@ export default {
     //       this.$message.error(res.message)
     //     }
     //   } catch (error) {
-    //     console.log('出错了', error)
+    //     console.log('出错了', error.message || error)
     //   }
     // },
     // async getTerminal() {
@@ -479,7 +479,7 @@ export default {
     //       this.$message.error(res.message)
     //     }
     //   } catch (error) {
-    //     console.log('出错了', error)
+    //     console.log('出错了', error.message || error)
     //   }
     // }
   }

+ 11 - 3
src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -165,6 +165,10 @@ export default {
               name: '装机件数',
               max: 10000
             },
+            {
+              name: '卸机件数',
+              max: 10000
+            },
             {
               name: '中转件数',
               max: 10000
@@ -222,6 +226,10 @@ export default {
           label: '装机',
           ratio: '0%'
         },
+        {
+          label: '卸机',
+          ratio: '0%'
+        },
         {
           label: '中转',
           ratio: '0%'
@@ -348,7 +356,7 @@ export default {
           this.$message.error(message ?? '失败')
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log('出错了', error.message || error)
       }
     },
     async getData(data) {
@@ -440,7 +448,7 @@ export default {
           this.$message.error(res.message)
         }
       } catch (error) {
-        console.log('出错了', error)
+        console.log('出错了', error.message || error)
       }
     },
     setChartHeight() {
@@ -468,7 +476,7 @@ export default {
     background-color: #fff;
     position: relative;
     .node-tooltip {
-      width: 90px;
+      width: 100px;
       position: absolute;
       bottom: 48px;
       left: 64px;

+ 1 - 1
src/views/systemSettings/views/queryTemplate/queryTemplateadd.vue

@@ -109,7 +109,7 @@ export default {
           this.$message.error(res.message ?? '失败')
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log('出错了', error.message || error)
       }
     },
     async getDataSourceList () {

+ 1 - 1
src/views/systemSettings/views/queryTemplate/queryTemplateedit.vue

@@ -118,7 +118,7 @@ export default {
           this.$message.error(res.message ?? '失败')
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log('出错了', error.message || error)
       }
     },
     async queryQueryTemplateByID (queryTemplateID) {

+ 4 - 4
src/views/systemSettings/views/serviceManagement/mixins/operate.js

@@ -40,7 +40,7 @@ export default {
           this.$message.error(result.message ?? '失败')
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log('出错了', error.message || error)
       }
     },
     async updateServiceNode (event, deployObject) {
@@ -68,7 +68,7 @@ export default {
           return Promise.reject(result.message)
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log('出错了', error.message || error)
       }
     },
     async updateServiceSource (operate, sourceDataID) {
@@ -95,7 +95,7 @@ export default {
           return Promise.reject(result.message)
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log('出错了', error.message || error)
       }
     },
     async updateServiceOutput (operate, outputTarget) {
@@ -128,7 +128,7 @@ export default {
           return Promise.reject(result.message)
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log('出错了', error.message || error)
       }
     }
   }

+ 0 - 149
src/views/systemSettings/views/serviceManagement/mixins/query.js

@@ -1,149 +0,0 @@
-/*
- * @Author: Badguy
- * @Date: 2022-04-27 15:54:38
- * @LastEditTime: 2022-05-11 17:58:57
- * @LastEditors: your name
- * @Description: 服务相关数据查询
- * have a nice day!
- */
-
-import { queryMap, myQuery } from '@/api/dataIntegration'
-
-export default {
-  data() {
-    return {}
-  },
-  mounted() {
-    if (this.serviceID) {
-      this.queryAll()
-    } else {
-      this.$router.push('/systemSettings')
-    }
-  },
-  methods: {
-    // 协议 id: 1
-    queryProtocolList() {
-      return myQuery(queryMap.protocol)
-    },
-    // 机器/节点 id: 2
-    queryNodeList() {
-      return myQuery(queryMap.node)
-    },
-    // 服务 id: 3
-    queryServiceList() {
-      return myQuery(queryMap.service)
-    },
-    // 源数据 id: 4
-    querySourceList() {
-      return myQuery(queryMap.source)
-    },
-    // 源数据项 id: 5
-    querySourceItemList() {
-      return myQuery(queryMap.sourceItem)
-    },
-    // 源数据服务关联 id: 6
-    queryServiceAndSourceList() {
-      return myQuery(queryMap.serviceAndSource)
-    },
-    // 目标数据 id: 7
-    queryTargetList() {
-      return myQuery(queryMap.target)
-    },
-    // 目标数据项 id: 8
-    queryTargetItemList() {
-      return myQuery(queryMap.targetItem)
-    },
-    // 服务输出项关联 id: 9
-    queryServiceAndOutputList() {
-      return myQuery(queryMap.serviceAndOutput)
-    },
-    // 服务节点关联 id: 10
-    queryServiceAndNodeList() {
-      return myQuery(queryMap.serviceAndNode)
-    },
-    // 按照ID查询服务 id: 11
-    queryServiceByID(serviceID) {
-      return myQuery(queryMap.serviceByID, serviceID)
-    },
-    // 按照服务ID查询节点列表 id: 12
-    queryNodeListByServiceId(serviceID) {
-      return myQuery(queryMap.nodeByServiceID, serviceID)
-    },
-    // 按照服务ID查询源数据列表 id: 13
-    querySourceListByServiceId(serviceID) {
-      return myQuery(queryMap.sourceByServiceID, serviceID)
-    },
-    // 按照服务ID查询目标数据列表 id: 14
-    queryTargetListByServiceId(serviceID) {
-      return myQuery(queryMap.targetByServiceID, serviceID)
-    },
-    // 按照目标数据ID查询目标数据项列表 id: 15
-    queryTargetItemListByTargetID(targetID) {
-      return myQuery(queryMap.targetItemByTargetID, targetID)
-    },
-    // 按照源数据ID查询源数据项列表 id: 16
-    querySourceItemListBySourceID(sourceID) {
-      return myQuery(queryMap.sourceItemBySourceID, sourceID)
-    },
-    // 按照目标数据ID查询目标数据 id: 17
-    queryTargetByID(targetID) {
-      return myQuery(queryMap.targetByID, targetID)
-    },
-    // 按照源数据ID查询源数据 id: 18
-    querySourceBySourceID(sourceID) {
-      return myQuery(queryMap.sourceByID, sourceID)
-    },
-    // 按照服务ID查询算法计算方式 id: 19
-    queryAlgorithmByServiceID(serviceID) {
-      return myQuery(queryMap.serviceAlgorithmByServiceID, serviceID)
-    },
-    // 按照服务ID查询服务输出列表 id: 20
-    queryOutputListByServiceId(serviceID) {
-      return myQuery(queryMap.outputListByServiceID, 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) {
-        console.log('错误', error)
-      }
-    }
-  }
-}

+ 0 - 1
src/views/systemSettings/views/serviceManagement/serviceAdd.vue

@@ -179,7 +179,6 @@ import Dialog from '@/layout/components/Dialog'
 import DataTable from '@/components/Table'
 import { myQuery } from '@/api/dataIntegration'
 
-// import query from './mixins/query'
 import operate from './mixins/operate'
 
 export default {

+ 0 - 899
src/views/systemSettings/views/serviceManagement/serviceEdit copy.vue

@@ -1,899 +0,0 @@
-<!--
- * @Date: 2022-03-24 09:55:13
- * @LastEditTime: 2022-05-16 09:55:51
- * @LastEditors: your name
- * @Description: 服务管理-编辑服务
- * have a nice day!
--->
-
-<template>
-  <div class="service-edit">
-    <div class="scrollbar">
-      <el-row :gutter="24">
-        <el-col :span="16">
-          <div class="part part-top">
-            <header class="title">
-              <p class="manageTitle">服务</p>
-              <el-button
-                size="small"
-                type="primary"
-                class="btn-save"
-                @click="btnSaveClickHandler"
-              >保存</el-button>
-            </header>
-            <main class="content">
-              <el-form
-                ref="serviceForm"
-                class="service-form"
-                :model="serviceForm"
-                label-position="right"
-                label-width="72px"
-                size="mini"
-              >
-                <el-form-item
-                  label="服务名称"
-                  prop="serviceName"
-                >
-                  <el-input
-                    v-model="serviceForm.serviceName"
-                    width="240px"
-                    placeholder="请输入服务名称"
-                    clearable
-                  />
-                </el-form-item>
-                <el-form-item label="是否同步">
-                  <el-radio-group v-model="serviceForm.isAsynchronous">
-                    <el-radio :label="0">是</el-radio>
-                    <el-radio :label="1">否</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-                <el-form-item
-                  label="服务描述"
-                  prop="serviceDescribe"
-                >
-                  <el-input
-                    v-model="serviceForm.serviceDescribe"
-                    placeholder="请输入描述"
-                    type="textarea"
-                    :autosize="{ minRows: 5, maxRows: 5 }"
-                    resize="none"
-                    clearable
-                  />
-                </el-form-item>
-              </el-form>
-            </main>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part part-top">
-            <header class="title">
-              <p class="manageTitle">部署机器</p>
-            </header>
-            <main class="content">
-              <div class="scrollbar">
-                <template v-if="nodeList.length">
-                  <el-row :gutter="16">
-                    <el-col :span="8">
-                      <div class="service-edit-card">
-                        <div
-                          class="card-btn-add"
-                          @click="showOperateDialog('node')"
-                        >
-                          <i class="el-icon-plus" />
-                        </div>
-                      </div>
-                    </el-col>
-                    <el-col
-                      v-for="node in checkedNodeList"
-                      :key="node.deployNodeID"
-                      :span="8"
-                    >
-                      <div class="service-edit-card">
-                        <div
-                          class="card-btn-close"
-                          @click="showDeleteDialog(node, 'node')"
-                        >
-                          <i class="el-icon-close" />
-                        </div>
-                        <div class="card-header">
-                          <span>{{ node.deployNodeName }}</span>
-                        </div>
-                      </div>
-                    </el-col>
-                  </el-row>
-                </template>
-                <template v-else>
-                  <NoData />
-                </template>
-              </div>
-            </main>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <header class="title">
-              <p class="manageTitle">输入</p>
-            </header>
-            <main class="content first-content">
-              <el-form
-                ref="inputForm"
-                class="input-form"
-                :model="inputForm"
-                label-position="right"
-                label-width="72px"
-                size="mini"
-              >
-                <el-form-item
-                  label="来源"
-                  prop="protocolID"
-                >
-                  <el-select v-model="inputForm.protocolID">
-                    <el-option
-                      v-for="protocol in protocolList"
-                      :key="protocol.protocolID"
-                      :value="protocol.protocolID"
-                      :label="protocol.protocolName"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item
-                  label="并发线程数"
-                  prop="threads"
-                  label-width="86px"
-                >
-                  <el-input
-                    v-model="inputForm.threads"
-                    width="166px"
-                    placeholder="请输入并发线程数"
-                    clearable
-                  />
-                </el-form-item>
-                <el-form-item
-                  label="来源配置"
-                  prop="connectConfig"
-                >
-                  <el-input
-                    v-model="inputForm.connectConfig"
-                    placeholder="请输入来源配置"
-                    type="textarea"
-                    :autosize="{ minRows: 4, maxRows: 4 }"
-                    resize="none"
-                    clearable
-                  />
-                </el-form-item>
-              </el-form>
-            </main>
-            <header class="title">
-              <p class="manageTitle">源数据</p>
-            </header>
-            <main class="content second-content">
-              <div class="scrollbar">
-                <template v-if="sourceList.length">
-                  <el-row :gutter="16">
-                    <el-col :span="8">
-                      <div class="service-edit-card">
-                        <div
-                          class="card-btn-add"
-                          @click="showOperateDialog('source')"
-                        >
-                          <i class="el-icon-plus" />
-                        </div>
-                      </div>
-                    </el-col>
-                    <el-col
-                      v-for="source in checkedSourceList"
-                      :key="source.sourceDataID"
-                      :span="8"
-                    >
-                      <div class="service-edit-card">
-                        <div
-                          class="card-btn-close"
-                          @click="showDeleteDialog(source, 'source')"
-                        >
-                          <i class="el-icon-close" />
-                        </div>
-                        <div class="card-header">
-                          <span>{{ source.dataName }}</span>
-                        </div>
-                      </div>
-                    </el-col>
-                  </el-row>
-                </template>
-                <template v-else>
-                  <NoData />
-                </template>
-              </div>
-            </main>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <header class="title">
-              <p class="manageTitle">数据处理</p>
-            </header>
-            <main class="content">
-              <div class="scrollbar">
-                <template v-if="processList.length">
-                  <el-row :gutter="16">
-                    <el-col :span="8">
-                      <div class="service-edit-card">
-                        <div
-                          class="card-btn-add"
-                          @click="showOperateDialog('process')"
-                        >
-                          <i class="el-icon-plus" />
-                        </div>
-                      </div>
-                    </el-col>
-                    <el-col
-                      v-for="process in checkedProcessList"
-                      :key="process.id"
-                      :span="8"
-                    >
-                      <div class="service-edit-card">
-                        <div
-                          class="card-btn-close"
-                          @click="showDeleteDialog(process, 'process')"
-                        >
-                          <i class="el-icon-close" />
-                        </div>
-                        <div class="card-header">
-                          <span>{{ process.processName }}</span>
-                        </div>
-                      </div>
-                    </el-col>
-                  </el-row>
-                </template>
-                <template v-else>
-                  <NoData />
-                </template>
-              </div>
-            </main>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <header class="title">
-              <p class="manageTitle">数据输出</p>
-              <el-button
-                size="small"
-                type="primary"
-                class="btn-white"
-                @click="showOperateDialog('output')"
-              >新增</el-button>
-            </header>
-            <main class="content">
-              <div class="scrollbar">
-                <el-row :gutter="16">
-                  <el-col
-                    v-for="outputTarget in outputList"
-                    :key="outputTarget.serviceOutputID"
-                    :span="24"
-                  >
-                    <div
-                      class="service-edit-card"
-                      style="height: 160px"
-                    >
-                      <div
-                        class="card-btn-close"
-                        @click="showDeleteDialog(outputTarget, 'output')"
-                      >
-                        <i class="el-icon-close" />
-                      </div>
-                      <div class="card-header">
-                        <span>{{ outputTargetProtocolName(outputTarget.protocolID) }}</span>
-                        <i
-                          class="icon-edit"
-                          @click="btnEditClickHandler(outputTarget, 'output')"
-                        />
-                      </div>
-                      <div class="card-main">
-                        <div class="flex">
-                          <div class="left">目标配置:</div>
-                          <div
-                            class="multiple-ellipsis"
-                            :title="outputTarget.dataOutputConfig"
-                          >{{ outputTarget.dataOutputConfig }}</div>
-                        </div>
-                        <span>{{ outputTargetDataName(outputTarget.targetdataID) }}</span>
-                      </div>
-                    </div>
-                  </el-col>
-                </el-row>
-              </div>
-            </main>
-          </div>
-        </el-col>
-      </el-row>
-    </div>
-    <Dialog
-      :flag="operateDialogVisible"
-      width="500px"
-    >
-      <template v-if="['node', 'source', 'process'].includes(operateDialogType)">
-        <div class="dialog-checkbox">
-          <div class="title">{{ dataInMap(operateDialogType, 'title') }}</div>
-          <main class="content">
-            <el-checkbox-group v-model="tempCheckedKeys">
-              <el-checkbox
-                v-for="item in dataInMap(operateDialogType, 'list')"
-                :key="item[dataInMap(operateDialogType, 'key')]"
-                :label="item[dataInMap(operateDialogType, 'key')]"
-              >{{ item[dataInMap(operateDialogType, 'label')] }}</el-checkbox>
-            </el-checkbox-group>
-          </main>
-          <div class="foot">
-            <el-button
-              size="medium"
-              type="primary"
-              class="r25 r26"
-              @click="checkedSubmitHandler"
-            >提交</el-button>
-            <el-button
-              size="medium"
-              class="r26"
-              @click="hideOperateDialog"
-            >取消</el-button>
-          </div>
-        </div>
-      </template>
-      <template v-if="operateDialogType === 'output'">
-        <div id="dialog-form">
-          <div class="title">数据输出编辑</div>
-          <main class="content">
-            <el-form
-              ref="outputForm"
-              class="output-form"
-              :model="outputForm"
-              label-position="right"
-              label-width="72px"
-              size="mini"
-            >
-              <el-form-item
-                label="协议类型"
-                prop="protocolID"
-              >
-                <el-select v-model="outputForm.protocolID">
-                  <el-option
-                    v-for="item in protocolList"
-                    :key="item.protocolID"
-                    :value="item.protocolID"
-                    :label="item.protocolName"
-                  />
-                </el-select>
-              </el-form-item>
-              <el-form-item
-                label="协议配置"
-                prop="dataOutputConfig"
-              >
-                <el-input
-                  v-model="outputForm.dataOutputConfig"
-                  type="textarea"
-                  placeholder="请输入协议配置"
-                  :autosize="{ minRows: 4, maxRows: 4 }"
-                  resize="none"
-                  clearable
-                />
-              </el-form-item>
-              <el-form-item
-                label="目标数据"
-                prop="targetdataID"
-              >
-                <el-select v-model="outputForm.targetdataID">
-                  <el-option
-                    v-for="item in targetList"
-                    :key="item.targetdataID"
-                    :value="item.targetdataID"
-                    :label="item.tdataName"
-                  />
-                </el-select>
-              </el-form-item>
-              <el-form-item
-                label="输出条件"
-                prop="outputCondition"
-              >
-                <el-input
-                  v-model="outputForm.outputCondition"
-                  type="textarea"
-                  placeholder="请输入输出条件"
-                  :autosize="{ minRows: 4, maxRows: 4 }"
-                  resize="none"
-                  clearable
-                />
-              </el-form-item>
-            </el-form>
-          </main>
-          <div class="foot">
-            <el-button
-              size="medium"
-              type="primary"
-              class="r25 r26"
-              @click="outputSubmitHandler"
-            >提交</el-button>
-            <el-button
-              size="medium"
-              class="r26"
-              @click="hideOperateDialog"
-            >取消</el-button>
-          </div>
-        </div>
-      </template>
-    </Dialog>
-    <!--删除弹框-->
-    <Dialog :flag="deleteDialogVisible">
-      <div class="dialog-delete">
-        <div class="del-title">删除{{ dataInMap(deleteDialogType, 'deleteTitle') }}</div>
-        <div class="content er">
-          <div class="log">
-            你是否确认删除{{ delObj[dataInMap(deleteDialogType, 'label')] || '这一项' }}?
-          </div>
-        </div>
-        <div class="del-foot right t30">
-          <el-button
-            size="medium"
-            class="r25 r26"
-            type="danger"
-            @click="deleteSubmitHandler"
-          >删除</el-button>
-          <el-button
-            size="medium"
-            class="r26"
-            @click="hideDeleteDialog"
-          >取消</el-button>
-        </div>
-      </div>
-    </Dialog>
-  </div>
-</template>
-
-<script>
-import NoData from '@/components/nodata'
-import Dialog from '@/layout/components/Dialog'
-import query from './mixins/query'
-import operate from './mixins/operate'
-
-const keyMap = {
-  node: {
-    title: '部署机器选择',
-    deleteTitle: '机器',
-    key: 'deployNodeID',
-    label: 'deployNodeName',
-    list: 'nodeList',
-    checked: 'checkedNodeKeys',
-    operate: 'updateServiceNode'
-  },
-  source: {
-    title: '源数据',
-    deleteTitle: '源数据',
-    key: 'sourceDataID',
-    label: 'dataName',
-    list: 'sourceList',
-    checked: 'checkedSourceKeys',
-    operate: 'updateServiceSource'
-  },
-  process: {},
-  output: {
-    deleteTitle: '输出目标',
-    key: 'serviceOutputID',
-    list: 'outputList',
-    operate: 'updateServiceOutput'
-  }
-}
-
-export default {
-  components: { NoData, Dialog },
-  mixins: [query, operate],
-  data() {
-    return {
-      serviceID: Number(this.$route.query.serviceID),
-      operateDialogType: null,
-      delObj: {},
-      deleteDialogType: null,
-      tempCheckedKeys: [],
-      serviceForm: {
-        serviceName: '',
-        isAsynchronous: null,
-        serviceDescribe: ''
-      },
-      inputForm: {
-        protocolID: null,
-        threads: null,
-        connectConfig: ''
-      },
-      outputForm: {
-        protocolID: null,
-        dataOutputConfig: '',
-        targetdataID: null,
-        outputCondition: '',
-        serviceOutputID: null
-      },
-      targetList: [],
-      protocolList: [],
-      nodeList: [],
-      checkedNodeKeys: [],
-      serviceAndNodeList: [],
-      sourceList: [],
-      checkedSourceKeys: [],
-      serviceAndSourceList: [],
-      processList: [],
-      checkedProcessKeys: [],
-      outputList: []
-    }
-  },
-  computed: {
-    // 获取各关联项的标题、键名、操作方法等
-    dataInMap() {
-      return function (type, keyType) {
-        if (type === null) {
-          return null
-        }
-        if (['title', 'deleteTitle', 'key', 'label'].includes(keyType)) {
-          return keyMap[type][keyType]
-        } else {
-          return this[keyMap[type][keyType]]
-        }
-      }
-    },
-    operateDialogVisible() {
-      return Boolean(this.operateDialogType)
-    },
-    deleteDialogVisible() {
-      return Boolean(this.deleteDialogType)
-    },
-    checkedNodeList() {
-      return this.nodeList.filter(item => this.checkedNodeKeys.includes(item.deployNodeID))
-    },
-    checkedSourceList() {
-      return this.sourceList.filter(item => this.checkedSourceKeys.includes(item.sourceDataID))
-    },
-    checkedProcessList() {
-      return this.processList.filter(item => this.checkedProcessKeys.includes(item.processName))
-    },
-    // 从协议列表中根据协议ID获取协议名称
-    outputTargetProtocolName() {
-      return function (protocolID) {
-        return this.protocolList.find(protocol => protocol.protocolID === protocolID).protocolName
-      }
-    },
-    // 从目标数据列表中根据目标数据ID获取目标数据名称
-    outputTargetDataName() {
-      return function (targetdataID) {
-        return this.targetList.find(target => target.targetdataID === targetdataID).tdataName
-      }
-    }
-  },
-  methods: {
-    // 服务信息保存
-    async btnSaveClickHandler() {
-      this.$refs['serviceForm'].validate(valid => {
-        if (!valid) return
-      })
-      this.$refs['inputForm'].validate(valid => {
-        if (!valid) return
-      })
-      await this.updateService()
-      this.queryAll()
-    },
-    // 关联编辑-显示弹框
-    showOperateDialog(type) {
-      if (['node', 'source', 'process'].includes(type)) {
-        this.tempCheckedKeys = [...this.dataInMap(type, 'checked')]
-      }
-      this.operateDialogType = type
-    },
-    btnEditClickHandler(obj, type) {
-      // Object.keys(this.outputForm).forEach(key => {
-      //   this.outputForm[key] = obj[key]
-      // })
-      this.outputForm = obj
-      this.showOperateDialog(type)
-    },
-    // 关联编辑-提交
-    async checkedSubmitHandler() {
-      const addKeys = this.tempCheckedKeys.filter(
-        key => !this.dataInMap(this.operateDialogType, 'checked').includes(key)
-      )
-      const removeKeys = this.dataInMap(this.operateDialogType, 'checked').filter(
-        key => !this.tempCheckedKeys.includes(key)
-      )
-      const createArr = addKeys.map(key => this.dataInMap(this.operateDialogType, 'operate')('create', key))
-      const deleteArr = removeKeys.map(key => this.dataInMap(this.operateDialogType, 'operate')('delete', key))
-      try {
-        await Promise.all([...createArr, ...deleteArr])
-        this.$message.success('成功')
-        await this.queryAll()
-        this.hideOperateDialog()
-      } catch (error) {
-        this.$message.error(error)
-      }
-    },
-    // 服务输出项新增/编辑
-    async outputSubmitHandler() {
-      const outputTarget = {
-        ...this.outputForm
-      }
-      try {
-        let message
-        if (outputTarget.serviceOutputID !== null) {
-          message = await this.updateServiceOutput('update', outputTarget)
-        } else {
-          message = await this.updateServiceOutput('create', outputTarget)
-        }
-        this.$message.success(message ?? '成功')
-        await this.queryAll()
-        this.hideOperateDialog()
-      } catch (error) {
-        this.$message.error(error)
-      }
-    },
-    // 关联编辑-隐藏弹框
-    hideOperateDialog() {
-      if (this.operateDialogType === 'output') {
-        this.$refs['outputForm'].resetFields()
-      }
-      this.operateDialogType = null
-    },
-    // 关联删除-显示弹框
-    showDeleteDialog(obj, type) {
-      this.delObj = obj
-      this.deleteDialogType = type
-    },
-    // 关联删除-提交
-    async deleteSubmitHandler() {
-      const operate = this.dataInMap(this.deleteDialogType, 'operate')
-      let message
-      try {
-        if (this.deleteDialogType === 'output') {
-          message = await operate('delete', this.delObj)
-        } else {
-          message = await operate('delete', this.delObj[this.dataInMap(this.deleteDialogType, 'key')])
-        }
-        this.$message.success(message ?? '成功')
-        await this.queryAll()
-        this.hideDeleteDialog()
-      } catch (error) {
-        this.$message.error(error)
-      }
-    },
-    // 关联删除-隐藏弹框
-    hideDeleteDialog() {
-      this.deleteDialogType = null
-      this.delObj = {}
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.service-edit {
-  margin: 0 -24px;
-  padding-bottom: 16px;
-  overflow: hidden;
-  .scrollbar {
-    height: calc(100vh - 120px);
-    padding: 0 24px;
-    overflow-x: hidden;
-    overflow-y: auto;
-    ::v-deep .part {
-      height: 640px;
-      padding: 26px 24px 0 24px;
-      background: #ffffff;
-      box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.1);
-      border-radius: 4px;
-      &.part-top {
-        height: 296px;
-        margin-bottom: 24px;
-        overflow: hidden;
-      }
-      .title {
-        display: flex;
-        justify-content: space-between;
-        margin-bottom: 24px;
-        &:nth-of-type(2) {
-          margin-top: 10px;
-        }
-        .manageTitle {
-          height: 32px;
-          line-height: 30px;
-        }
-        .el-button {
-          width: 64px;
-          height: 32px;
-          border: none;
-          &.btn-white {
-            background-color: #ffffff;
-            border: 1px solid #92ace2;
-            color: #2d67e3;
-          }
-          &:hover {
-            background-color: #487be8;
-            color: #ffffff;
-          }
-        }
-      }
-      label,
-      span,
-      button,
-      input,
-      optgroup,
-      select,
-      textarea {
-        font-family: Helvetica, Microsoft YaHei;
-        font-size: 14px;
-        font-weight: 400;
-      }
-      label {
-        color: #303133;
-      }
-      input {
-        color: #101116;
-      }
-      .el-input__inner,
-      .el-textarea__inner {
-        padding-left: 8px;
-        padding-right: 8px;
-      }
-      .el-radio {
-        font-weight: 400;
-      }
-      .content {
-        margin: 0;
-        &:not(.first-content) {
-          height: calc(100% - 32px - 24px);
-        }
-        &.second-content {
-          height: calc(100% - 297px);
-        }
-        > .scrollbar {
-          margin: -12px -24px 0 0;
-          padding: 12px 24px 28px 0;
-          height: calc(100% + 12px);
-          > .el-row > .el-col {
-            margin-bottom: 16px;
-            .service-edit-card {
-              height: 80px;
-              padding: 16px 14px 0 16px;
-              background: #f5f7fa;
-              box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.1);
-              border-radius: 4px;
-              position: relative;
-              font-family: Helvetica, 'Microsoft YaHei';
-              .card-btn-add {
-                margin: -16px -14px 0 -16px;
-                height: calc(100% + 16px);
-                border: 1px dashed #9ebbf7;
-                cursor: pointer;
-                position: relative;
-                .el-icon-plus {
-                  font-size: 32px;
-                  color: #9ebbf7;
-                  position: absolute;
-                  top: 50%;
-                  left: 50%;
-                  margin: -16px -16px;
-                }
-              }
-              .card-btn-close {
-                position: absolute;
-                top: -12px;
-                right: -12px;
-                z-index: 10;
-                width: 24px;
-                height: 24px;
-                line-height: 24px;
-                text-align: center;
-                background: #000000;
-                opacity: 0.8;
-                border-radius: 50%;
-                color: #ffffff;
-                cursor: pointer;
-              }
-              .card-header {
-                display: flex;
-                justify-content: flex-start;
-                color: #101116;
-                font-size: 14px;
-                margin-bottom: 30px;
-                .icon-edit {
-                  width: 14px;
-                  height: 14px;
-                  display: inline-block;
-                  background-repeat: no-repeat;
-                  background-size: cover;
-                  transition: all 0.3s;
-                  margin-left: 16px;
-                  cursor: pointer;
-                  background-image: url('../../../../assets/status/ic_edit_default.png');
-                  &:hover {
-                    background-image: url('../../../../assets/status/ic_edit_hovar.png');
-                  }
-                }
-              }
-              .card-main {
-                font-size: 14px;
-                font-family: Helvetica, Microsoft YaHei;
-                color: #101116;
-                .flex {
-                  height: 32px;
-                  margin-bottom: 23px;
-                  .left {
-                    padding-right: 9px;
-                  }
-                  .multiple-ellipsis {
-                    flex: 1;
-                    display: -webkit-box;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    word-break: break-all;
-                    -webkit-box-orient: vertical;
-                    -webkit-line-clamp: 2;
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      &:nth-last-child(1) .content > .scrollbar > .el-row > .el-col {
-        margin-bottom: 24px;
-        &:nth-last-child(1) {
-          margin-bottom: 0;
-        }
-      }
-    }
-  }
-  ::v-deep .service-form {
-    display: flex;
-    flex-wrap: wrap;
-    .el-form-item {
-      margin-bottom: 25px;
-      .el-form-item__label {
-        padding-right: 16px;
-      }
-      &:nth-child(2) {
-        margin-left: 80px;
-        flex: 1;
-        .el-form-item__label {
-          margin-right: 9px;
-        }
-      }
-      &:nth-child(3) {
-        width: 100%;
-      }
-    }
-  }
-  ::v-deep .input-form {
-    display: flex;
-    flex-wrap: wrap;
-    .el-form-item {
-      margin-bottom: 25px;
-      .el-form-item__label {
-        padding-right: 16px;
-      }
-      &:nth-child(2) {
-        margin-left: 54px;
-        flex: 1;
-      }
-      &:nth-child(3) {
-        width: 100%;
-      }
-    }
-  }
-  .dialog-checkbox {
-    .content {
-      margin-left: 16px;
-      .el-checkbox-group {
-        margin-right: 24px;
-        .el-checkbox {
-          margin-bottom: 24px;
-          font-family: Helvetica, Microsoft YaHei;
-          color: #303133;
-        }
-      }
-    }
-  }
-  ::v-deep #dialog-form .el-select .el-input__inner {
-    width: 100%;
-  }
-}
-</style>

+ 1 - 2
src/views/systemSettings/views/serviceManagement/serviceEdit.vue

@@ -188,7 +188,6 @@ import Dialog from '@/layout/components/Dialog'
 import DataTable from '@/components/Table'
 import { myQuery, GeneralDataReception } from '@/api/dataIntegration'
 
-// import query from './mixins/query'
 import operate from './mixins/operate'
 
 export default {
@@ -349,7 +348,7 @@ export default {
           this.$message.error(res.message ?? '失败')
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log('出错了', error.message || error)
       }
     },
   }

+ 3 - 3
src/views/systemSettings/views/serviceManagement/serviceHome.vue

@@ -290,7 +290,7 @@ export default {
           return [];
         }
       } catch (error) {
-        console.log("错误", error);
+        console.log("出错了", error.message || error);
       }
     },
     async createService () {
@@ -314,7 +314,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-        console.log("错误", error);
+        console.log("出错了", error.message || error);
       }
     },
     async formService () {
@@ -338,7 +338,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-        console.log("错误", error);
+        console.log("出错了", error.message || error);
       }
     },
   },