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

public/config.js

@@ -74,20 +74,21 @@ const DATACONTENT_ID = {
 
   /***-----基础数据------***/
   deployNodeId: 54, //基础数据-节点信息维护-获取二级节点(表格)-id
+  deployNodeteoId: 60, //基础数据-节点信息维护-二级页面-id
   deployNodeThreeId: 64, //基础数据-节点信息维护-获取三级节点-id
-  airlineTableId: 52, //基础数据-航司信息维护-表格-id
+  airlineTableId: 80, //基础数据-航司信息维护-表格-id
   airportTableId: 79, //基础数据-机场信息维护-表格-id
   airportTreeId: 58, //基础数据-机场信息维护-公司列表-id
   bagTableId: 55, //基础数据-特殊行李维护-表格-id
 
   // 数据统计
-  inOrOutId:52,//获取进离岗下拉ID
-  AirlineId:53,//获取航线下拉ID
-  AreaId:70,//获取大区下拉ID
-  AirportId:77,//获取航站下拉ID
-  TerminalId:56,//获取航站楼下拉ID
-  byAreaId:50,//根据大区统计ID
-  byOtherId:63,//获取大区以外统计ID
+  inOrOutId: 52,//获取进离岗下拉ID
+  AirlineId: 53,//获取航线下拉ID
+  AreaId: 70,//获取大区下拉ID
+  AirportId: 77,//获取航站下拉ID
+  TerminalId: 56,//获取航站楼下拉ID
+  byAreaId: 50,//根据大区统计ID
+  byOtherId: 63,//获取大区以外统计ID
   baggageStatistics: 73, // 获取行李统计
   nodeStatistics: 75 // 获取节点统计
 };

src/components/Table/index.vue

@@ -183,7 +183,7 @@
                       type="text"
                       size="small"
                       @click="handlenodeSet(scope.row)"
-                      >节点设置</el-button
+                      >位置设置</el-button
                     >
                   </div>
                 </div>
@@ -239,7 +239,12 @@
                       </el-select>
                     </template>
                     <!-- <template v-else-if="item.dataType == 'longtext'">
-                      <el-input size="small" :rows="1" type="textarea" v-model="tableForm[item.columnName]"></el-input>
+                      <el-input
+                        size="small"
+                        :rows="1"
+                        type="textarea"
+                        v-model="tableForm[item.columnName]"
+                      ></el-input>
                     </template> -->
                     <template v-else>
                       <el-input
@@ -480,7 +485,6 @@ export default {
     dataContent: {
       handler(val) {
         if (val) {
-          console.log(val);
           if (val.companyID) {
             this.resetTable();
             this.getQuery();
@@ -632,9 +636,11 @@ export default {
           this.tableArrs.push(item.columnName);
           // const reqUt = this.getSelectData(item.listqueryTemplateID)
           // reqUts.push(reqUt)
-          this.tableOptions[item.columnName] = await this.getSelectData(
-            item.listqueryTemplateID
-          );
+          if(!this.tableOptions[item.columnName]){
+            this.tableOptions[item.columnName] = await this.getSelectData(
+              item.listqueryTemplateID
+            );
+          }
           // console.log(this.tableOptions[item.columnName])
         }
         // this.filterValues[item.columnName] = ''
@@ -910,7 +916,7 @@ export default {
       this.$router.push({
         path: "/BasicsData/deployNodeChild",
         query: {
-          nodeID: row.nodeCode,
+          nodeCode: row.nodeCode,
         },
       });
     },

src/views/BasicsData/views/deployNode/deployNodeChild.vue

@@ -2,7 +2,7 @@
   <div class="queryItemSettings_home">
     <div class="wrap">
       <DataTable
-        data-id="60"
+        :data-id="dataId"
         :data-content="{ nodeCode }"
         :rows="24"
         label-width="80px"
@@ -19,6 +19,7 @@ export default {
   data() {
     return {
       nodeCode: null,
+      dataId: DATACONTENT_ID.deployNodeteoId,
     };
   },
   created() {
@@ -26,7 +27,7 @@ export default {
     //   this.$router.push("/systemSettings/queryTemplate");
     //   return;
     // }
-    this.nodeCode = Number(this.$route.query.nodeCode);
+    this.nodeCode = this.$route.query.nodeCode;
   },
 };
 </script>