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

src/router/routes/routes-file-two.js

@@ -13,7 +13,7 @@ const systemSettingsRoutes = {
         {
           path: '/systemSettings',
           name: 'serviceManagement',
-          component: { render (c) { return c('router-view') } },
+          component: { render(c) { return c('router-view') } },
           redirect: '/systemSettings',
           meta: { title: '服务管理' },
           hidden: true,
@@ -38,7 +38,7 @@ const systemSettingsRoutes = {
         {
           path: '/systemSettings/sourceDataItemManagement',
           name: 'sourceDataItemManagement',
-          component: { render (c) { return c('router-view') } },
+          component: { render(c) { return c('router-view') } },
           redirect: '/systemSettings/sourceDataItemManagement',
           meta: { title: '源数据管理' },
           hidden: true,
@@ -63,7 +63,7 @@ const systemSettingsRoutes = {
         {
           path: '/systemSettings/targetDataManagement',
           name: 'targetDataManagement',
-          component: { render (c) { return c('router-view') } },
+          component: { render(c) { return c('router-view') } },
           redirect: '/systemSettings/targetDataManagement',
           meta: { title: '目标数据管理' },
           hidden: true,
@@ -105,7 +105,7 @@ const systemSettingsRoutes = {
         {
           path: '/systemSettings/warningSet',
           name: 'warningSet',
-          component: { render (c) { return c('router-view') } },
+          component: { render(c) { return c('router-view') } },
           redirect: '/systemSettings/warningSet',
           meta: { title: '报警预警设置' },
           hidden: true,
@@ -140,7 +140,7 @@ const systemSettingsRoutes = {
             component: () => import('@/views/systemSettings/views/queryTemplate/queryTemplate'),
           },
           {
-            path: '/systemSettings/queryTemplate/queryTemplateadd',
+            path: '/systemSettings/queryTemplateadd',
             name: 'queryTemplateadd',
             component: () => import('@/views/systemSettings/views/queryTemplate/queryTemplateadd'),
             meta: { title: '新增查询模板' },
@@ -149,8 +149,8 @@ const systemSettingsRoutes = {
             src: require('@/assets/nav/ic_setting_top@2x.png')
           },
           {
-            path: '/systemSettings/queryTemplate/queryTemplateedit',
-            name: 'queryTemplateadd',
+            path: '/systemSettings/queryTemplateedit',
+            name: 'queryTemplateedit',
             component: () => import('@/views/systemSettings/views/queryTemplate/queryTemplateedit'),
             meta: { title: '编辑查询模板' },
             hidden: false,

src/views/BasicsData/views/BaggageType/BaggageType.vue

@@ -325,7 +325,7 @@ export default {
         } catch (error) {
           console.log("错误", error);
         }
-        this.$refs.ruleFormall.resetFields();
+        this.EditForm = {};
         this.EditFlag = false;
       }
     },
@@ -380,7 +380,7 @@ export default {
           console.log("错误", error);
         }
         this.addFlag = false;
-        this.$refs.ruleForms.resetFields();
+        this.ruleForm = {};
       }
     },
     //新增机场信息-弹框-取消
@@ -389,8 +389,8 @@ export default {
       this.EditFlag = false;
       this.ruleForm.name = "";
       this.ruleForm.fullName = "";
-      this.$refs.ruleForms.resetFields();
-      this.$refs.ruleFormall.resetFields();
+      this.ruleForm = {};
+      this.EditForm = {};
     },
     //删除
     async remove() {

src/views/advancedQuery/views/advancedHome.vue

@@ -76,7 +76,11 @@
           :filters="tableDataFilters[item.prop]"
           :filter-method="tableDataFilters[item.prop] && filterHandler"
           filter-placement="top"
-        />
+        >
+        <template slot-scope="scope">
+          <a href="javascript:void(0);">{{scope.row[item.prop]}}</a>
+        </template>
+        </el-table-column>
       </el-table>
     </div>
     <!--列设置-->

src/views/baggageManagement/components/flight/index.vue

@@ -398,7 +398,7 @@ const departureBaggageTableColumn = [
   },
   { name: '装载序号', prop: 'LoadSN', align: 'center' },
   { name: '值机', prop: 'checkIn', align: 'center' },
-  { name: '状态', prop: 'status', align: 'center' },
+  { name: '状态', prop: 'latestStatus', align: 'center' },
   { name: '安检', prop: 'security', align: 'center' },
   { name: '分拣', prop: 'sorting', align: 'center' },
   { name: '装车', prop: 'loading', align: 'center' },
@@ -454,10 +454,7 @@ export default {
       transferOutBaggageTableData: [], // 中转出
       flightBaggageTableData: [], // 行李列表
       flightBaggageTableFilters: {
-        PassengerNameUpcase: [],
-        BagSN: [],
-        SpecialType: [],
-        U_Device_ID: []
+        latestStatus:[]
       }
     }
   },
@@ -624,7 +621,7 @@ export default {
         })
         this.flightBaggageTableData = flightBaggageTableData.map((item, index) => {
           item['checkIn'] = `${item['checkIn'] ?? ''} ${item['checkInTime'] ? item['checkInTime'].split('T')[1] : ''}`
-          item['status'] = item['Status'] === 'DEL' ? '删除' : ''
+          item['latestStatus'] = item['Status'] === 'DEL' ? '删除' : item['latestStatus']
           item['security'] = `${item['DealInfo'] ?? ''} ${item['DealTime'] ? item['DealTime'].split('T')[1] : ''}`
           item['sorting'] = `${item['sortLocationMark'] ?? ''} ${
             item['sortDealTime'] ? item['sortDealTime'].split('T')[1] : ''

src/views/systemSettings/views/queryTemplate/queryTemplate.vue

@@ -185,7 +185,7 @@ export default {
       // this.EditForm.name = item.typeName;
       // this.EditForm.fullName = item.typeCode;
       this.$router.push({
-        path: "/systemSettings/queryTemplate/queryTemplateedit",
+        path: "/systemSettings/queryTemplateedit",
         query: {
           queryTemplateName: item.queryTemplateName,
           protocolID: item.protocolID,
@@ -244,7 +244,7 @@ export default {
 
     //新增机场信息-弹框
     handleAdd() {
-      this.$router.push("/systemSettings/queryTemplate/queryTemplateadd");
+      this.$router.push("/systemSettings/queryTemplateadd");
     },
     //新增机场信息-弹框-取消
     resetForm() {

src/views/systemSettings/views/queryTemplate/queryTemplateadd.vue

@@ -14,7 +14,7 @@
     >
       <el-row :gutter="24" class="b24">
         <el-col :span="5">
-          <el-form-item label="查询模板名称" prop="queryTemplateName">
+          <el-form-item label="查询模板名称">
             <el-input
               size="medium"
               placeholder="暂无数据"
@@ -23,7 +23,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="查询协议" prop="protocolID">
+          <el-form-item label="查询协议">
             <el-select
               v-model="ruleForm.protocolID"
               placeholder="暂无数据"
@@ -40,7 +40,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="14">
-          <el-form-item label="查询模板描述" prop="queryTemplateDescribe">
+          <el-form-item label="查询模板描述">
             <el-input
               size="medium"
               placeholder="暂无数据"
@@ -49,11 +49,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item
-        label="查询配置"
-        prop="queryTemplatetConfig"
-        style="margin-bottom: 24px"
-      >
+      <el-form-item label="查询配置" style="margin-bottom: 24px">
         <el-input
           v-model="ruleForm.queryTemplatetConfig"
           class="desc"
@@ -64,7 +60,7 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="查询语句" prop="queryTemplate">
+      <el-form-item label="查询语句">
         <el-input
           v-model="ruleForm.queryTemplate"
           class="desc"
@@ -91,7 +87,12 @@ export default {
         queryTemplatetConfig: "",
         queryTemplate: "",
       },
-      options: [],
+      options: [
+        {
+          value: 1,
+          label: 1,
+        },
+      ],
       rules: {
         queryTemplateName: [
           { required: true, message: "请输入查询模板名称", trigger: "blur" },

src/views/systemSettings/views/queryTemplate/queryTemplateedit.vue

@@ -2,7 +2,7 @@
   <div class="queryTemplate">
     <Search title="编辑查询模板" :isSearch="false">
       <button class="btnAner">测试</button>
-      <button class="btnAn">保存</button>
+      <button class="btnAn" @click="addSubmit">保存</button>
     </Search>
     <el-form
       style="margin-top: 10px"
@@ -14,7 +14,7 @@
     >
       <el-row :gutter="24" class="b24">
         <el-col :span="5">
-          <el-form-item label="查询模板名称" prop="queryTemplateName">
+          <el-form-item label="查询模板名称">
             <el-input
               size="medium"
               placeholder="暂无数据"
@@ -23,7 +23,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="查询协议" prop="protocolID">
+          <el-form-item label="查询协议">
             <el-select
               v-model="ruleForm.protocolID"
               placeholder="暂无数据"
@@ -40,7 +40,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="14">
-          <el-form-item label="查询模板描述" prop="queryTemplateDescribe">
+          <el-form-item label="查询模板描述">
             <el-input
               size="medium"
               placeholder="暂无数据"
@@ -49,11 +49,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item
-        label="查询配置"
-        prop="queryTemplatetConfig"
-        style="margin-bottom: 24px"
-      >
+      <el-form-item label="查询配置" style="margin-bottom: 24px">
         <el-input
           v-model="ruleForm.queryTemplatetConfig"
           class="desc"
@@ -64,7 +60,7 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="查询语句" prop="queryTemplate">
+      <el-form-item label="查询语句">
         <el-input
           v-model="ruleForm.queryTemplate"
           class="desc"
@@ -80,6 +76,7 @@
 </template>
 <script>
 import Search from "@/layout/components/Search/index.vue";
+import { GeneralDataReception } from "@/api/dataIntegration";
 export default {
   data() {
     return {
@@ -89,6 +86,7 @@ export default {
         queryTemplateDescribe: "",
         queryTemplatetConfig: "",
         queryTemplate: "",
+        operate: "",
       },
       options: [],
       rules: {