修改

src/views/newArrival/index.vue

@@ -106,12 +106,12 @@ export default {
         startDate: this.startDate,
         endDate: this.endDate
       }
-      queryData['arrStation_iataCd'] = this.formData.currentAirport
+      queryData['landAirport'] = this.formData.currentAirport
       for (const key in queryData) {
         if (Object.hasOwnProperty.call(queryData, key)) {
           const val = queryData[key]
           const comparator = key == 'startDate' ? '>=' : key == 'endDate' ? '<=' : '='
-          const column = key == 'startDate' ? 'flightDate' : key == 'endDate' ? 'flightDate' : key
+          const column = key == 'startDate' ? 'carrierFlightsDate' : key == 'endDate' ? 'carrierFlightsDate' : key
           const r = {
             left: '(',
             column: column,

src/views/newDeparture/index.vue

@@ -106,12 +106,12 @@ export default {
         startDate: this.startDate,
         endDate: this.endDate
       }
-      queryData['depStation_iataCd'] = this.formData.currentAirport
+      queryData['outAirport'] = this.formData.currentAirport
       for (const key in queryData) {
         if (Object.hasOwnProperty.call(queryData, key)) {
           const val = queryData[key]
           const comparator = key == 'startDate' ? '>=' : key == 'endDate' ? '<=' : '='
-          const column = key == 'startDate' ? 'flightDate' : key == 'endDate' ? 'flightDate' : key
+          const column = key == 'startDate' ? 'carrierFlightsDate' : key == 'endDate' ? 'carrierFlightsDate' : key
           const r = {
             left: '(',
             column: column,

src/views/newFlightView/index.vue

@@ -5,7 +5,7 @@
         <div class="newFlightView-left-top-top">
           <div class="newFlightView-left-top-top-title flex-wrap">
             <div class="newFlightView-left-top-top-title-info">航班基本信息</div>
-            <div class="newFlightView-left-top-top-title-no">{{ flightObj.flightNo }}</div>
+            <div class="newFlightView-left-top-top-title-no">{{ flightObj.carrierFlights }}</div>
           </div>
           <div class="newFlightView-left-top-top-status">
             <el-scrollbar style="height: 100%">
@@ -18,7 +18,7 @@
         <div class="newFlightView-left-top-list">
           <el-descriptions :column="2">
             <el-descriptions-item label="起飞机场简称">{{ infoObj.takeoff_airport_name }}</el-descriptions-item>
-            <el-descriptions-item label="起飞机场三字码">{{ infoObj.depStation_iataCd }}</el-descriptions-item>
+            <el-descriptions-item label="起飞机场三字码">{{ infoObj.outAirport }}</el-descriptions-item>
             <el-descriptions-item :span="2" label="日期">{{ formatTime(infoObj.actualTakeOffTime,infoObj.estimateTakeOffTime,infoObj.scheduleTakeOffTime) }}</el-descriptions-item>
             <el-descriptions-item label="登机口">{{ infoObj.gateCd }}</el-descriptions-item>
             <el-descriptions-item label="停机位"> {{ infoObj.depstandCd }}</el-descriptions-item>
@@ -27,7 +27,7 @@
         <div class="newFlightView-left-top-list">
           <el-descriptions :column="2">
             <el-descriptions-item label="降落机场简称">{{ infoObj.target_airport_name }}</el-descriptions-item>
-            <el-descriptions-item label="降落机场三字码">{{ infoObj.arrStation_iataCd }}</el-descriptions-item>
+            <el-descriptions-item label="降落机场三字码">{{ infoObj.landAirport }}</el-descriptions-item>
             <el-descriptions-item :span="2" label="日期">{{ formatTime(infoObj.actualLandInTime,infoObj.estimateLandInTime,infoObj.scheduleLandInTime) }}</el-descriptions-item>
             <el-descriptions-item label="提取转盘">{{infoObj.arrcarouselCd}}</el-descriptions-item>
             <el-descriptions-item label="停机位"> {{ infoObj.arrstandCd }}</el-descriptions-item>
@@ -99,24 +99,24 @@ export default {
   async created () {
     const checkDatas = []
     const query = this.$route.query
-    const { flightNo, flightDate } = query
+    const { carrierFlights, carrierFlightsDate } = query
     this.flightObj = query
     this.dataContent = query
     const res = await this.getViewInfo(query)
     this.infoObj = res[0]
-    const sts = await this.getViewInfo({ flightNo, flightDate })
+    const sts = await this.getViewInfo({ carrierFlights, carrierFlightsDate })
     if (sts && sts.length) {
       for (const p of sts) {
-        const { depStation_iataCd, arrStation_iataCd } = p
+        const { outAirport, landAirport } = p
         this.deArrs.push({
-          depStation_iataCd,
-          arrStation_iataCd
+          outAirport,
+          landAirport
         })
       }
     }
     const newDatas = _.cloneDeep(this.deArrs)
     if (newDatas && newDatas.length) {
-      const m = combine(newDatas, 'depStation_iataCd', 'arrStation_iataCd')
+      const m = combine(newDatas, 'outAirport', 'landAirport')
       m.forEach((item, index) => {
         checkDatas.push(`${m[index]}-${m[index + 1]}`)
         const obj = {
@@ -126,7 +126,13 @@ export default {
         this.deArrsNum.push(obj)
       })
       this.checkStates = m
-      this.checkList = checkDatas.splice(0, m.length - 1)
+      const [a1, a2] = [m[0], m[m.length - 1]]
+      const { outAirport, landAirport } = this.infoObj
+      if (a1 == outAirport && a2 == landAirport) {
+        this.checkList = checkDatas.splice(0, m.length - 1)
+      } else {
+        this.checkList = [`${outAirport}-${landAirport}`]
+      }
     }
   },
   mounted () {
@@ -149,9 +155,9 @@ export default {
     },
     // 导出
     exportHandler (refName, tableName) {
-      const { flightNo, flightDate, depStation_iataCd, arrStation_iataCd } = this.flightObj
+      const { carrierFlights, carrierFlightsDate, outAirport, landAirport } = this.flightObj
       const table = this.$refs[refName].$el.cloneNode(true);
-      const fileName = `${tableName}-${flightNo}-${flightDate}-${depStation_iataCd}-${arrStation_iataCd}.xlsx`;
+      const fileName = `${tableName}-${carrierFlights}-${carrierFlightsDate}-${outAirport}-${landAirport}.xlsx`;
       throttledExportToExcel(table, tableName, fileName);
     },
     // 选中
@@ -177,8 +183,8 @@ export default {
         const c4 = caps[0].name //起飞
         const c5 = caps[caps.length - 1].name //降落
         const newPrams = _.cloneDeep(this.dataContent)
-        newPrams.depStation_iataCd = c4
-        newPrams.arrStation_iataCd = c5
+        newPrams.outAirport = c4
+        newPrams.landAirport = c5
         this.table1 = newPrams
         this.table2 = newPrams
         const res = await this.getViewInfo(newPrams)

src/views/newUserManagement/index.vue

@@ -87,7 +87,7 @@
             <el-button @click="handleTableAdd" type="primary" size="small">新增</el-button>
           </div>
           <div class="contents">
-            <el-table :data="tableData" border style="width: 100%">
+            <el-table :data="tableData" height="100%" border style="width: 100%">
               <el-table-column prop="user_name" label="用户名">
               </el-table-column>
               <el-table-column prop="user_status" label="状态">
@@ -572,15 +572,15 @@ export default {
               delete data.user_pwd
               const { code } = await this.getChangeList(SERVICE_ID.getUserTableId, data, 2, 'user_id')
               this.tipMsg(code)
-              const result = await this.getQueryList(SERVICE_ID.getUserTableId, {
-                up_user_group_id: this.treeCheckObj.user_group_id
-              })
-              this.tableData = result.returnData
-              this.clearTableForm()
-              this.tableFlag = false
-              this.paswordFlag = false
             }
           }
+          const result = await this.getQueryList(SERVICE_ID.getUserTableId, {
+            up_user_group_id: this.treeCheckObj.user_group_id
+          })
+          this.tableData = result.returnData
+          this.clearTableForm()
+          this.tableFlag = false
+          this.paswordFlag = false
         }
         else {
           return false
@@ -631,6 +631,10 @@ export default {
           margin-top: 18px;
         }
       }
+      .newService-content-left-bottom {
+        height: calc(100% - 130px);
+        padding-right: 5px;
+      }
       .contents {
         // margin-top: 24px;
         padding: 0 24px;
@@ -686,6 +690,7 @@ export default {
         padding: 24px;
         .contents {
           margin-top: 24px;
+          height: calc(100% - 50px);
         }
       }
     }

src/views/systemSettings/views/newAuth/components/button.vue

@@ -66,8 +66,7 @@
 </template>
 
 <script>
-import pb from '@/layout/mixin/getPublicData'
-import { initColumnSet } from '@/api/newLogin'
+import pb from '@/layout/mixin/publicFunc'
 export default {
   name: 'Button',
   mixins: [pb],
@@ -104,7 +103,8 @@ export default {
         auth_comment: ''
       },
       relationData: [],
-      passData: []
+      passData: [],
+      formObj: {}
     }
   },
   watch: {
@@ -118,9 +118,10 @@ export default {
     },
     authObj: {
       handler (obj) {
-        console.log(obj)
-        this.relationData = []
-        this.passData = []
+        // console.log('dddd', obj)
+        // this.relationData = []
+        // this.passData = []
+        this.formObj = _.cloneDeep(obj)
         if (!Array.isArray(obj.pass_parameters) && obj.pass_parameters) {
           obj.pass_parameters = obj.pass_parameters.split(',')
         }
@@ -141,7 +142,7 @@ export default {
     }
   },
   mounted () {
-    this.getRelationData()
+    this.getRelationData(this.authNum ?? this.form.up_auth_id)
   },
   methods: {
     //清空表单
@@ -154,11 +155,11 @@ export default {
       }
     },
     async getRelationData (id = this.form.up_auth_id) {
-      const result = await this.getQuery(SERVICE_ID.getTableColumnId, false, { serviceOutPutId: id })
-      if (result && result.length) {
-        this.relationData = result
-        this.passData = result
-      }
+      // this.form.pass_parameters = ''
+      // this.form.relation_data = ''
+      const { returnData } = await this.getQueryList(SERVICE_ID.getTableColumnId, { serviceOutPutId: id })
+      this.relationData = _.cloneDeep(returnData)
+      this.passData = _.cloneDeep(returnData)
     }
   }
 }