Merge branch 'master' of http://120.26.64.82:10880/BFFE/SMAirports

public/config.js

@@ -21,6 +21,7 @@ window.SERVICE_ID = {
   bagViewId: 20036, //航班视图-基础信息
   changePwd: 20045, // 修改密码
   userColAuthId: 200227, //用户授权-列设置
+  containerId: 200238, //容器历史记录-容器历史
 
   /***-----高级查询------***/
   baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id

src/layout/mixin/publicFunc.js

@@ -13,27 +13,29 @@ export default {
   },
   created () {
     const { auth_id } = this.$route.meta
-    const { arrs } = getAuthData(auth_id)
-    const table = arrs.filter(item => item.auth_type == 4)
-    const table2 = arrs.filter(item => item.auth_type == 5)
-    if (table2 && table2.length) {
-      const obj = table2[0]
-      this.AqueryParams = obj
-      this.TqueryId = obj.queryTemplateID
-      this.TauthId = obj.auth_id
-    }
-    if (table && table.length) {
-      if (table.length == 1) {
-        const obj = table[0]
+    if (auth_id) {
+      const { arrs } = getAuthData(auth_id)
+      const table = arrs.filter(item => item.auth_type == 4)
+      const table2 = arrs.filter(item => item.auth_type == 5)
+      if (table2 && table2.length) {
+        const obj = table2[0]
         this.AqueryParams = obj
-        this.AqueryId = obj.queryTemplateID
-        this.AauthId = obj.auth_id
+        this.TqueryId = obj.queryTemplateID
+        this.TauthId = obj.auth_id
+      }
+      if (table && table.length) {
+        if (table.length == 1) {
+          const obj = table[0]
+          this.AqueryParams = obj
+          this.AqueryId = obj.queryTemplateID
+          this.AauthId = obj.auth_id
+        } else {
+          this.AauthTable = table
+        }
       } else {
-        this.AauthTable = table
+        this.AauthId = auth_id
+        this.AqueryId = auth_id
       }
-    } else {
-      this.AauthId = auth_id
-      this.AqueryId = auth_id
     }
   },
   methods: {

src/views/baggageManagementTemp/components/departure/index.vue

@@ -8,17 +8,8 @@
 <template>
   <div class="departure-one">
     <!--功能区-表单-->
-    <div
-      ref="formWrap"
-      class="terminal-form-wrap"
-    >
-      <el-form
-        ref="form"
-        :inline="true"
-        :model="formData"
-        :rules="rules"
-        class="form"
-      >
+    <div ref="formWrap" class="terminal-form-wrap">
+      <el-form ref="form" :inline="true" :model="formData" :rules="rules" class="form">
         <div class="form-left">
           <el-form-item prop="currentAirport">
             <!-- <el-cascader
@@ -33,22 +24,8 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select
-              v-model="formData.currentAirport"
-              class="input-shadow"
-              size="small"
-              style="width: 150px"
-              filterable
-              default-first-option
-              placeholder="请选择机场"
-              @change="airPortChange"
-            >
-              <el-option
-                v-for="(item, index) in AirportList"
-                :key="index"
-                :label="item.planDepartureApt"
-                :value="item.planDepartureApt"
-              />
+            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" style="width: 150px" filterable default-first-option placeholder="请选择机场" @change="airPortChange">
+              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.planDepartureApt" :value="item.planDepartureApt" />
             </el-select>
           </el-form-item>
           <!-- <el-form-item prop="startDate">
@@ -75,76 +52,30 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item
-            prop="flightDate"
-            label="航班日期"
-          >
-            <el-date-picker
-              v-model="formData.flightDate"
-              :clearable="false"
-              size="small"
-              style="width: 300px"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="dateRangePickerOptions"
-              @change="dateChangeHandler"
-            />
+          <el-form-item prop="flightDate" label="航班日期">
+            <el-date-picker v-model="formData.flightDate" :clearable="false" size="small" style="width: 300px" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @change="dateChangeHandler" />
           </el-form-item>
           <el-form-item>
             <div class="box-item">
               <p>预计装载总数：</p>
-              <li
-                v-for="(item, index) in orderNum"
-                :key="index"
-                :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }"
-              >
+              <li v-for="(item, index) in orderNum" :key="index" :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }">
                 <span v-if="!isNaN(item)">
                   <i ref="numberItem">0123456789</i>
                 </span>
-                <span
-                  v-else
-                  class="comma"
-                  >{{ item }}</span
-                >
+                <span v-else class="comma">{{ item }}</span>
               </li>
             </div>
           </el-form-item>
         </div>
-        <div
-          class="form-right"
-          @keyup.enter="onSubmit(0)"
-        >
+        <div class="form-right" @keyup.enter="onSubmit(0)">
           <el-form-item prop="search">
-            <el-popover
-              :value="popoverVisible"
-              placement="bottom"
-              trigger="manual"
-            >
+            <el-popover :value="popoverVisible" placement="bottom" trigger="manual">
               <span>请输入航班号（示例：CA1234）或行李牌号（示例：1234567890）</span>
-              <el-input
-                slot="reference"
-                v-model="formData.search"
-                class="input-shadow"
-                style="width: 240px; margin-left: 105px"
-                size="small"
-                placeholder="请输入内容"
-                prefix-icon="el-icon-search"
-                clearable
-                @focus="popoverVisible = true"
-                @blur="popoverVisible = false"
-              />
+              <el-input slot="reference" v-model="formData.search" class="input-shadow" style="width: 240px; margin-left: 105px" size="small" placeholder="请输入内容" prefix-icon="el-icon-search" clearable @focus="popoverVisible = true" @blur="popoverVisible = false" />
             </el-popover>
           </el-form-item>
           <el-form-item>
-            <el-button
-              class="btn-shadow"
-              size="mini"
-              type="primary"
-              @click="onSubmit(0)"
-              >搜索</el-button
-            >
+            <el-button class="btn-shadow" size="mini" type="primary" @click="onSubmit(0)">搜索</el-button>
           </el-form-item>
           <!-- <el-form-item v-is="['dm_dt_timeIcon']">
             <TimeZoneSelector />
@@ -156,112 +87,42 @@
             <img class="btn-img btn-shadow" src="@/assets/baggage/ic_setting.png" title="列设置" @click="show" />
           </el-form-item> -->
           <el-form-item>
-            <img
-              class="btn-img btn-shadow"
-              src="@/assets/baggage/ic_setting.png"
-              title="列设置"
-              @click="show"
-            />
+            <img class="btn-img btn-shadow" src="@/assets/baggage/ic_setting.png" title="列设置" @click="show" />
           </el-form-item>
           <!-- <el-form-item v-is="['dm_dt_columnSettings']">
             <img class="btn-img btn-shadow" src="@/assets/baggage/ic_export.png" title="导出" @click="exportHandler('table', '航站离港列表')" />
           </el-form-item> -->
           <el-form-item>
-            <img
-              class="btn-img btn-shadow"
-              src="@/assets/baggage/ic_export.png"
-              title="导出"
-              @click="exportHandler('table', '航站离港列表')"
-            />
+            <img class="btn-img btn-shadow" src="@/assets/baggage/ic_export.png" title="导出" @click="exportHandler('table', '航站离港列表')" />
           </el-form-item>
         </div>
       </el-form>
     </div>
     <!--表格-->
-    <div
-      v-loading="loading"
-      class="terminal-table"
-      element-loading-text="拼命加载中"
-      element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-    >
-      <el-table
-        ref="table"
-        class="table"
-        :height="computedTableHeight"
-        :data="dealedTableData"
-        :header-cell-class-name="headerCellClass"
-        :row-class-name="tableRowClassName"
-        :cell-class-name="cellClass"
-        show-summary
-        :summary-method="summaryMethod"
-        border
-        stripe
-        fit
-        @cell-click="cellClickHandler"
-      >
-        <el-table-column
-          v-for="col in tableColsCopy"
-          :key="col.prop"
-          :prop="col.prop"
-          :label="col.label"
-          :width="col.width"
-          :fixed="col.fixed"
-          :formatter="tableFormat"
-        >
+    <div v-loading="loading" class="terminal-table" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-table ref="table" class="table" :height="computedTableHeight" :data="dealedTableData" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" show-summary :summary-method="summaryMethod" border stripe fit @cell-click="cellClickHandler">
+        <el-table-column v-for="col in tableColsCopy" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed" :formatter="tableFormat">
           <template #header>
-            <el-tooltip
-              :content="col.desc || childCol.label"
-              placement="top"
-            >
-              <TableHeaderCell
-                :label="col.label"
-                :filter-options="tableDataFilters[col.prop]"
-                :filter-values.sync="filterValues[col.prop]"
-                :sortable="col.sortable"
-                :sort-rule.sync="tableDataSortRules[col.prop]"
-              />
+            <el-tooltip :content="col.desc || childCol.label" placement="top">
+              <TableHeaderCell :label="col.label" :filter-options="tableDataFilters[col.prop]" :filter-values.sync="filterValues[col.prop]" :sortable="col.sortable" :sort-rule.sync="tableDataSortRules[col.prop]" />
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <!--列设置-->
-    <Dialog
-      :flag="dialogFlag"
-      class="dialog-check-group"
-    >
+    <Dialog :flag="dialogFlag" class="dialog-check-group">
       <div class="dialog-wrapper">
         <div class="title">列设置</div>
         <div class="content">
-          <el-tree
-            ref="columnSetTree"
-            :data="tableCols"
-            :class="colsCheckClass"
-            show-checkbox
-            node-key="index"
-            :default-expand-all="true"
-            :props="{
+          <el-tree ref="columnSetTree" :data="tableCols" :class="colsCheckClass" show-checkbox node-key="index" :default-expand-all="true" :props="{
               label: 'label',
               children: 'children'
-            }"
-            :default-checked-keys="checkedKeysTemp"
-            @check="handleCheck"
-          />
+            }" :default-checked-keys="checkedKeysTemp" @check="handleCheck" />
         </div>
         <div class="foot right t30">
