瀏覽代碼

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

zhaoke 2 年之前
父節點
當前提交
59dec733d3

+ 3 - 3
src/views/advancedQuery/views/advancedHome.vue

@@ -586,7 +586,7 @@ export default {
   },
   beforeDestroy () {
     this.loading = false
-    // 
+    //
     // if (this.$route.matched.filter(item => item.name && item.meta.title).length > 1) {
     //   this.$store.dispatch('app/setQueryForm', {
     //     ...this.form,
@@ -826,11 +826,11 @@ export default {
         if (az.test(val)) {
           this.form['passengerName'] = val
           this.onCheckGj(true)
-        } else if (azNum.test(val) && top2.test(val)) {
+        } else if (azNum.test(val) && top2.test(val)&&val.length < 8) {
           // 字母加数字且前两位为字母则为航班号
           this.form['flightNO'] = val
           this.onCheckGj(true)
-        } else if ((num.test(val) && val.length === 10) || bagNo.test(val)) {
+        } else if ((num.test(val) && val.length === 10) || (bagNo.test(val)&&val.length >7)) {
           // 纯数字且位数等于10则为行李牌号
           this.form['baggageNO'] = val
           this.onCheckGj(true)

+ 3 - 2
src/views/baggageManagement/mixins/form.js

@@ -234,6 +234,7 @@ export default {
           // const top2 = /^[a-zA-Z]{2}\w*$/
           const top2 = /^([a-zA-Z][0-9])|([0-9][a-zA-Z])|([a-zA-Z]{2})/
           const num = /^[0-9]+$/
+          const bagNo = /^[a-zA-Z]{2}[0-9]{6}$/
           const queryData = {
             startDate: this.startDate,
             endDate: this.endDate
@@ -246,10 +247,10 @@ export default {
           if (az.test(this.formData.search)) {
             // 纯字母则为旅客姓名
             queryData['passengerName'] = this.formData.search
-          } else if (azNum.test(this.formData.search) && top2.test(this.formData.search)) {
+          } else if (azNum.test(this.formData.search) && top2.test(this.formData.search)&&this.formData.search.length <8) {
             // 字母加数字且前两位为字母则为航班号
             queryData['flightNO'] = this.formData.search
-          } else if (num.test(this.formData.search) && this.formData.search.length === 10) {
+          } else if ((num.test(this.formData.search) && this.formData.search.length === 10)||((bagNo.test(this.formData.search)&&this.formData.search.length >7))) {
             // 纯数字且位数等于10则为行李牌号
             queryData['baggageNO'] = this.formData.search
           } else {

+ 218 - 79
src/views/systemSettings/views/warningSet/warningEdit.vue

@@ -15,7 +15,10 @@
             <el-col :span="6">
               <div class="aviName">
                 <span class="aviP">场景编号</span>
-                <el-input v-model="tableFormer.alarmSceneId" placeholder="请输入场景编号"></el-input>
+                <el-input
+                  v-model="tableFormer.alarmSceneId"
+                  placeholder="请输入场景编号"
+                ></el-input>
               </div>
             </el-col>
             <el-col :span="6">
@@ -25,16 +28,40 @@
                   v-model="tableFormer.IATACode"
                   placeholder="请输入航司二字码"
                 ></el-input> -->
-                <el-select v-model="tableFormer.IATACode" class="input-shadow" size="small" filterable default-first-option placeholder="请选择二字码">
-                  <el-option v-for="(item, index) in characterList" :key="index" :label="item.k" :value="item.k" />
+                <el-select
+                  v-model="tableFormer.IATACode"
+                  class="input-shadow"
+                  size="small"
+                  filterable
+                  default-first-option
+                  placeholder="请选择二字码"
+                >
+                  <el-option
+                    v-for="(item, index) in characterList"
+                    :key="index"
+                    :label="item.k"
+                    :value="item.k"
+                  />
                 </el-select>
               </div>
             </el-col>
             <el-col :span="6">
               <div class="aviName" style="margin-left: 20px">
                 <span class="aviP">起飞机场</span>
-                <el-select v-model="tableFormer.departmentAirport" class="input-shadow" size="small" filterable default-first-option placeholder="请选择机场">
-                  <el-option v-for="(item, index) in AirportList" :key="index" :label="item.planDepartureApt" :value="item.planDepartureApt" />
+                <el-select
+                  v-model="tableFormer.departmentAirport"
+                  class="input-shadow"
+                  size="small"
+                  filterable
+                  default-first-option
+                  placeholder="请选择机场"
+                >
+                  <el-option
+                    v-for="(item, index) in AirportList"
+                    :key="index"
+                    :label="item.planDepartureApt"
+                    :value="item.planDepartureApt"
+                  />
                 </el-select>
                 <!-- <el-input
                   v-model="tableFormer.departmentAirport"
@@ -45,8 +72,20 @@
             <el-col :span="6">
               <div class="aviName" style="margin-left: 20px">
                 <span class="aviP">降落机场</span>
-                <el-select v-model="tableFormer.landingAirport" class="input-shadow" size="small" filterable default-first-option placeholder="请选择机场">
-                  <el-option v-for="(item, index) in AirportList" :key="index" :label="item.planDepartureApt" :value="item.planDepartureApt" />
+                <el-select
+                  v-model="tableFormer.landingAirport"
+                  class="input-shadow"
+                  size="small"
+                  filterable
+                  default-first-option
+                  placeholder="请选择机场"
+                >
+                  <el-option
+                    v-for="(item, index) in AirportList"
+                    :key="index"
+                    :label="item.planDepartureApt"
+                    :value="item.planDepartureApt"
+                  />
                 </el-select>
                 <!-- <el-input
                   v-model="tableFormer.landingAirport"
@@ -57,14 +96,24 @@
             <el-col :span="6">
               <div class="digName4">
                 <div class="aviP1">航班号</div>
-                <el-input placeholder="请输入航班号" v-model="tableFormer.flightNo"></el-input>
+                <el-input
+                  placeholder="请输入航班号"
+                  v-model="tableFormer.flightNo"
+                ></el-input>
               </div>
             </el-col>
             <el-col :span="6">
               <div class="digName1">
                 <div class="aviName1">
                   <div class="aviP2">起飞时间</div>
-                  <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="tableFormer.startDate" :rows="1" type="datetime" placeholder="选择日期时间" @change="inputChangeHandler(item.columnName)">
+                  <el-date-picker
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    v-model="tableFormer.startDate"
+                    :rows="1"
+                    type="datetime"
+                    placeholder="选择日期时间"
+                    @change="inputChangeHandler(item.columnName)"
+                  >
                   </el-date-picker>
                 </div>
               </div>
@@ -72,7 +121,14 @@
             <el-col :span="6">
               <div class="aviName1">
                 <div class="aviP5">降落时间</div>
-                <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="tableFormer.endDate" :rows="1" type="datetime" placeholder="选择日期时间" @change="inputChangeHandler(item.columnName)">
+                <el-date-picker
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  v-model="tableFormer.endDate"
+                  :rows="1"
+                  type="datetime"
+                  placeholder="选择日期时间"
+                  @change="inputChangeHandler(item.columnName)"
+                >
                 </el-date-picker>
               </div>
             </el-col>
@@ -82,7 +138,15 @@
     </div>
 
     <div class="centerBox">
-      <Search title="报警预警策略" :isSearch="false" :isSlot="false" :isChild="true" @clearSearchData="clearSearchData" @getSearchData="getSearchData" style="padding-left: 16px; padding-right: 32px" />
+      <Search
+        title="报警预警策略"
+        :isSearch="false"
+        :isSlot="false"
+        :isChild="true"
+        @clearSearchData="clearSearchData"
+        @getSearchData="getSearchData"
+        style="padding-left: 16px; padding-right: 32px"
+      />
 
       <div class="LBox">
         <!-- <div @click="addDig" class="lbox-add r24">
@@ -104,11 +168,18 @@
                 <!-- <div class="title flower">
                   {{ item.name }}
                 </div> -->
-                <el-tooltip effect="dark" :content="item.StrategyName" placement="bottom">
+                <el-tooltip
+                  effect="dark"
+                  :content="item.StrategyName"
+                  placement="bottom"
+                >
                   <div class="title flower">{{ item.StrategyName }}</div>
                 </el-tooltip>
                 <div class="edit_log" @click="editup(item)"></div>
-                <div @click="delBox(item, index)" class="el-icon-close icon posab"></div>
+                <div
+                  @click="delBox(item, index)"
+                  class="el-icon-close icon posab"
+                ></div>
               </div>
               <div class="text item" style="margin-top: 15px">
                 <div class="adTime fwgh" style="margin-bottom: 15px">
@@ -154,8 +225,16 @@
           </p>
         </div>
         <div class="DelFoot right t30" style="background: #ffffff">
-          <el-button size="medium" @click="tableRemove" class="r25 buwitch" type="danger">删除</el-button>
-          <el-button size="medium" class="r26" @click="rmFlag = false">取消</el-button>
+          <el-button
+            size="medium"
+            @click="tableRemove"
+            class="r25 buwitch"
+            type="danger"
+            >删除</el-button
+          >
+          <el-button size="medium" class="r26" @click="rmFlag = false"
+            >取消</el-button
+          >
         </div>
       </div>
     </Dialog>
@@ -221,23 +300,54 @@
             <el-row :gutter="20">
               <el-col v-for="(item, index) in tableColsCopy" :key="index">
                 <el-form-item :label="item.columnLabel">
-                  <template v-if="
+                  <template
+                    v-if="
                       item.listqueryTemplateID || item.listqueryTemplateID == 0
-                    ">
-                    <el-select size="small" clearable style="width: 100%" v-model="tableForm[item.columnName]" @change="changeSelect(item.columnName)" placeholder="请选择">
-                      <el-option v-for="item in tableOptions[item.columnName]" :key="item.v" :label="item.k" :value="item.v">
+                    "
+                  >
+                    <el-select
+                      v-model="tableForm[item.columnName]"
+                      class="input-shadow"
+                      size="small"
+                      filterable
+                      default-first-option
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        v-for="item in tableOptions[item.columnName]"
+                        :key="item.v"
+                        :label="item.k"
+                        :value="item.v"
+                      >
                       </el-option>
                     </el-select>
                   </template>
                   <template v-else-if="item.dataType == 'longtext'">
-                    <el-input size="small" :rows="1" type="textarea" @change="inputChangeHandler(item.columnName)" v-model="tableForm[item.columnName]"></el-input>
+                    <el-input
+                      size="small"
+                      :rows="1"
+                      type="textarea"
+                      @change="inputChangeHandler(item.columnName)"
+                      v-model="tableForm[item.columnName]"
+                    ></el-input>
                   </template>
                   <template v-else-if="item.dataType == 'datetime'">
-                    <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="tableForm[item.columnName]" :rows="1" type="datetime" placeholder="选择日期时间" @change="inputChangeHandler(item.columnName)">
+                    <el-date-picker
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      v-model="tableForm[item.columnName]"
+                      :rows="1"
+                      type="datetime"
+                      placeholder="选择日期时间"
+                      @change="inputChangeHandler(item.columnName)"
+                    >
                     </el-date-picker>
                   </template>
                   <template v-else>
-                    <el-input size="small" v-model="tableForm[item.columnName]" @change="inputChangeHandler(item.columnName)"></el-input>
+                    <el-input
+                      size="small"
+                      v-model="tableForm[item.columnName]"
+                      @change="inputChangeHandler(item.columnName)"
+                    ></el-input>
                   </template>
                 </el-form-item>
               </el-col>
@@ -245,7 +355,9 @@
           </el-form>
         </div>
         <div class="foot right">
-          <el-button size="medium" @click="handleOk" class="r24" type="primary">确定</el-button>
+          <el-button size="medium" @click="handleOk" class="r24" type="primary"
+            >确定</el-button
+          >
           <el-button @click="flag = false" size="medium">取消</el-button>
         </div>
       </div>
@@ -270,7 +382,7 @@ import {
 } from "@/api/SystemSettings.js";
 export default {
   components: { Dialog, Search },
-  data () {
+  data() {
     return {
       optionProps: {
         value: "inAicompanyCode2",
@@ -342,7 +454,7 @@ export default {
         shortcuts: [
           {
             text: "最近一周",
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
@@ -351,7 +463,7 @@ export default {
           },
           {
             text: "最近一个月",
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
@@ -360,7 +472,7 @@ export default {
           },
           {
             text: "最近三个月",
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
@@ -389,7 +501,7 @@ export default {
       tableOptions: {},
     };
   },
-  created () {
+  created() {
     this.getAirPortData();
     this.getCharacterData();
     this.sysServiceWarn();
@@ -402,23 +514,23 @@ export default {
     // this.AlarmlocationList(this.code4, "2");
   },
   watch: {
-    code3 () {
+    code3() {
       this.AlarmlocationList(this.code3, "1");
     },
-    code4 () {
+    code4() {
       this.AlarmlocationList(this.code4, "2");
     },
   },
   methods: {
-    load () {
-      // 
+    load() {
+      //
       if (this.noMore || this.loading) {
         return;
       }
       this.getQuery();
     },
     //获取预警报警场景(按照ID)
-    async sysServiceWarn () {
+    async sysServiceWarn() {
       try {
         this.loading = true;
         let arr = [];
@@ -442,12 +554,10 @@ export default {
       } catch (error) {
         this.page--;
         this.loading = false;
-
-
       }
     },
     //获取开始位置
-    async AlarmlocationList (data, val) {
+    async AlarmlocationList(data, val) {
       if (val == "1") {
         const result = await Alarmlocation({ code: data });
         if (result.code == 0) {
@@ -461,9 +571,9 @@ export default {
       }
     },
     //清除搜索
-    clearSearchData () { },
+    clearSearchData() {},
     //模糊查询
-    findarrays (ar, feature, v) {
+    findarrays(ar, feature, v) {
       var arr = [];
       for (var i = 0; i < ar.length; i++) {
         var atxt = ar[i][feature];
@@ -486,36 +596,36 @@ export default {
       return arr;
     },
     //搜索
-    getSearchData (val) {
+    getSearchData(val) {
       if (val) {
         this.infoArr = this.findarrays(this.infoArr, "name", val);
       } else {
         this.UserWarning();
       }
     },
-    closeForm () {
+    closeForm() {
       this.$refs.form.resetFields();
     },
-    changeValue (val) {
+    changeValue(val) {
       this.form.name = val;
 
       this.$forceUpdate();
     },
-    changeValue1 (val) {
+    changeValue1(val) {
       this.form.WarningDur = val;
       this.$forceUpdate();
     },
-    changeValue2 (val) {
+    changeValue2(val) {
       this.form.alamDur = val;
       this.$forceUpdate();
     },
-    changeValue3 (val) {
+    changeValue3(val) {
       this.form.desc = val;
       this.$forceUpdate();
     },
 
     //获取航司信息列表
-    async getAirlines () {
+    async getAirlines() {
       const res = await AirlinesInquiry({});
       if (res.code === 0) {
         this.aircompeny = res.returnData;
@@ -524,7 +634,7 @@ export default {
       }
     },
     //机场列表
-    async getAirlist () {
+    async getAirlist() {
       const res = await AirportsList({});
       if (res.code === 0) {
         this.arilist = res.returnData;
@@ -533,7 +643,7 @@ export default {
       }
     },
     //节点信息列表
-    async tracenode () {
+    async tracenode() {
       const res = await traceNodeslist({});
       if (res.code === 0) {
         this.traceList = res.returnData;
@@ -542,13 +652,13 @@ export default {
       }
     },
     //编辑数据
-    async editSubmit () {
+    async editSubmit() {
       this.tableFormer.event = 2;
       this.generalDataReceptions(this.tableFormer);
     },
 
     //策略列表
-    async UserWarning () {
+    async UserWarning() {
       try {
         let arr = [];
         arr.push(this.$route.query.id);
@@ -561,13 +671,26 @@ export default {
           this.infoArr.push(...returnData.listValues);
           this.tableCols = returnData.columnSet;
           this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
+          const datas = _.cloneDeep(this.tableColsCopy);
+          // const reqUts = [];
+          datas.forEach(async (item) => {
+            if (item.listqueryTemplateID || item.listqueryTemplateID == 0) {
+              // const reqUt = this.getSelectData(item.listqueryTemplateID)
+              // reqUts.push(reqUt)
+              if (!this.tableOptions[item.columnName]) {
+                this.tableOptions[item.columnName] = await this.getSelectData(
+                  item.listqueryTemplateID
+                );
+              }
+              //
+            }
+            // this.filterValues[item.columnName] = ''
+          });
         } else {
           this.$message.error.message;
           this.page--;
         }
       } catch (error) {
-
-
         this.page--;
       }
       // const res = await UserWarningList({
@@ -579,14 +702,14 @@ export default {
       //   this.$message.error.message;
       // }
     },
-    infoIndex () { },
+    infoIndex() {},
 
-    delBox (item) {
+    delBox(item) {
       this.rmFlag = true;
       this.tableObj.alarmStrategyID = item.alarmStrategyID;
     },
     //删除
-    async remove () {
+    async remove() {
       const res = await DelUserWarning({
         id: this.DelId,
       });
@@ -598,12 +721,12 @@ export default {
       }
       this.remove = false;
     },
-    addDig () {
+    addDig() {
       this.flag = true;
       this.tableType = "add";
       this.tableForm = {};
     },
-    editInfo (item) {
+    editInfo(item) {
       this.posType = 2;
       this.editFalg = true;
       this.form.name = item.name;
@@ -619,10 +742,10 @@ export default {
       this.posArrCopy = _.cloneDeep(item);
     },
 
-    close () {
+    close() {
       this.editFalg = false;
     },
-    async submit () {
+    async submit() {
       if (this.posType === 1) {
         const res = await AddUserWarning({
           id: null,
@@ -671,7 +794,7 @@ export default {
       this.closeForm();
     },
     // 新增/编辑-确认
-    submitClickHandler () {
+    submitClickHandler() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           if (this.tableType == "add") {
@@ -686,7 +809,7 @@ export default {
       });
     },
     //表格-增/删/改
-    async generalDataReception (data) {
+    async generalDataReception(data) {
       try {
         data = {
           ...data,
@@ -712,7 +835,6 @@ export default {
           this.tableForm = {};
         }
       } catch (error) {
-
         this.flag = false;
         this.rmFlag = false;
         this.tableObj = {};
@@ -720,16 +842,16 @@ export default {
       }
     },
     //表格-删除-确认
-    tableRemove () {
+    tableRemove() {
       this.tableObj.event = 3;
       this.generalDataReception(this.tableObj);
     },
     //弹框-确定
-    handleOk () {
+    handleOk() {
       this.submitClickHandler();
     },
     //表格-增/删/改
-    async generalDataReceptions (data) {
+    async generalDataReceptions(data) {
       try {
         data = {
           ...data,
@@ -746,18 +868,16 @@ export default {
         } else {
           this.$message.error("操作失败");
         }
-      } catch (error) {
-
-      }
+      } catch (error) {}
     },
     //编辑
-    editup (data) {
+    editup(data) {
       this.flag = true;
       this.tableType = "";
       this.tableForm = JSON.parse(JSON.stringify(data));
     },
     // 选择机场
-    async getAirPortData () {
+    async getAirPortData() {
       try {
         const res = await getQuery({
           id: DATACONTENT_ID.departureAirId,
@@ -772,12 +892,10 @@ export default {
         } else {
           this.$message.error(res.message);
         }
-      } catch (error) {
-
-      }
+      } catch (error) {}
     },
     //选择二字码
-    async getCharacterData () {
+    async getCharacterData() {
       try {
         const res = await getQuery({
           id: DATACONTENT_ID.twoCharacterOptions,
@@ -792,16 +910,14 @@ export default {
         } else {
           this.$message.error(res.message);
         }
-      } catch (error) {
-
-      }
+      } catch (error) {}
     },
     // 列表滚动事件
-    scrollEvent (e) {
+    scrollEvent(e) {
       if (
         e.srcElement.offsetHeight +
-        e.srcElement.scrollTop -
-        e.srcElement.scrollHeight ===
+          e.srcElement.scrollTop -
+          e.srcElement.scrollHeight ===
         0
       ) {
         if (this.isUpdate) {
@@ -812,6 +928,26 @@ export default {
         }
       }
     },
+    changeSelect(data) {
+      if (this.tableForm[data] === "") {
+        this.tableForm[data] = null;
+      }
+      this.tableForm[this.tableOptions[data][0].setvalue] =
+        this.tableForm[data];
+      //
+    },
+    //获取弹框-下拉数据
+    async getSelectData(id) {
+      const { code, returnData } = await Query({
+        id,
+        dataContent: [],
+      });
+      if (code == 0) {
+        return returnData.listValues;
+      } else {
+        return [];
+      }
+    },
   },
 };
 </script>
@@ -1001,6 +1137,9 @@ export default {
 ::v-deep .el-row {
   width: 100%;
 }
+::v-deep .el-select {
+  width: 100%;
+}
 ::v-deep .formBox {
   .digName {
     width: 100%;

+ 142 - 43
src/views/systemSettings/views/warningSet/warningSet.vue

@@ -11,7 +11,11 @@
   <div class="airportInfo">
     <!--搜索-->
     <div class="nodeLnformation_header">
-      <Search title="报警预警设置" @getSearchData="getSearchData" :isSearch="false">
+      <Search
+        title="报警预警设置"
+        @getSearchData="getSearchData"
+        :isSearch="false"
+      >
         <button @click="handleAdd" class="btnAdd">新增</button>
       </Search>
     </div>
@@ -22,12 +26,20 @@
           <div class="box-card">
             <div class="headerBox">
               <div class="tltle-head">
-                <el-tooltip class="item" effect="dark" :content="item.IATACode" placement="bottom">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  :content="item.IATACode"
+                  placement="bottom"
+                >
                   <div class="title fz16">{{ item.IATACode }}</div>
                 </el-tooltip>
                 <div @click="gotoAram(item, index)" class="edit_log"></div>
               </div>
-              <div @click="delBtn(item, index)" class="el-icon-close icon"></div>
+              <div
+                @click="delBtn(item, index)"
+                class="el-icon-close icon"
+              ></div>
             </div>
             <div class="text item" style="margin-top: 6px">
               <div class="adTime">
@@ -51,23 +63,54 @@
             <el-row :gutter="20">
               <el-col v-for="(item, index) in tableColsCopy" :key="index">
                 <el-form-item :label="item.columnLabel">
-                  <template v-if="
+                  <template
+                    v-if="
                       item.listqueryTemplateID || item.listqueryTemplateID == 0
-                    ">
-                    <el-select size="small" clearable style="width: 100%" v-model="tableForm[item.columnName]" @change="changeSelect(item.columnName)" placeholder="请选择">
-                      <el-option v-for="item in tableOptions[item.columnName]" :key="item.v" :label="item.k" :value="item.v">
+                    "
+                  >
+                    <el-select
+                      v-model="tableForm[item.columnName]"
+                      class="input-shadow"
+                      size="small"
+                      filterable
+                      default-first-option
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        v-for="item in tableOptions[item.columnName]"
+                        :key="item.v"
+                        :label="item.k"
+                        :value="item.v"
+                      >
                       </el-option>
                     </el-select>
                   </template>
                   <template v-else-if="item.dataType == 'longtext'">
-                    <el-input size="small" :rows="1" type="textarea" @change="inputChangeHandler(item.columnName)" v-model="tableForm[item.columnName]"></el-input>
+                    <el-input
+                      size="small"
+                      :rows="1"
+                      type="textarea"
+                      @change="inputChangeHandler(item.columnName)"
+                      v-model="tableForm[item.columnName]"
+                    ></el-input>
                   </template>
                   <template v-else-if="item.dataType == 'datetime'">
-                    <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="tableForm[item.columnName]" :rows="1" type="datetime" placeholder="选择日期时间" @change="inputChangeHandler(item.columnName)">
+                    <el-date-picker
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      v-model="tableForm[item.columnName]"
+                      :rows="1"
+                      type="datetime"
+                      placeholder="选择日期时间"
+                      @change="inputChangeHandler(item.columnName)"
+                    >
                     </el-date-picker>
                   </template>
                   <template v-else>
-                    <el-input size="small" v-model="tableForm[item.columnName]" @change="inputChangeHandler(item.columnName)"></el-input>
+                    <el-input
+                      size="small"
+                      v-model="tableForm[item.columnName]"
+                      @change="inputChangeHandler(item.columnName)"
+                    ></el-input>
                   </template>
                 </el-form-item>
               </el-col>
@@ -75,7 +118,9 @@
           </el-form>
         </div>
         <div class="foot right">
-          <el-button size="medium" @click="handleOk" class="r24" type="primary">确定</el-button>
+          <el-button size="medium" @click="handleOk" class="r24" type="primary"
+            >确定</el-button
+          >
           <el-button @click="flag = false" size="medium">取消</el-button>
         </div>
       </div>
@@ -93,8 +138,16 @@
         </div>
         <div class="DelFoot right t30">
-          <el-button size="medium" @click="tableRemove" class="r25 buwitch" type="danger">删除</el-button>
-          <el-button size="medium" class="r26" @click="rmFlag = false">取消</el-button>
+          <el-button
+            size="medium"
+            @click="tableRemove"
+            class="r25 buwitch"
+            type="danger"
+            >删除</el-button
+          >
+          <el-button size="medium" class="r26" @click="rmFlag = false"
+            >取消</el-button
+          >
         </div>
       </div>
     </Dialog>
@@ -176,6 +229,7 @@ import {
   DelWarning,
 } from "@/api/SystemSettings.js";
 import Dialog from "@/layout/components/Dialog/index.vue";
+import { getQuery } from "@/api/flight";
 import {
   Query,
   GeneralDataReception,
@@ -185,7 +239,7 @@ import {
 import { de } from "vis";
 export default {
   components: { Search, Dialog },
-  data () {
+  data() {
     return {
       flag: false,
       EditDialogVisible: false,
@@ -229,7 +283,7 @@ export default {
         shortcuts: [
           {
             text: "最近一周",
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
@@ -238,7 +292,7 @@ export default {
           },
           {
             text: "最近一个月",
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
@@ -247,7 +301,7 @@ export default {
           },
           {
             text: "最近三个月",
-            onClick (picker) {
+            onClick(picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
@@ -268,26 +322,26 @@ export default {
       tableOptions: {},
     };
   },
-  created () {
+  created() {
     this.getWarningList();
     // this.getAirlines();
     // this.getAirlist();
   },
   methods: {
-    getSearchData (val) {
+    getSearchData(val) {
       if (val) {
         this.warnin, (gArr = findarrays(this.warningArr, "IATACode", val));
       } else {
         this.getWarningList();
       }
     },
-    inputChangeHandler (data) {
+    inputChangeHandler(data) {
       if (this.tableForm[data] === "") {
         this.tableForm[data] = null;
       }
     },
     //场景列表
-    async getWarningList () {
+    async getWarningList() {
       try {
         const { code, returnData } = await Query({
           id: DATACONTENT_ID.sysServiceWarningId,
@@ -301,22 +355,35 @@ export default {
           });
           this.tableCols = returnData.columnSet;
           this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
+          const datas = _.cloneDeep(this.tableColsCopy);
+          // const reqUts = [];
+          datas.forEach(async (item) => {
+            if (item.listqueryTemplateID || item.listqueryTemplateID == 0) {
+              // const reqUt = this.getSelectData(item.listqueryTemplateID)
+              // reqUts.push(reqUt)
+              if (!this.tableOptions[item.columnName]) {
+                this.tableOptions[item.columnName] = await this.getSelectData(
+                  item.listqueryTemplateID
+                );
+              }
+              //
+            }
+            // this.filterValues[item.columnName] = ''
+          });
         } else {
           this.page--;
           this.$message.error.message;
         }
       } catch (error) {
         this.page--;
-
-
       }
     },
     // 列表滚动事件
-    scrollEvent (e) {
+    scrollEvent(e) {
       if (
         e.srcElement.offsetHeight +
-        e.srcElement.scrollTop -
-        e.srcElement.scrollHeight ===
+          e.srcElement.scrollTop -
+          e.srcElement.scrollHeight ===
         0
       ) {
         if (this.isUpdate) {
@@ -327,14 +394,14 @@ export default {
         }
       }
     },
-    delBtn (item, index) {
+    delBtn(item, index) {
       this.delId = item.id;
       this.warnname = item.warnName;
       this.rmFlag = true;
       this.tableObj.alarmSceneId = item.alarmSceneId;
     },
     //删除
-    async remove () {
+    async remove() {
       const res = await DelWarning({
         id: this.delId,
       });
@@ -346,12 +413,13 @@ export default {
       }
       this.rmFlag = false;
     },
-    handleAdd () {
+    handleAdd() {
       this.flag = true;
       this.tableType = "add";
+      this.getAirPortData();
     },
     //获取航司信息列表
-    async getAirlines () {
+    async getAirlines() {
       const res = await AirlinesInquiry({});
       if (res.code === 0) {
         this.aircompeny = res.returnData;
@@ -360,11 +428,11 @@ export default {
       }
     },
     //弹框-确定
-    handleOk () {
+    handleOk() {
       this.submitClickHandler();
     },
     // 新增/编辑-确认
-    submitClickHandler () {
+    submitClickHandler() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           if (this.tableType == "add") {
@@ -379,7 +447,7 @@ export default {
       });
     },
     //增/删/改
-    async generalDataReception (data) {
+    async generalDataReception(data) {
       try {
         data = {
           ...data,
@@ -405,25 +473,27 @@ export default {
           this.tableForm = {};
         }
       } catch (error) {
-
         this.flag = false;
         this.rmFlag = false;
         this.tableObj = {};
         this.tableForm = {};
       }
     },
-    //机场列表
-    async getAirlist () {
-      const res = await AirportsList({});
-      if (res.code === 0) {
-        this.arilist = res.returnData;
+    //获取弹框-下拉数据
+    async getSelectData(id) {
+      const { code, returnData } = await Query({
+        id,
+        dataContent: [],
+      });
+      if (code == 0) {
+        return returnData.listValues;
       } else {
-        this.$message.error.message;
+        return [];
       }
     },
 
     //新增数据
-    async addSubmit () {
+    async addSubmit() {
       let arr = 0;
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -461,7 +531,7 @@ export default {
         this.EditDialogVisible = false;
       }
     },
-    gotoAram (item, index) {
+    gotoAram(item, index) {
       this.$router.push({
         path: "/systemSettings/warningEdit",
         query: {
@@ -470,10 +540,36 @@ export default {
       });
     },
     //表格-删除-确认
-    tableRemove () {
+    tableRemove() {
       this.tableObj.event = 3;
       this.generalDataReception(this.tableObj);
     },
+    changeSelect(data) {
+      if (this.tableForm[data] === "") {
+        this.tableForm[data] = null;
+      }
+      this.tableForm[this.tableOptions[data][0].setvalue] =
+        this.tableForm[data];
+      //
+    },
+    // 选择机场
+    async getAirPortData() {
+      try {
+        const res = await getQuery({
+          id: DATACONTENT_ID.departureAirId,
+          dataContent: [],
+        });
+        if (Number(res.code) === 0) {
+          this.AirportList = res.returnData.listValues;
+          // this.formData.currentAirport = "PEK";
+          // this.getAviationData();
+          // this.upAviationData();
+          // this.resetLoopEvent();
+        } else {
+          this.$message.error(res.message);
+        }
+      } catch (error) {}
+    },
   },
 };
 </script>
@@ -592,6 +688,9 @@ export default {
 ::v-deep .el-row {
   width: 100%;
 }
+::v-deep .el-select {
+  width: 100%;
+}
 ::v-deep .el-date-editor.el-input,
 .el-date-editor.el-input__inner {
   width: 100%;