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

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

@@ -33,14 +33,6 @@
             ref="airportInfoChildForm"
           >
             <el-row :gutter="24">
-              <el-col>
-                <el-form-item label="航站楼编码" size="default">
-                  <el-input
-                    v-model="tableForm.terminalID"
-                    placeholder="请输入航站楼编码"
-                  />
-                </el-form-item>
-              </el-col>
               <el-col>
                 <el-form-item
                   label="航站名称"
@@ -54,6 +46,14 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col>
+                <el-form-item label="航站楼编码" size="default">
+                  <el-input
+                    v-model="tableForm.terminalID"
+                    placeholder="请输入航站楼编码"
+                  />
+                </el-form-item>
+              </el-col>
               <el-col>
                 <el-form-item
                   label="机场三字码"
@@ -62,6 +62,7 @@
                   :rules="formRules.isNotNull"
                 >
                   <el-input
+                    disabled
                     v-model="tableForm.airportCode"
                     placeholder="请输入机场三字码"
                   />

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

@@ -35,66 +35,67 @@
             <el-row :gutter="24">
               <el-col>
                 <el-form-item
-                  label="位置序号"
+                  label="航站楼ID"
                   size="default"
-                  prop="positionSN"
+                  prop="terminalID"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
-                    v-model="tableForm.positionSN"
-                    placeholder="请输入位置序号"
+                    disabled
+                    v-model="tableForm.terminalID"
+                    placeholder="请输入航站楼ID"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item
-                  label="位置描述"
+                  label="位置序号"
                   size="default"
-                  prop="positionDescribe"
+                  prop="positionSN"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
-                    v-model="tableForm.positionDescribe"
-                    placeholder="请输入位置描述"
+                    v-model="tableForm.positionSN"
+                    placeholder="请输入位置序号"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item
-                  label="位置英文描述"
+                  label="位置编码"
                   size="default"
-                  prop="englishDescribe"
+                  prop="locationCode"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
-                    v-model="tableForm.englishDescribe"
-                    placeholder="请输入位置英文描述"
+                    v-model="tableForm.locationCode"
+                    placeholder="请输入位置编码"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item
-                  label="位置编码"
+                  label="位置描述"
                   size="default"
-                  prop="locationCode"
+                  prop="positionDescribe"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
-                    v-model="tableForm.locationCode"
-                    placeholder="请输入位置编码"
+                    v-model="tableForm.positionDescribe"
+                    placeholder="请输入位置描述"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item
-                  label="航站楼ID"
+                  label="位置英文描述"
                   size="default"
-                  prop="terminalID"
+                  prop="englishDescribe"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
-                    v-model="tableForm.terminalID"
-                    placeholder="请输入航站楼ID"
+                    v-model="tableForm.englishDescribe"
+                    placeholder="请输入位置英文描述"
                   />
                 </el-form-item>
               </el-col>

src/views/BasicsData/containerMaintenance/index.vue

@@ -48,14 +48,14 @@
               </el-col>
               <el-col>
                 <el-form-item
-                  label="标识符"
+                  label="容器编码"
                   size="default"
                   prop="containerCode"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
                     v-model="tableForm.containerCode"
-                    placeholder="请输入标识符"
+                    placeholder="请输入容器编码"
                   />
                 </el-form-item>
               </el-col>

src/views/BasicsData/modelMaintenance/index.vue

@@ -61,14 +61,14 @@
               </el-col>
               <el-col>
                 <el-form-item
-                  label="标识符"
+                  label="机型编码"
                   size="default"
                   prop="modelCode"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
                     v-model="tableForm.modelCode"
-                    placeholder="请输入标识符"
+                    placeholder="请输入机型编码"
                   />
                 </el-form-item>
               </el-col>

src/views/systemSettings/datastructure/datastructureTerm.vue

@@ -280,7 +280,7 @@ const tableData = ref([]);
 const state = reactive({
   list: [
     { label: "项名称", key: "name" },
-    { label: "输出标识符", key: "china" },
+    { label: "输出编码", key: "china" },
     { label: "数据类型", key: "englin" },
     { label: "唯一项", key: "two" },
     { label: "必填项", key: "three" },

src/views/systemSettings/warningSet/index.vue

@@ -300,12 +300,12 @@ const delRest = () => {
   flag.value = false;
 };
 //获取表格数据
-const getQuery = async () => {
+const getQuery = async (data) => {
   try {
     const { code, returnData } = await Query({
       id: DATACONTENT_ID.sysServiceWarningId,
       needPage: ++page.value,
-      dataContent: Object.values(dataContent.value),
+      dataContent: data ? [data] : [],
     });
     if (code === "0") {
       if (returnData.listValues.length === 0) {
@@ -391,12 +391,11 @@ const generalDataReception = async (data) => {
 };
 //清除
 const searchForms = (data) => {
-  // tableData.value = [];
-
-  // page.value = 0;
-  getQuery();
+  page.value = 0;
+  tableData.value = [];
+  getQuery(data);
 };
-getQuery();
+// getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {