Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

src/views/systemSettings/views/protocolManagement/protocolHome.vue

@@ -190,6 +190,7 @@ export default {
         if (res.code === "0") {
           this.removeDialogVisible = false;
           this.$message.success("删除成功");
+          this.getList()
         } else {
           this.$message.error(res.message ?? "失败");
         }
@@ -206,6 +207,7 @@ export default {
         })
         if (res.code === "0") {
           this.$message.success(res.message ?? '成功')
+          this.getList()
         } else {
           this.$message.error(res.message ?? '失败')
         }
@@ -222,6 +224,7 @@ export default {
         })
         if (res.code === "0") {
           this.$message.success(res.message ?? '成功')
+          this.getList()
         } else {
           this.$message.error(res.message ?? '失败')
         }

src/views/systemSettings/views/serviceManagement/serviceHome.vue

@@ -1,5 +1,4 @@
 <!--
- * @Author: Badguy
  * @Date: 2022-04-12 17:49:47
  * @LastEditTime: 2022-04-13 16:17:37
  * @LastEditors: your name
@@ -24,13 +23,13 @@
         <el-row :gutter="24">
           <el-col
             v-for="item in dataList"
-            :key="item.protocolId"
+            :key="item.serviceID"
             :span="4"
           >
             <div class="grid-content">
               <div class="grid-content-hand flex">
                 <div class="title flex-wrap">
-                  <div class="name">{{ item.protocolName }}</div>
+                  <div class="name">{{ item.serviceName }}</div>
                   <i
                     class="loger"
                     @click="showEditDialog(item)"
@@ -48,10 +47,10 @@
       <!--删除弹框-->
       <Dialog :flag="removeDialogVisible">
         <div class="airportInfoDialog">
-          <div class="Deltitle">删除协议</div>
+          <div class="Deltitle">删除服务</div>
           <div class="content er">
             <div class="log">
-              是否确认删除{{ rmObj.protocolName }}？
+              你是否确认删除{{ rmObj.serviceName }}？
             </div>
           </div>
           <div class="DelFoot right t30">
@@ -74,7 +73,8 @@
 </template>
 
 <script>
-import Dialog from '@/layout/components/Dialog/index.vue'
+import Dialog from '@/layout/components/Dialog/index.vue';
+import { Query  } from '@/api/dataIntegration';
 
 export default {
   name: 'ProtocolHome',
@@ -87,14 +87,24 @@ export default {
     }
   },
   created() {
-    for (let index = 0; index < 20; index++) {
-      this.dataList.push({
-        protocolId: index,
-        protocolName: '服务-' + (Math.floor(Math.random() * 20) + 1)
-      })
-    }
+    this.getList()
   },
   methods: {
+    async getList() {
+      try {
+        const res = await Query({
+          id: 3,
+          dataContent: []
+        });
+        if (res.code === "0") {
+            this.dataList = res.returnData
+        } else {
+          this.$message.error(res.message ?? "失败");
+        }
+      } catch (error) {
+        console.log("错误", error);
+      }
+    },
     // 新增-弹框
     showAddDialog() {
       this.$router.push('/systemSettings/serviceEdit')

src/views/systemSettings/views/sourceDataItemManagement/sourceDataItemHome.vue

@@ -18,17 +18,17 @@
       </div>
       <div class="protocol-content">
         <el-row :gutter="24">
-          <el-col v-for="item in dataList" :key="item.protocolId" :span="4">
+          <el-col v-for="item in dataList" :key="item.sourceDataID" :span="4">
             <div class="grid-content">
               <div class="head-line"></div>
               <div class="grid-content-hand flex">
                 <div class="title flex-wrap">
-                  <div class="name">{{ item.protocolName }}</div>
+                  <div class="name">{{ item.dataName }}</div>
                   <i class="loger" @click="showEditDialog(item)" />
                 </div>
                 <i class="el-icon-close icon" @click="showRemoveDialog(item)" />
               </div>
-              <div class="disc">行李源报文</div>
+              <div class="disc">{{item.dataType}}</div>
             </div>
           </el-col>
         </el-row>
@@ -52,7 +52,7 @@
 
 <script>
 import Dialog from "@/layout/components/Dialog/index.vue";
-import { GeneralDataReception } from "@/api/dataIntegration";
+import { Query  } from '@/api/dataIntegration';
 
 export default {
   name: "ProtocolHome",
@@ -65,21 +65,31 @@ export default {
     };
   },
   created () {
-    for (let index = 0; index < 20; index++) {
-      this.dataList.push({
-        protocolId: index,
-        protocolName: "源数据-" + (Math.floor(Math.random() * 20) + 1),
-      });
-    }
+    this.getList()
   },
   methods: {
+    async getList() {
+      try {
+        const res = await Query({
+          id: 4,
+          dataContent: []
+        });
+        if (res.code === "0") {
+            this.dataList = res.returnData
+        } else {
+          this.$message.error(res.message ?? "失败");
+        }
+      } catch (error) {
+        console.log("错误", error);
+      }
+    },
     // 新增-跳转
     showAddDialog () {
       this.$router.push('/systemSettings/sourceDataItemEdit')
     },
     // 编辑-跳转
     showEditDialog (item) {
-
+      this.$router.push('/systemSettings/sourceDataItemEdit')
     },
     // 删除-弹框
     showRemoveDialog (item) {

src/views/systemSettings/views/targetDataManagement/targetDataHome.vue

@@ -66,6 +66,7 @@
 
 <script>
 import Dialog from "@/layout/components/Dialog/index.vue";
+import { Query  } from '@/api/dataIntegration'
 
 export default {
   name: "targetDataHome",