修改下拉

public/config.js

@@ -122,6 +122,7 @@ window.DATACONTENT_ID = {
 
   // 数据统计
   airlineOptions: 1806, // 航线下拉
+  twoCharacterOptions: 1803426, // 二字码下拉
   termSeleid: 1156, //航站选择下拉
   areaOptions: 1807, // 大区/基地分公司下拉
   AirportId: 1808, // 航站下拉

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

@@ -1,29 +1,38 @@
 <template>
   <div class="queryItemSettings_home">
     <div class="wrap">
-      <DataTable :data-id="dataId" :edit-id="editId" :data-content="{ queryTemplateID }" :rows="12" label-width="140px" :min-height="70" width="800px" />
+      <DataTable
+        :data-id="dataId"
+        :edit-id="editId"
+        :data-content="{ queryTemplateID }"
+        :rows="12"
+        label-width="140px"
+        :min-height="70"
+        width="800px"
+        tableHeight="750px"
+      />
     </div>
   </div>
 </template>
 <script>
-import DataTable from '@/components/Table'
+import DataTable from "@/components/Table";
 export default {
   components: { DataTable },
-  data () {
+  data() {
     return {
       dataId: DATACONTENT_ID.sysQueryChildTabId,
       editId: DATACONTENT_ID.sysQueryChildEditTabId,
-      queryTemplateID: null
-    }
+      queryTemplateID: null,
+    };
   },
-  created () {
+  created() {
     if (!this.$route.query.queryTemplateID) {
-      this.$router.push('/systemSettings/queryTemplate')
-      return
+      this.$router.push("/systemSettings/queryTemplate");
+      return;
     }
-    this.queryTemplateID = Number(this.$route.query.queryTemplateID)
-  }
-}
+    this.queryTemplateID = Number(this.$route.query.queryTemplateID);
+  },
+};
 </script>
 <style lang="scss" scoped>
 .queryItemSettings-home {

src/views/systemSettings/views/warningSet/warningEdit.vue

@@ -24,28 +24,73 @@
             <el-col :span="6">
               <div class="aviName">
                 <span class="aviP">航司二字码</span>
-                <el-input
+                <!-- <el-input
                   v-model="tableFormer.IATACode"
                   placeholder="请输入航司二字码"
-                ></el-input>
+                ></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>
               </div>
             </el-col>
             <el-col :span="6">
               <div class="aviName" style="margin-left: 20px">
                 <span class="aviP">起飞机场</span>
-                <el-input
+                <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"
                   placeholder="请输入起飞机场"
-                ></el-input>
+                ></el-input> -->
               </div>
             </el-col>
             <el-col :span="6">
               <div class="aviName" style="margin-left: 20px">
                 <span class="aviP">降落机场</span>
-                <el-input
+                <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"
                   placeholder="请输入起飞机场"
-                ></el-input>
+                ></el-input> -->
               </div>
             </el-col>
             <el-col :span="6">
@@ -109,9 +154,9 @@
             <span class="icon el-icon-plus"></span>
           </div>
         </div> -->
-        <el-row :gutter="24" v-el-table-infinite-scroll="load">
+        <el-row :gutter="24">
           <el-col :span="4">
-            <div @click="addDig" class="lbox-add r24">
+            <div @click="addDig" class="lbox-add">
               <div class="terminal-info-add-icons">
                 <span class="icon el-icon-plus"></span>
               </div>
@@ -130,9 +175,10 @@
                 >
                   <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"
+                  class="el-icon-close icon posab"
                 ></div>
               </div>
               <div class="text item" style="margin-top: 15px">
@@ -322,12 +368,8 @@
 <script>
 import Dialog from "@/layout/components/Dialog/index.vue";
 import Search from "@/layout/components/Search/index.vue";
-import {
-  Query,
-  GeneralDataReception,
-  Start,
-  Stop,
-} from "@/api/dataIntegration";
+import { Query, GeneralDataReception } from "@/api/dataIntegration";
+import { getQuery } from "@/api/flight";
 import {
   AddWarning,
   AirlinesInquiry,
@@ -342,6 +384,14 @@ export default {
   components: { Dialog, Search },
   data() {
     return {
+      optionProps: {
+        value: "inAicompanyCode2",
+        label: "inAicompanyCode2",
+      },
+      optionPropser: {
+        value: "outAicompanyCode2",
+        label: "outAicompanyCode2",
+      },
       id: this.$route.query.id,
       // airportCode2: this.$route.query.airportCode2,
       // BeginTime1: this.$route.query.BeginTime1,
@@ -446,9 +496,12 @@ export default {
       noMore: false,
       loading: false,
       page: 0,
+      characterList: [], //二字码列表
     };
   },
   created() {
+    this.getAirPortData();
+    this.getCharacterData();
     this.sysServiceWarn();
     this.UserWarning();
     // this.getAirlines();
@@ -657,6 +710,7 @@ export default {
     addDig() {
       this.flag = true;
       this.tableType = "add";
+      this.tableForm = {};
     },
     editInfo(item) {
       this.posType = 2;
@@ -805,6 +859,52 @@ export default {
         console.log(error);
       }
     },
+    //编辑
+    editup(data) {
+      this.flag = true;
+      this.tableType = "";
+      this.tableForm = JSON.parse(JSON.stringify(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) {
+        console.log("出错了", error.message || error);
+      }
+    },
+    //选择二字码
+    async getCharacterData() {
+      try {
+        const res = await getQuery({
+          id: DATACONTENT_ID.twoCharacterOptions,
+          dataContent: [],
+        });
+        if (Number(res.code) === 0) {
+          this.characterList = res.returnData.listValues;
+          // this.formData.currentAirport = "PEK";
+          // this.getAviationData();
+          // this.upAviationData();
+          // this.resetLoopEvent();
+        } else {
+          this.$message.error(res.message);
+        }
+      } catch (error) {
+        console.log("出错了", error.message || error);
+      }
+    },
   },
 };
 </script>
@@ -859,6 +959,7 @@ export default {
     padding: 0 16px 0 16px;
     display: flex;
     align-items: center;
+    display: none;
   }
   ::v-deep .el-dialog__title {
     color: #ffffff !important;
@@ -937,9 +1038,14 @@ export default {
   background: #ffffff;
   border-radius: 4px;
   margin-bottom: 24px;
+  position: relative;
+  .posab {
+    position: absolute;
+    right: 12px;
+  }
   .tltle-head {
     display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
     align-items: center;
   }
   .el-button {
@@ -1039,7 +1145,10 @@ export default {
     width: 100%;
     margin-right: 10px;
     text-align: right;
-    .el-input {
+    > .el-input {
+      width: 58%;
+    }
+    .el-select {
       width: 58%;
     }
   }
@@ -1119,7 +1228,7 @@ export default {
 }
 .centerBox {
   height: 610px;
-  padding: 32px 0 44px 0;
+  padding: 0 0 22px 0;
   // background: #ffffff;
   // box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
   // border-radius: 4px;
@@ -1165,7 +1274,7 @@ export default {
   flex-wrap: wrap;
   width: 100%;
   // margin-left: 30px;
-  margin-top: 40px;
+  margin-top: 16px;
   margin-bottom: 20px;
 }
 .lbox-add {