-          <el-button
-            size="medium"
-            class="r24"
-            type="primary"
-            @click="onCheck"
-            >确定</el-button
-          >
-          <el-button
-            size="medium"
-            @click="hide"
-            >取消</el-button
-          >
+          <el-button size="medium" class="r24" type="primary" @click="onCheck">确定</el-button>
+          <el-button size="medium" @click="hide">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -275,6 +136,7 @@ import terminalMixin from '../../mixins/terminal'
 import formMixin from '../../mixins/form'
 import tableColsMixin from '../../mixins/tableCols'
 import timeZoneMixin from '../../mixins/timeZone'
+import pf from '@/layout/mixin/publicFunc'
 import { TempQuery } from '@/api/temp'
 import { GeneralDataReception } from '@/api/temp'
 import TableHeaderCell from '@/components/TableHeaderCell'
@@ -284,8 +146,8 @@ import { mapGetters } from 'vuex'
 export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
-  mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
-  data() {
+  mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin, pf],
+  data () {
     return {
       orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       popoverVisible: false,
@@ -435,12 +297,12 @@ export default {
     }
   },
   computed: {
-    singleDay() {
+    singleDay () {
       return this.startDate === this.endDate
     },
     ...mapGetters(['timeZone'])
   },
-  mounted() {
+  mounted () {
     this.getAirPortData()
     this.table = this.$refs.table.bodyWrapper
     const that = this
@@ -448,45 +310,46 @@ export default {
       that.scrollTop = this.table.scrollTop
     })
   },
-  activated() {
+  activated () {
     this.table.scrollTop = this.scrollTop
     this.getTableData()
     this.getWarningData()
     this.loopEvent = setInterval(this.getTableData, LOOP_INTERVAL.departureTable)
   },
-  deactivated() {
+  deactivated () {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
-  beforeDestroy() {
+  beforeDestroy () {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
   methods: {
-    resetLoopEvent() {
+    resetLoopEvent () {
       this.loading = true
       this.hasSetTableScroll = false
       this.loopEvent && clearInterval(this.loopEvent)
       this.getTableData()
       this.loopEvent = setInterval(this.getTableData, LOOP_INTERVAL.departureTable)
     },
-    airPortChange() {
+    airPortChange () {
       this.resetLoopEvent()
     },
-    dateChangeHandler() {
+    dateChangeHandler () {
       this.resetLoopEvent()
     },
     // 选择机场
-    async getAirPortData() {
+    async getAirPortData () {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureAirMainId,
-          dataContent: []
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureAirMainId,
+        //   dataContent: []
+        // })
+        const res = await this.getQueryListAuth(SERVICE_ID.departureAirMainId, {}, 1, 9999, 276)
         if (Number(res.code) === 0) {
           this.AirportList = this._.orderBy(res.returnData.listValues, o => o.planDepartureApt)
           this.formData.currentAirport = 'PEK'
@@ -498,12 +361,13 @@ export default {
         this.$message.error('失败')
       }
     },
-    async getWarningData() {
+    async getWarningData () {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureWarningId,
-          dataContent: []
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureWarningId,
+        //   dataContent: []
+        // })
+        const res = await this.getQueryList(SERVICE_ID.departureWarningId, {}, 1, 999)
         if (Number(res.code) === 0) {
           const { listValues } = res.returnData
           this.WarningData = listValues
@@ -514,7 +378,7 @@ export default {
         this.$message.error('失败')
       }
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName ({ row, rowIndex }) {
       const classes = []
       if (row.flightStatus === 'DLY') {
         classes.push('bgl-delayed')
@@ -530,7 +394,7 @@ export default {
       }
       return classes.join(' ')
     },
-    headerCellClass({ row, column }) {
+    headerCellClass ({ row, column }) {
       const classes = []
       if (['warning', 'exceptions', 'midIn'].includes(column.property)) {
         classes.push('bgl-huang')
@@ -552,16 +416,17 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData() {
+    async getTableData () {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
       const arr = [this.formData.currentAirport, this.startDate, this.endDate]
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureTableMainId,
-          dataContent: [...arr, ...arr, ...arr]
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureTableMainId,
+        //   dataContent: [...arr, ...arr, ...arr]
+        // })
+        const res = await this.getQueryListAuth(SERVICE_ID.departureTableMainId, { departureAirport: arr[0], beginDate: arr[1], endDate: arr[2] }, 1, 9999, 276)
         if (Number(res.code) === 0) {
           this.initTableData(res.returnData.listValues)
         } else {
@@ -575,7 +440,7 @@ export default {
         this.loading = false
       }
     },
-    initTableData(tableData) {
+    initTableData (tableData) {
       const currentTime = new Date()
       const curTime = this.formatTime(currentTime)
       this.baggageCount = 0
@@ -639,7 +504,7 @@ export default {
         this.setTableScroll()
       })
     },
-    formatTime(date, type = 1) {
+    formatTime (date, type = 1) {
       let time = null
       if (type == 1) {
         time = parseTime(date, '{y}-{m}-{d} {h}:{i}:{s}')
@@ -649,7 +514,7 @@ export default {
       const newTimt = new Date(time)
       return newTimt.getTime()
     },
-    async sendLog(obj) {
+    async sendLog (obj) {
       try {
         const newObj = {
           logTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
@@ -668,7 +533,7 @@ export default {
         this.$message.error('失败')
       }
     },
-    setTableScroll() {
+    setTableScroll () {
       this.leaveCount = 0
       this.dealedTableData.forEach(row => {
         if (row['hasTakeOff'] === 1 && !row['flightCanceled']) {
@@ -694,7 +559,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform() {
+    setNumberTransform () {
       const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -704,7 +569,7 @@ export default {
       }
     },
 
-    toOrderNum(num) {
+    toOrderNum (num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
@@ -717,7 +582,7 @@ export default {
       }
       this.setNumberTransform()
     },
-    exportHandler(refName, tableName) {
+    exportHandler (refName, tableName) {
       if (this.loading) {
         return
       }
@@ -753,7 +618,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         font-size: 14px;
       }
       .el-switch__label {
@@ -859,7 +724,7 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, 'Microsoft YaHei';
+      font-family: Helvetica, "Microsoft YaHei";
       letter-spacing: 0;
     }
     .cell-click {
@@ -892,7 +757,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: '';
+            content: "";
             position: absolute;
             left: 0;
             bottom: 0;
@@ -912,7 +777,7 @@ export default {
         background: lightcoral !important;
         position: relative;
         &::after {
-          content: '';
+          content: "";
           display: block;
           width: 100%;
           height: 100%;
@@ -926,7 +791,7 @@ export default {
         background: #fcf0b1 !important;
         position: relative;
         &::after {
-          content: '';
+          content: "";
           display: block;
           width: 100%;
           height: 100%;

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/newBagDetails/components/baggageView.vue

@@ -190,6 +190,7 @@ export default {
           })
           this.tableData.push(...returnData);
           this.tableData = _.uniqBy(this.tableData, 'carrierFlights')
+          this.tableData = this.tableData.sort((a, b) => Date.parse(a.carrierFlightsDate) - Date.parse(b.carrierFlightsDate))
           this.tableData.forEach(item => {
             item.bagStatus.map(p => {
               const { timeProp, loclProp, stateProp } = p

src/views/newBagDetails/index.vue

@@ -12,9 +12,9 @@
             </div>
           </el-col>
           <el-col :span="20">
-            <scroll-pane ref="scrollPane" class="tags-view-wrapper">
+            <el-scrollbar ref="scrollPane" class="tags-view-wrapper">
               <div v-for="(item,index) in detailsArr" class="tags-view-item" @click="tagClick(item,index)" :class="activeIndex == index ? 'active' : ''" :key="index">{{ item.luggageNum }}</div>
-            </scroll-pane>
+            </el-scrollbar>
           </el-col>
         </el-row>
       </div>

src/views/newContainer/index.vue

@@ -3,7 +3,7 @@
     <div class="newContainer-top">
       <div class="newContainer-top-title flex">
         <div class="manageTitle">容器基本信息</div>
-        <el-button size="small" type="primary">历史记录</el-button>
+        <el-button @click="toHistory" size="small" type="primary">历史记录</el-button>
       </div>
       <div class="newContainer-top-table">
         <el-row class="msgs-ds" :gutter="20">
@@ -92,6 +92,12 @@ export default {
         }
         this.detailsArr = datas
       }
+    },
+    toHistory () {
+      const { container_ID } = this.query
+      if (container_ID) {
+        this.$router.push({ path: '/newContainerHistory', query: { container_ID } })
+      }
     }
   }
 }

src/views/newContainerHistory/index.vue

@@ -0,0 +1,98 @@
+<template>
+  <div class="newContainerHistory flex">
+    <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="newContainerHistory-left">
+      <div class="newContainerHistory-left-top manageTitle">容器历史</div>
+      <div class="newContainerHistory-left-bottom">
+        <el-scrollbar style="height: 100%;">
+          <el-tree :data="dataTree" :props="defaultProps" highlight-current default-expand-all @node-click="handleNodeClick"></el-tree>
+        </el-scrollbar>
+      </div>
+    </div>
+    <div class="newContainerHistory-right flex1">
+      <Table :tableTag="tableTag" />
+    </div>
+  </div>
+</template>
+
+<script>
+import pf from '@/layout/mixin/publicFunc'
+import Table from '@/views/newQuery/components/table.vue'
+export default {
+  name: 'NewContainerHistory',
+  mixins: [pf],
+  components: { Table },
+  data () {
+    return {
+      query: '',
+      loading: false,
+      dataTree: [
+        {
+          label: '',
+          children: []
+        }
+      ],
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
+      tableTag: {}
+    }
+  },
+  created () {
+    const { query } = this.$route
+    this.query = query
+  },
+  mounted () {
+    this.tableTag = this.query
+    this.getListTree()
+  },
+  methods: {
+    async getListTree () {
+      try {
+        this.loading = true
+        const { code, returnData } = await this.getQueryList(SERVICE_ID.containerId, this.query)
+        if (code == 0 && returnData && returnData.length) {
+          const datas = [...returnData]
+          datas.forEach(item => {
+            item.label = `${item.carrierFlights}-${item.carrierFlightsDate.replaceAll('-', '/')}-${item.outAirport}-${item.landAirport}`
+          })
+          this.dataTree[0].label = `容器历史-${this.query.container_ID}`
+          this.dataTree[0].children = datas
+          this.loading = false
+        }
+      } catch (error) {
+        console.log(error)
+        this.loading = false
+      }
+    },
+    handleNodeClick (data) {
+      console.log(data)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.newContainerHistory {
+  padding: 24px;
+  height: calc(100vh - 80px);
+  &-left {
+    width: 360px;
+    margin-right: 24px;
+    background-color: #fff;
+    &-bottom {
+      height: calc(100% - 30px);
+      padding: 12px;
+      ::v-deep .el-tree {
+        .el-tree-node__label {
+          font-size: 14px;
+          font-weight: 600;
+        }
+      }
+    }
+  }
+  &-right {
+    background-color: #fff;
+  }
+}
+</style>

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>
@@ -97,26 +97,48 @@ export default {
     }
   },
   async created () {
+    const checkDatas = []
     const query = this.$route.query
-    const { flightNo, flightDate } = query
+    if (query.inflightNo || query.inflightDate) {
+      query.carrierFlights = query.inflightNo
+      query.carrierFlightsDate = query.inflightDate
+    }
+    if (query.transferFlightNO || query.outflightDate) {
+      query.carrierFlights = query.inflightNo
+      query.carrierFlightsDate = query.outflightDate
+    }
+    if (query.Inbound_flight_number || query.Inbound_flight_date) {
+      query.carrierFlights = query.Inbound_flight_number
+      query.carrierFlightsDate = query.Inbound_flight_date
+    }
+    if (query.Inbound_flight_number || query.Inbound_flight_date) {
+      query.carrierFlights = query.Inbound_flight_number
+      query.carrierFlightsDate = query.Inbound_flight_date
+    }
+    if (query.departure_flights_number || query.departure_flights_date) {
+      query.carrierFlights = query.departure_flights_number
+      query.carrierFlightsDate = query.departure_flights_date
+    }
+    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 = {
           item,
           index
@@ -124,6 +146,13 @@ export default {
         this.deArrsNum.push(obj)
       })
       this.checkStates = m
+      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 () {
@@ -146,9 +175,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);
     },
     // 选中
@@ -174,8 +203,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/newTable/index.vue

@@ -63,7 +63,7 @@
               </div>
               <div class="flex-wrap">
                 <el-form-item class="flex1 r40" label="数据源名称">
-                  <el-select size="small" v-model="form.datasource_id" placeholder="请选择数据源">
+                  <el-select size="small" v-model="form.datasource_id" clearable placeholder="请选择数据源">
                     <el-option v-for="(item,index) in dataSourceArrs" :key="index" :label="item.dataSourceName" :value="item.dataSourceID"></el-option>
                   </el-select>
                 </el-form-item>

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)
     }
   }
 }