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

src/layout/components/ToolBar/index.vue

@@ -14,6 +14,7 @@
               <img :src="item.src" :alt="item.meta.title" />
             </div> -->
             <img
+              style="width: 18px; height: 18px"
               :src="dialog == index ? item.srcer : item.src"
               :alt="item.meta.title"
             />
@@ -91,7 +92,7 @@ export default {
     background: #ffffff;
     box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
     border-radius: 4px;
-    min-width: 200px;
+    min-width: 220px;
     .toolbar-list-bar {
       display: flex;
       align-items: center;

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

@@ -29,7 +29,7 @@ const authorityRoutes = {
           path: '/',
           name: 'AuthorityHome',
           component: {
-            render(c) {
+            render (c) {
               return c('router-view')
             }
           },
@@ -91,7 +91,7 @@ const roleRoutes = {
           path: '/',
           name: 'AuthorityRoleHome',
           component: {
-            render(c) {
+            render (c) {
               return c('router-view')
             }
           },
@@ -142,7 +142,7 @@ const accountRoutes = {
           path: '/account',
           name: 'accountHome',
           component: {
-            render(c) {
+            render (c) {
               return c('router-view')
             }
           },
@@ -180,4 +180,25 @@ const accountRoutes = {
   ]
 }
 
-export default [authorityRoutes, roleRoutes, accountRoutes]
+//高级查询
+const advanceRoutes = {
+  path: '/advance',
+  component: Layout,
+  children: [
+    {
+      path: '/advance',
+      component: () => import('@/views/advancedQuery/index.vue'),
+      meta: { title: '高级查询', icon: 'dataParser', imgstyle: 'ic_list_nav_search_default.png', imgstyleup: 'ic_list_nav_search_check.png' },
+      children: [
+        {
+          path: '/advance',
+          name: 'advance',
+          component: () => import('@/views/advancedQuery/views/advancedHome.vue'),
+          meta: { title: '高级查询' }
+        }
+      ]
+    },
+  ]
+}
+
+export default [authorityRoutes, roleRoutes, accountRoutes, advanceRoutes]

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

@@ -17,8 +17,8 @@ const BasicsDataRoutes = {
           component: () => import('@/views/BasicsData/views/airlineCompany/airlineCompanyInfo'),
           meta: { title: '航司信息维护', roles: ['airline_information_page'] },
           hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png')
+          src: require('@/assets/nav/ic_data_top_default @2x.png'),
+          srcer: require('@/assets/nav/ic_data_top_check@2x.png')
         },
         {
           path: '/BasicsData/airportInfo',
@@ -27,8 +27,8 @@ const BasicsDataRoutes = {
           redirect: '/BasicsData/airportInfo',
           meta: { title: '机场信息维护' },
           hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png'),
+          src: require('@/assets/nav/ic_data_top_default @2x.png'),
+          srcer: require('@/assets/nav/ic_data_top_check@2x.png'),
           children: [
             {
               path: '/BasicsData/airportInfo',
@@ -51,8 +51,8 @@ const BasicsDataRoutes = {
           component: () => import('@/views/BasicsData/views/deployNode/deployNodeHome'),
           meta: { title: '节点信息维护' },
           hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png')
+          src: require('@/assets/nav/ic_data_top_default @2x.png'),
+          srcer: require('@/assets/nav/ic_data_top_check@2x.png')
         },
         // {
         //   path: '/BasicsData/warningSet',
@@ -84,8 +84,8 @@ const BasicsDataRoutes = {
           component: () => import('@/views/BasicsData/views/BaggageType/BaggageType'),
           meta: { title: '特殊行李分类' },
           hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png')
+          src: require('@/assets/nav/ic_data_top_default @2x.png'),
+          srcer: require('@/assets/nav/ic_data_top_check@2x.png')
         }
       ]
     }

src/views/BasicsData/views/airlineCompany/airlineCompanyInfo.vue

@@ -10,11 +10,7 @@
   <div class="airportInfo">
     <!--搜索-->
     <div class="airportInfo-search">
-      <Search
-        title="航司信息维护"
-        @getSearchData="getSearchData"
-        :isSearch="false"
-      >
+      <Search title="航司信息维护" :isSearch="false">
         <button v-is="['ss_aim_add']" @click="handleAdd" class="newbut">
           新增
         </button>
@@ -36,10 +32,10 @@
                 <el-tooltip
                   class="item"
                   effect="dark"
-                  :content="item.airCompanyName"
+                  :content="item.Name"
                   placement="bottom"
                 >
-                  <div class="title">{{ item.airCompanyName }}</div>
+                  <div class="title">{{ item.Name }}</div>
                 </el-tooltip>
                 <!-- <div class="title fz16">{{ item.airCompanyName }}</div> -->
                 <div
@@ -56,7 +52,7 @@
                 ></span>
               </div>
             </div>
-            <div class="list desc">{{ item.airCompanyFullName }}</div>
+            <div class="list desc">{{ item.FullName }}</div>
           </div>
         </el-col>
       </el-row>
@@ -106,53 +102,46 @@
             label-width="120px"
             class="demo-ruleForm"
           >
-            <el-form-item label="航司中文简称" prop="name">
+            <el-form-item label="航司中文简称" prop="Name">
               <el-input
                 size="medium"
                 placeholder="请输入航司中文简称（必填）"
-                v-model="ruleForm.name"
+                v-model="ruleForm.Name"
               ></el-input>
             </el-form-item>
-            <el-form-item label="航司英文简称" prop="fullName">
+            <el-form-item label="航司英文简称">
               <el-input
                 size="medium"
                 placeholder="请输入航司英文简称（必填）"
-                v-model="ruleForm.fullName"
+                v-model="ruleForm.names"
               ></el-input>
             </el-form-item>
-            <el-form-item label="航司二字码" prop="code">
-              <el-input
-                size="medium"
-                placeholder="请输入航司二字码（必填）"
-                v-model="ruleForm.code"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="航司全称" prop="code">
+            <el-form-item label="航司全称" prop="FullName">
               <el-input
                 size="medium"
                 placeholder="请输入航司全称（必填）"
-                v-model="ruleForm.code"
+                v-model="ruleForm.FullName"
               ></el-input>
             </el-form-item>
-            <el-form-item label="航司二字码" prop="code">
+            <el-form-item label="航司二字码" prop="Code2">
               <el-input
                 size="medium"
                 placeholder="请输入航司二字码（必填）"
-                v-model="ruleForm.code"
+                v-model="ruleForm.Code2"
               ></el-input>
             </el-form-item>
-            <el-form-item label="航司三字码" prop="code">
+            <el-form-item label="航司三字码" prop="">
               <el-input
                 size="medium"
                 placeholder="请输入航司三字码（必填）"
-                v-model="ruleForm.code"
+                v-model="ruleForm.names"
               ></el-input>
             </el-form-item>
-            <el-form-item label="航司性质" prop="code">
+            <el-form-item label="航司性质" prop="">
               <el-input
                 size="medium"
                 placeholder="请输入航司性质（必填）"
-                v-model="ruleForm.code"
+                v-model="ruleForm.names"
               ></el-input>
             </el-form-item>
           </el-form>
@@ -171,6 +160,7 @@
         </div>
       </div>
     </Dialog>
+    <!--编辑机场信息弹框-->
     <Dialog :flag="EditFlag" @close="closeForm" :showFlag="true" width="415px">
       <div class="airportInfoDialog dialog-public-background">
         <div class="flx">编辑航司信息</div>
@@ -179,56 +169,49 @@
             :model="EditForm"
             :rules="rules"
             ref="ruleFormer"
-            label-width="100px"
+            label-width="120px"
             class="demo-ruleForm"
           >
-            <el-form-item label="航司中文简称" prop="name">
+            <el-form-item label="航司中文简称" prop="Name">
               <el-input
                 size="medium"
                 placeholder="请输入航司中文简称（必填）"
-                v-model="ruleForm.name"
+                v-model="EditForm.Name"
               ></el-input>
             </el-form-item>
-            <el-form-item label="航司英文简称" prop="fullName">
+            <el-form-item label="航司英文简称">
               <el-input
                 size="medium"
                 placeholder="请输入航司英文简称（必填）"
-                v-model="ruleForm.fullName"
+                v-model="EditForm.names"
               ></el-input>
             </el-form-item>
-            <el-form-item label="航司二字码" prop="code">
-              <el-input
-                size="medium"
-                placeholder="请输入航司二字码（必填）"
-                v-model="ruleForm.code"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="航司全称" prop="code">
+            <el-form-item label="航司全称" prop="FullName">
               <el-input
                 size="medium"
                 placeholder="请输入航司全称（必填）"
-                v-model="ruleForm.code"
+                v-model="EditForm.FullName"
               ></el-input>
             </el-form-item>
-            <el-form-item label="航司二字码" prop="code">
+            <el-form-item label="航司二字码" prop="Code2">
               <el-input
                 size="medium"
                 placeholder="请输入航司二字码（必填）"
-                v-model="ruleForm.code"
+                v-model="EditForm.Code2"
               ></el-input>
             </el-form-item>
-            <el-form-item label="航司三字码" prop="code">
+            <el-form-item label="航司三字码" prop="">
               <el-input
                 size="medium"
                 placeholder="请输入航司三字码（必填）"
-                v-model="ruleForm.code"
+                v-model="EditForm.names"
               ></el-input>
             </el-form-item>
-            <el-form-item label="航司性质" prop="code">
+            <el-form-item label="航司性质" prop="">
               <el-input
                 size="medium"
                 placeholder="请输入航司性质（必填）"
-                v-model="ruleForm.code"
+                v-model="EditForm.names"
               ></el-input>
             </el-form-item>
           </el-form>
@@ -261,6 +244,7 @@
 import Search from "@/layout/components/Search/index.vue";
 import Dialog from "@/layout/components/Dialog/index.vue";
 import { findarrays } from "@/utils/validate";
+import { GeneralDataReception, Query } from "@/api/dataIntegration";
 import {
   AirlinesInquiry,
   DelAirlines,
@@ -273,8 +257,9 @@ export default {
     return {
       arr: [
         {
-          airCompanyName: "名称",
-          airCompanyFullName: "测试",
+          names: "",
+          Name: "名称",
+          FullName: "测试",
         },
       ], //内容数据
       flag: false, //删除弹框开关
@@ -289,29 +274,40 @@ export default {
       },
       ruleForm: {
         //新增机场信息表单
-        name: "",
-        fullName: "",
-        code: "",
+        Name: "",
+        FullName: "",
+        Code2: "",
+        operate: "1",
       },
       EditForm: {
-        name: "",
-        fullName: "",
-        code: "",
+        //编辑机场信息表单
+        ID: "",
+        Name: "",
+        FullName: "",
+        Code2: "",
+        operate: "2",
+      },
+      eleForm: {
+        //删除机场信息表单
+        ID: "",
+        Name: "",
+        FullName: "",
+        Code2: "",
       },
       rules: {
         //新增机场信息表单验证
-        name: [{ required: true, message: "请输入航司简称", trigger: "blur" }],
-        fullName: [
+        Name: [{ required: true, message: "请输入航司简称", trigger: "blur" }],
+        FullName: [
           { required: true, message: "请输入航司全称", trigger: "blur" },
         ],
-        code: [
+        Code2: [
           { required: true, message: "请输入航司二字码", trigger: "blur" },
         ],
       },
     };
   },
   mounted() {
-    // this.getAirlines();
+    this.getAirlines();
   },
   computed: {
     serachBox() {
@@ -328,52 +324,24 @@ export default {
     },
   },
   methods: {
-    // //模糊查询
-    // findarrays(ar, feature, v) {
-    //   var arr = [];
-    //   for (var i = 0; i < ar.length; i++) {
-    //     var atxt = ar[i][feature];
-    //     var btxt = v;
-    //     //		将字符串按某个字符切割成若干个字符串，并以数组形式返回
-    //     var atxtarr = atxt.split("");
-    //     var btxtarr = btxt.split("");
-    //     var type = 0;
-    //     for (var k = 0; k < atxtarr.length; k++) {
-    //       for (var p = 0; p < btxtarr.length; p++) {
-    //         if (atxtarr[k] == btxtarr[p]) {
-    //           type = 1;
-    //         }
-    //       }
-    //     }
-    //     if (type == 1) {
-    //       arr.push(ar[i]);
-    //     }
-    //   }
-    //   return arr;
-    // },
-    //搜索
-    getSearchData(val) {
-      if (val) {
-        this.arr = findarrays(this.arr, "airCompanyName", val);
-      } else {
-        this.getAirlines();
-      }
-    },
     //删除信息
     handleMove(item) {
+      this.eleForm = item;
+      this.eleForm["operate"] = "3";
       this.ids = item.id;
       this.flag = true;
       this.rmObj = {
-        name: item.airCompanyName,
+        name: item.Name,
       };
     },
     airEdit(item) {
-      this.idss = item.id;
-      this.EditForm.name = item.airCompanyName;
-      this.EditForm.fullName = item.airCompanyFullName;
-      this.EditForm.code = item.code2;
+      this.EditForm.ID = item.ID;
+      this.EditForm.Name = item.Name;
+      this.EditForm.FullName = item.FullName;
+      this.EditForm.Code2 = item.Code2;
       this.EditFlag = true;
     },
+    //编辑机场信息-弹框-提交
     async EditSubmit() {
       let arr = 0;
       this.$refs["ruleFormer"].validate((valid) => {
@@ -385,22 +353,20 @@ export default {
         }
       });
       if (arr == 1) {
-        if (this.EditForm.name != "" && this.EditForm.fullName != "") {
-          const result = await AddAirlines({
-            id: this.idss,
-            code2: this.EditForm.code,
-            airCompanyName: this.EditForm.name,
-            airCompanyFullName: this.EditForm.fullName,
+        try {
+          const res = await GeneralDataReception({
+            serviceId: "15",
+            dataContent: JSON.stringify(this.EditForm),
           });
-          if (result.code === 0) {
+          if (res.code === "0") {
             this.getAirlines();
-            this.EditFlag = false;
-            this.$message.success("修改成功");
+            this.$message.success(res.message ?? "成功");
+            this.resetForm();
           } else {
-            this.$message.error.message;
+            this.$message.error(res.message ?? "失败");
           }
-        } else {
-          this.$message.warning("请输入必填信息");
+        } catch (error) {
+          console.log("错误", error);
         }
       }
     },
@@ -409,11 +375,18 @@ export default {
     },
     //获取航司信息列表
     async getAirlines() {
-      const result = await AirlinesInquiry({});
-      if (result.code === 0) {
-        this.arr = result.returnData;
-      } else {
-        this.$message.error.message;
+      try {
+        const res = await Query({
+          id: 22,
+          dataContent: [],
+        });
+        if (res.code === "0") {
+          this.arr = res.returnData;
+        } else {
+          this.$message.error(res.message ?? "失败");
+        }
+      } catch (error) {
+        console.log("错误", error);
       }
     },
 
@@ -433,24 +406,20 @@ export default {
         }
       });
       if (arr == 1) {
-        if (this.ruleForm.name != "" && this.ruleForm.fullName != "") {
-          const result = await AddAirlines({
-            code2: this.ruleForm.code,
-            airCompanyName: this.ruleForm.name,
-            airCompanyFullName: this.ruleForm.fullName,
+        try {
+          const res = await GeneralDataReception({
+            serviceId: "15",
+            dataContent: JSON.stringify(this.ruleForm),
           });
-          if (result.code === 0) {
+          if (res.code === "0") {
+            this.$message.success(res.message ?? "成功");
             this.getAirlines();
-            this.addFlag = false;
-            this.$message.success("新增成功");
-            this.EditForm.code = null;
-            this.ruleForm.name = "";
-            this.ruleForm.fullName = "";
+            this.resetForm();
           } else {
-            this.$message.error.message;
+            this.$message.error(res.message ?? "失败");
           }
-        } else {
-          this.$message.warning("请输入必填信息");
+        } catch (error) {
+          console.log("错误", error);
         }
         this.closeForm();
       }
@@ -459,22 +428,27 @@ export default {
     resetForm() {
       this.addFlag = false;
       this.EditFlag = false;
-      this.EditForm.code = null;
-      this.ruleForm.name = "";
-      this.ruleForm.fullName = "";
+      this.EditForm.Name = null;
+      this.ruleForm.FullName = "";
+      this.ruleForm.Code2 = "";
       this.ruleForm.code = "";
     },
     //删除
     async remove() {
-      const result = await DelAirlines({
-        id: this.ids,
-      });
-      if (result.code === 0) {
-        this.flag = false;
-        this.getAirlines();
-        this.$message.success("删除成功");
-      } else {
-        this.$message.error.message;
+      try {
+        const res = await GeneralDataReception({
+          serviceId: "15",
+          dataContent: JSON.stringify(this.eleForm),
+        });
+        if (res.code === "0") {
+          this.$message.success(res.message ?? "成功");
+          this.getAirlines();
+          this.flag = false;
+        } else {
+          this.$message.error(res.message ?? "失败");
+        }
+      } catch (error) {
+        console.log("错误", error);
       }
     },
   },

src/views/BasicsData/views/airport/airportInfo.vue

@@ -76,7 +76,7 @@
                         :key="indexs"
                       >
                         {{ res.name }}
-                        <div class="logx" @click="Tinkhall(res)">x</div>
+                        <div class="logx" @click="Tinkhall(res)"></div>
                       </div>
                     </div>
                     <!-- <div class="list desc">{{ item.fullName }}</div> -->
@@ -675,6 +675,7 @@ export default {
         width: 20px;
         height: 20px;
         background: #ffffff;
+        // background: url("../../../../assets/index/ic_close_s @2x.png") no-repeat;
         border: 1px solid #2d67e3;
         border-radius: 2px;
         margin-right: 8px;
@@ -705,11 +706,14 @@ export default {
           position: absolute;
           right: 8px;
           top: 6px;
-          width: 6px;
-          height: 6px;
+          width: 7px;
+          height: 7px;
           display: flex;
           align-items: center;
           justify-content: center;
+          background: url("../../../../assets/index/ic_close_s @2x.png")
+            no-repeat;
+          background-size: 100% 100%;
           // background: #fff;
           cursor: pointer;
           color: #ffffff;

src/views/advancedQuery/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <router-view></router-view>
+</template>

src/views/advancedQuery/views/advancedHome.vue

@@ -0,0 +1,184 @@
+<template>
+  <div class="advance">
+    <div class="advance__head flex">
+      <div class="flex-wrap interfaceLog_head_time">
+        <div class="manageTitle">高级查询</div>
+        <div class="interfaceLog_head_time_start mr10">
+          <el-date-picker v-model="timeStart" size="small" type="datetime" placeholder="选择开始日期时间" default-time="00:00:00">
+          </el-date-picker>
+        </div>
+        <div class="interfaceLog_head_time_end">
+          <el-date-picker v-model="timeEnd" size="small" type="datetime" placeholder="选择结束日期时间" default-time="00:00:00">
+          </el-date-picker>
+        </div>
+      </div>
+      <Search @getSearchData="getSearchData" @clearSearchData="clearSearchData" :isTitle="false" :isSlot="true">
+        <div class="flex-wrap">
+          <button class="btnAn">高级查询</button>
+          <div @click="show" class="setting"></div>
+        </div>
+      </Search>
+    </div>
+    <!--表格-->
+    <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="advance__table">
+      <el-table ref="table" max-height="100%" show-summary class="table" :data="tableData" border stripe height="calc(100vh - 155px)" style="width: 100%">
+        <el-table-column v-for="(item, index) in tableColsCopy" :prop="item.statCode" :label="item.statName" :key="index">
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--列设置-->
+    <Dialog :flag="rowFlag">
+      <div class="rowDialog">
+        <div class="title">列设置</div>
+        <div class="content">
+          <el-checkbox-group v-model="checkList">
+            <el-row :gutter="20">
+              <el-col v-for="(item, index) in tableCols" :key="index" class="ck" :span="6">
+                <el-checkbox :label="item">{{ item.statName }}</el-checkbox>
+              </el-col>
+            </el-row>
+          </el-checkbox-group>
+        </div>
+        <div class="foot right t30">
+          <el-button size="medium" class="r24" @click="onCheck" type="primary">确定</el-button>
+          <el-button size="medium" @click="close">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import Search from '@/layout/components/Search';
+import Dialog from "@/layout/components/Dialog";
+import { IntegratedQuery, StatItemsQueryByStatMain } from '@/api/flight';
+export default {
+  name: 'Advance',
+  components: { Search, Dialog },
+  data () {
+    return {
+      loading: false,
+      rowFlag: false,
+      tableData: [],
+      tableColsCopy: [],
+      checkList: [],
+      tableCols: [],
+      timeStart: '',
+      timeEnd: ''
+    }
+  },
+  created () {
+    // this.integratedQuery();
+    // this.statItemsQueryByStatMain();
+  },
+  mounted () {
+    document.querySelector('.interfaceLog_head_time_start .el-input__prefix i').remove()
+    document.querySelector('.interfaceLog_head_time_start .el-input__prefix').innerHTML = '开始：'
+    document.querySelector('.interfaceLog_head_time_end .el-input__prefix i').remove()
+    document.querySelector('.interfaceLog_head_time_end .el-input__prefix').innerHTML = '结束：'
+  },
+  updated () {
+    //table数据更新
+    this.$nextTick(() => {
+      this.$refs.table.doLayout();
+    });
+  },
+  methods: {
+    //查询
+    getSearchData (val) {
+      console.log(val)
+    },
+    //清除查询
+    clearSearchData () {
+
+    },
+    //列设置-确定
+    onCheck () {
+      this.tableColsCopy = _.cloneDeep(this.checkList);
+      const datas = _.sortBy(this.tableColsCopy, (o) => o.showOrder);
+      this.tableColsCopy = datas;
+      this.tableCopy = this.checkList;
+      this.rowFlag = false;
+    },
+    //弹框展开
+    show () {
+      this.tableCopy = this.checkList;
+      this.rowFlag = true;
+    },
+    //弹框关闭
+    close () {
+      this.rowFlag = false;
+      this.checkList = this.tableCopy;
+      this.tableColsCopy = _.cloneDeep(this.checkList);
+    },
+    //综合查询
+    async integratedQuery (obj = {}) {
+      try {
+        this.loading = true
+        const res = await IntegratedQuery(obj)
+        if (res.code === 0) {
+          this.tableData = res.returnData
+          this.loading = false
+        } else {
+          this.$message.error(res.message)
+          this.loading = false
+        }
+      } catch (error) {
+        console.log('出错了', error)
+        this.loading = false
+      }
+    },
+    //表头数据查询
+    async statItemsQueryByStatMain (obj = {}) {
+      try {
+        const res = await StatItemsQueryByStatMain({
+          mainId: 1
+        })
+        if (res.code === 0) {
+          const datas = _.sortBy(res.returnData, (o) => o.showOrder);
+          this.tableCols = datas
+          this.tableColsCopy = _.cloneDeep(this.tableCols)
+          this.checkList = this.tableCols
+        } else {
+          this.$message.error(res.message)
+        }
+      } catch (error) {
+        console.log('出错了', error)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.advance {
+  padding: 8px;
+  &__head {
+    line-height: 32px;
+    margin-top: 8px;
+    margin-bottom: 16px;
+    .setting {
+      height: 32px;
+      width: 32px;
+      cursor: pointer;
+      background-size: 100% 100%;
+      background: url("../../../assets/departure/ic_setting.png") no-repeat;
+      margin-left: 12px;
+      position: relative;
+      top: 2px;
+    }
+    .mr10 {
+      margin-right: 10px;
+    }
+    ::v-deep .interfaceLog_head_time {
+      .el-input__prefix {
+        left: 10px;
+        color: #101116;
+      }
+      .el-input--prefix .el-input__inner {
+        padding-left: 50px;
+      }
+    }
+  }
+}
+</style>

src/views/systemSettings/views/sourceDataItemManagement/sourceDataItemEdit.vue

@@ -352,25 +352,19 @@ export default {
     return {
       ruleForm: {
         //基本信息表单
-        tdataName: "",
-        eventID: "",
-        datatype: "",
+        dataName: "",
+        dataType: "",
         dataDescribe: "",
+        computingMethod:"",
+        validationExpression:""
       },
       rules: {
         //基本信息验证
-        tdataName: [
+        dataName: [
           { required: true, message: "请输入目标数据名", trigger: "blur" },
         ],
-        eventID: [
-          {
-            required: true,
-            message: "请输入目标数据事件标识",
-            trigger: "blur",
-          },
-        ],
-        datatype: [
-          { required: true, message: "请选择数据类型", trigger: "change" },
+        dataType: [
+          { required: true, message: "请选择数据格式", trigger: "change" },
         ],
       },
       posArr: [], //存储数据项数据
@@ -463,7 +457,7 @@ export default {
       }
     },
 
-    //保存
+    //保存主数据
     async storagemod() {
       this.ruleForm["operate"] = "2";
       try {
@@ -480,6 +474,7 @@ export default {
         console.log("错误", error);
       }
     },
+    //获取数据项列表
     async getDataList() {
       let params = {
         id: 16,
@@ -534,6 +529,7 @@ export default {
             delete res.children
           }
         });
+        this.posArrCopy = JSON.parse(JSON.stringify(this.posArr));
       } else {
         this.$message.error(res.message ?? "失败");
       }
@@ -543,12 +539,44 @@ export default {
       let that = this;
       that.storagedetails().then(function (data) {
         if (val) {
-          that.posArr = findarrays(that.posArr, "itemName", val);
+          that.posArr = that.rebuildData(val,that.posArr);
         } else {
           that.storagedetails();
         }
       });
     },
+    //根据name字段模糊匹配树状结构数据，最后将处理好的数据返回出来
+    rebuildData (value, arr){
+      if (!arr) {
+        return []
+      }
+      const newarr = [];
+      arr.forEach(element => {
+      // indexOf用来判读当前节点name字段是否包含所搜索的字符串value
+      // 返回值：包含则返回索引值，反之返回-1
+        if (element.ItemName.indexOf(value) > -1) {
+          const ab = this.rebuildData(value, element.children);
+          const obj = {
+            ...element,
+            children: ab
+          }
+          newarr.push(obj);
+        } else {
+        // 判断当前节点知否有子节点，并且子节点中有数据，有数据继续递归查找
+          if (element.children && element.children.length > 0) {
+            const ab = this.rebuildData(value, element.children);
+            const obj = {
+              ...element,
+              children: ab
+            };
+            if (ab && ab.length > 0) {
+              newarr.push(obj);
+            }
+          }
+        }
+      });
+      return newarr
+    },
     //清空搜索
     clearSearchData() {
       this.posArr = this.posArrCopy;
@@ -585,12 +613,14 @@ export default {
       this.msgType = 1;
       this.addFlag = true;
     },
+    //点击列表新增按钮
     handleAdd(index,row){
       this.msgType = 1;
       this.addFlag = true;
       this.dataForm.parentID = row.ItemID;
       this.dataForm.parentIDs = [row.ItemID];
     },
+    //点击列表编辑按钮
     handleEdit(index,row){
       this.msgType = 2;
       this.addFlag = true;
@@ -621,6 +651,7 @@ export default {
         }
       });
     },
+    //数据项保存
     async saveData(){
       try {
             const res =  await GeneralDataReception({
@@ -639,7 +670,7 @@ export default {
           }
 
     },
-    //存储数据项-取消
+    //数据项-取消
     resetForm(formName) {
       this.addFlag = false;
       this.dataForm = {};

src/views/systemSettings/views/targetDataManagement/targetDataEdit.vue

@@ -339,13 +339,13 @@ export default {
       dataForm: {},
       dataRules: {
         //数据项表单验证
-        name: [
+        ItemName: [
           { required: true, message: "请输入数据项名称", trigger: "blur" },
         ],
-        code: [
+        computingExpression: [
           { required: true, message: "请输入数据来源表达式", trigger: "blur" },
         ],
-        tag: [{ required: true, message: "请选数据类型", trigger: "change" }],
+        dataType: [{ required: true, message: "请选数据类型", trigger: "change" }],
       },
       addFlag: false, //数据项弹框,
       dataStoreid: "", //修改id，
@@ -487,10 +487,11 @@ export default {
         );
         this.posArr.forEach((res, index) => {
           res.index = index + 1;
-          if(res.children.length<1){
-            delete res.children
-          }
+          // if(res.children.length<1){
+          //   delete res.children
+          // }
         });
+        this.posArrCopy = JSON.parse(JSON.stringify(this.posArr));
       } else {
         this.$message.error(res.message ?? "失败");
       }
@@ -500,12 +501,44 @@ export default {
       let that = this;
       that.storagedetails().then(function (data) {
         if (val) {
-          that.posArr = findarrays(that.posArr, "ItemName", val);
+          that.posArr = that.rebuildData(val,that.posArr);
         } else {
           that.storagedetails();
         }
       });
     },
+    //根据name字段模糊匹配树状结构数据，最后将处理好的数据返回出来
+    rebuildData (value, arr){
+      if (!arr) {
+        return []
+      }
+      const newarr = [];
+      arr.forEach(element => {
+      // indexOf用来判读当前节点name字段是否包含所搜索的字符串value
+      // 返回值：包含则返回索引值，反之返回-1
+        if (element.ItemName.indexOf(value) > -1) {
+          const ab = this.rebuildData(value, element.children);
+          const obj = {
+            ...element,
+            children: ab
+          }
+          newarr.push(obj);
+        } else {
+        // 判断当前节点知否有子节点，并且子节点中有数据，有数据继续递归查找
+          if (element.children && element.children.length > 0) {
+            const ab = this.rebuildData(value, element.children);
+            const obj = {
+              ...element,
+              children: ab
+            };
+            if (ab && ab.length > 0) {
+              newarr.push(obj);
+            }
+          }
+        }
+      });
+      return newarr
+    },
     //清空搜索
     clearSearchData() {
       this.posArr = this.posArrCopy;