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

src/router/routes/routes-file-three.ts

@@ -38,7 +38,7 @@ const HomeRoutes = {
           path: "/BasicsData/airportInfoChild",
           name: "AirportInfoChild",
           hidden: true,
-          meta: { title: "区域设置" },
+          meta: { title: "区域设置", keepAlive: true },
           redirect: "/BasicsData/airportInfoChild",
           component: {
             render: () => h(resolveComponent("router-view")),

src/views/BasicsData/airportInfo/airportInfoChild/index.vue

@@ -1,66 +1,67 @@
 <template>
-  <div class="airportInfo scroll-y">
-    <div class="wrap">
-      <Minheader :is-auth="true" :is-statuser="true" @addForm="addForm">
-        <template #header>
-          <div class="status flex-wrap">
-            <div class="manageTitle">区域设置</div>
-          </div>
-        </template></Minheader
-      >
-      <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
-      </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.terminalName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
-        <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="airportInfoChildForm"
-          >
-            <el-row :gutter="24">
-              <el-col>
-                <el-form-item
-                  label="区域名称"
-                  size="default"
-                  prop="terminalName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.terminalName"
-                    placeholder="请输入区域名称"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col>
-                <el-form-item
-                  label="区域编码"
-                  size="default"
-                  prop="terminalID"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.terminalID"
-                    placeholder="请输入区域编码"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- <el-col>
+  <keep-alive>
+    <div class="airportInfo scroll-y">
+      <div class="wrap">
+        <Minheader :is-auth="true" :is-statuser="true" @addForm="addForm">
+          <template #header>
+            <div class="status flex-wrap">
+              <div class="manageTitle">区域设置</div>
+            </div>
+          </template></Minheader
+        >
+        <div class="app-containers">
+          <DataTable
+            :tableHeader="tableCols"
+            :tableData="tableData"
+            :tableBtnGroup="tableBtnGroup"
+            :tableProperty="{ rowKey: 'ID' }"
+            @btnClick="btnClick"
+          />
+        </div>
+        <Dialog
+          :flag="flag"
+          :type="type"
+          :msgTitle="msgTitle"
+          :delName="tableForm.terminalName"
+          @resetForm="resetForm"
+          @delRest="delRest"
+          @submitForm="submitForm"
+          @delRemove="delRemove"
+        >
+          <div class="diacont">
+            <el-form
+              :model="tableForm"
+              :rules="formRules"
+              ref="airportInfoChildForm"
+            >
+              <el-row :gutter="24">
+                <el-col>
+                  <el-form-item
+                    label="区域名称"
+                    size="default"
+                    prop="terminalName"
+                    :rules="formRules.isNotNull"
+                  >
+                    <el-input
+                      v-model="tableForm.terminalName"
+                      placeholder="请输入区域名称"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col>
+                  <el-form-item
+                    label="区域编码"
+                    size="default"
+                    prop="terminalID"
+                    :rules="formRules.isNotNull"
+                  >
+                    <el-input
+                      v-model="tableForm.terminalID"
+                      placeholder="请输入区域编码"
+                    />
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col>
                 <el-form-item
                   label="机场三字码"
                   size="default"
@@ -74,30 +75,31 @@
                   />
                 </el-form-item>
               </el-col> -->
-              <el-col>
-                <el-form-item label="机场名称" size="default">
-                  <el-input
-                    disabled
-                    v-model="tableForm.abbreviation"
-                    placeholder="请输入机场名称"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="备注" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.remarks"
-                    placeholder="请输入备注"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </Dialog>
+                <el-col>
+                  <el-form-item label="机场名称" size="default">
+                    <el-input
+                      disabled
+                      v-model="tableForm.abbreviation"
+                      placeholder="请输入机场名称"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="备注" size="default">
+                    <el-input
+                      type="textarea"
+                      v-model="tableForm.remarks"
+                      placeholder="请输入备注"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </Dialog>
+      </div>
     </div>
-  </div>
+  </keep-alive>
 </template>
 <script setup lang="ts">
 import DataTable from "@/components/tableTemp/index.vue";
@@ -156,12 +158,14 @@ const state = reactive({
   ],
   listLoading: true,
 });
-tableForm.airportCode = route.query.IATACode
-  ? route.query.IATACode
-  : Cookies.get("IATACode");
-tableForm.abbreviation = route.query.abbreviation
-  ? route.query.abbreviation
-  : Cookies.get("abbreviation");
+// tableForm.airportCode = route.query.IATACode
+//   ? route.query.IATACode
+//   : Cookies.get("IATACode");
+// tableForm.abbreviation = route.query.abbreviation
+//   ? route.query.abbreviation
+//   : Cookies.get("abbreviation");
+tableForm.airportCode = route.query.IATACode;
+tableForm.abbreviation = route.query.abbreviation;
 //新增
 const addForm = () => {
   msgTitle.value = "新增区域";

src/views/BasicsData/airportInfo/index.vue

@@ -439,8 +439,8 @@ const btnClick = (row, index, param) => {
     tableForm.companyName = index.companyName;
     tableForm.event = index.event;
   } else if (param === 4) {
-    Cookies.set("IATACode", index.IATACode);
-    Cookies.set("abbreviation", index.abbreviation);
+    // Cookies.set("IATACode", index.IATACode);
+    // Cookies.set("abbreviation", index.abbreviation);
     router.push({
       path: "/BasicsData/airportInfoChild",
       query: {