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

src/layout/components/Search/index.vue

@@ -14,44 +14,20 @@
       </div>
       <div v-if="isOnly" class="content flex-wrap">
         <el-select v-model="value" clearable placeholder="请选择" v-if="isSou">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
+          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
         <el-select v-model="value1" clearable placeholder="请选择" v-if="isSou">
-          <el-option
-            v-for="item in options1"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
+          <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
-        <div
-          v-if="isSearch"
-          :class="isChild ? 'childSearch' : ''"
-          class="search"
-        >
-          <el-input
-            :size="isChild ? 'medium' : ''"
-            :placeholder="placeholder"
-            @clear="clearSearch"
-            clearable
-            v-model="input"
-          >
+        <div v-if="isSearch" :class="isChild ? 'childSearch' : ''" class="search">
+          <el-input :size="isChild ? 'medium' : ''" :placeholder="placeholder" @clear="clearSearch" clearable v-model="input">
             <el-button slot="prepend" icon="el-icon-search"></el-button>
           </el-input>
         </div>
         <div v-if="isSearch" class="btn">
-          <button
-            :class="isChild ? 'childBtnAn' : ''"
-            @click="checkSearch"
-            class="btnAn"
-          >
+          <button :class="isChild ? 'childBtnAn' : ''" @click="checkSearch" class="btnAn">
             搜索
           </button>
         </div>
@@ -108,14 +84,14 @@ export default {
       default: false,
     },
   },
-  data() {
+  data () {
     return {
       input: "",
     };
   },
   methods: {
-    checkSearch() {
-      if (isSou) {
+    checkSearch () {
+      if (this.isSou) {
         let params = {
           input: this.input,
           value1: this.value1,
@@ -126,7 +102,7 @@ export default {
         this.$emit("getSearchData", this.input);
       }
     },
-    clearSearch() {
+    clearSearch () {
       this.$emit("clearSearchData", this.input);
     },
   },

src/views/dataIntegration/views/interfaceLog.vue

@@ -15,7 +15,7 @@
         <Search @getSearchData="getSearchData" :isTitle="false" @clearSearchData="clearSearchData" />
       </div>
     </div>
-    <div class="interfaceLog_content">
+    <div class="interfaceLog_content flex-wrap">
       <el-table :data="tableData" class="table" border style="width: 100%">
         <el-table-column prop="action" label="动作">
         </el-table-column>
@@ -33,6 +33,18 @@
         <el-table-column prop="details" label="详情">
         </el-table-column>
       </el-table>
+      <div class="interfaceLog_content_progress">
+        <el-timeline>
+          <el-timeline-item v-for="(item,index) in preDatas" :key="index">
+            <div class="list">
+              <div class="list_status"></div>
+              <div class="list_title">{{item.title}}</div>
+              <div class="list_code">{{item.code}}</div>
+              <div class="list_time">{{item.time}}</div>
+            </div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
     </div>
   </div>
 </template>
@@ -46,7 +58,8 @@ export default {
     return {
       timeStart: '',
       timeEnd: '',
-      tableData: []
+      tableData: [],
+      preDatas: []
     }
   },
   created () {
@@ -59,8 +72,16 @@ export default {
         result: i % 2 == 0 ? true : false,
         details: '数据格式不正确'
       };
+      const obj = {
+        title: '更新 Github 模板',
+        code: '989665554',
+        time: '2022-4-26 15:48:55',
+        id: i
+      };
       this.tableData.push(element)
+      this.preDatas.push(obj)
     }
+    this.preDatas.splice(5, 10)
   },
   mounted () {
     document.querySelector('.interfaceLog_head_time_start .el-input__prefix i').remove()
@@ -96,7 +117,7 @@ export default {
     }
   }
   .interfaceLog_head_btn {
-    .btn {
+    ::v-deep .btn {
       margin-right: 0;
     }
   }
@@ -114,6 +135,74 @@ export default {
         color: #df4545;
       }
     }
+    &_progress {
+      width: 368px;
+      background: #fafcff;
+      margin-left: 8px;
+      padding: 13px 32px;
+      overflow: hidden;
+      ::v-deep .el-timeline {
+        padding: 0;
+        .el-timeline-item {
+          position: relative;
+          &::after {
+            position: absolute;
+            content: "";
+            height: 1px;
+            width: calc(100% + 4px);
+            background-color: #dfe3ea;
+            left: 28px;
+            bottom: 20px;
+          }
+          &:last-child {
+            &::after {
+              height: 0;
+            }
+          }
+        }
+        .el-timeline-item__node--normal {
+          z-index: 2;
+          background-color: #fff;
+          width: 10px;
+          height: 10px;
+          left: 0px;
+          top: 2px;
+        }
+        .el-timeline-item__tail {
+          border-left: 4px solid #dfe3ea;
+          left: 3px;
+        }
+        .el-timeline-item:last-child .el-timeline-item__tail {
+          height: 1000%;
+          display: block;
+        }
+        .list {
+          &_status {
+            position: absolute;
+            width: 20px;
+            height: 20px;
+            background: #2d67e3;
+            left: -5px;
+            border-radius: 50%;
+            z-index: 1;
+          }
+          &_title,
+          &_code {
+            margin-bottom: 7px;
+            font-size: 14px;
+            font-family: Microsoft YaHei;
+            font-weight: bold;
+            color: #101116;
+          }
+          &_time {
+            font-size: 12px;
+            font-family: Helvetica;
+            font-weight: 400;
+            color: #afb4bf;
+          }
+        }
+      }
+    }
   }
 }
 </style>

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",