zhongxiaoyu 3 жил өмнө
parent
commit
3e4900b8ef

+ 59 - 1
src/api/dataIntegration.js

@@ -1,13 +1,14 @@
 /*
  * @Author: Badguy
  * @Date: 2022-04-13 14:35:17
- * @LastEditTime: 2022-04-15 14:39:21
+ * @LastEditTime: 2022-05-05 11:32:18
  * @LastEditors: your name
  * @Description: 数据整合接口
  * have a nice day!
  */
 
 import request from '@/utils/request'
+import { Message } from 'element-ui'
 
 export function GeneralDataReception(params) {
   return request({
@@ -30,3 +31,60 @@ export function Query(params) {
     data: params
   })
 }
+
+export const queryMap = {
+  protocol: 1,
+  node: 2,
+  service: 3,
+  source: 4,
+  sourceItem: 5,
+  serviceAndSource: 6,
+  target: 7,
+  targetItem: 8,
+  serviceAndOutput: 9,
+  serviceAndNode: 10,
+  serviceByID: 11,
+  nodeByServiceID: 12,
+  sourceByServiceID: 13,
+  targetByServiceID: 14,
+  targetItemByTargetID: 15,
+  sourceItemBySourceID: 16,
+  targetByID: 17,
+  sourceByID: 18,
+  serviceAlgorithmByServiceID: 19,
+  outputListByServiceID: 20,
+  departureAirPort: 31,
+  landingAirport: 32,
+  departureAirPortBylandingAirport: 33,
+  landingAirportBydepartureAirPort: 34,
+  carrier: 35,
+  craftType: 36,
+  airLine: 37,
+  landingFlight: 38,
+  departureFlight: 39,
+  transferFlight: 40,
+  container: 41,
+  trasferOutBaggage: 42,
+  trasferInBaggage: 43,
+  baggageBasicInfoByID: 60,
+  baggageTrackByID: 61,
+  baggageDetailsByID: 62
+}
+
+export async function myQuery(id, ...dataContent) {
+  const params = {
+    id,
+    dataContent
+  }
+  try {
+    const result = await Query(params)
+    if (Number(result.code) === 0) {
+      return result.returnData
+    } else {
+      Message.error(result.message ?? '失败')
+      return Promise.reject(result.message)
+    }
+  } catch (error) {
+    return Promise.reject(error)
+  }
+}

+ 2 - 1
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 16:23:00
+ * @LastEditTime: 2022-05-05 11:07:44
  * @LastEditors: your name
  * @Description: 服务相关操作
  * have a nice day!
@@ -19,6 +19,7 @@ export default {
   methods: {
     async updateService() {
       const params = {
+        serviceID: this.serviceID,
         ...this.serviceForm,
         ...this.inputForm,
         operate: 2

+ 22 - 62
src/views/systemSettings/views/serviceManagement/mixins/query.js

@@ -1,36 +1,13 @@
 /*
  * @Author: Badguy
  * @Date: 2022-04-27 15:54:38
- * @LastEditTime: 2022-04-29 15:57:40
+ * @LastEditTime: 2022-05-05 10:13:48
  * @LastEditors: your name
  * @Description: 服务相关数据查询
  * have a nice day!
  */
 
-import { Query } from '@/api/dataIntegration'
-
-const queryMap = {
-  protocol: 1,
-  node: 2,
-  service: 3,
-  source: 4,
-  sourceItem: 5,
-  serviceAndSource: 6,
-  target: 7,
-  targetItem: 8,
-  serviceAndOutput: 9,
-  serviceAndNode: 10,
-  serviceByID: 11,
-  nodeByServiceID: 12,
-  sourceByServiceID: 13,
-  targetByServiceID: 14,
-  targetItemByTargetID: 15,
-  sourceItemBySourceID: 16,
-  targetByID: 17,
-  sourceByID: 18,
-  serviceAlgorithmByServiceID: 19,
-  outputListByServiceID: 20
-}
+import { queryMap, myQuery } from '@/api/dataIntegration'
 
 export default {
   data() {
@@ -44,102 +21,85 @@ export default {
     }
   },
   methods: {
-    async myQuery(type, queryID) {
-      const params = {
-        id: type,
-        dataContent: []
-      }
-      queryID && params.dataContent.push(queryID)
-      try {
-        const result = await Query(params)
-        if (Number(result.code) === 0) {
-          return result.returnData
-        } else {
-          return Promise.reject(result.message)
-        }
-      } catch (error) {
-        return Promise.reject(error)
-      }
-    },
     // 协议 id: 1
     queryProtocolList() {
-      return this.myQuery(queryMap.protocol)
+      return myQuery(queryMap.protocol)
     },
     // 机器/节点 id: 2
     queryNodeList() {
-      return this.myQuery(queryMap.node)
+      return myQuery(queryMap.node)
     },
     // 服务 id: 3
     queryServiceList() {
-      return this.myQuery(queryMap.service)
+      return myQuery(queryMap.service)
     },
     // 源数据 id: 4
     querySourceList() {
-      return this.myQuery(queryMap.source)
+      return myQuery(queryMap.source)
     },
     // 源数据项 id: 5
     querySourceItemList() {
-      return this.myQuery(queryMap.sourceItem)
+      return myQuery(queryMap.sourceItem)
     },
     // 源数据服务关联 id: 6
     queryServiceAndSourceList() {
-      return this.myQuery(queryMap.serviceAndSource)
+      return myQuery(queryMap.serviceAndSource)
     },
     // 目标数据 id: 7
     queryTargetList() {
-      return this.myQuery(queryMap.target)
+      return myQuery(queryMap.target)
     },
     // 目标数据项 id: 8
     queryTargetItemList() {
-      return this.myQuery(queryMap.targetItem)
+      return myQuery(queryMap.targetItem)
     },
     // 服务输出项关联 id: 9
     queryServiceAndOutputList() {
-      return this.myQuery(queryMap.serviceAndOutput)
+      return myQuery(queryMap.serviceAndOutput)
     },
     // 服务节点关联 id: 10
     queryServiceAndNodeList() {
-      return this.myQuery(queryMap.targetItem)
+      return myQuery(queryMap.targetItem)
     },
     // 按照ID查询服务 id: 11
     queryServiceByID(serviceID) {
-      return this.myQuery(queryMap.serviceByID, serviceID)
+      return myQuery(queryMap.serviceByID, serviceID)
     },
     // 按照服务ID查询节点列表 id: 12
     queryNodeListByServiceId(serviceID) {
-      return this.myQuery(queryMap.nodeByServiceID, serviceID)
+      return myQuery(queryMap.nodeByServiceID, serviceID)
     },
     // 按照服务ID查询源数据列表 id: 13
     querySourceListByServiceId(serviceID) {
-      return this.myQuery(queryMap.sourceByServiceID, serviceID)
+      return myQuery(queryMap.sourceByServiceID, serviceID)
     },
     // 按照服务ID查询目标数据列表 id: 14
     queryTargetListByServiceId(serviceID) {
-      return this.myQuery(queryMap.targetByServiceID, serviceID)
+      return myQuery(queryMap.targetByServiceID, serviceID)
     },
     // 按照目标数据ID查询目标数据项列表 id: 15
     queryTargetItemListByTargetID(targetID) {
-      return this.myQuery(queryMap.targetItemByTargetID, targetID)
+      return myQuery(queryMap.targetItemByTargetID, targetID)
     },
     // 按照源数据ID查询源数据项列表 id: 16
     querySourceItemListBySourceID(sourceID) {
-      return this.myQuery(queryMap.sourceItemBySourceID, sourceID)
+      return myQuery(queryMap.sourceItemBySourceID, sourceID)
     },
     // 按照目标数据ID查询目标数据 id: 17
     queryTargetByID(targetID) {
-      return this.myQuery(queryMap.targetByID, targetID)
+      return myQuery(queryMap.targetByID, targetID)
     },
     // 按照源数据ID查询源数据 id: 18
     querySourceBySourceID(sourceID) {
-      return this.myQuery(queryMap.sourceByID, sourceID)
+      return myQuery(queryMap.sourceByID, sourceID)
     },
     // 按照服务ID查询算法计算方式 id: 19
     queryAlgorithmByServiceID(serviceID) {
-      return this.myQuery(queryMap.sourceItemBySourceID, serviceID)
+      return myQuery(queryMap.sourceItemBySourceID, serviceID)
     },
     // 按照服务ID查询服务输出列表 id: 20
     queryOutputListByServiceId(serviceID) {
-      return this.myQuery(queryMap.outputListByServiceID, serviceID)
+      return myQuery(queryMap.outputListByServiceID, serviceID)
     },
     async queryAll(serviceID = this.serviceID) {
       try {