zhaoke hai 11 meses
pai
achega
8a2e61c602
Modificáronse 77 ficheiros con 959 adicións e 3329 borrados
  1. 13 34
      src/components/SearchWithTooltip/index.vue
  2. 32 71
      src/components/SimpleTable/index.vue
  3. 6 6
      src/components/Table/index.vue
  4. 5 5
      src/components/TableAirport/index.vue
  5. 3 3
      src/components/TableHeaderCell/index.vue
  6. 1 1
      src/components/YearRangePicker/index.vue
  7. 2 2
      src/components/generateEcharts/components/echart/statisticsHeader.vue
  8. 5 14
      src/layout/components/AppMain.vue
  9. 6 20
      src/layout/components/Dialog/index.vue
  10. 4 4
      src/layout/components/Navbar.vue
  11. 10 16
      src/layout/components/OrgTree/index.vue
  12. 5 5
      src/layout/components/Search/index.vue
  13. 7 233
      src/layout/components/Sidebar/SidebarItem.vue
  14. 4 133
      src/layout/components/Sidebar/index.vue
  15. 1 1
      src/layout/components/ToolBar/index.vue
  16. 0 358
      src/styles/index.css
  17. 0 0
      src/styles/index.min.css
  18. 61 17
      src/styles/index.scss
  19. 10 27
      src/styles/sidebar.scss
  20. 5 5
      src/styles/variables.scss
  21. 2 2
      src/views/BasicsData/views/airlineCompany/airlineCompanyInfo.vue
  22. 5 5
      src/views/BasicsData/views/airport/airportInfo.vue
  23. 4 17
      src/views/BasicsData/views/airport/airportInfoChild.vue
  24. 4 17
      src/views/BasicsData/views/deployNode/deployNodeChild.vue
  25. 2 2
      src/views/advancedQuery/views/advancedHome.vue
  26. 2 2
      src/views/baggageManagement copy/components/arrival/index.vue
  27. 3 3
      src/views/baggageManagement copy/components/baggage/index.vue
  28. 40 136
      src/views/baggageManagement copy/components/container/index.vue
  29. 29 83
      src/views/baggageManagement copy/components/containerHistory/index.vue
  30. 2 2
      src/views/baggageManagement copy/components/departure/index.vue
  31. 3 3
      src/views/baggageManagement copy/components/departureC/index.vue
  32. 2 2
      src/views/baggageManagement copy/components/flight/index.vue
  33. 2 2
      src/views/baggageManagement copy/components/transferArrival/index.vue
  34. 2 2
      src/views/baggageManagement copy/components/transferDeparture/index.vue
  35. 2 2
      src/views/baggageManagementTemp/components/arrival/index.vue
  36. 4 4
      src/views/baggageManagementTemp/components/baggage/index.vue
  37. 40 136
      src/views/baggageManagementTemp/components/container/index.vue
  38. 29 83
      src/views/baggageManagementTemp/components/containerHistory/index.vue
  39. 2 2
      src/views/baggageManagementTemp/components/departure/index.vue
  40. 3 3
      src/views/baggageManagementTemp/components/departureC/index.vue
  41. 3 3
      src/views/baggageManagementTemp/components/flight/index.vue
  42. 63 241
      src/views/baggageManagementTemp/components/transferArrival/index.vue
  43. 2 2
      src/views/baggageManagementTemp/components/transferDeparture/index.vue
  44. 2 2
      src/views/dashboards/components/echart/statisticsHeader.vue
  45. 1 1
      src/views/dataIntegration/views/graphChart.vue
  46. 28 120
      src/views/dataIntegration/views/interfaceEdit.vue
  47. 1 1
      src/views/dataIntegration/views/interfaceLog.vue
  48. 8 8
      src/views/exchange/views/omMonitoring/css/index.scss
  49. 2 2
      src/views/flightViewManagement/components/arrival/index.vue
  50. 3 3
      src/views/flightViewManagement/components/baggage/index.vue
  51. 40 136
      src/views/flightViewManagement/components/container/index.vue
  52. 29 83
      src/views/flightViewManagement/components/containerHistory/index.vue
  53. 2 2
      src/views/flightViewManagement/components/departure/index.vue
  54. 2 2
      src/views/flightViewManagement/components/flight/index.vue
  55. 1 1
      src/views/login/index copy.vue
  56. 1 1
      src/views/login/index.vue
  57. 2 2
      src/views/monitoringlarge/components/echart/statisticsHeader.vue
  58. 1 1
      src/views/newArrival/index.vue
  59. 2 2
      src/views/newBagDetails/components/baggageView.vue
  60. 2 2
      src/views/newBagDetails/index.vue
  61. 1 1
      src/views/newDeparture/index.vue
  62. 6 6
      src/views/newQuery/components/search.vue
  63. 1 1
      src/views/newQuery/components/table.vue
  64. 4 4
      src/views/newQuery/index.vue
  65. 4 4
      src/views/newRole/css/index.scss
  66. 10 10
      src/views/newTable/index.vue
  67. 1 1
      src/views/newTransfer/index.vue
  68. 57 125
      src/views/statisticalAnalysis/components/index.vue
  69. 1 1
      src/views/statisticsCharts/components/TableDialog.vue
  70. 44 125
      src/views/statisticsCharts/components/statisticsHeader.vue
  71. 21 55
      src/views/statisticsCharts/components/statisticsTabs.vue
  72. 193 782
      src/views/statisticsCharts/components/tableformbrs.vue
  73. 11 11
      src/views/systemSettings/views/newMachine/components/table.vue
  74. 3 3
      src/views/systemSettings/views/newMachine/css/index.scss
  75. 3 3
      src/views/systemSettings/views/newService/css/index.scss
  76. 2 2
      src/views/table/css/index.scss
  77. 40 117
      src/views/upload/index.vue

+ 13 - 34
src/components/SearchWithTooltip/index.vue

@@ -1,39 +1,18 @@
 <template>
   <div class="pub-search">
     <div class="flex">
-      <div
-        v-if="title"
-        class="title"
-      >
+      <div v-if="title" class="title">
         {{ title }}
       </div>
       <div class="content flex-wrap">
-        <div
-          class="search"
-          @keyup.enter="checkSearch"
-        >
-          <el-popover
-            :value="popoverVisible"
-            placement="bottom"
-            trigger="manual"
-          >
+        <div class="search" @keyup.enter="checkSearch">
+          <el-popover :value="popoverVisible" placement="bottom" trigger="manual">
             <span>{{ searchTooltip }}</span>
-            <el-input
-              slot="reference"
-              v-model="input"
-              :placeholder="placeholder"
-              prefix-icon="el-icon-search"
-              clearable
-              @focus="inputFocusOn = true"
-              @blur="inputFocusOn = false"
-            />
+            <el-input slot="reference" v-model="input" :placeholder="placeholder" prefix-icon="el-icon-search" clearable @focus="inputFocusOn = true" @blur="inputFocusOn = false" />
           </el-popover>
         </div>
         <div class="btn">
-          <button
-            class="btnAn"
-            @click="checkSearch"
-          >
+          <button class="btnAn" @click="checkSearch">
             搜索
           </button>
         </div>
@@ -62,29 +41,29 @@ export default {
       default: ''
     }
   },
-  data() {
+  data () {
     return {
       input: '',
       inputFocusOn: false
     }
   },
   computed: {
-    popoverVisible() {
+    popoverVisible () {
       return this.searchTooltip && this.inputFocusOn
     }
   },
   watch: {
-    input(val) {
+    input (val) {
       if (val === '') {
         this.$emit('clearSearchData', val)
       }
     }
   },
   methods: {
-    checkSearch() {
+    checkSearch () {
       this.$emit('getSearchData', this.input)
     },
-    setSearch(val) {
+    setSearch (val) {
       this.input = val
     }
   }
@@ -129,13 +108,13 @@ export default {
     padding-left: 16px;
     &::after {
       position: absolute;
-      content: '';
+      content: "";
       width: 4px;
       height: 20px;
       top: 50%;
       margin-top: -9px;
       left: 0;
-      background: #2d67e3;
+      background: #2f3480;
     }
   }
   ::v-deep .el-input__icon {
@@ -159,7 +138,7 @@ export default {
     padding: 0 18px;
     height: 32px;
     line-height: 32px;
-    background: #2d67e3;
+    background: #2f3480;
     box-shadow: 0px 3px 4px 0px rgba(0, 0, 0, 0.18);
     border-radius: 4px;
     outline: none;

+ 32 - 71
src/components/SimpleTable/index.vue

@@ -1,49 +1,10 @@
 <template>
-  <div
-    v-loading="loading"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    class="table-wrapper"
-  >
-    <el-table
-      ref="table"
-      v-el-table-infinite-scroll="load"
-      :data="dealedTableData"
-      :header-cell-class-name="headerCellClass"
-      :row-class-name="rowClass"
-      :cell-class-name="cellClass"
-      :span-method="tableSpanMethod"
-      :show-summary="showSummary"
-      :summary-method="tableSummaryMethod"
-      :height="height"
-      stripe
-      fit
-      border
-      @cell-click="cellClickHandler"
-    >
-      <el-table-column
-        v-for="col in filteredTableCols"
-        :key="col.columnName"
-        :prop="col.columnName"
-        :label="col.columnLabel"
-        :width="col.width"
-        :show-overflow-tooltip="showOverflowTooltip"
-        :formatter="tableFormatter"
-      >
+  <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="table-wrapper">
+    <el-table ref="table" v-el-table-infinite-scroll="load" :data="dealedTableData" :header-cell-class-name="headerCellClass" :row-class-name="rowClass" :cell-class-name="cellClass" :span-method="tableSpanMethod" :show-summary="showSummary" :summary-method="tableSummaryMethod" :height="height" stripe fit border @cell-click="cellClickHandler">
+      <el-table-column v-for="col in filteredTableCols" :key="col.columnName" :prop="col.columnName" :label="col.columnLabel" :width="col.width" :show-overflow-tooltip="showOverflowTooltip" :formatter="tableFormatter">
         <template #header>
-          <el-tooltip
-            :content="col.columnDescribe || col.columnLabel"
-            placement="top"
-          >
-            <TableHeaderCell
-              :label="col.columnLabel"
-              :filter-options="tableDataFilters[col.columnName]"
-              :filter-values.sync="filterValues[col.columnName]"
-              filter-style="arrow"
-              :sortable="!!col.needSort"
-              :sort-rule.sync="tableDataSortRules[col.columnName]"
-            />
+          <el-tooltip :content="col.columnDescribe || col.columnLabel" placement="top">
+            <TableHeaderCell :label="col.columnLabel" :filter-options="tableDataFilters[col.columnName]" :filter-values.sync="filterValues[col.columnName]" filter-style="arrow" :sortable="!!col.needSort" :sort-rule.sync="tableDataSortRules[col.columnName]" />
           </el-tooltip>
         </template>
       </el-table-column>
@@ -105,7 +66,7 @@ export default {
       type: Function
     }
   },
-  data() {
+  data () {
     return {
       tableData: [],
       tableDataFilters: {}, // 表头-下拉数据
@@ -117,10 +78,10 @@ export default {
   },
   computed: {
     ...mapGetters(['clickedCells']),
-    filteredTableCols() {
+    filteredTableCols () {
       return this.tableCols.filter(col => col.needShow)
     },
-    dealedTableData() {
+    dealedTableData () {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
@@ -146,25 +107,25 @@ export default {
   },
   watch: {
     data: {
-      handler(arr) {
+      handler (arr) {
         this.tableData = arr
       },
       deep: true
     },
     tableData: {
-      handler() {
+      handler () {
         this.setTableFilters()
       },
       deep: true
     },
     tableCols: {
-      handler() {
+      handler () {
         this.setTableFilters()
       },
       deep: true
     },
     dealedTableData: {
-      handler(arr) {
+      handler (arr) {
         const spanArr = []
         let pos = 0
         arr.forEach((item, index, arr) => {
@@ -185,7 +146,7 @@ export default {
       deep: true
     },
     headerCellClassName: {
-      handler(func) {
+      handler (func) {
         if (func) {
           this.headerCellClass = func().bind(this)
         }
@@ -194,7 +155,7 @@ export default {
       immediate: true
     },
     rowClassName: {
-      handler(func) {
+      handler (func) {
         if (func) {
           this.rowClass = func().bind(this)
         }
@@ -203,7 +164,7 @@ export default {
       immediate: true
     },
     cellClassName: {
-      handler(func) {
+      handler (func) {
         if (func) {
           this.cellClass = func().bind(this)
         }
@@ -212,7 +173,7 @@ export default {
       immediate: true
     },
     spanMethod: {
-      handler(func) {
+      handler (func) {
         if (func) {
           this.tableSpanMethod = func().bind(this)
         }
@@ -221,7 +182,7 @@ export default {
       immediate: true
     },
     summaryMethod: {
-      handler(func) {
+      handler (func) {
         if (func) {
           this.tableSummaryMethod = func().bind(this)
         }
@@ -230,7 +191,7 @@ export default {
       immediate: true
     },
     formatter: {
-      handler(func) {
+      handler (func) {
         if (func) {
           this.tableFormatter = func().bind(this)
         }
@@ -239,17 +200,17 @@ export default {
       immediate: true
     }
   },
-  mounted() {
+  mounted () {
     this.$emit('mounted', 'table', this.$refs['table'])
   },
-  updated() {
+  updated () {
     this.$refs['table']?.doLayout()
   },
   methods: {
-    load() {
+    load () {
       this.$emit('load')
     },
-    headerCellClass({ row, column, rowIndex, columnIndex }) {
+    headerCellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -257,13 +218,13 @@ export default {
       }
       return classes.join(' ')
     },
-    rowClass() {
+    rowClass () {
       return ''
     },
-    cellClass() {
+    cellClass () {
       return ''
     },
-    tableSpanMethod({ row, column, rowIndex, columnIndex }) {
+    tableSpanMethod ({ row, column, rowIndex, columnIndex }) {
       if (this.tableGroups.includes(column.property)) {
         const _row = this.spanArr[rowIndex]
         const _col = _row > 0 ? 1 : 0
@@ -273,7 +234,7 @@ export default {
         }
       }
     },
-    tableSummaryMethod(param) {
+    tableSummaryMethod (param) {
       const { columns, data } = param
       const sums = []
       columns.forEach((column, index) => {
@@ -296,13 +257,13 @@ export default {
       })
       return sums
     },
-    cellClickHandler(...params) {
+    cellClickHandler (...params) {
       this.$emit('cell-click', ...params)
     },
-    tableFormatter(row, column, cellValue) {
+    tableFormatter (row, column, cellValue) {
       return cellValue
     },
-    setTableFilters() {
+    setTableFilters () {
       this.tableDataFilters = {}
       this.filteredTableCols.forEach(col => {
         if (col.needFilters) {
@@ -328,12 +289,12 @@ 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 {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }
@@ -355,6 +316,6 @@ export default {
   color: #909399;
   text-align: center;
   font-size: 20px;
-  font-family: Helvetica, 'Microsoft YaHei';
+  font-family: Helvetica, "Microsoft YaHei";
 }
 </style>

+ 6 - 6
src/components/Table/index.vue

@@ -694,7 +694,7 @@ export default {
     handlePreview (row) {
       this.$emit("preview", row);
     },
-    formatter(row, column, cellValue, index) {
+    formatter (row, column, cellValue, index) {
       const sameColumn = this.tableCols.find(col => col.columnName === column.property)
       if (sameColumn && this.fromDataType(sameColumn.dataType) === 'datetime') {
         return (cellValue ?? '').replace('T', ' ')
@@ -724,7 +724,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }
@@ -776,7 +776,7 @@ export default {
       justify-content: center;
       float: left;
       span {
-        color: #2d67e3;
+        color: #2f3480;
       }
     }
     .rmScser {
@@ -790,7 +790,7 @@ export default {
       justify-content: center;
       float: left;
       span {
-        color: #2d67e3;
+        color: #2f3480;
       }
     }
     .rmSc {
@@ -825,7 +825,7 @@ export default {
       .icon {
         width: 14px;
         height: 14px;
-        background: #2d67e3;
+        background: #2f3480;
         border-radius: 2px;
         display: inline-block;
         vertical-align: middle;
@@ -880,7 +880,7 @@ export default {
     transform: rotate(-180deg);
   }
   &.arrow-blue {
-    color: #2d7cff;
+    color: #2f3480;
     font-weight: bold;
   }
 }

+ 5 - 5
src/components/TableAirport/index.vue

@@ -828,7 +828,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }
@@ -880,7 +880,7 @@ export default {
       justify-content: center;
       float: left;
       span {
-        color: #2d67e3;
+        color: #2f3480;
       }
     }
     .rmScser {
@@ -894,7 +894,7 @@ export default {
       justify-content: center;
       float: left;
       span {
-        color: #2d67e3;
+        color: #2f3480;
       }
     }
     .rmSc {
@@ -929,7 +929,7 @@ export default {
       .icon {
         width: 14px;
         height: 14px;
-        background: #2d67e3;
+        background: #2f3480;
         border-radius: 2px;
         display: inline-block;
         vertical-align: middle;
@@ -983,7 +983,7 @@ export default {
     transform: rotate(-180deg);
   }
   &.arrow-blue {
-    color: #2d7cff;
+    color: #2f3480;
     font-weight: bold;
   }
 }

+ 3 - 3
src/components/TableHeaderCell/index.vue

@@ -99,7 +99,7 @@ export default {
     transform: rotate(-180deg);
   }
   &.arrow-active {
-    color: #2d7cff;
+    color: #2f3480;
     font-weight: bold;
   }
 }
@@ -107,7 +107,7 @@ export default {
   cursor: pointer;
   position: relative;
   &:hover {
-    color: #2d7cff;
+    color: #2f3480;
   }
   &::after {
     content: "";
@@ -121,7 +121,7 @@ export default {
   &.btn-filter-active,
   &:hover {
     &::after {
-      border-bottom: 2px solid #2d7cff;
+      border-bottom: 2px solid #2f3480;
     }
   }
 }

+ 1 - 1
src/components/YearRangePicker/index.vue

@@ -150,7 +150,7 @@ export default {
     border-color: #c0c4cc;
   }
   &.is-focus {
-    border-color: #409eff;
+    border-color: #2f3480;
   }
   .range-separator {
     width: 30px;

+ 2 - 2
src/components/generateEcharts/components/echart/statisticsHeader.vue

@@ -558,7 +558,7 @@ export default {
               border-color: #c0c4cc;
             }
             &:focus {
-              border-color: #409eff;
+              border-color: #2f3480;
             }
           }
         }
@@ -575,7 +575,7 @@ export default {
             border-color: #c0c4cc;
           }
           &.is-active {
-            border-color: #409eff;
+            border-color: #2f3480;
           }
           .el-input__icon {
             color: #303133;

+ 5 - 14
src/layout/components/AppMain.vue

@@ -9,20 +9,11 @@
 <template>
   <section class="app-main">
     <div class="app-main-content">
-      <transition
-        name="fade-transform"
-        mode="out-in"
-      >
-        <keep-alive
-          v-if="$route.meta && $route.meta.keepAlive"
-          :max="6"
-        >
+      <transition name="fade-transform" mode="out-in">
+        <keep-alive v-if="$route.meta && $route.meta.keepAlive" :max="6">
           <router-view :key="key" />
         </keep-alive>
-        <router-view
-          v-else
-          :key="key"
-        />
+        <router-view v-else :key="key" />
       </transition>
     </div>
   </section>
@@ -32,7 +23,7 @@
 export default {
   name: 'AppMain',
   computed: {
-    key() {
+    key () {
       return Object.keys(this.$route.query).reduce((string, currentKey, index) => {
         if (currentKey !== 'fastFilter') {
           string += `${index ? '&' : '?'}${currentKey}=${this.$route.query[currentKey]}`
@@ -51,7 +42,7 @@ export default {
   width: 100%;
   position: relative;
   overflow: hidden;
-  padding-left: 150px;
+  padding-left: 210px;
   padding-top: 80px;
   /* margin-top: 112px; */
 }

+ 6 - 20
src/layout/components/Dialog/index.vue

@@ -8,24 +8,10 @@
 -->
 <template>
   <div class="dialog">
-    <el-dialog
-      :visible.sync="flag"
-      :append-to-body="isBody"
-      ref="dialogTk"
-      :top="top"
-      :custom-class="customClass"
-      :lock-scroll="false"
-      :modal="modal"
-      :before-close="close"
-      :width="width"
-      :show-close="showFlag"
-    >
-      <div
-        :style="{
+    <el-dialog :visible.sync="flag" :append-to-body="isBody" ref="dialogTk" :top="top" :custom-class="customClass" :lock-scroll="false" :modal="modal" :before-close="close" :width="width" :show-close="showFlag">
+      <div :style="{
           height: child ? this.$store.state.settings.dialogHeight - 96 + 'px' : '',
-        }"
-        class="dialog-content"
-      >
+        }" class="dialog-content">
         <slot />
       </div>
     </el-dialog>
@@ -78,7 +64,7 @@ export default {
   // 监听弹框开关
   watch: {
     flag: {
-      handler(val) {
+      handler (val) {
         if (val) {
           this.$nextTick(() => {
             // 获取弹框高度
@@ -97,7 +83,7 @@ export default {
   },
   methods: {
     // 弹框关闭
-    close() {
+    close () {
       this.$emit("closeDialog", false);
     },
   },
@@ -124,7 +110,7 @@ export default {
       font-family: Microsoft YaHei;
       font-weight: bold;
       height: 36px;
-      background: #2d67e3;
+      background: #2f3480;
       color: #ffffff;
       margin-bottom: 24px;
       width: 100%;

+ 4 - 4
src/layout/components/Navbar.vue

@@ -172,7 +172,7 @@ export default {
   > .navbar_top {
     width: 100%;
     height: 48px;
-    background: #2d67e3;
+    background: #2f3480;
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -291,7 +291,7 @@ export default {
         transition: all 0.3s;
         &:hover {
           background: #fff;
-          color: #2d67e3;
+          color: #2f3480;
         }
       }
       .user {
@@ -438,7 +438,7 @@ export default {
     background: #ffffff;
     justify-content: space-between;
     align-items: center;
-    padding-left: 130px;
+    padding-left: 210px;
     padding-right: 24px;
     ::v-deep .el-breadcrumb {
       font-size: 18px;
@@ -462,7 +462,7 @@ export default {
         margin-left: -18px;
         margin-right: 10px;
         font-size: 14px;
-        color: #2d67e3;
+        color: #2f3480;
         cursor: pointer;
       }
     }

+ 10 - 16
src/layout/components/OrgTree/index.vue

@@ -9,13 +9,7 @@
 <template>
   <div class="orgTree">
     <div class="orgTreeContent">
-      <vue2-org-tree
-        :data="dataList"
-        :horizontal="true"
-        collapsable
-        @on-expand="onExpand"
-        :render-content="renderContent"
-      />
+      <vue2-org-tree :data="dataList" :horizontal="true" collapsable @on-expand="onExpand" :render-content="renderContent" />
     </div>
   </div>
 </template>
@@ -26,18 +20,18 @@ export default {
   props: {
     dataList: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
     renderContent: {
       type: Function,
     },
   },
-  mounted() {
+  mounted () {
     this.toggleExpand(this.dataList, true);
   },
   watch: {
     dataList: {
-      handler(val, old) {
+      handler (val, old) {
         if (val != old) {
           this.toggleExpand(val, true);
         }
@@ -46,7 +40,7 @@ export default {
     },
   },
   methods: {
-    collapse(list) {
+    collapse (list) {
       const _this = this;
       list.forEach(function (child) {
         if (child.expand) {
@@ -56,7 +50,7 @@ export default {
       });
     },
     //展开
-    onExpand(e, data) {
+    onExpand (e, data) {
       const _this = this;
       if ("expand" in data) {
         data.expand = !data.expand;
@@ -71,14 +65,14 @@ export default {
       }
     },
     //节点关闭按钮点击
-    onNodeClick(e, data) {
+    onNodeClick (e, data) {
       const _this = this;
       if (e.target.className === "icon el-icon-close") {
         this.decompose(_this.dataList.children, data.id);
       }
     },
     //删除指定数据
-    decompose(data, id) {
+    decompose (data, id) {
       for (let i = 0; i < data.length; i++) {
         if (data[i].id === id) {
           data.splice(i, 1);
@@ -88,7 +82,7 @@ export default {
       }
     },
     //是否完全展开
-    toggleExpand(data, val) {
+    toggleExpand (data, val) {
       const _this = this;
       if (Array.isArray(data)) {
         data.forEach(function (item) {
@@ -295,7 +289,7 @@ export default {
     .org-tree-node-btn {
       width: 24px;
       height: 24px;
-      background-color: #2d67e3;
+      background-color: #2f3480;
       box-shadow: none;
       border: none;
     }

+ 5 - 5
src/layout/components/Search/index.vue

@@ -156,7 +156,7 @@ export default {
       top: 50%;
       margin-top: -9px;
       left: 0;
-      background: #2d67e3;
+      background: #2f3480;
     }
   }
   ::v-deep .el-input__icon {
@@ -205,7 +205,7 @@ export default {
     padding: 0 18px;
     height: 32px;
     line-height: 32px;
-    background: #2d67e3;
+    background: #2f3480;
     box-shadow: 0px 3px 4px 0px rgba(0, 0, 0, 0.18);
     border-radius: 4px;
     outline: none;
@@ -227,14 +227,14 @@ export default {
     font-size: 14px;
     font-family: Microsoft YaHei;
     font-weight: bold;
-    color: #2d67e3;
+    color: #2f3480;
     cursor: pointer;
   }
   .childBtnAn {
     padding: 0 18px;
     height: 32px;
     line-height: 32px;
-    background: #2d67e3;
+    background: #2f3480;
     box-shadow: 0px 3px 4px 0px rgba(0, 0, 0, 0.18);
     border-radius: 4px;
     outline: none;
@@ -256,7 +256,7 @@ export default {
     font-size: 14px;
     font-family: Microsoft YaHei;
     font-weight: 400;
-    color: #2d67e3;
+    color: #2f3480;
     cursor: pointer;
   }
 

+ 7 - 233
src/layout/components/Sidebar/SidebarItem.vue

@@ -2,7 +2,7 @@
   <div v-if="!item.hidden">
     <template v-if="hasOneShowingChild(item.children, item)">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">
+        <el-menu-item :index="resolvePath(onlyOneChild.path)" style="color: #333;" :class="{ 'submenu-title-noDropdown': !isNest }">
           <item :icon="onlyOneChild.meta.elSvgIcon||(item.meta&&item.meta.elSvgIcon)" :title="item.meta.title" />
         </el-menu-item>
       </app-link>
@@ -107,21 +107,20 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .el-menu-item.is-active {
-  //设置背景颜色
-  background-color: #2d67e3 !important;
-  //设置字体颜色
+.el-menu-item:hover {
+  background-color: #2f3480;
   color: #ffffff !important;
 }
+
 .router-link-active > li {
   //设置背景颜色
-  background-color: #2d67e3 !important;
+  background-color: #2f3480 !important;
   //设置字体颜色
   color: #ffffff !important;
 }
 // ::v-deep .el-menu-item.is-active:hover {
 //   //设置背景颜色
-//   background-color: #2d67e3 !important;
+//   background-color: #2f3480 !important;
 //   //设置字体颜色
 //   color: #ffffff !important;
 // }
@@ -129,78 +128,7 @@ export default {
 // // ::v-deep .el-submenu__title:hover {
 // //   background: red !important;
 // // }
-::v-deep .el-menu-item:hover {
-  // background: #2d67e3 !important;
-  color: #fff !important;
-  .account {
-    background: url("../../../assets/nav/ic_list_nav_account_check.png");
-  }
-  .accountgroup {
-    background: url("../../../assets/nav/ic_list_nav_group_check.png");
-  }
-  .role {
-    background: url("../../../assets/nav/ic_list_nav_character_check.png");
-  }
-  .authority {
-    background: url("../../../assets/nav/ic_list_nav_permissions_check.png");
-  }
-  .transfer {
-    background: url("../../../assets/nav/ic_list_nav_transit_check.png");
-  }
-  .arrival {
-    background: url("../../../assets/nav/ic_list_nav_arrive_check.png");
-  }
-  .departure {
-    background: url("../../../assets/nav/ic_list_nav_leave_check.png");
-  }
-  .dataCollection {
-    background: url("../../../assets/nav/ic_data_collection_check.png");
-  }
-  .dataParser {
-    background: url("../../../assets/nav/ic_data_governance_check .png");
-  }
-  .dataStore {
-    background: url("../../../assets/nav/ic_data_save_check.png") no-repeat;
-  }
-  .dashboard {
-    background: url("../../../assets/nav/ic_setting_nav_check.png") no-repeat;
-  }
-  .advance {
-    background: url("../../../assets/nav/ic_list_nav_search_check.png");
-  }
-  .integration {
-    background: url("../../../assets/nav/ic_data_governance_check .png");
-  }
-  .protocol {
-    background: url("../../../assets/nav/ic_list_nav_agreement_check.png");
-  }
-
-  .deployNode {
-    background: url("../../../assets/nav/ic_list_nav_node_check.png");
-  }
-
-  .sourceDataItem {
-    background: url("../../../assets/nav/ic_list_nav_source_check.png");
-  }
 
-  .BasicsData {
-    background: url("../../../assets/nav/ic_data_collection_check.png")
-      no-repeat;
-  }
-
-  .systemSettings {
-    background: url("../../../assets/nav/ic_setting_nav_check.png") no-repeat;
-  }
-
-  .statisticsCharts {
-    background: url("../../../assets/nav/ic_list_nav_statistical_check.png")
-      no-repeat;
-  }
-  .statisticalAnalysis {
-    background: url("../../../assets/nav/ic_list_nav_screen_check.png")
-      no-repeat;
-  }
-}
 // ::v-deep .el-menu-item {
 //   transition: border-color 0.3s, background-color 0s, color 0s;
 // }
@@ -208,7 +136,7 @@ export default {
 //   background-color: #6db6ff !important;
 // }
 // .pathNamecosy:hover {
-//   background-image: #2d67e3 !important;
+//   background-image: #2f3480 !important;
 // }
 .nav_item {
   width: 36px;
@@ -253,160 +181,6 @@ export default {
 .pathNameercosy {
   display: none;
 }
-.account {
-  background: url("../../../assets/nav/ic_list_nav_account_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_account_check.png")
-      no-repeat;
-  }
-}
-.accountgroup {
-  background: url("../../../assets/nav/ic_list_nav_group_default.png") no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_group_check.png") no-repeat;
-  }
-}
-.role {
-  background: url("../../../assets/nav/ic_list_nav_character_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_character_check.png")
-      no-repeat;
-  }
-}
-.authority {
-  background: url("../../../assets/nav/ic_list_nav_permissions_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_permissions_check.png")
-      no-repeat;
-  }
-}
-.transfer {
-  background: url("../../../assets/nav/ic_list_nav_transit_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_transit_check.png")
-      no-repeat;
-  }
-}
-.arrival {
-  background: url("../../../assets/nav/ic_list_nav_arrive_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_arrive_check.png")
-      no-repeat;
-  }
-}
-.departure {
-  background: url("../../../assets/nav/ic_list_nav_leave_default.png") no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_leave_check.png") no-repeat;
-  }
-}
-.dataCollection {
-  background: url("../../../assets/nav/ic_data_collection_default .png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_data_collection_check.png")
-      no-repeat;
-  }
-}
-.dataParser {
-  background: url("../../../assets/nav/ic_data_governance_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_data_governance_check .png")
-      no-repeat;
-  }
-}
-.dataStore {
-  background: url("../../../assets/nav/ic_data_save_default .png") no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_data_save_check.png") no-repeat;
-  }
-}
-.dashboard {
-  background: url("../../../assets/nav/ic_setting_nav_default.png") no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_setting_nav_check.png") no-repeat;
-  }
-}
-.advance {
-  background: url("../../../assets/nav/ic_list_nav_search_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_search_check.png")
-      no-repeat;
-  }
-}
-.integration {
-  background: url("../../../assets/nav/ic_data_governance_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_data_governance_check .png")
-      no-repeat;
-  }
-}
-.protocol {
-  background: url("../../../assets/nav/ic_list_nav_agreement_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_agreement_check.png")
-      no-repeat;
-  }
-}
-
-.deployNode {
-  background: url("../../../assets/nav/ic_list_nav_node_default.png") no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_node_check.png") no-repeat;
-  }
-}
-
-.sourceDataItem {
-  background: url("../../../assets/nav/ic_list_nav_source_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_source_check.png")
-      no-repeat;
-  }
-}
-
-.BasicsData {
-  background: url("../../../assets/nav/ic_data_collection_default .png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_data_collection_check.png")
-      no-repeat;
-  }
-}
-
-.systemSettings {
-  background: url("../../../assets/nav/ic_setting_nav_default.png") no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_setting_nav_check.png") no-repeat;
-  }
-}
-
-.statisticsCharts {
-  background: url("../../../assets/nav/ic_list_nav_statistical_default .png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_statistical_check.png")
-      no-repeat;
-  }
-}
-
-.statisticalAnalysis {
-  background: url("../../../assets/nav/ic_list_nav_screen_default.png")
-    no-repeat;
-  &:hover {
-    background: url("../../../assets/nav/ic_list_nav_screen_check.png")
-      no-repeat;
-  }
-}
 
 // .el-tooltip__popper.is-dark{
 //   background: #255395;

+ 4 - 133
src/layout/components/Sidebar/index.vue

@@ -2,7 +2,7 @@
   <div :class="{ 'has-logo': showLogo }">
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-menu class="navMenu" :default-active="activeMenu" :background-color="variables.menusBg" :text-color="variables.menuText" :unique-opened="false" :active-text-color="variables.menuActiveText" :collapse-transition="false" mode="vertical">
+      <el-menu class="navMenu" :default-active="activeMenu" :background-color="variables.menusBg" :text-color="variables.menuText" :unique-opened="false" :collapse-transition="false" mode="vertical">
         <sidebar-item v-for="(route, index) in permission_routes" :key="index" :item="route" :base-path="route.path" :leup="leup" />
       </el-menu>
     </el-scrollbar>
@@ -71,137 +71,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.rloop {
-  width: 8px;
-  height: 100%;
-  position: absolute;
-  // background: #2d67e3;
-  z-index: 999;
-  right: 0;
-  top: 0;
-  > .log_open {
-    width: 8px;
-    height: 144px;
-    background: #385086;
-    border-radius: 0px 8px 8px 0px;
-    position: absolute;
-    top: 42%;
-    right: -8px;
-    display: flex;
-    align-items: center;
-    > .arrows {
-      width: 6px;
-      height: 6px;
-      background: url("../../../assets/logo/ic_arrow_left.png") no-repeat;
-    }
-    > .arrow {
-      width: 6px;
-      height: 6px;
-      background: url("../../../assets/logo/ic_arrow_right.png") no-repeat;
-    }
-    // border-top-right-radius: 12px;
-    // border-bottom-right-radius: 12px;
-  }
-  // > .log_open:hover {
-  //   background: #2d67e3;
-  //   > .rloop {
-  //     background: #2d67e3;
-  //   }
-  // }
-  &:hover {
-    background: #2d67e3;
-    > .log_open {
-      background: #2d67e3;
-    }
-  }
-  > img {
-    width: 20px;
-    height: 20px;
-    position: absolute;
-    top: 45%;
-    right: -10px;
-  }
-}
-::v-deep .navMenu {
-  .router-link-active {
-    .account {
-      background: url("../../../assets/nav/ic_list_nav_account_check.png")
-        no-repeat;
-    }
-    .accountgroup {
-      background: url("../../../assets/nav/ic_list_nav_group_check.png")
-        no-repeat;
-    }
-    .role {
-      background: url("../../../assets/nav/ic_list_nav_character_check.png")
-        no-repeat;
-    }
-    .authority {
-      background: url("../../../assets/nav/ic_list_nav_permissions_check.png")
-        no-repeat;
-    }
-    .transfer {
-      background: url("../../../assets/nav/ic_list_nav_transit_check.png")
-        no-repeat;
-    }
-    .arrival {
-      background: url("../../../assets/nav/ic_list_nav_arrive_check.png")
-        no-repeat;
-    }
-    .departure {
-      background: url("../../../assets/nav/ic_list_nav_leave_check.png")
-        no-repeat;
-    }
-    .dataCollection {
-      background: url("../../../assets/nav/ic_data_collection_check.png")
-        no-repeat;
-    }
-    .dataParser {
-      background: url("../../../assets/nav/ic_data_governance_check .png")
-        no-repeat;
-    }
-    .dataStore {
-      background: url("../../../assets/nav/ic_data_save_check.png") no-repeat;
-    }
-    .dashboard {
-      background: url("../../../assets/nav/ic_setting_nav_check.png") no-repeat;
-    }
-    .advance {
-      background: url("../../../assets/nav/ic_list_nav_search_check.png")
-        no-repeat;
-    }
-    .integration {
-      background: url("../../../assets/nav/ic_data_governance_check .png")
-        no-repeat;
-    }
-    .protocol {
-      background: url("../../../assets/nav/ic_list_nav_agreement_check.png")
-        no-repeat;
-    }
-    .deployNode {
-      background: url("../../../assets/nav/ic_list_nav_node_check.png")
-        no-repeat;
-    }
-    .sourceDataItem {
-      background: url("../../../assets/nav/ic_list_nav_source_check.png")
-        no-repeat;
-    }
-    .BasicsData {
-      background: url("../../../assets/nav/ic_data_collection_check.png")
-        no-repeat;
-    }
-
-    .systemSettings {
-      background: url("../../../assets/nav/ic_setting_nav_check.png") no-repeat;
-    }
-    .statisticsCharts {
-      background: url("../../../assets/nav/ic_list_nav_statistical_check.png")
-        no-repeat;
-    }
-    .statisticalAnalysis {
-      background: url("../../../assets/nav/ic_list_nav_screen_check.png")
-        no-repeat;
-    }
-  }
+::v-deep .el-submenu__title:hover {
+  background-color: #2f3480;
+  color: #fff !important;
 }
 </style>

+ 1 - 1
src/layout/components/ToolBar/index.vue

@@ -128,7 +128,7 @@ export default {
     }
   }
   .toolbar-active {
-    background: #2d67e3;
+    background: #2f3480;
     .toolbar-list-name {
       color: #ffffff;
     }

+ 0 - 358
src/styles/index.css

@@ -1,358 +0,0 @@
-:export {
-  menuText: #bfcbd9;
-  menuActiveText: #409EFF;
-  subMenuActiveText: #f4f4f5;
-  menuBg: #ffffff;
-  menuHover: #263445;
-  subMenuBg: #1f2d3d;
-  subMenuHover: #001528;
-  sideBarWidth: 210px;
-}
-
-/* fade */
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.28s;
-}
-
-.fade-enter,
-.fade-leave-active {
-  opacity: 0;
-}
-
-/* fade-transform */
-.fade-transform-leave-active,
-.fade-transform-enter-active {
-  transition: all .5s;
-}
-
-.fade-transform-enter {
-  opacity: 0;
-  transform: translateX(-30px);
-}
-
-.fade-transform-leave-to {
-  opacity: 0;
-  transform: translateX(30px);
-}
-
-/* breadcrumb transition */
-.breadcrumb-enter-active,
-.breadcrumb-leave-active {
-  transition: all .5s;
-}
-
-.breadcrumb-enter,
-.breadcrumb-leave-active {
-  opacity: 0;
-  transform: translateX(20px);
-}
-
-.breadcrumb-move {
-  transition: all .5s;
-}
-
-.breadcrumb-leave-active {
-  position: absolute;
-}
-
-.el-breadcrumb__inner,
-.el-breadcrumb__inner a {
-  font-weight: 400 !important;
-}
-
-.el-upload input[type="file"] {
-  display: none !important;
-}
-
-.el-upload__input {
-  display: none;
-}
-
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
-
-.upload-container .el-upload {
-  width: 100%;
-}
-
-.upload-container .el-upload .el-upload-dragger {
-  width: 100%;
-  height: 200px;
-}
-
-.el-dropdown-menu a {
-  display: block;
-}
-
-.el-range-separator {
-  box-sizing: content-box;
-}
-
-#app .main-container {
-  min-height: 100%;
-  transition: margin-left .28s;
-  margin-left: 210px;
-  position: relative;
-}
-
-#app .sidebar-container {
-  transition: width 0.28s;
-  width: 210px !important;
-  /* background-color: #304156; */
-  height: 100%;
-  position: fixed;
-  font-size: 0px;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 998;
-  overflow: hidden;
-}
-
-#app .sidebar-container .horizontal-collapse-transition {
-  transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
-}
-
-#app .sidebar-container .scrollbar-wrapper {
-  overflow-x: hidden !important;
-}
-
-#app .sidebar-container .el-scrollbar__bar.is-vertical {
-  right: 0px;
-}
-
-#app .sidebar-container .el-scrollbar {
-  height: 100%;
-}
-
-#app .sidebar-container.has-logo .el-scrollbar {
-  height: calc(100% - 50px);
-}
-
-#app .sidebar-container .is-horizontal {
-  display: none;
-}
-
-#app .sidebar-container a {
-  display: inline-block;
-  width: 100%;
-  overflow: hidden;
-}
-
-#app .sidebar-container .svg-icon {
-  margin-right: 16px;
-}
-
-#app .sidebar-container .sub-el-icon {
-  margin-right: 12px;
-  margin-left: -2px;
-}
-
-#app .sidebar-container .el-menu {
-  border: none;
-  height: 100%;
-  width: 100% !important;
-}
-
-#app .sidebar-container .submenu-title-noDropdown:hover,
-#app .sidebar-container .el-submenu__title:hover {
-  background-color: #ffffff !important;
-}
-
-#app .sidebar-container .is-active > .el-submenu__title {
-  color: #f4f4f5 !important;
-}
-
-#app .sidebar-container .nest-menu .el-submenu > .el-submenu__title,
-#app .sidebar-container .el-submenu .el-menu-item {
-  min-width: 210px !important;
-  /* background-color: red !important; */
-}
-
-#app .sidebar-container .nest-menu .el-submenu > .el-submenu__title:hover,
-#app .sidebar-container .el-submenu .el-menu-item:hover {
-  background-color: #001528 !important;
-}
-
-#app .hideSidebar .sidebar-container {
-  width: 48px !important;
-}
-
-#app .hideSidebar .main-container {
-  margin-left: 54px;
-}
-
-#app .hideSidebar .submenu-title-noDropdown {
-  padding: 0 !important;
-  position: relative;
-}
-
-#app .hideSidebar .submenu-title-noDropdown .el-tooltip {
-  padding: 0 !important;
-}
-
-#app .hideSidebar .submenu-title-noDropdown .el-tooltip .svg-icon {
-  margin-left: 20px;
-}
-
-#app .hideSidebar .submenu-title-noDropdown .el-tooltip .sub-el-icon {
-  margin-left: 19px;
-}
-
-#app .hideSidebar .el-submenu {
-  overflow: hidden;
-}
-
-#app .hideSidebar .el-submenu > .el-submenu__title {
-  padding: 0 !important;
-}
-
-#app .hideSidebar .el-submenu > .el-submenu__title .svg-icon {
-  margin-left: 20px;
-}
-
-#app .hideSidebar .el-submenu > .el-submenu__title .sub-el-icon {
-  margin-left: 19px;
-}
-
-#app .hideSidebar .el-submenu > .el-submenu__title .el-submenu__icon-arrow {
-  display: none;
-}
-
-#app .hideSidebar .el-menu--collapse .el-submenu > .el-submenu__title > span {
-  height: 0;
-  width: 0;
-  overflow: hidden;
-  visibility: hidden;
-  display: inline-block;
-}
-
-#app .el-menu--collapse .el-menu .el-submenu {
-  min-width: 210px !important;
-}
-
-#app .mobile .main-container {
-  margin-left: 0px;
-}
-
-#app .mobile .sidebar-container {
-  transition: transform .28s;
-  width: 210px !important;
-}
-
-#app .mobile.hideSidebar .sidebar-container {
-  pointer-events: none;
-  transition-duration: 0.3s;
-  transform: translate3d(-210px, 0, 0);
-}
-
-#app .withoutAnimation .main-container,
-#app .withoutAnimation .sidebar-container {
-  transition: none;
-}
-
-.el-menu--vertical > .el-menu .svg-icon {
-  margin-right: 16px;
-}
-
-.el-menu--vertical > .el-menu .sub-el-icon {
-  margin-right: 12px;
-  margin-left: -2px;
-}
-
-.el-menu--vertical .nest-menu .el-submenu > .el-submenu__title:hover,
-.el-menu--vertical .el-menu-item:hover {
-  background-color: #263445 !important;
-}
-
-.el-menu--vertical > .el-menu--popup {
-  max-height: 100vh;
-  overflow-y: auto;
-}
-
-.el-menu--vertical > .el-menu--popup::-webkit-scrollbar-track-piece {
-  background: #d3dce6;
-}
-
-.el-menu--vertical > .el-menu--popup::-webkit-scrollbar {
-  width: 6px;
-}
-
-.el-menu--vertical > .el-menu--popup::-webkit-scrollbar-thumb {
-  background: #99a9bf;
-  border-radius: 20px;
-}
-
-body {
-  height: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
-}
-
-.el-message {
-  width: 240px;
-  height: 48px;
-  background: #F6FFF7;
-  box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
-  border-radius: 24px;
-}
-
-label {
-  font-weight: 700;
-}
-
-html {
-  height: 100%;
-  box-sizing: border-box;
-}
-
-#app {
-  height: 100%;
-}
-
-*,
-*:before,
-*:after {
-  box-sizing: inherit;
-}
-
-a:focus,
-a:active {
-  outline: none;
-}
-
-a,
-a:focus,
-a:hover {
-  cursor: pointer;
-  color: inherit;
-  text-decoration: none;
-}
-
-div:focus {
-  outline: none;
-}
-
-li {
-  list-style-type: none;
-}
-
-.clearfix:after {
-  visibility: hidden;
-  display: block;
-  font-size: 0;
-  content: " ";
-  clear: both;
-  height: 0;
-}
-
-.app-container {
-  padding: 20px;
-}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
src/styles/index.min.css


+ 61 - 17
src/styles/index.scss

@@ -124,7 +124,7 @@ li {
   font-family: Microsoft YaHei;
   font-weight: bold;
   height: 36px;
-  background: #2d67e3;
+  background: #2f3480;
   color: #ffffff;
   margin-bottom: 24px;
   width: 100%;
@@ -160,7 +160,7 @@ li {
   font-size: 14px;
   font-family: Microsoft YaHei;
   font-weight: 400;
-  color: #2D67E3;
+  color: #2f3480;
   cursor: pointer;
 }
 .r24 {
@@ -360,7 +360,7 @@ li {
     bottom: 0;
     left: 0;
     margin: auto;
-    background: #2d67e3;
+    background: #2f3480;
   }
 }
 
@@ -409,8 +409,8 @@ li {
 /*修改checkbox选中样式*/
 .el-checkbox__input.is-checked .el-checkbox__inner,
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-  background-color: #2d67e3;
-  border-color: #2d67e3;
+  background-color: #2f3480;
+  border-color: #2f3480;
 }
 
 /*修改tree children布局*/
@@ -425,12 +425,12 @@ li {
 
 /*修改radio选中样式*/
 .el-radio__input.is-checked .el-radio__inner {
-  border-color: #2d67e3;
+  border-color: #2f3480;
   background: #fff;
   &::after {
     width: 8px;
     height: 8px;
-    background-color: #2d67e3;
+    background-color: #2f3480;
   }
 }
 
@@ -478,14 +478,14 @@ li {
   margin-left: 24px !important;
 
   &:focus {
-    border-color: #2d67e3;
+    border-color: #2f3480;
     color: #fff;
-    background: #2d67e3;
+    background: #2f3480;
   }
 
   &:hover {
-    background: #2d67e3;
-    border-color: #2d67e3;
+    background: #2f3480;
+    border-color: #2f3480;
     color: #fff;
   }
 }
@@ -524,25 +524,69 @@ li {
 }
 
 .el-button--primary {
-  background: #2d67e3;
+  background: #2f3480;
   border-radius: 4px;
   font-family: Microsoft YaHei;
   font-weight: bold;
   color: #ffffff;
-  border-color: #2d67e3;
+  border-color: #2f3480;
   &:focus {
-    background: #2d67e3;
-    border-color: #2d67e3;
+    background: #2f3480;
+    border-color: #2f3480;
     color: #fff;
   }
 
   &:hover {
-    background: #2d67e3;
-    border-color: #2d67e3;
+    background: #2f3480;
+    border-color: #2f3480;
     color: #fff;
   }
 }
 
+.el-button--primary.is-plain,.el-button--default{
+  color: #2f3480;
+  background: #fff;
+  border-color: #2f3480;
+  &:focus {
+    background: #2f3480;
+    border-color: #2f3480;
+    color: #fff;
+  }
+
+  &:hover {
+    background: #2f3480;
+    border-color: #2f3480;
+    color: #fff;
+  }
+}
+
+.el-button--primary.is-disabled{
+  color: #fff;
+  background-color: rgba(47,52,128, .7);
+  border-color: #2f3480;
+  &:hover {
+    background: rgba(47,52,128, .8);
+    border-color: #2f3480;
+    color: #fff;
+  }
+}
+
+.el-input.is-active .el-input__inner, .el-input__inner:focus,.el-textarea__inner:focus,.el-checkbox__inner:hover,.el-select .el-input__inner:focus{
+  border-color: #2f3480;
+}
+
+.el-range-editor.is-active, .el-range-editor.is-active:hover, .el-select .el-input.is-focus .el-input__inner{
+  border-color: #2f3480;
+}
+
+.el-select-dropdown__item.selected,.el-date-table td.today span{
+  color: #2f3480;
+}
+
+.el-date-table td.end-date span, .el-date-table td.start-date span{
+  background-color: #2f3480;
+}
+
 /*二级弹框背景*/
 .ej-dialog-bg {
   background: #f5f7fa !important;

+ 10 - 27
src/styles/sidebar.scss

@@ -4,20 +4,20 @@
     transition: margin-left 0.28s;
     // margin-left: $sideBarWidth;
     position: relative;
-    background-color: #dfe3ea;
+    background-color: #fff;
   }
 
   .sidebar-container {
-    width: 150px;
+    width: 210px;
     // transition: width 0.28s;
     // width: $sideBarWidth !important;
-    background-color: #041741;
+    background-color: #fff;
     // height: 100%;
     padding: 16px 0 32px 0;
     // border-radius: 6px;
     position: fixed;
     font-size: 0px;
-    top: 47px;
+    top: 48px;
     // bottom: 0;
     left: 0%;
     bottom: 0%;
@@ -74,42 +74,25 @@
       height: 100%;
       width: 100% !important;
       > div {
-        background: #041741 !important;
+        // background: #041741 !important;
       }
     }
 
-    // menu hover
-    // .submenu-title-noDropdown,
-    .el-submenu__title {
-      &:hover {
-        background-color: #2d67e3 !important;
-      }
-    }
-
-    .submenu-title-noDropdown {
-      &:hover {
-        // background-color: initial !important;
-        background: #2d67e3 !important;
-      }
-    }
-
-    .is-active > .el-submenu__title {
-      color: $subMenuActiveText !important;
-    }
-
+    
     & .nest-menu .el-submenu > .el-submenu__title,
     & .el-submenu .el-menu-item {
       min-width: $sideBarWidth !important;
-      background-color: $subMenuBg !important;
+      background-color: $subMenuBg;
       &:hover {
-        // background-color: $subMenuHover !important;
+        background-color: $subMenuHover;
+        color: #fff;
       }
     }
   }
 
   .hideSidebar {
     .sidebar-container {
-      width: 150px;
+      width: 210px;
     }
 
     .main-container {

+ 5 - 5
src/styles/variables.scss

@@ -1,15 +1,15 @@
 // sidebar
-$menuText:#bfcbd9;
-$menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
+$menuText:#333;
+$menuActiveText:#2f3480;
+$subMenuActiveText:#fff; //https://github.com/ElemeFE/element/issues/12951
 
 $menuBg:#ffffff;
 $menusBg:#041741;
 $menuHover:#ffffff;
 $menucurrency: #ffffff;
 
-$subMenuBg:#1f2d3d;
-$subMenuHover:#001528;
+$subMenuBg:#fff;
+$subMenuHover:#2f3480;
 
 $sideBarWidth: 210px;
 

+ 2 - 2
src/views/BasicsData/views/airlineCompany/airlineCompanyInfo.vue

@@ -133,7 +133,7 @@ export default {
             this.$message.error(res.message ?? "失败");
           }
         } catch (error) {
-this.$message.error("失败");
+          this.$message.error("失败");
         }
       }
     },
@@ -319,7 +319,7 @@ this.$message.error("失败");
     font-family: Microsoft YaHei;
     font-weight: bold;
     height: 36px;
-    background: #2d67e3;
+    background: #2f3480;
     color: #ffffff;
     margin-bottom: 28px;
   }

+ 5 - 5
src/views/BasicsData/views/airport/airportInfo.vue

@@ -274,7 +274,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-this.$message.error("失败");
+        this.$message.error("失败");
       }
     },
     //删除信息
@@ -376,7 +376,7 @@ this.$message.error("失败");
     > .log {
       width: 4px;
       height: 20px;
-      background: #2d67e3;
+      background: #2f3480;
       margin-right: 12px;
     }
     > .headr_name {
@@ -473,14 +473,14 @@ this.$message.error("失败");
         height: 20px;
         background: #ffffff;
         // background: url("../../../../assets/index/ic_close_s @2x.png") no-repeat;
-        border: 1px solid #2d67e3;
+        border: 1px solid #2f3480;
         border-radius: 2px;
         margin-right: 8px;
         margin-bottom: 8px;
         display: flex;
         align-items: center;
         justify-content: center;
-        color: #2d67e3;
+        color: #2f3480;
         font-size: 14px;
         font-weight: 800;
         cursor: pointer;
@@ -488,7 +488,7 @@ this.$message.error("失败");
       .plus_list {
         width: 48px;
         height: 20px;
-        background: #2d67e3;
+        background: #2f3480;
         border-radius: 2px;
         display: flex;
         align-items: center;

+ 4 - 17
src/views/BasicsData/views/airport/airportInfoChild.vue

@@ -1,20 +1,7 @@
 <template>
   <div class="queryItemSettings_home">
     <div class="wrap">
-      <DataTable
-        data-id="61"
-        :data-content="{ IATACode }"
-        :rows="24"
-        labelWidth="100px"
-        :min-height="70"
-        width="400px"
-        tableHeight="750"
-        :isStatuser="true"
-        :isAuth="true"
-        authAdd="terminal_add_button"
-        authEdit="terminal_edit_button"
-        authDel="terminal_delete_button"
-      >
+      <DataTable data-id="61" :data-content="{ IATACode }" :rows="24" labelWidth="100px" :min-height="70" width="400px" tableHeight="750" :isStatuser="true" :isAuth="true" authAdd="terminal_add_button" authEdit="terminal_edit_button" authDel="terminal_delete_button">
         <template v-slot:header>
           <div class="status flex-wrap">
             <div class="manageTitle">航站设置</div>
@@ -28,12 +15,12 @@
 import DataTable from "@/components/Table";
 export default {
   components: { DataTable },
-  data() {
+  data () {
     return {
       IATACode: null,
     };
   },
-  created() {
+  created () {
     // if (!this.$route.query.queryTemplateID) {
     //   this.$router.push("/systemSettings/queryTemplate");
     //   return;
@@ -60,7 +47,7 @@ export default {
         border-radius: 4px;
         font-family: Microsoft YaHei;
         font-weight: bold;
-        color: #2d67e3;
+        color: #2f3480;
       }
       margin-bottom: 30px;
     }

+ 4 - 17
src/views/BasicsData/views/deployNode/deployNodeChild.vue

@@ -1,20 +1,7 @@
 <template>
   <div class="queryItemSettings_home">
     <div class="wrap">
-      <DataTable
-        :data-id="dataId"
-        :data-content="{ nodeCode }"
-        :rows="24"
-        labelWidth="100px"
-        :min-height="70"
-        width="400px"
-        tableHeight="720"
-        :isStatuser="true"
-        :isAuth="true"
-        authAdd="location_setting_add"
-        authEdit="location_settings_editing"
-        authDel="location_settings_deleting"
-      >
+      <DataTable :data-id="dataId" :data-content="{ nodeCode }" :rows="24" labelWidth="100px" :min-height="70" width="400px" tableHeight="720" :isStatuser="true" :isAuth="true" authAdd="location_setting_add" authEdit="location_settings_editing" authDel="location_settings_deleting">
         <template v-slot:header>
           <div class="status flex-wrap">
             <div class="manageTitle">节点设置</div>
@@ -28,13 +15,13 @@
 import DataTable from "@/components/Table";
 export default {
   components: { DataTable },
-  data() {
+  data () {
     return {
       nodeCode: null,
       dataId: DATACONTENT_ID.deployNodeteoId,
     };
   },
-  created() {
+  created () {
     // if (!this.$route.query.queryTemplateID) {
     //   this.$router.push("/systemSettings/queryTemplate");
     //   return;
@@ -61,7 +48,7 @@ export default {
         border-radius: 4px;
         font-family: Microsoft YaHei;
         font-weight: bold;
-        color: #2d67e3;
+        color: #2f3480;
       }
       margin-bottom: 30px;
     }

+ 2 - 2
src/views/advancedQuery/views/advancedHome.vue

@@ -1018,7 +1018,7 @@ export default {
     //     }
     //   })
     // },
-    setDataContent(...keys) {
+    setDataContent (...keys) {
       function digitFormat (num) {
         if (num) {
           num = '000' + num
@@ -1207,7 +1207,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 2 - 2
src/views/baggageManagement copy/components/arrival/index.vue

@@ -595,7 +595,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -684,7 +684,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 3 - 3
src/views/baggageManagement copy/components/baggage/index.vue

@@ -925,7 +925,7 @@ export default {
           height: 100%;
           background: #afb4bf;
           &.step-line-active {
-            background: #2d67e3;
+            background: #2f3480;
           }
         }
       }
@@ -970,7 +970,7 @@ export default {
           }
         }
         &.active-item .step-circle {
-          background: #2d67e3;
+          background: #2f3480;
         }
       }
     }
@@ -997,7 +997,7 @@ export default {
         &.cell-click {
           cursor: pointer;
           .cell {
-            color: #2d7cff;
+            color: #2f3480;
           }
         }
         .cell {

+ 40 - 136
src/views/baggageManagement copy/components/container/index.vue

@@ -3,64 +3,29 @@
     <div class="container-basic">
       <div class="title">
         <div class="manageTitle">容器基本信息</div>
-        <el-button
-          type="primary"
-          size="small"
-          @click="toContainerHistory"
-        >历史记录</el-button>
+        <el-button type="primary" size="small" @click="toContainerHistory">历史记录</el-button>
       </div>
-      <div
-        ref="basicBox"
-        class="basic-info-box"
-      >
+      <div ref="basicBox" class="basic-info-box">
         <el-row :gutter="10">
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="4"
-          >
+          <el-col :xs="6" :sm="6" :xl="4">
             <div class="grid-content">容器编号:{{ $route.query.containerID }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">容器类型:{{ $route.query.containerType }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">舱位:{{ $route.query.containerSpace }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">航班号:{{ $route.query.flightNO }}</div>
           </el-col>
-          <el-col
-            :xs="12"
-            :sm="12"
-            :xl="5"
-          >
+          <el-col :xs="12" :sm="12" :xl="5">
             <div class="grid-content">航班日期:{{ $route.query.flightDate }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">起飞站:{{ $route.query.departureAirport }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">目的站:{{ $route.query.landingAirport }}</div>
           </el-col>
         </el-row>
@@ -70,92 +35,32 @@
       <div class="title">
         <div class="manageTitle">容器行李列表</div>
         <!-- <TimeZoneSelector /> -->
-        <img
-          class="btn-square btn-shadow"
-          src="@/assets/baggage/ic_export.png"
-          title="导出"
-          @click="exportHandler('table', '容器行李列表')"
-        >
-        <img
-          class="btn-square btn-shadow"
-          src="@/assets/baggage/ic_setting.png"
-          title="列设置"
-          @click="show"
-        >
+        <img class="btn-square btn-shadow" src="@/assets/baggage/ic_export.png" title="导出" @click="exportHandler('table', '容器行李列表')">
+        <img class="btn-square btn-shadow" src="@/assets/baggage/ic_setting.png" title="列设置" @click="show">
       </div>
       <div class="table-wrapper">
-        <el-table
-          ref="table"
-          :data="dealedTableData"
-          :height="computedTableHeight"
-          border
-          stripe
-          size="mini"
-          show-summary
-          :summary-method="summaryRow(dealedTableData.length)"
-          :header-cell-class-name="headerCellClass"
-          :header-cell-style="{ color: '#101116' }"
-          :row-class-name="rowClass"
-          :cell-class-name="cellClass"
-          @cell-click="cellClickHandler"
-        >
-          <el-table-column
-            v-for="col in tableColsCopy"
-            :key="col.index"
-            :prop="col.prop"
-            :label="col.label"
-            :align="col.align || 'center'"
-            :width="col.width"
-            :fixed="col.fixed"
-            :formatter="tableFormat"
-          >
+        <el-table ref="table" :data="dealedTableData" :height="computedTableHeight" border stripe size="mini" show-summary :summary-method="summaryRow(dealedTableData.length)" :header-cell-class-name="headerCellClass" :header-cell-style="{ color: '#101116' }" :row-class-name="rowClass" :cell-class-name="cellClass" @cell-click="cellClickHandler">
+          <el-table-column v-for="col in tableColsCopy" :key="col.index" :prop="col.prop" :label="col.label" :align="col.align || 'center'" :width="col.width" :fixed="col.fixed" :formatter="tableFormat">
             <template #header>
-              <TableHeaderCell
-                :label="col.label"
-                :filter-options="tableDataFilters[col.prop]"
-                :filter-values.sync="filterValues[col.prop]"
-                :sortable="col.sortable"
-                :sort-rule.sync="tableDataSortRules[col.prop]"
-              />
+              <TableHeaderCell :label="col.label" :filter-options="tableDataFilters[col.prop]" :filter-values.sync="filterValues[col.prop]" :sortable="col.sortable" :sort-rule.sync="tableDataSortRules[col.prop]" />
             </template>
           </el-table-column>
         </el-table>
       </div>
     </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('tableData')"
-          >确定</el-button>
-          <el-button
-            size="medium"
-            @click="hide"
-          >取消</el-button>
+          <el-button size="medium" class="r24" type="primary" @click="onCheck('tableData')">确定</el-button>
+          <el-button size="medium" @click="hide">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -183,7 +88,7 @@ export default {
     tableColsMixin
     //  timeZoneMixin
   ],
-  data() {
+  data () {
     return {
       loading: false,
       queryData: {},
@@ -269,7 +174,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clickedCells']),
-    dealedTableData() {
+    dealedTableData () {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
@@ -294,7 +199,7 @@ export default {
     }
   },
   watch: {
-    loading(val) {
+    loading (val) {
       if (val) {
         this.fullscreenLoading = this.$loading({
           lock: true,
@@ -307,7 +212,7 @@ export default {
       }
     }
   },
-  created() {
+  created () {
     const { flightNO, flightDate, departureAirport, landingAirport, containerID } = this.$route.query
     if (flightNO && flightDate && departureAirport && landingAirport && containerID) {
       this.queryData = { flightNO, flightDate, departureAirport, landingAirport, containerID }
@@ -325,29 +230,28 @@ export default {
       }
     })
   },
-  activated() {
+  activated () {
     this.setTableHeight()
   },
-  updated() {
+  updated () {
     this.setTableHeight()
   },
-  deactivated() {
+  deactivated () {
     this.fullscreenLoading?.close()
   },
   methods: {
-    setTableHeight() {
+    setTableHeight () {
       const headerHeight = 80
       const bottomBlankHeight = 16
       const titleHeight = 64
       const basicBoxHeight = this.$refs['basicBox'].offsetHeight
-      this.computedTableHeight = `calc(100vh - ${
-        headerHeight + bottomBlankHeight + titleHeight * 2 + basicBoxHeight
-      }px)`
+      this.computedTableHeight = `calc(100vh - ${headerHeight + bottomBlankHeight + titleHeight * 2 + basicBoxHeight
+        }px)`
       this.$nextTick(() => {
         this.$refs['table']?.doLayout()
       })
     },
-    rowClass({ row, rowIndex }) {
+    rowClass ({ row, rowIndex }) {
       const classes = []
       if (row['isDEL'] === 'DEL') {
         classes.push('bgl-deleted')
@@ -358,7 +262,7 @@ export default {
       return classes.join(' ')
     },
     // 给表头单元格加上 ascending 或 descending 使用 element 自带的排序箭头变色
-    headerCellClass({ row, column, rowIndex, columnIndex }) {
+    headerCellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -366,7 +270,7 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClass({ row, column, rowIndex, columnIndex }) {
+    cellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       if (
         ['checkInTime', 'DealInfo', 'sortLocationMark', 'loadLocationMark', 'inflLocationMark'].includes(
@@ -398,7 +302,7 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClickHandler(row, column, cell, event) {
+    cellClickHandler (row, column, cell, event) {
       if (
         [
           'passengerName',
@@ -437,7 +341,7 @@ export default {
         }
       }
     },
-    toContainerHistory() {
+    toContainerHistory () {
       this.$router.push({
         path: `${this.$route.path.split('/').slice(0, -1).join('/')}/containerHistory`,
         query: {
@@ -446,12 +350,12 @@ export default {
       })
     },
     // 统计行数
-    summaryRow(num) {
+    summaryRow (num) {
       return function () {
         return ['合计', `共${num}件`]
       }
     },
-    tableFormat(row, column, cellValue) {
+    tableFormat (row, column, cellValue) {
       switch (column.property) {
         case 'isDEL':
           return cellValue === 'DEL' ? '删除' : ''
@@ -461,12 +365,12 @@ export default {
           return cellValue ?? ''
       }
     },
-    exportHandler(refName, tableName) {
+    exportHandler (refName, tableName) {
       const table = this.$refs[refName].$el.cloneNode(true)
       const fileName = `${tableName}-${Object.values(this.queryData).join('-')}.xlsx`
       exportToExcel(table, tableName, fileName)
     },
-    async queryContainerBaggage(dataContent) {
+    async queryContainerBaggage (dataContent) {
       this.loading = true
       this.tableData = []
       try {
@@ -528,12 +432,12 @@ 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 {
           cursor: pointer;
-          color: #2d7cff;
+          color: #2f3480;
           &.cell-clicked {
             color: purple;
           }

+ 29 - 83
src/views/baggageManagement copy/components/containerHistory/index.vue

@@ -5,32 +5,10 @@
         <span class="manageTitle">容器历史</span>
         <!-- <BackButton /> -->
       </div>
-      <div
-        v-loading="treeLoading"
-        element-loading-text="拼命加载中"
-        element-loading-spinner="el-icon-loading"
-        element-loading-background="rgba(0, 0, 0, 0.8)"
-        class="container-tree"
-      >
-        <el-tree
-          :data="containerHistoryTree"
-          :props="defaultTreeProps"
-          node-key="index"
-          default-expand-all
-          :expand-on-click-node="false"
-          @current-change="currentChangeHandler"
-        >
-          <span
-            slot-scope="{ node, data }"
-            class="el-tree-node__label"
-          >
-            <el-tooltip
-              v-if="data.index === -1"
-              class="item"
-              effect="dark"
-              :content="msg"
-              placement="top"
-            >
+      <div v-loading="treeLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="container-tree">
+        <el-tree :data="containerHistoryTree" :props="defaultTreeProps" node-key="index" default-expand-all :expand-on-click-node="false" @current-change="currentChangeHandler">
+          <span slot-scope="{ node, data }" class="el-tree-node__label">
+            <el-tooltip v-if="data.index === -1" class="item" effect="dark" :content="msg" placement="top">
               <span>{{ node.label }}</span>
             </el-tooltip>
             <span v-else>{{ node.label }}</span>
@@ -38,46 +16,12 @@
         </el-tree>
       </div>
     </div>
-    <div
-      v-loading="tableLoading"
-      element-loading-text="拼命加载中"
-      element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-      class="container-right"
-    >
-      <el-table
-        ref="table"
-        :data="dealedTableData"
-        border
-        stripe
-        fit
-        height="calc(100vh - 80px - 17px - 20px)"
-        :header-cell-class-name="headerCellClass"
-        :row-class-name="tableRowClassName"
-        :cell-class-name="cellClass"
-        @cell-click="cellClickHandler"
-      >
-        <el-table-column
-          v-for="col in tableCols"
-          :key="col.prop"
-          :prop="col.prop"
-          :label="col.label"
-          :width="col.width"
-          :fixed="col.fixed"
-          :formatter="tableFormat"
-        >
+    <div v-loading="tableLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="container-right">
+      <el-table ref="table" :data="dealedTableData" border stripe fit height="calc(100vh - 80px - 17px - 20px)" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" @cell-click="cellClickHandler">
+        <el-table-column v-for="col in tableCols" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed" :formatter="tableFormat">
           <template #header>
-            <el-tooltip
-              :content="col.desc || col.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 || col.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>
@@ -99,7 +43,7 @@ export default {
     // BackButton,
     TableHeaderCell
   },
-  data() {
+  data () {
     return {
       queryData: {},
       containerHistory: [],
@@ -192,7 +136,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clickedCells']),
-    containerHistoryTree() {
+    containerHistoryTree () {
       return [
         {
           index: -1,
@@ -204,7 +148,7 @@ export default {
         }
       ]
     },
-    dealedTableData() {
+    dealedTableData () {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
@@ -228,7 +172,7 @@ export default {
       return this._.orderBy(filtered, sortRules[0], sortRules[1])
     }
   },
-  created() {
+  created () {
     const { containerID } = this.$route.query
     if (containerID) {
       this.queryData = { containerID }
@@ -246,18 +190,18 @@ export default {
       }
     })
   },
-  updated() {
+  updated () {
     // table数据更新
     this.$nextTick(() => {
       this.$refs.table.doLayout()
     })
   },
-  deactivated() {
+  deactivated () {
     this.treeLoading = false
     this.tableLoading = false
   },
   methods: {
-    currentChangeHandler({ index }) {
+    currentChangeHandler ({ index }) {
       if (index > -1) {
         this.selectedHistoryData = this.containerHistory[index]
         const { flightNO, flightDate, departureAirport, arriveAirport, containerID } = this.selectedHistoryData
@@ -266,7 +210,7 @@ export default {
       }
     },
     // 给表头单元格加上 ascending 或 descending 使用 element 自带的排序箭头变色
-    headerCellClass({ row, column, rowIndex, columnIndex }) {
+    headerCellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -274,14 +218,14 @@ export default {
       }
       return classes.join(' ')
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName ({ row, rowIndex }) {
       const classes = []
       if (row.isDEL === 'DEL') {
         classes.push('bgl-deleted')
       }
       return classes.join(' ')
     },
-    cellClass({ row, column, rowIndex, columnIndex }) {
+    cellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       if (
         [
@@ -306,7 +250,7 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClickHandler(row, column, cell, event) {
+    cellClickHandler (row, column, cell, event) {
       if (
         [
           'passengerName',
@@ -363,7 +307,7 @@ export default {
         }
       }
     },
-    tableFormat(row, column, cellValue) {
+    tableFormat (row, column, cellValue) {
       switch (column.property) {
         case 'isDEL':
           return cellValue === 'DEL' ? '删除' : ''
@@ -373,7 +317,7 @@ export default {
           return cellValue ?? ''
       }
     },
-    async queryContainerHistory(dataContent) {
+    async queryContainerHistory (dataContent) {
       this.treeLoading = true
       this.tableData = []
       try {
@@ -385,7 +329,7 @@ export default {
       }
       this.treeLoading = false
     },
-    async queryBaggageList(dataContent) {
+    async queryBaggageList (dataContent) {
       this.tableLoading = true
       this.tableData = []
       try {
@@ -430,13 +374,15 @@ export default {
             letter-spacing: 1px;
             line-height: 38px;
             font-size: 14px;
-            font-family: Helvetica, 'Microsoft YaHei';
+            font-family: Helvetica, "Microsoft YaHei";
             font-weight: bold;
             color: #101116;
           }
         }
         > .el-tree-node__content {
-          > .el-tree-node__expand-icon.el-icon-caret-right:not(.is-leaf):before {
+          > .el-tree-node__expand-icon.el-icon-caret-right:not(
+              .is-leaf
+            ):before {
             font-size: 16px;
             color: #101116;
           }
@@ -456,12 +402,12 @@ 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 {
         cursor: pointer;
-        color: #2d7cff;
+        color: #2f3480;
         &.cell-clicked {
           color: purple;
         }

+ 2 - 2
src/views/baggageManagement copy/components/departure/index.vue

@@ -635,7 +635,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -724,7 +724,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 3 - 3
src/views/baggageManagement copy/components/departureC/index.vue

@@ -375,7 +375,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-this.$message.error("失败");
+        this.$message.error("失败");
       }
     },
     tableRowClassName ({ row, rowIndex }) {
@@ -557,7 +557,7 @@ this.$message.error("失败");
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -646,7 +646,7 @@ this.$message.error("失败");
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 2 - 2
src/views/baggageManagement copy/components/flight/index.vue

@@ -1250,7 +1250,7 @@ export default {
         &:hover,
         &.active {
           .drag-icon {
-            color: #2d67e3;
+            color: #2f3480;
           }
         }
         .drag-line {
@@ -1314,7 +1314,7 @@ export default {
   ::v-deep .el-table {
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 2 - 2
src/views/baggageManagement copy/components/transferArrival/index.vue

@@ -774,7 +774,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -863,7 +863,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 2 - 2
src/views/baggageManagement copy/components/transferDeparture/index.vue

@@ -749,7 +749,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -838,7 +838,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 2 - 2
src/views/baggageManagementTemp/components/arrival/index.vue

@@ -600,7 +600,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -689,7 +689,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 4 - 4
src/views/baggageManagementTemp/components/baggage/index.vue

@@ -949,7 +949,7 @@ export default {
           height: 100%;
           background: #afb4bf;
           &.step-line-active {
-            background: #2d67e3;
+            background: #2f3480;
           }
         }
       }
@@ -994,7 +994,7 @@ export default {
           }
         }
         &.active-item .step-circle {
-          background: #2d67e3;
+          background: #2f3480;
         }
       }
     }
@@ -1021,7 +1021,7 @@ export default {
         &.cell-click {
           cursor: pointer;
           .cell {
-            color: #2d7cff;
+            color: #2f3480;
           }
         }
         .cell {
@@ -1112,7 +1112,7 @@ export default {
     width: 20px;
     height: 15px;
     border-radius: 4px;
-    background-color: #2d67e3;
+    background-color: #2f3480;
     color: #ffffff;
     cursor: pointer;
     text-align: center;

+ 40 - 136
src/views/baggageManagementTemp/components/container/index.vue

@@ -3,64 +3,29 @@
     <div class="container-basic">
       <div class="title">
         <div class="manageTitle">容器基本信息</div>
-        <el-button
-          type="primary"
-          size="small"
-          @click="toContainerHistory"
-        >历史记录</el-button>
+        <el-button type="primary" size="small" @click="toContainerHistory">历史记录</el-button>
       </div>
-      <div
-        ref="basicBox"
-        class="basic-info-box"
-      >
+      <div ref="basicBox" class="basic-info-box">
         <el-row :gutter="10">
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="4"
-          >
+          <el-col :xs="6" :sm="6" :xl="4">
             <div class="grid-content">容器编号:{{ $route.query.containerID }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">容器类型:{{ $route.query.containerType }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">舱位:{{ $route.query.containerSpace }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">航班号:{{ $route.query.flightNO }}</div>
           </el-col>
-          <el-col
-            :xs="12"
-            :sm="12"
-            :xl="5"
-          >
+          <el-col :xs="12" :sm="12" :xl="5">
             <div class="grid-content">航班日期:{{ $route.query.flightDate }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">起飞站:{{ $route.query.departureAirport }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">目的站:{{ $route.query.landingAirport }}</div>
           </el-col>
         </el-row>
@@ -70,92 +35,32 @@
       <div class="title">
         <div class="manageTitle">容器行李列表</div>
         <!-- <TimeZoneSelector /> -->
-        <img
-          class="btn-square btn-shadow"
-          src="@/assets/baggage/ic_export.png"
-          title="导出"
-          @click="exportHandler('table', '容器行李列表')"
-        >
-        <img
-          class="btn-square btn-shadow"
-          src="@/assets/baggage/ic_setting.png"
-          title="列设置"
-          @click="show"
-        >
+        <img class="btn-square btn-shadow" src="@/assets/baggage/ic_export.png" title="导出" @click="exportHandler('table', '容器行李列表')">
+        <img class="btn-square btn-shadow" src="@/assets/baggage/ic_setting.png" title="列设置" @click="show">
       </div>
       <div class="table-wrapper">
-        <el-table
-          ref="table"
-          :data="dealedTableData"
-          :height="computedTableHeight"
-          border
-          stripe
-          size="mini"
-          show-summary
-          :summary-method="summaryRow(dealedTableData.length)"
-          :header-cell-class-name="headerCellClass"
-          :header-cell-style="{ color: '#101116' }"
-          :row-class-name="rowClass"
-          :cell-class-name="cellClass"
-          @cell-click="cellClickHandler"
-        >
-          <el-table-column
-            v-for="col in tableColsCopy"
-            :key="col.index"
-            :prop="col.prop"
-            :label="col.label"
-            :align="col.align || 'center'"
-            :width="col.width"
-            :fixed="col.fixed"
-            :formatter="tableFormat"
-          >
+        <el-table ref="table" :data="dealedTableData" :height="computedTableHeight" border stripe size="mini" show-summary :summary-method="summaryRow(dealedTableData.length)" :header-cell-class-name="headerCellClass" :header-cell-style="{ color: '#101116' }" :row-class-name="rowClass" :cell-class-name="cellClass" @cell-click="cellClickHandler">
+          <el-table-column v-for="col in tableColsCopy" :key="col.index" :prop="col.prop" :label="col.label" :align="col.align || 'center'" :width="col.width" :fixed="col.fixed" :formatter="tableFormat">
             <template #header>
-              <TableHeaderCell
-                :label="col.label"
-                :filter-options="tableDataFilters[col.prop]"
-                :filter-values.sync="filterValues[col.prop]"
-                :sortable="col.sortable"
-                :sort-rule.sync="tableDataSortRules[col.prop]"
-              />
+              <TableHeaderCell :label="col.label" :filter-options="tableDataFilters[col.prop]" :filter-values.sync="filterValues[col.prop]" :sortable="col.sortable" :sort-rule.sync="tableDataSortRules[col.prop]" />
             </template>
           </el-table-column>
         </el-table>
       </div>
     </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('tableData')"
-          >确定</el-button>
-          <el-button
-            size="medium"
-            @click="hide"
-          >取消</el-button>
+          <el-button size="medium" class="r24" type="primary" @click="onCheck('tableData')">确定</el-button>
+          <el-button size="medium" @click="hide">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -183,7 +88,7 @@ export default {
     tableColsMixin
     //  timeZoneMixin
   ],
-  data() {
+  data () {
     return {
       loading: false,
       queryData: {},
@@ -269,7 +174,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clickedCells']),
-    dealedTableData() {
+    dealedTableData () {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
@@ -294,7 +199,7 @@ export default {
     }
   },
   watch: {
-    loading(val) {
+    loading (val) {
       if (val) {
         this.fullscreenLoading = this.$loading({
           lock: true,
@@ -307,7 +212,7 @@ export default {
       }
     }
   },
-  created() {
+  created () {
     const { flightNO, flightDate, departureAirport, landingAirport, containerID } = this.$route.query
     if (flightNO && flightDate && departureAirport && landingAirport && containerID) {
       this.queryData = { flightNO, flightDate, departureAirport, landingAirport, containerID }
@@ -325,29 +230,28 @@ export default {
       }
     })
   },
-  activated() {
+  activated () {
     this.setTableHeight()
   },
-  updated() {
+  updated () {
     this.setTableHeight()
   },
-  deactivated() {
+  deactivated () {
     this.fullscreenLoading?.close()
   },
   methods: {
-    setTableHeight() {
+    setTableHeight () {
       const headerHeight = 80
       const bottomBlankHeight = 16
       const titleHeight = 64
       const basicBoxHeight = this.$refs['basicBox'].offsetHeight
-      this.computedTableHeight = `calc(100vh - ${
-        headerHeight + bottomBlankHeight + titleHeight * 2 + basicBoxHeight
-      }px)`
+      this.computedTableHeight = `calc(100vh - ${headerHeight + bottomBlankHeight + titleHeight * 2 + basicBoxHeight
+        }px)`
       this.$nextTick(() => {
         this.$refs['table']?.doLayout()
       })
     },
-    rowClass({ row, rowIndex }) {
+    rowClass ({ row, rowIndex }) {
       const classes = []
       if (row['isDEL'] === 'DEL') {
         classes.push('bgl-deleted')
@@ -358,7 +262,7 @@ export default {
       return classes.join(' ')
     },
     // 给表头单元格加上 ascending 或 descending 使用 element 自带的排序箭头变色
-    headerCellClass({ row, column, rowIndex, columnIndex }) {
+    headerCellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -366,7 +270,7 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClass({ row, column, rowIndex, columnIndex }) {
+    cellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       if (
         ['checkInTime', 'DealInfo', 'sortLocationMark', 'loadLocationMark', 'inflLocationMark'].includes(
@@ -398,7 +302,7 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClickHandler(row, column, cell, event) {
+    cellClickHandler (row, column, cell, event) {
       if (
         [
           // 'passengerName',
@@ -437,7 +341,7 @@ export default {
         }
       }
     },
-    toContainerHistory() {
+    toContainerHistory () {
       this.$router.push({
         path: `${this.$route.path.split('/').slice(0, -1).join('/')}/containerHistory`,
         query: {
@@ -446,12 +350,12 @@ export default {
       })
     },
     // 统计行数
-    summaryRow(num) {
+    summaryRow (num) {
       return function () {
         return ['合计', `共${num}件`]
       }
     },
-    tableFormat(row, column, cellValue) {
+    tableFormat (row, column, cellValue) {
       switch (column.property) {
         case 'isDEL':
           return cellValue === 'DEL' ? '删除' : ''
@@ -461,12 +365,12 @@ export default {
           return cellValue ?? ''
       }
     },
-    exportHandler(refName, tableName) {
+    exportHandler (refName, tableName) {
       const table = this.$refs[refName].$el.cloneNode(true)
       const fileName = `${tableName}-${Object.values(this.queryData).join('-')}.xlsx`
       exportToExcel(table, tableName, fileName)
     },
-    async queryContainerBaggage(dataContent) {
+    async queryContainerBaggage (dataContent) {
       this.loading = true
       this.tableData = []
       try {
@@ -528,12 +432,12 @@ 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 {
           cursor: pointer;
-          color: #2d7cff;
+          color: #2f3480;
           &.cell-clicked {
             color: purple;
           }

+ 29 - 83
src/views/baggageManagementTemp/components/containerHistory/index.vue

@@ -5,32 +5,10 @@
         <span class="manageTitle">容器历史</span>
         <!-- <BackButton /> -->
       </div>
-      <div
-        v-loading="treeLoading"
-        element-loading-text="拼命加载中"
-        element-loading-spinner="el-icon-loading"
-        element-loading-background="rgba(0, 0, 0, 0.8)"
-        class="container-tree"
-      >
-        <el-tree
-          :data="containerHistoryTree"
-          :props="defaultTreeProps"
-          node-key="index"
-          default-expand-all
-          :expand-on-click-node="false"
-          @current-change="currentChangeHandler"
-        >
-          <span
-            slot-scope="{ node, data }"
-            class="el-tree-node__label"
-          >
-            <el-tooltip
-              v-if="data.index === -1"
-              class="item"
-              effect="dark"
-              :content="msg"
-              placement="top"
-            >
+      <div v-loading="treeLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="container-tree">
+        <el-tree :data="containerHistoryTree" :props="defaultTreeProps" node-key="index" default-expand-all :expand-on-click-node="false" @current-change="currentChangeHandler">
+          <span slot-scope="{ node, data }" class="el-tree-node__label">
+            <el-tooltip v-if="data.index === -1" class="item" effect="dark" :content="msg" placement="top">
               <span>{{ node.label }}</span>
             </el-tooltip>
             <span v-else>{{ node.label }}</span>
@@ -38,46 +16,12 @@
         </el-tree>
       </div>
     </div>
-    <div
-      v-loading="tableLoading"
-      element-loading-text="拼命加载中"
-      element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-      class="container-right"
-    >
-      <el-table
-        ref="table"
-        :data="dealedTableData"
-        border
-        stripe
-        fit
-        height="calc(100vh - 80px - 17px - 20px)"
-        :header-cell-class-name="headerCellClass"
-        :row-class-name="tableRowClassName"
-        :cell-class-name="cellClass"
-        @cell-click="cellClickHandler"
-      >
-        <el-table-column
-          v-for="col in tableCols"
-          :key="col.prop"
-          :prop="col.prop"
-          :label="col.label"
-          :width="col.width"
-          :fixed="col.fixed"
-          :formatter="tableFormat"
-        >
+    <div v-loading="tableLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="container-right">
+      <el-table ref="table" :data="dealedTableData" border stripe fit height="calc(100vh - 80px - 17px - 20px)" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" @cell-click="cellClickHandler">
+        <el-table-column v-for="col in tableCols" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed" :formatter="tableFormat">
           <template #header>
-            <el-tooltip
-              :content="col.desc || col.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 || col.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>
@@ -99,7 +43,7 @@ export default {
     // BackButton,
     TableHeaderCell
   },
-  data() {
+  data () {
     return {
       queryData: {},
       containerHistory: [],
@@ -192,7 +136,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clickedCells']),
-    containerHistoryTree() {
+    containerHistoryTree () {
       return [
         {
           index: -1,
@@ -204,7 +148,7 @@ export default {
         }
       ]
     },
-    dealedTableData() {
+    dealedTableData () {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
@@ -228,7 +172,7 @@ export default {
       return this._.orderBy(filtered, sortRules[0], sortRules[1])
     }
   },
-  created() {
+  created () {
     const { containerID } = this.$route.query
     if (containerID) {
       this.queryData = { containerID }
@@ -246,18 +190,18 @@ export default {
       }
     })
   },
-  updated() {
+  updated () {
     // table数据更新
     this.$nextTick(() => {
       this.$refs.table.doLayout()
     })
   },
-  deactivated() {
+  deactivated () {
     this.treeLoading = false
     this.tableLoading = false
   },
   methods: {
-    currentChangeHandler({ index }) {
+    currentChangeHandler ({ index }) {
       if (index > -1) {
         this.selectedHistoryData = this.containerHistory[index]
         const { flightNO, flightDate, departureAirport, arriveAirport, containerID } = this.selectedHistoryData
@@ -266,7 +210,7 @@ export default {
       }
     },
     // 给表头单元格加上 ascending 或 descending 使用 element 自带的排序箭头变色
-    headerCellClass({ row, column, rowIndex, columnIndex }) {
+    headerCellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -274,14 +218,14 @@ export default {
       }
       return classes.join(' ')
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName ({ row, rowIndex }) {
       const classes = []
       if (row.isDEL === 'DEL') {
         classes.push('bgl-deleted')
       }
       return classes.join(' ')
     },
-    cellClass({ row, column, rowIndex, columnIndex }) {
+    cellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       if (
         [
@@ -306,7 +250,7 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClickHandler(row, column, cell, event) {
+    cellClickHandler (row, column, cell, event) {
       if (
         [
           // 'passengerName',
@@ -363,7 +307,7 @@ export default {
         }
       }
     },
-    tableFormat(row, column, cellValue) {
+    tableFormat (row, column, cellValue) {
       switch (column.property) {
         case 'isDEL':
           return cellValue === 'DEL' ? '删除' : ''
@@ -373,7 +317,7 @@ export default {
           return cellValue ?? ''
       }
     },
-    async queryContainerHistory(dataContent) {
+    async queryContainerHistory (dataContent) {
       this.treeLoading = true
       this.tableData = []
       try {
@@ -385,7 +329,7 @@ export default {
       }
       this.treeLoading = false
     },
-    async queryBaggageList(dataContent) {
+    async queryBaggageList (dataContent) {
       this.tableLoading = true
       this.tableData = []
       try {
@@ -430,13 +374,15 @@ export default {
             letter-spacing: 1px;
             line-height: 38px;
             font-size: 14px;
-            font-family: Helvetica, 'Microsoft YaHei';
+            font-family: Helvetica, "Microsoft YaHei";
             font-weight: bold;
             color: #101116;
           }
         }
         > .el-tree-node__content {
-          > .el-tree-node__expand-icon.el-icon-caret-right:not(.is-leaf):before {
+          > .el-tree-node__expand-icon.el-icon-caret-right:not(
+              .is-leaf
+            ):before {
             font-size: 16px;
             color: #101116;
           }
@@ -456,12 +402,12 @@ 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 {
         cursor: pointer;
-        color: #2d7cff;
+        color: #2f3480;
         &.cell-clicked {
           color: purple;
         }

+ 2 - 2
src/views/baggageManagementTemp/components/departure/index.vue

@@ -644,7 +644,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -733,7 +733,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 3 - 3
src/views/baggageManagementTemp/components/departureC/index.vue

@@ -375,7 +375,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-this.$message.error("失败");
+        this.$message.error("失败");
       }
     },
     tableRowClassName ({ row, rowIndex }) {
@@ -557,7 +557,7 @@ this.$message.error("失败");
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -646,7 +646,7 @@ this.$message.error("失败");
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 3 - 3
src/views/baggageManagementTemp/components/flight/index.vue

@@ -1039,7 +1039,7 @@ export default {
     // queryBaggageByFlightNO (dataContent) {
     //   return myQuery(SERVICE_ID.flightBaggage, ...dataContent)
     // },
-    async queryBaggageTable(dataContent) {
+    async queryBaggageTable (dataContent) {
       try {
         const res = await TempQuery({
           serviceId: 1144,
@@ -1280,7 +1280,7 @@ export default {
         &:hover,
         &.active {
           .drag-icon {
-            color: #2d67e3;
+            color: #2f3480;
           }
         }
         .drag-line {
@@ -1344,7 +1344,7 @@ export default {
   ::v-deep .el-table {
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 63 - 241
src/views/baggageManagementTemp/components/transferArrival/index.vue

@@ -8,17 +8,8 @@
 <template>
   <div class="transfer-in">
     <!--功能区-表单-->
-    <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,55 +24,15 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select
-              v-model="formData.currentAirport"
-              class="input-shadow"
-              size="small"
-              style="width: 100px"
-              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: 100px" 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="inboundCarrier">
-            <el-cascader
-              v-model="formData.inboundCarrier"
-              class="input-shadow"
-              style="width: 140px"
-              size="small"
-              :options="carrierProps"
-              :props="optionProps"
-              placeholder="进港承运航司"
-              collapse-tags
-              clearable
-              filterable
-              default-first-option
-              @change="resetLoopEvent"
-            />
+            <el-cascader v-model="formData.inboundCarrier" class="input-shadow" style="width: 140px" size="small" :options="carrierProps" :props="optionProps" placeholder="进港承运航司" collapse-tags clearable filterable default-first-option @change="resetLoopEvent" />
           </el-form-item>
           <el-form-item prop="outgoingAirline">
-            <el-cascader
-              v-model="formData.outgoingAirline"
-              class="input-shadow"
-              style="width: 140px"
-              size="small"
-              :options="carrierPropsop"
-              :props="optionPropser"
-              placeholder="离港承运航司"
-              collapse-tags
-              clearable
-              filterable
-              default-first-option
-              @change="resetLoopEvent"
-            />
+            <el-cascader v-model="formData.outgoingAirline" class="input-shadow" style="width: 140px" size="small" :options="carrierPropsop" :props="optionPropser" placeholder="离港承运航司" collapse-tags clearable filterable default-first-option @change="resetLoopEvent" />
           </el-form-item>
           <!-- <el-form-item prop="startDate">
             <el-date-picker
@@ -107,85 +58,33 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item
-            prop="flightDate"
-            label="航班日期"
-          >
-            <el-date-picker
-              v-model="formData.flightDate"
-              :clearable="false"
-              size="small"
-              style="width: 280px"
-              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: 280px" 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(1)"
-        >
+        <div class="form-right" @keyup.enter="onSubmit(1)">
           <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"
-                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" 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(1)"
-              >搜索</el-button
-            >
+            <el-button class="btn-shadow" size="mini" type="primary" @click="onSubmit(1)">搜索</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button
-              class="btn-shadow"
-              size="mini"
-              type="primary"
-              @click="changeView"
-              >切换视角</el-button
-            >
+            <el-button class="btn-shadow" size="mini" type="primary" @click="changeView">切换视角</el-button>
           </el-form-item>
           <!-- <el-form-item v-is="['ti_timeIcon']">
             <TimeZoneSelector />
@@ -197,79 +96,25 @@
             <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"
-        :data="dealedTableData"
-        :height="computedTableHeight"
-        show-summary
-        :summary-method="summaryMethod"
-        :span-method="arraySpanMethod"
-        :header-cell-class-name="headerCellClass"
-        :row-class-name="tableRowClassName"
-        :cell-class-name="cellClass"
-        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"
-        >
-          <el-table-column
-            v-for="childCol in col.children"
-            :key="childCol.prop"
-            :prop="childCol.prop"
-            :label="childCol.label"
-            :width="childCol.width"
-            :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" :data="dealedTableData" :height="computedTableHeight" show-summary :summary-method="summaryMethod" :span-method="arraySpanMethod" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" 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">
+          <el-table-column v-for="childCol in col.children" :key="childCol.prop" :prop="childCol.prop" :label="childCol.label" :width="childCol.width" :formatter="tableFormat">
             <template #header>
-              <el-tooltip
-                :content="childCol.desc || childCol.label"
-                placement="top"
-              >
-                <TableHeaderCell
-                  :label="childCol.label"
-                  :filter-options="tableDataFilters[childCol.prop]"
-                  :filter-values.sync="filterValues[childCol.prop]"
-                  :sortable="childCol.sortable"
-                  :sort-rule.sync="tableDataSortRules[childCol.prop]"
-                />
+              <el-tooltip :content="childCol.desc || childCol.label" placement="top">
+                <TableHeaderCell :label="childCol.label" :filter-options="tableDataFilters[childCol.prop]" :filter-values.sync="filterValues[childCol.prop]" :sortable="childCol.sortable" :sort-rule.sync="tableDataSortRules[childCol.prop]" />
               </el-tooltip>
             </template>
           </el-table-column>
@@ -277,41 +122,18 @@
       </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>
@@ -336,7 +158,7 @@ export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
   mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin, pf],
-  data() {
+  data () {
     return {
       optionProps: {
         value: 'inAicompanyCode2',
@@ -512,14 +334,14 @@ export default {
     }
   },
   computed: {
-    singleDay() {
+    singleDay () {
       return this.startDate === this.endDate
     },
     ...mapGetters(['timeZone'])
   },
   watch: {
     dealedTableData: {
-      handler(val) {
+      handler (val) {
         this.spanArr = []
         let contactDot = this.contactDot
         val.forEach((item, index, arr) => {
@@ -542,10 +364,10 @@ export default {
       deep: true
     }
   },
-  created() {
+  created () {
     // this.getAirPortData()
   },
-  mounted() {
+  mounted () {
     this.$refs['form'].validateField('flightDate')
     this.getAirPortData()
     this.table = this.$refs.table.bodyWrapper
@@ -554,7 +376,7 @@ export default {
       that.scrollTop = this.table.scrollTop
     })
   },
-  activated() {
+  activated () {
     const { currentAirport, startDate, endDate } = this.$route.query
     if ((currentAirport ?? '') !== '') {
       this.formData.currentAirport = currentAirport
@@ -570,20 +392,20 @@ export default {
     this.getWarningData()
     this.loopEvent = setInterval(this.getTableData, LOOP_INTERVAL.transferArrivalTable)
   },
-  deactivated() {
+  deactivated () {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
-  beforeDestroy() {
+  beforeDestroy () {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
   methods: {
-    async getWarningData() {
+    async getWarningData () {
       try {
         // const res = await TempQuery({
         //   id: SERVICE_ID.departureWarningId,
@@ -600,14 +422,14 @@ export default {
         this.$message.error('失败')
       }
     },
-    resetLoopEvent() {
+    resetLoopEvent () {
       this.loading = true
       this.hasSetTableScroll = false
       this.loopEvent && clearInterval(this.loopEvent)
       this.getTableData()
       this.loopEvent = setInterval(this.getTableData, LOOP_INTERVAL.transferArrivalTable)
     },
-    headerCellClass({ row, column }) {
+    headerCellClass ({ row, column }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -615,7 +437,7 @@ export default {
       }
       return classes.join(' ')
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName ({ row, rowIndex }) {
       const classes = []
       if (row.hasArrived) {
         classes.push('bgl-hui')
@@ -625,29 +447,29 @@ export default {
       }
       return classes.join(' ')
     },
-    changeView() {
+    changeView () {
       const query = {
         currentAirport: this.formData.currentAirport,
         startDate: this.startDate,
         endDate: this.endDate
       }
       this.$router.push({
-        path:'/transfer/departure',
+        path: '/transfer/departure',
         query
       })
     },
-    airPortChange() {
+    airPortChange () {
       this.getAviationData()
       this.upAviationData()
       this.resetLoopEvent()
     },
-    dateChangeHandler() {
+    dateChangeHandler () {
       this.getAviationData()
       this.upAviationData()
       this.resetLoopEvent()
     },
     // 选择机场
-    async getAirPortData() {
+    async getAirPortData () {
       try {
         const res = await this.getQueryListAuth(SERVICE_ID.departureAirId, {}, 1, 9999, 280)
         if (Number(res.code) === 0) {
@@ -675,7 +497,7 @@ export default {
       }
     },
     // 选择航司
-    async getAviationData() {
+    async getAviationData () {
       try {
         // const res = await TempQuery({
         //   id: SERVICE_ID.departureAviJoinId,
@@ -692,7 +514,7 @@ export default {
       }
     },
     // 选择航司
-    async upAviationData() {
+    async upAviationData () {
       try {
         // const res = await TempQuery({
         //   id: SERVICE_ID.departureAviLeaveId,
@@ -719,7 +541,7 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData() {
+    async getTableData () {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
@@ -759,7 +581,7 @@ export default {
         this.loading = false
       }
     },
-    initTableData(tableData) {
+    initTableData (tableData) {
       const currentTime = new Date()
       const curTime = this.formatTime(currentTime)
       this.baggageCount = 0
@@ -827,7 +649,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}')
@@ -837,7 +659,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}'),
@@ -856,7 +678,7 @@ export default {
         this.$message.error('失败')
       }
     },
-    setTableScroll() {
+    setTableScroll () {
       this.arrivalCount = 0
       this.dealedTableData.forEach(row => {
         if (row['hasArrived']) {
@@ -882,7 +704,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform() {
+    setNumberTransform () {
       const numberItems = this.$refs.numberItem // 拿到数字的ref,计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -892,7 +714,7 @@ export default {
       }
     },
 
-    toOrderNum(num) {
+    toOrderNum (num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数,添加"0"补位
@@ -905,7 +727,7 @@ export default {
       }
       this.setNumberTransform()
     },
-    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
       for (let i = 0; i < 7; i++) {
         if (columnIndex === i) {
           const _row = this.spanArr[rowIndex]
@@ -917,7 +739,7 @@ export default {
         }
       }
     },
-    exportHandler(refName, tableName) {
+    exportHandler (refName, tableName) {
       if (this.loading) {
         return
       }
@@ -953,7 +775,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         font-size: 14px;
       }
       .el-switch__label {
@@ -975,7 +797,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -1059,12 +881,12 @@ 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 {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }
@@ -1093,7 +915,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: '';
+            content: "";
             position: absolute;
             left: 0;
             bottom: 0;
@@ -1108,7 +930,7 @@ export default {
       background: lightcoral !important;
       position: relative;
       &::after {
-        content: '';
+        content: "";
         display: block;
         width: 100%;
         height: 100%;
@@ -1122,7 +944,7 @@ export default {
       background: #fcf0b1 !important;
       position: relative;
       &::after {
-        content: '';
+        content: "";
         display: block;
         width: 100%;
         height: 100%;

+ 2 - 2
src/views/baggageManagementTemp/components/transferDeparture/index.vue

@@ -773,7 +773,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -862,7 +862,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 2 - 2
src/views/dashboards/components/echart/statisticsHeader.vue

@@ -567,7 +567,7 @@ export default {
               border-color: #c0c4cc;
             }
             &:focus {
-              border-color: #409eff;
+              border-color: #2f3480;
             }
           }
         }
@@ -584,7 +584,7 @@ export default {
             border-color: #c0c4cc;
           }
           &.is-active {
-            border-color: #409eff;
+            border-color: #2f3480;
           }
           .el-input__icon {
             color: #303133;

+ 1 - 1
src/views/dataIntegration/views/graphChart.vue

@@ -507,7 +507,7 @@ export default {
           },
           itemStyle: {
             normal: {
-              color: "#409eff",
+              color: "#2f3480",
             },
             shadowBlur: 0
           },

+ 28 - 120
src/views/dataIntegration/views/interfaceEdit.vue

@@ -12,13 +12,7 @@
     <el-container class="scrollbar">
       <el-container>
         <el-main class="part part1">
-          <el-form
-            ref="form"
-            :model="formData"
-            class="form"
-            label-position="right"
-            label-width="132px"
-          >
+          <el-form ref="form" :model="formData" class="form" label-position="right" label-width="132px">
             <div class="header">
               <span class="title">编辑接口</span>
               <el-form-item label="是否启用">
@@ -28,82 +22,34 @@
                 </el-radio-group>
               </el-form-item>
               <el-form-item>
-                <el-button
-                  type="primary"
-                  size="small"
-                >保存</el-button>
+                <el-button type="primary" size="small">保存</el-button>
               </el-form-item>
             </div>
             <div class="main">
-              <el-form-item
-                label="名称"
-                prop="name"
-              >
-                <el-input
-                  v-model="formData.name"
-                  width="224px"
-                  placeholder="请输入名称"
-                  size="small"
-                  clearable
-                />
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" width="224px" placeholder="请输入名称" size="small" clearable />
               </el-form-item>
-              <el-form-item
-                label="描述"
-                prop="desc"
-              >
-                <el-input
-                  v-model="formData.desc"
-                  placeholder="请输入描述"
-                  type="textarea"
-                  :auto-size="{ minRows: 2 }"
-                  clearable
-                />
+              <el-form-item label="描述" prop="desc">
+                <el-input v-model="formData.desc" placeholder="请输入描述" type="textarea" :auto-size="{ minRows: 2 }" clearable />
               </el-form-item>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="接口类型">
-                    <el-select
-                      v-model="formData.type"
-                      size="small"
-                      placeholder="请选择"
-                    >
-                      <el-option
-                        v-for="{ value, label } in formOptions.type"
-                        :key="value"
-                        :value="value"
-                        :label="label"
-                      />
+                    <el-select v-model="formData.type" size="small" placeholder="请选择">
+                      <el-option v-for="{ value, label } in formOptions.type" :key="value" :value="value" :label="label" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="接口协议">
-                    <el-select
-                      v-model="formData.protocol"
-                      size="small"
-                      placeholder="请选择"
-                    >
-                      <el-option
-                        v-for="{ value, label } in formOptions.protocol"
-                        :key="value"
-                        :value="value"
-                        :label="label"
-                      />
+                    <el-select v-model="formData.protocol" size="small" placeholder="请选择">
+                      <el-option v-for="{ value, label } in formOptions.protocol" :key="value" :value="value" :label="label" />
                     </el-select>
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-form-item
-                label="详细配置"
-                prop="options"
-              >
-                <el-input
-                  v-model="formData.options"
-                  placeholder="请输入详细配置"
-                  type="textarea"
-                  :auto-size="{ minRows: 2 }"
-                  clearable
-                />
+              <el-form-item label="详细配置" prop="options">
+                <el-input v-model="formData.options" placeholder="请输入详细配置" type="textarea" :auto-size="{ minRows: 2 }" clearable />
               </el-form-item>
               <el-form-item label="是否开启本地缓存">
                 <el-radio-group v-model="formData.cache">
@@ -112,52 +58,24 @@
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="目标数据类型">
-                <el-select
-                  v-model="formData.dataType"
-                  size="small"
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="{ value, label } in formOptions.dataType"
-                    :key="value"
-                    :value="value"
-                    :label="label"
-                  />
+                <el-select v-model="formData.dataType" size="small" placeholder="请选择">
+                  <el-option v-for="{ value, label } in formOptions.dataType" :key="value" :value="value" :label="label" />
                 </el-select>
               </el-form-item>
-              <el-form-item
-                label="目标数据配置"
-                prop="dataOptions"
-              >
-                <el-input
-                  v-model="formData.dataOptions"
-                  placeholder="请输入目标数据配置"
-                  type="textarea"
-                  :auto-size="{ minRows: 2 }"
-                  clearable
-                />
+              <el-form-item label="目标数据配置" prop="dataOptions">
+                <el-input v-model="formData.dataOptions" placeholder="请输入目标数据配置" type="textarea" :auto-size="{ minRows: 2 }" clearable />
               </el-form-item>
             </div>
           </el-form>
         </el-main>
-        <el-aside
-          class="part part2"
-          width="502px"
-        >
+        <el-aside class="part part2" width="502px">
           <div class="header">
             <span class="title">节点管理</span>
-            <el-button
-              class="button-white"
-              size="small"
-            >新增</el-button>
+            <el-button class="button-white" size="small">新增</el-button>
           </div>
           <div class="main">
             <el-row :gutter="22">
-              <el-col
-                v-for="node in nodeList"
-                :key="node.id"
-                :span="12"
-              >
+              <el-col v-for="node in nodeList" :key="node.id" :span="12">
                 <div class="interface-edit-card">
                   <div class="card-button-close">
                     <i class="el-icon-close" />
@@ -175,24 +93,14 @@
           </div>
         </el-aside>
       </el-container>
-      <el-footer
-        class="part part3"
-        height="360px"
-      >
+      <el-footer class="part part3" height="360px">
         <div class="header">
           <span class="title">源数据管理</span>
-          <el-button
-            class="button-white"
-            size="small"
-          >新增</el-button>
+          <el-button class="button-white" size="small">新增</el-button>
         </div>
         <div class="main">
           <el-row :gutter="20">
-            <el-col
-              v-for="source in sourceList"
-              :key="source.id"
-              :span="4"
-            >
+            <el-col v-for="source in sourceList" :key="source.id" :span="4">
               <div class="interface-edit-card">
                 <div class="card-button-close">
                   <i class="el-icon-close" />
@@ -215,7 +123,7 @@
 
 <script>
 export default {
-  data() {
+  data () {
     return {
       formData: {
         active: '1',
@@ -331,11 +239,11 @@ export default {
           font-size: 20px;
           font-weight: bold;
           &::before {
-            content: '';
+            content: "";
             position: absolute;
             width: 4px;
             height: 20px;
-            background: #2d67e3;
+            background: #2f3480;
             top: 6px;
             left: 0;
           }
@@ -346,7 +254,7 @@ export default {
           &.button-white {
             background: #ffffff;
             border: 1px solid #92ace2;
-            color: #2d67e3;
+            color: #2f3480;
           }
         }
       }
@@ -357,7 +265,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         font-size: 14px;
       }
       label {
@@ -378,7 +286,7 @@ export default {
         box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.1);
         border-radius: 4px;
         position: relative;
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         .card-button-close {
           position: absolute;
           top: -12px;

+ 1 - 1
src/views/dataIntegration/views/interfaceLog.vue

@@ -181,7 +181,7 @@ export default {
             position: absolute;
             width: 20px;
             height: 20px;
-            background: #2d67e3;
+            background: #2f3480;
             left: -5px;
             border-radius: 50%;
             z-index: 1;

+ 8 - 8
src/views/exchange/views/omMonitoring/css/index.scss

@@ -104,7 +104,7 @@
             }
             .start,
             .stop {
-              color: #2579a0;
+              color: #2f3480;
             }
             .error {
               color: #eb3434;
@@ -156,11 +156,11 @@
     }
     .serButton {
       border: 1px solid #b2cbde;
-      color: #2579a0;
+      color: #2f3480;
       border-radius: 4px;
     }
     .bcButton {
-      background: #2579a0;
+      background: #2f3480;
       border-radius: 4px;
     }
   }
@@ -183,7 +183,7 @@
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }
@@ -235,7 +235,7 @@
       justify-content: center;
       float: left;
       span {
-        color: #2d67e3;
+        color: #2f3480;
       }
     }
     .rmScser {
@@ -249,7 +249,7 @@
       justify-content: center;
       float: left;
       span {
-        color: #2d67e3;
+        color: #2f3480;
       }
     }
     .rmSc {
@@ -284,7 +284,7 @@
       .icon {
         width: 14px;
         height: 14px;
-        background: #2d67e3;
+        background: #2f3480;
         border-radius: 2px;
         display: inline-block;
         vertical-align: middle;
@@ -339,7 +339,7 @@
     transform: rotate(-180deg);
   }
   &.arrow-blue {
-    color: #2d7cff;
+    color: #2f3480;
     font-weight: bold;
   }
 }

+ 2 - 2
src/views/flightViewManagement/components/arrival/index.vue

@@ -595,7 +595,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -684,7 +684,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 3 - 3
src/views/flightViewManagement/components/baggage/index.vue

@@ -920,7 +920,7 @@ export default {
           height: 100%;
           background: #afb4bf;
           &.step-line-active {
-            background: #2d67e3;
+            background: #2f3480;
           }
         }
       }
@@ -965,7 +965,7 @@ export default {
           }
         }
         &.active-item .step-circle {
-          background: #2d67e3;
+          background: #2f3480;
         }
       }
     }
@@ -992,7 +992,7 @@ export default {
         &.cell-click {
           cursor: pointer;
           .cell {
-            color: #2d7cff;
+            color: #2f3480;
           }
         }
         .cell {

+ 40 - 136
src/views/flightViewManagement/components/container/index.vue

@@ -3,64 +3,29 @@
     <div class="container-basic">
       <div class="title">
         <div class="manageTitle">容器基本信息</div>
-        <el-button
-          type="primary"
-          size="small"
-          @click="toContainerHistory"
-        >历史记录</el-button>
+        <el-button type="primary" size="small" @click="toContainerHistory">历史记录</el-button>
       </div>
-      <div
-        ref="basicBox"
-        class="basic-info-box"
-      >
+      <div ref="basicBox" class="basic-info-box">
         <el-row :gutter="10">
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="4"
-          >
+          <el-col :xs="6" :sm="6" :xl="4">
             <div class="grid-content">容器编号:{{ $route.query.containerID }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">容器类型:{{ $route.query.containerType }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">舱位:{{ $route.query.containerSpace }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">航班号:{{ $route.query.flightNO }}</div>
           </el-col>
-          <el-col
-            :xs="12"
-            :sm="12"
-            :xl="5"
-          >
+          <el-col :xs="12" :sm="12" :xl="5">
             <div class="grid-content">航班日期:{{ $route.query.flightDate }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">起飞站:{{ $route.query.departureAirport }}</div>
           </el-col>
-          <el-col
-            :xs="6"
-            :sm="6"
-            :xl="3"
-          >
+          <el-col :xs="6" :sm="6" :xl="3">
             <div class="grid-content">目的站:{{ $route.query.landingAirport }}</div>
           </el-col>
         </el-row>
@@ -70,92 +35,32 @@
       <div class="title">
         <div class="manageTitle">容器行李列表</div>
         <!-- <TimeZoneSelector /> -->
-        <img
-          class="btn-square btn-shadow"
-          src="@/assets/baggage/ic_export.png"
-          title="导出"
-          @click="exportHandler('table', '容器行李列表')"
-        >
-        <img
-          class="btn-square btn-shadow"
-          src="@/assets/baggage/ic_setting.png"
-          title="列设置"
-          @click="show"
-        >
+        <img class="btn-square btn-shadow" src="@/assets/baggage/ic_export.png" title="导出" @click="exportHandler('table', '容器行李列表')">
+        <img class="btn-square btn-shadow" src="@/assets/baggage/ic_setting.png" title="列设置" @click="show">
       </div>
       <div class="table-wrapper">
-        <el-table
-          ref="table"
-          :data="dealedTableData"
-          :height="computedTableHeight"
-          border
-          stripe
-          size="mini"
-          show-summary
-          :summary-method="summaryRow(dealedTableData.length)"
-          :header-cell-class-name="headerCellClass"
-          :header-cell-style="{ color: '#101116' }"
-          :row-class-name="rowClass"
-          :cell-class-name="cellClass"
-          @cell-click="cellClickHandler"
-        >
-          <el-table-column
-            v-for="col in tableColsCopy"
-            :key="col.index"
-            :prop="col.prop"
-            :label="col.label"
-            :align="col.align || 'center'"
-            :width="col.width"
-            :fixed="col.fixed"
-            :formatter="tableFormat"
-          >
+        <el-table ref="table" :data="dealedTableData" :height="computedTableHeight" border stripe size="mini" show-summary :summary-method="summaryRow(dealedTableData.length)" :header-cell-class-name="headerCellClass" :header-cell-style="{ color: '#101116' }" :row-class-name="rowClass" :cell-class-name="cellClass" @cell-click="cellClickHandler">
+          <el-table-column v-for="col in tableColsCopy" :key="col.index" :prop="col.prop" :label="col.label" :align="col.align || 'center'" :width="col.width" :fixed="col.fixed" :formatter="tableFormat">
             <template #header>
-              <TableHeaderCell
-                :label="col.label"
-                :filter-options="tableDataFilters[col.prop]"
-                :filter-values.sync="filterValues[col.prop]"
-                :sortable="col.sortable"
-                :sort-rule.sync="tableDataSortRules[col.prop]"
-              />
+              <TableHeaderCell :label="col.label" :filter-options="tableDataFilters[col.prop]" :filter-values.sync="filterValues[col.prop]" :sortable="col.sortable" :sort-rule.sync="tableDataSortRules[col.prop]" />
             </template>
           </el-table-column>
         </el-table>
       </div>
     </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('tableData')"
-          >确定</el-button>
-          <el-button
-            size="medium"
-            @click="hide"
-          >取消</el-button>
+          <el-button size="medium" class="r24" type="primary" @click="onCheck('tableData')">确定</el-button>
+          <el-button size="medium" @click="hide">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -183,7 +88,7 @@ export default {
     tableColsMixin
     //  timeZoneMixin
   ],
-  data() {
+  data () {
     return {
       loading: false,
       queryData: {},
@@ -269,7 +174,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clickedCells']),
-    dealedTableData() {
+    dealedTableData () {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
@@ -294,7 +199,7 @@ export default {
     }
   },
   watch: {
-    loading(val) {
+    loading (val) {
       if (val) {
         this.fullscreenLoading = this.$loading({
           lock: true,
@@ -307,7 +212,7 @@ export default {
       }
     }
   },
-  created() {
+  created () {
     const { flightNO, flightDate, departureAirport, landingAirport, containerID } = this.$route.query
     if (flightNO && flightDate && departureAirport && landingAirport && containerID) {
       this.queryData = { flightNO, flightDate, departureAirport, landingAirport, containerID }
@@ -325,29 +230,28 @@ export default {
       }
     })
   },
-  activated() {
+  activated () {
     this.setTableHeight()
   },
-  updated() {
+  updated () {
     this.setTableHeight()
   },
-  deactivated() {
+  deactivated () {
     this.fullscreenLoading?.close()
   },
   methods: {
-    setTableHeight() {
+    setTableHeight () {
       const headerHeight = 80
       const bottomBlankHeight = 16
       const titleHeight = 64
       const basicBoxHeight = this.$refs['basicBox'].offsetHeight
-      this.computedTableHeight = `calc(100vh - ${
-        headerHeight + bottomBlankHeight + titleHeight * 2 + basicBoxHeight
-      }px)`
+      this.computedTableHeight = `calc(100vh - ${headerHeight + bottomBlankHeight + titleHeight * 2 + basicBoxHeight
+        }px)`
       this.$nextTick(() => {
         this.$refs['table']?.doLayout()
       })
     },
-    rowClass({ row, rowIndex }) {
+    rowClass ({ row, rowIndex }) {
       const classes = []
       if (row['isDEL'] === 'DEL') {
         classes.push('bgl-deleted')
@@ -358,7 +262,7 @@ export default {
       return classes.join(' ')
     },
     // 给表头单元格加上 ascending 或 descending 使用 element 自带的排序箭头变色
-    headerCellClass({ row, column, rowIndex, columnIndex }) {
+    headerCellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -366,7 +270,7 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClass({ row, column, rowIndex, columnIndex }) {
+    cellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       if (
         ['checkInTime', 'DealInfo', 'sortLocationMark', 'loadLocationMark', 'inflLocationMark'].includes(
@@ -398,7 +302,7 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClickHandler(row, column, cell, event) {
+    cellClickHandler (row, column, cell, event) {
       if (
         [
           'passengerName',
@@ -437,7 +341,7 @@ export default {
         }
       }
     },
-    toContainerHistory() {
+    toContainerHistory () {
       this.$router.push({
         path: `${this.$route.path.split('/').slice(0, -1).join('/')}/containerHistory`,
         query: {
@@ -446,12 +350,12 @@ export default {
       })
     },
     // 统计行数
-    summaryRow(num) {
+    summaryRow (num) {
       return function () {
         return ['合计', `共${num}件`]
       }
     },
-    tableFormat(row, column, cellValue) {
+    tableFormat (row, column, cellValue) {
       switch (column.property) {
         case 'isDEL':
           return cellValue === 'DEL' ? '删除' : ''
@@ -461,12 +365,12 @@ export default {
           return cellValue ?? ''
       }
     },
-    exportHandler(refName, tableName) {
+    exportHandler (refName, tableName) {
       const table = this.$refs[refName].$el.cloneNode(true)
       const fileName = `${tableName}-${Object.values(this.queryData).join('-')}.xlsx`
       exportToExcel(table, tableName, fileName)
     },
-    async queryContainerBaggage(dataContent) {
+    async queryContainerBaggage (dataContent) {
       this.loading = true
       this.tableData = []
       try {
@@ -528,12 +432,12 @@ 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 {
           cursor: pointer;
-          color: #2d7cff;
+          color: #2f3480;
           &.cell-clicked {
             color: purple;
           }

+ 29 - 83
src/views/flightViewManagement/components/containerHistory/index.vue

@@ -5,32 +5,10 @@
         <span class="manageTitle">容器历史</span>
         <!-- <BackButton /> -->
       </div>
-      <div
-        v-loading="treeLoading"
-        element-loading-text="拼命加载中"
-        element-loading-spinner="el-icon-loading"
-        element-loading-background="rgba(0, 0, 0, 0.8)"
-        class="container-tree"
-      >
-        <el-tree
-          :data="containerHistoryTree"
-          :props="defaultTreeProps"
-          node-key="index"
-          default-expand-all
-          :expand-on-click-node="false"
-          @current-change="currentChangeHandler"
-        >
-          <span
-            slot-scope="{ node, data }"
-            class="el-tree-node__label"
-          >
-            <el-tooltip
-              v-if="data.index === -1"
-              class="item"
-              effect="dark"
-              :content="msg"
-              placement="top"
-            >
+      <div v-loading="treeLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="container-tree">
+        <el-tree :data="containerHistoryTree" :props="defaultTreeProps" node-key="index" default-expand-all :expand-on-click-node="false" @current-change="currentChangeHandler">
+          <span slot-scope="{ node, data }" class="el-tree-node__label">
+            <el-tooltip v-if="data.index === -1" class="item" effect="dark" :content="msg" placement="top">
               <span>{{ node.label }}</span>
             </el-tooltip>
             <span v-else>{{ node.label }}</span>
@@ -38,46 +16,12 @@
         </el-tree>
       </div>
     </div>
-    <div
-      v-loading="tableLoading"
-      element-loading-text="拼命加载中"
-      element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-      class="container-right"
-    >
-      <el-table
-        ref="table"
-        :data="dealedTableData"
-        border
-        stripe
-        fit
-        height="calc(100vh - 80px - 17px - 20px)"
-        :header-cell-class-name="headerCellClass"
-        :row-class-name="tableRowClassName"
-        :cell-class-name="cellClass"
-        @cell-click="cellClickHandler"
-      >
-        <el-table-column
-          v-for="col in tableCols"
-          :key="col.prop"
-          :prop="col.prop"
-          :label="col.label"
-          :width="col.width"
-          :fixed="col.fixed"
-          :formatter="tableFormat"
-        >
+    <div v-loading="tableLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="container-right">
+      <el-table ref="table" :data="dealedTableData" border stripe fit height="calc(100vh - 80px - 17px - 20px)" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" @cell-click="cellClickHandler">
+        <el-table-column v-for="col in tableCols" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed" :formatter="tableFormat">
           <template #header>
-            <el-tooltip
-              :content="col.desc || col.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 || col.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>
@@ -99,7 +43,7 @@ export default {
     // BackButton,
     TableHeaderCell
   },
-  data() {
+  data () {
     return {
       queryData: {},
       containerHistory: [],
@@ -192,7 +136,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clickedCells']),
-    containerHistoryTree() {
+    containerHistoryTree () {
       return [
         {
           index: -1,
@@ -204,7 +148,7 @@ export default {
         }
       ]
     },
-    dealedTableData() {
+    dealedTableData () {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
@@ -228,7 +172,7 @@ export default {
       return this._.orderBy(filtered, sortRules[0], sortRules[1])
     }
   },
-  created() {
+  created () {
     const { containerID } = this.$route.query
     if (containerID) {
       this.queryData = { containerID }
@@ -246,18 +190,18 @@ export default {
       }
     })
   },
-  updated() {
+  updated () {
     // table数据更新
     this.$nextTick(() => {
       this.$refs.table.doLayout()
     })
   },
-  deactivated() {
+  deactivated () {
     this.treeLoading = false
     this.tableLoading = false
   },
   methods: {
-    currentChangeHandler({ index }) {
+    currentChangeHandler ({ index }) {
       if (index > -1) {
         this.selectedHistoryData = this.containerHistory[index]
         const { flightNO, flightDate, departureAirport, arriveAirport, containerID } = this.selectedHistoryData
@@ -266,7 +210,7 @@ export default {
       }
     },
     // 给表头单元格加上 ascending 或 descending 使用 element 自带的排序箭头变色
-    headerCellClass({ row, column, rowIndex, columnIndex }) {
+    headerCellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -274,14 +218,14 @@ export default {
       }
       return classes.join(' ')
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName ({ row, rowIndex }) {
       const classes = []
       if (row.isDEL === 'DEL') {
         classes.push('bgl-deleted')
       }
       return classes.join(' ')
     },
-    cellClass({ row, column, rowIndex, columnIndex }) {
+    cellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       if (
         [
@@ -306,7 +250,7 @@ export default {
       }
       return classes.join(' ')
     },
-    cellClickHandler(row, column, cell, event) {
+    cellClickHandler (row, column, cell, event) {
       if (
         [
           'passengerName',
@@ -363,7 +307,7 @@ export default {
         }
       }
     },
-    tableFormat(row, column, cellValue) {
+    tableFormat (row, column, cellValue) {
       switch (column.property) {
         case 'isDEL':
           return cellValue === 'DEL' ? '删除' : ''
@@ -373,7 +317,7 @@ export default {
           return cellValue ?? ''
       }
     },
-    async queryContainerHistory(dataContent) {
+    async queryContainerHistory (dataContent) {
       this.treeLoading = true
       this.tableData = []
       try {
@@ -385,7 +329,7 @@ export default {
       }
       this.treeLoading = false
     },
-    async queryBaggageList(dataContent) {
+    async queryBaggageList (dataContent) {
       this.tableLoading = true
       this.tableData = []
       try {
@@ -430,13 +374,15 @@ export default {
             letter-spacing: 1px;
             line-height: 38px;
             font-size: 14px;
-            font-family: Helvetica, 'Microsoft YaHei';
+            font-family: Helvetica, "Microsoft YaHei";
             font-weight: bold;
             color: #101116;
           }
         }
         > .el-tree-node__content {
-          > .el-tree-node__expand-icon.el-icon-caret-right:not(.is-leaf):before {
+          > .el-tree-node__expand-icon.el-icon-caret-right:not(
+              .is-leaf
+            ):before {
             font-size: 16px;
             color: #101116;
           }
@@ -456,12 +402,12 @@ 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 {
         cursor: pointer;
-        color: #2d7cff;
+        color: #2f3480;
         &.cell-clicked {
           color: purple;
         }

+ 2 - 2
src/views/flightViewManagement/components/departure/index.vue

@@ -635,7 +635,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/
@@ -724,7 +724,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 2 - 2
src/views/flightViewManagement/components/flight/index.vue

@@ -1247,7 +1247,7 @@ export default {
         &:hover,
         &.active {
           .drag-icon {
-            color: #2d67e3;
+            color: #2f3480;
           }
         }
         .drag-line {
@@ -1311,7 +1311,7 @@ export default {
   ::v-deep .el-table {
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 1 - 1
src/views/login/index copy.vue

@@ -293,7 +293,7 @@ $light_gray: #eee;
     font-family: Microsoft YaHei;
     font-weight: 400;
     text-decoration: underline;
-    color: #2d67e3;
+    color: #2f3480;
     .fpwd {
       cursor: pointer;
     }

+ 1 - 1
src/views/login/index.vue

@@ -275,7 +275,7 @@ $light_gray: #eee;
     font-family: Microsoft YaHei;
     font-weight: 400;
     text-decoration: underline;
-    color: #2d67e3;
+    color: #2f3480;
     .fpwd {
       cursor: pointer;
     }

+ 2 - 2
src/views/monitoringlarge/components/echart/statisticsHeader.vue

@@ -567,7 +567,7 @@ export default {
               border-color: #c0c4cc;
             }
             &:focus {
-              border-color: #409eff;
+              border-color: #2f3480;
             }
           }
         }
@@ -584,7 +584,7 @@ export default {
             border-color: #c0c4cc;
           }
           &.is-active {
-            border-color: #409eff;
+            border-color: #2f3480;
           }
           .el-input__icon {
             color: #303133;

+ 1 - 1
src/views/newArrival/index.vue

@@ -246,7 +246,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/

+ 2 - 2
src/views/newBagDetails/components/baggageView.vue

@@ -352,7 +352,7 @@ export default {
             height: 100%;
             background: #afb4bf;
             &.step-line-active {
-              background: #2d67e3;
+              background: #2f3480;
             }
           }
         }
@@ -397,7 +397,7 @@ export default {
             }
           }
           &.active-item .step-circle {
-            background: #2d67e3;
+            background: #2f3480;
           }
         }
       }

+ 2 - 2
src/views/newBagDetails/index.vue

@@ -356,7 +356,7 @@ export default {
                 left: 0;
                 bottom: 0;
                 height: 3px;
-                background: #2d67e3;
+                background: #2f3480;
               }
             }
           }
@@ -427,7 +427,7 @@ export default {
               left: 0;
               bottom: 0;
               height: 3px;
-              background: #2d67e3;
+              background: #2f3480;
             }
           }
         }

+ 1 - 1
src/views/newDeparture/index.vue

@@ -251,7 +251,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/

+ 6 - 6
src/views/newQuery/components/search.vue

@@ -434,14 +434,14 @@ export default {
       height: 50px;
       margin-bottom: 0;
       background-color: #fff;
-      border: 1px solid #409eff;
+      border: 1px solid #2f3480;
       border-right: none;
       &:first-child {
         border-radius: 4px 0px 0px 4px;
       }
       &:nth-last-child(2) {
         border-radius: 0px 4px 4px 0px;
-        border-right: 1px solid#409EFF;
+        border-right: 1px solid#2f3480;
       }
       &:nth-child(3) {
         flex: 1;
@@ -501,7 +501,7 @@ export default {
       font-size: 14px;
       font-family: Microsoft YaHei;
       text-decoration: underline;
-      color: #409eff;
+      color: #2f3480;
       cursor: pointer;
     }
     .clickable-add {
@@ -517,11 +517,11 @@ export default {
         height: 30px;
         line-height: 28px;
         border-radius: 50%;
-        border: 1px solid #409eff;
-        color: #409eff;
+        border: 1px solid #2f3480;
+        color: #2f3480;
       }
       &:hover .clickable-wrapper {
-        background-color: #409eff;
+        background-color: #2f3480;
         color: #fff;
       }
     }

+ 1 - 1
src/views/newQuery/components/table.vue

@@ -730,7 +730,7 @@ export default {
   ::v-deep .table {
     .is-click-btn {
       .cell {
-        color: #409eff;
+        color: #2f3480;
         cursor: pointer;
         position: relative;
       }

+ 4 - 4
src/views/newQuery/index.vue

@@ -371,14 +371,14 @@ export default {
       max-width: 750px;
       white-space: nowrap;
       .active {
-        background: #409eff !important;
-        border-color: #409eff !important;
+        background: #2f3480 !important;
+        border-color: #2f3480 !important;
         color: #fff !important;
       }
       .el-button {
         &:focus {
-          color: #409eff;
-          background: #ecf5ff;
+          color: #2f3480;
+          background: #2f3480;
           border-color: #b3d8ff;
         }
       }

+ 4 - 4
src/views/newRole/css/index.scss

@@ -72,7 +72,7 @@
             }
             .start,
             .stop {
-              color: #2579a0;
+              color: #2f3480;
             }
             .error {
               color: #eb3434;
@@ -101,7 +101,7 @@
               }
               .ym{
                 font-size: 14px;
-                color: #2579a0;
+                color: #2f3480;
                 margin-right: 16px;
               }
             }
@@ -182,11 +182,11 @@
     }
     .serButton {
       border: 1px solid #b2cbde;
-      color: #2579a0;
+      color: #2f3480;
       border-radius: 4px;
     }
     .bcButton {
-      background: #2579a0;
+      background: #2f3480;
       border-radius: 4px;
     }
   }

+ 10 - 10
src/views/newTable/index.vue

@@ -761,14 +761,14 @@ export default {
     }
   }
   .bcButton {
-    background: #2579a0;
+    background: #2f3480;
     border-radius: 4px;
-    border-color: #2579a0;
+    border-color: #2f3480;
     color: #ffffff;
   }
   .bcButton.is-disabled {
     color: #8cc5ff;
-    background-color: #ecf5ff;
+    background-color: #2f3480;
     border-color: #d9ecff;
   }
   .bcTitle {
@@ -793,7 +793,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }
@@ -851,7 +851,7 @@ export default {
       justify-content: center;
       float: left;
       span {
-        color: #2579a0;
+        color: #2f3480;
       }
     }
     .rmScser {
@@ -865,7 +865,7 @@ export default {
       justify-content: center;
       float: left;
       span {
-        color: #2d67e3;
+        color: #2f3480;
       }
     }
     .rmSc {
@@ -900,7 +900,7 @@ export default {
       .icon {
         width: 14px;
         height: 14px;
-        background: #2d67e3;
+        background: #2f3480;
         border-radius: 2px;
         display: inline-block;
         vertical-align: middle;
@@ -955,7 +955,7 @@ export default {
     transform: rotate(-180deg);
   }
   &.arrow-blue {
-    color: #2d7cff;
+    color: #2f3480;
     font-weight: bold;
   }
 }
@@ -965,10 +965,10 @@ export default {
 .data-table-dialog {
   ::v-deep .dialog-content {
     .title {
-      background-color: #2579a0;
+      background-color: #2f3480;
     }
     .bcButton {
-      background-color: #2579a0;
+      background-color: #2f3480;
     }
     .contents {
       padding: 24px;

+ 1 - 1
src/views/newTransfer/index.vue

@@ -238,7 +238,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     writing-mode: vertical-lr;
     text-orientation: upright;
     /*文字禁止编辑*/

+ 57 - 125
src/views/statisticalAnalysis/components/index.vue

@@ -1,27 +1,12 @@
 <template>
-  <div
-    id="fullDom"
-    :class="value == 1 ? 'isWhite' : 'isBlack'"
-  >
+  <div id="fullDom" :class="value == 1 ? 'isWhite' : 'isBlack'">
     <div class="statisticalAnalysisContent">
       <div class="flex">
         <div class="manageTitle">统计分析</div>
         <div class="manageBtns">
-          <el-switch
-            v-model="value"
-            active-color="#13ce66"
-            inactive-color="#ff4949"
-            active-value="1"
-            inactive-value="0"
-            title="切换主题"
-            @change="changeZt"
-          >
+          <el-switch v-model="value" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0" title="切换主题" @change="changeZt">
           </el-switch>
-          <span
-            title="全屏"
-            @click="fullScreen"
-            class="el-icon-full-screen iconfull"
-          ></span>
+          <span title="全屏" @click="fullScreen" class="el-icon-full-screen iconfull"></span>
         </div>
       </div>
       <div class="content">
@@ -30,22 +15,14 @@
             <div class="content-list-box-bp">
               <div class="content-list-box-bp-title">运输总量</div>
               <div class="box-item">
-                <li
-                  v-for="(item, index) in orderNum"
-                  :key="index"
-                  :class="{
+                <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>
             </div>
@@ -68,10 +45,7 @@
                 </div>
               </div>
               <div class="total-transportation-content">
-                <LineCharts
-                  id="total-transportation"
-                  :option="totalOption"
-                />
+                <LineCharts id="total-transportation" :option="totalOption" />
               </div>
             </div>
           </div>
@@ -80,26 +54,16 @@
               <div class="content-list-box-bp-title">统计数据</div>
               <div class="statistical-data">
                 <el-row>
-                  <el-col
-                    v-for="(item, index) in statisticalData"
-                    :key="index"
-                    :span="12"
-                  >
+                  <el-col v-for="(item, index) in statisticalData" :key="index" :span="12">
                     <div class="flex-wrap">
                       <div class="icon">
-                        <img
-                          :src="item.src"
-                          :alt="item.msg"
-                        />
+                        <img :src="item.src" :alt="item.msg" />
                       </div>
                       <div class="info">
                         <div class="info-time">
-                          <el-tooltip
-                            :content="String(item.info)"
-                            :disabled="
+                          <el-tooltip :content="String(item.info)" :disabled="
                               item.key !== 'transnum' || item.info < 10000
-                            "
-                          >
+                            ">
                             <span class="info-time-xq">{{
                               item.key === 'transnum' && item.info >= 10000
                                 ? `${Math.floor(item.info / 10000)}万`
@@ -133,10 +97,7 @@
                   <div class="total-data-info-list">( 单位:万 )</div>
                 </div>
                 <div class="total-data-charts">
-                  <BarCharts
-                    id="total-charts"
-                    :option="dataOption"
-                  />
+                  <BarCharts id="total-charts" :option="dataOption" />
                 </div>
               </div>
             </div>
@@ -144,22 +105,12 @@
               <div class="content-list-box-bp-title">异常行李</div>
               <div class="total-data pie-data flex-wrap">
                 <div class="total-data-charts">
-                  <PieCharts
-                    id="pie-charts"
-                    :option="pieOption"
-                  />
+                  <PieCharts id="pie-charts" :option="pieOption" />
                 </div>
                 <div class="total-data-info">
-                  <div
-                    v-for="(item, index) in baggageData"
-                    :key="index"
-                    class="total-data-info-list"
-                  >
+                  <div v-for="(item, index) in baggageData" :key="index" class="total-data-info-list">
                     <div class="pie-data-list">
-                      <span
-                        :class="'icon' + (index + 1)"
-                        class="icon"
-                      ></span>
+                      <span :class="'icon' + (index + 1)" class="icon"></span>
                       <span class="text">{{ item.name }}</span>
                     </div>
                     <div class="pie-data-list flex-wrap">
@@ -172,22 +123,13 @@
             </div>
           </div>
           <div class="content-list-box boxMap">
-            <MapCharts
-              id="box-map"
-              :option="boxMap"
-            />
+            <MapCharts id="box-map" :option="boxMap" />
             <div class="boxMap-box flex-wrap">
               <div class="boxMap-pie domestic">
-                <PieCharts
-                  id="domestic"
-                  :option="domesticOption"
-                />
+                <PieCharts id="domestic" :option="domesticOption" />
               </div>
               <div class="boxMap-pie international">
-                <PieCharts
-                  id="international"
-                  :option="internationalOption"
-                />
+                <PieCharts id="international" :option="internationalOption" />
               </div>
             </div>
           </div>
@@ -195,21 +137,11 @@
             <div class="content-list-box-bp">
               <div class="content-list-box-bp-title">航站运输排行</div>
               <div class="terminal-transportation mt36">
-                <vue-seamless-scroll
-                  class="scrollTable"
-                  :class-option="defaultOption"
-                >
-                  <div
-                    class="terminal-transportation-list flex"
-                    v-for="(item, index) in terminalData"
-                    :key="index"
-                  >
+                <vue-seamless-scroll class="scrollTable" :class-option="defaultOption">
+                  <div class="terminal-transportation-list flex" v-for="(item, index) in terminalData" :key="index">
                     <div class="name">{{ item.name }}</div>
                     <div class="progress">
-                      <el-progress
-                        :percentage="item.percentage"
-                        :color="customColor"
-                      ></el-progress>
+                      <el-progress :percentage="item.percentage" :color="customColor"></el-progress>
                     </div>
                     <div class="num">{{ item.num }}</div>
                   </div>
@@ -241,7 +173,7 @@ export default {
     MapCharts,
     vueSeamlessScroll,
   },
-  data() {
+  data () {
     return {
       value: '1',
       isFull: false,
@@ -544,7 +476,7 @@ export default {
               position: 'left',
             },
             itemStyle: {
-              color: '#2D67E3',
+              color: '#2f3480',
               barBorderRadius: [4, 0, 0, 4],
             },
             data: [43, 53, 24, 11, 32],
@@ -785,11 +717,11 @@ export default {
                 color: new this.$echarts.graphic.LinearGradient(0, 1, 0, 0, [
                   {
                     offset: 0,
-                    color: '#2D67E3',
+                    color: '#2f3480',
                   },
                   {
                     offset: 1,
-                    color: '#2D67E3',
+                    color: '#2f3480',
                   },
                 ]),
               },
@@ -876,11 +808,11 @@ export default {
                 color: new this.$echarts.graphic.LinearGradient(0, 1, 0, 0, [
                   {
                     offset: 0,
-                    color: '#2D67E3',
+                    color: '#2f3480',
                   },
                   {
                     offset: 1,
-                    color: '#2D67E3',
+                    color: '#2f3480',
                   },
                 ]),
               },
@@ -921,7 +853,7 @@ export default {
     }
   },
   computed: {
-    defaultOption() {
+    defaultOption () {
       return {
         step: 0.5, // 数值越大速度滚动越快
         limitMoveNum: 0, // 开始无缝滚动的数据量  //this.fourDatata.length
@@ -935,16 +867,16 @@ export default {
     },
   },
   watch: {
-    countEnterNum() {
+    countEnterNum () {
       this.getCountEnterNum()
     },
   },
-  created() {
+  created () {
     this.getDataInit()
   },
   methods: {
     // 切换主题
-    changeZt(val) {
+    changeZt (val) {
       if (val == 0) {
         this.totalOption.xAxis.axisLine.lineStyle.color = '#fff'
         this.totalOption.xAxis.axisLabel.color = '#fff'
@@ -1041,11 +973,11 @@ export default {
                 color: new this.$echarts.graphic.LinearGradient(0, 1, 0, 0, [
                   {
                     offset: 0,
-                    color: '#2D67E3',
+                    color: '#2f3480',
                   },
                   {
                     offset: 1,
-                    color: '#2D67E3',
+                    color: '#2f3480',
                   },
                 ]),
               },
@@ -1069,11 +1001,11 @@ export default {
                 color: new this.$echarts.graphic.LinearGradient(0, 1, 0, 0, [
                   {
                     offset: 0,
-                    color: '#2D67E3',
+                    color: '#2f3480',
                   },
                   {
                     offset: 1,
-                    color: '#2D67E3',
+                    color: '#2f3480',
                   },
                 ]),
               },
@@ -1090,7 +1022,7 @@ export default {
       }
     },
     // 全屏
-    fullScreen() {
+    fullScreen () {
       this.isFull = !this.isFull
       const ele = document.getElementById('fullDom')
       if (this.isFull) {
@@ -1100,7 +1032,7 @@ export default {
       }
     },
     // 获取运输总量
-    async getOrderNum() {
+    async getOrderNum () {
       const { code, returnData } = await TempQuery({
         id: SERVICE_ID.stOrderId,
         dataContent: [],
@@ -1113,7 +1045,7 @@ export default {
       }
     },
     // 获取运输总量-统计图
-    async getOrderNumChart() {
+    async getOrderNumChart () {
       const { code, returnData } = await TempQuery({
         id: SERVICE_ID.stOrderChartId,
         dataContent: [],
@@ -1137,7 +1069,7 @@ export default {
       }
     },
     // 获取统计数据
-    async getStatistical() {
+    async getStatistical () {
       const { code, returnData } = await TempQuery({
         id: SERVICE_ID.stCalId,
         dataContent: [],
@@ -1161,7 +1093,7 @@ export default {
       }
     },
     // 获取航班数
-    async getFignts() {
+    async getFignts () {
       const { code, returnData } = await TempQuery({
         id: SERVICE_ID.stFigntsId,
         dataContent: [],
@@ -1185,7 +1117,7 @@ export default {
       }
     },
     // 获取中转数
-    async getSpeed() {
+    async getSpeed () {
       const { code, returnData } = await TempQuery({
         id: SERVICE_ID.stSpeedId,
         dataContent: [],
@@ -1203,7 +1135,7 @@ export default {
       }
     },
     // 获取异常行李
-    async getBaggage() {
+    async getBaggage () {
       const { code, returnData } = await TempQuery({
         id: SERVICE_ID.stBaggageId,
         dataContent: [],
@@ -1222,7 +1154,7 @@ export default {
       }
     },
     // 获取区域运输top
-    async getMap() {
+    async getMap () {
       const { code, returnData } = await TempQuery({
         id: SERVICE_ID.stMapId,
         dataContent: [],
@@ -1232,13 +1164,13 @@ export default {
         listValues.sort((a, b) => b.bagsnum - a.bagsnum)
         listValues.map((item, index) => {
           item.name = item.province
-          ;(item.value = item.bagsnum), (item.index = index + 1)
+            ; (item.value = item.bagsnum), (item.index = index + 1)
         })
         this.boxMap.series[0].data = listValues
       }
     },
     // 获取国内国际
-    async getCountry() {
+    async getCountry () {
       const { code, returnData } = await TempQuery({
         id: SERVICE_ID.stCountryId,
         dataContent: [],
@@ -1271,7 +1203,7 @@ export default {
       }
     },
     // 获取航站运输排行
-    async getTerminalData() {
+    async getTerminalData () {
       const { code, returnData } = await TempQuery({
         id: SERVICE_ID.stTerminalId,
         dataContent: [],
@@ -1293,7 +1225,7 @@ export default {
       }
     },
     // 获取初始数据
-    getDataInit() {
+    getDataInit () {
       this.getOrderNum()
       this.getOrderNumChart()
       this.getStatistical()
@@ -1304,13 +1236,13 @@ export default {
       this.getCountry()
       this.getTerminalData()
     },
-    getCountEnterNum() {
+    getCountEnterNum () {
       this.$nextTick(() => {
         this.toOrderNum(this.countEnterNum) // 这里输入数字即可调用
         this.setNumberTransform()
       })
     },
-    toOrderNum(num) {
+    toOrderNum (num) {
       num = num.toString()
       if (num.length < 9) {
         num = '0' + num // 如未满八位数,添加"0"补位
@@ -1322,7 +1254,7 @@ export default {
         this.$message.warning('总量数字过大')
       }
     },
-    setNumberTransform() {
+    setNumberTransform () {
       const numberItems = this.$refs.numberItem // 拿到数字的ref,计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -1338,7 +1270,7 @@ export default {
 <style lang="scss" scoped>
 .iconfull {
   font-size: 20px;
-  color: #2d67e3;
+  color: #2f3480;
   cursor: pointer;
   position: relative;
   top: 3px;
@@ -1350,7 +1282,7 @@ export default {
   min-height: calc(100vh - 80px);
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  background-image: url('../../../assets/analysis/bg_b.png');
+  background-image: url("../../../assets/analysis/bg_b.png");
   .manageTitle {
     color: #fff;
     line-height: 38px;
@@ -1501,7 +1433,7 @@ export default {
                   margin-right: 8px;
                 }
                 .icon1 {
-                  background: #2d67e3;
+                  background: #2f3480;
                 }
                 .icon2 {
                   background: #e9c042;
@@ -1548,10 +1480,10 @@ export default {
           }
           &::after {
             position: absolute;
-            content: '';
+            content: "";
             width: 11px;
             height: 11px;
-            background-image: url('../../../assets/analysis/pic_triangle_conner.png');
+            background-image: url("../../../assets/analysis/pic_triangle_conner.png");
             background-repeat: no-repeat;
             background-size: 100% 100%;
             left: 10px;
@@ -1577,7 +1509,7 @@ export default {
     line-height: 32px;
     text-align: center;
     list-style: none;
-    color: #2d7cff;
+    color: #2f3480;
     display: flex;
     justify-content: center;
     text-orientation: upright;
@@ -1703,7 +1635,7 @@ export default {
 }
 .isWhite {
   .statisticalAnalysisContent {
-    background-image: url('../../../assets/analysis/bg_a.png');
+    background-image: url("../../../assets/analysis/bg_a.png");
     color: #333;
     .manageTitle,
     .info-msg,

+ 1 - 1
src/views/statisticsCharts/components/TableDialog.vue

@@ -379,7 +379,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }

+ 44 - 125
src/views/statisticsCharts/components/statisticsHeader.vue

@@ -3,116 +3,39 @@
     <template v-if="title">
       <div class="title">{{ title }}</div>
     </template>
-    <el-form
-      ref="form"
-      class="form"
-      :model="formData"
-    >
-      <el-form-item
-        v-for="item in formItems"
-        :key="item.prop"
-        :prop="item.prop"
-        :label="item.label"
-        :style="{
+    <el-form ref="form" class="form" :model="formData">
+      <el-form-item v-for="item in formItems" :key="item.prop" :prop="item.prop" :label="item.label" :style="{
           width: item.width || '120px',
-        }"
-      >
+        }">
         <template v-if="item.inputType === 'input'">
-          <el-input
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            :placeholder="item.placeholder || '请输入'"
-            :clearable="item.clearable"
-          />
+          <el-input v-model="formData[item.prop]" :size="item.size || 'small'" :placeholder="item.placeholder || '请输入'" :clearable="item.clearable" />
         </template>
         <template v-if="item.inputType === 'select'">
-          <el-select
-            v-model="formData[item.prop]"
-            :filterable="item.filterable"
-            :default-first-option="item.filterable"
-            :size="item.size || 'small'"
-            :placeholder="item.placeholder || '请选择'"
-            :multiple="item.multiple"
-            :collapse-tags="item.multiple"
-            :clearable="item.clearable"
-            :disabled="item.disabled"
-          >
-            <el-option
-              v-for="option in item.options"
-              :key="option.value"
-              :value="option.value"
-              :label="option.label"
-            />
+          <el-select v-model="formData[item.prop]" :filterable="item.filterable" :default-first-option="item.filterable" :size="item.size || 'small'" :placeholder="item.placeholder || '请选择'" :multiple="item.multiple" :collapse-tags="item.multiple" :clearable="item.clearable" :disabled="item.disabled">
+            <el-option v-for="option in item.options" :key="option.value" :value="option.value" :label="option.label" />
           </el-select>
         </template>
         <template v-if="item.inputType === 'datePicker'">
-          <el-date-picker
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            type="daterange"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          />
+          <el-date-picker v-model="formData[item.prop]" :size="item.size || 'small'" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
         </template>
         <template v-if="item.inputType === 'monthPicker'">
-          <el-date-picker
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            type="monthrange"
-            format="yyyy-MM"
-            value-format="yyyy-MM"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始月份"
-            end-placeholder="结束月份"
-          />
+          <el-date-picker v-model="formData[item.prop]" :size="item.size || 'small'" type="monthrange" format="yyyy-MM" value-format="yyyy-MM" unlink-panels range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" />
         </template>
         <template v-if="item.inputType === 'yearPicker'">
-          <year-range-picker
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            range-separator="至"
-          />
+          <year-range-picker v-model="formData[item.prop]" :size="item.size || 'small'" range-separator="至" />
         </template>
         <template v-if="item.inputType === 'cascader'">
-          <el-cascader
-            v-model="formData[item.prop]"
-            :size="item.size || 'small'"
-            :placeholder="item.placeholder || '请选择'"
-            :options="item.options"
-            :props="item.props"
-            :clearable="item.clearable"
-            :disabled="item.disabled"
-          />
+          <el-cascader v-model="formData[item.prop]" :size="item.size || 'small'" :placeholder="item.placeholder || '请选择'" :options="item.options" :props="item.props" :clearable="item.clearable" :disabled="item.disabled" />
         </template>
       </el-form-item>
       <el-form-item v-if="formItems.length">
-        <el-button
-          type="primary"
-          size="small"
-          @click="getData"
-          >{{ buttonText }}</el-button
-        >
+        <el-button type="primary" size="small" @click="getData">{{ buttonText }}</el-button>
       </el-form-item>
       <el-form-item v-if="withExport">
-        <img
-          src="../../../assets/nav/ic_export.png"
-          title="导出"
-          class="btn-icon-only"
-          @click="exportClickHandler"
-        />
+        <img src="../../../assets/nav/ic_export.png" title="导出" class="btn-icon-only" @click="exportClickHandler" />
       </el-form-item>
       <el-form-item v-if="withSetting">
-        <img
-          src="../../../assets/nav/ic_setting.png"
-          title="节点设置"
-          class="btn-icon-only"
-          @click="settingClickHandler"
-        />
+        <img src="../../../assets/nav/ic_setting.png" title="节点设置" class="btn-icon-only" @click="settingClickHandler" />
       </el-form-item>
     </el-form>
   </div>
@@ -157,7 +80,7 @@ export default {
       default: false,
     },
   },
-  data() {
+  data () {
     return {
       formData: {
         range: '',
@@ -200,7 +123,7 @@ export default {
               label: '航站楼',
             },
           ],
-          changeHandler(value) {
+          changeHandler (value) {
             this.setInOrOutOptions(value)
             const rangeMap = {
               航线: 'air_line',
@@ -246,7 +169,7 @@ export default {
               label: '按年统计',
             },
           ],
-          changeHandler(value) {
+          changeHandler (value) {
             const typeMap = {
               日: 'datePicker',
               月: 'monthPicker',
@@ -265,12 +188,10 @@ export default {
                 }
                 if (value === '月') {
                   if (oldValue === '年') {
-                    this.formData.dateTime[0] = `${
-                      dateTime[0].split('-')[0]
-                    }-01`
-                    this.formData.dateTime[1] = `${
-                      dateTime[1].split('-')[0]
-                    }-12`
+                    this.formData.dateTime[0] = `${dateTime[0].split('-')[0]
+                      }-01`
+                    this.formData.dateTime[1] = `${dateTime[1].split('-')[0]
+                      }-12`
                   }
                   if (oldValue === '日') {
                     this.formData.dateTime[0] = dateTime[0]
@@ -285,12 +206,10 @@ export default {
                 }
                 if (value === '日') {
                   if (oldValue === '年') {
-                    this.formData.dateTime[0] = `${
-                      dateTime[0].split('-')[0]
-                    }-01-01`
-                    this.formData.dateTime[1] = `${
-                      dateTime[1].split('-')[0]
-                    }-12-31`
+                    this.formData.dateTime[0] = `${dateTime[0].split('-')[0]
+                      }-01-01`
+                    this.formData.dateTime[1] = `${dateTime[1].split('-')[0]
+                      }-12-31`
                   }
                   if (oldValue === '月') {
                     this.formData.dateTime[0] = `${dateTime[0]
@@ -375,27 +294,27 @@ export default {
   },
   computed: {
     ...mapGetters(['savedFormDataMap']),
-    formDataObj() {
+    formDataObj () {
       return JSON.parse(JSON.stringify(this.formData))
     },
   },
   watch: {
     items: {
-      handler(val) {
+      handler (val) {
         val && (this.formItems = val)
       },
       deep: true,
       immediate: true,
     },
     data: {
-      handler(val) {
+      handler (val) {
         val && (this.formData = val)
       },
       deep: true,
       immediate: true,
     },
     formDataObj: {
-      handler(val, oldVal) {
+      handler (val, oldVal) {
         this.formItems.forEach(item => {
           if (
             item.changeHandler &&
@@ -408,7 +327,7 @@ export default {
       deep: true,
     },
   },
-  created() {
+  created () {
     this.customItems.forEach(item => {
       if (typeof item.itemIndex === 'number') {
         if (item.prop) {
@@ -438,7 +357,7 @@ export default {
     })
   },
   methods: {
-    getData() {
+    getData () {
       const formData = this._.cloneDeep(this.formData)
       try {
         this.formItems.forEach(item => {
@@ -488,13 +407,13 @@ export default {
       }
       this.$emit('getFormData', formData)
     },
-    exportClickHandler() {
+    exportClickHandler () {
       this.$emit('export')
     },
-    settingClickHandler() {
+    settingClickHandler () {
       this.$emit('setting')
     },
-    setInOrOutOptions(range) {
+    setInOrOutOptions (range) {
       const theInOrOutItem = this.formItems.find(
         item => item.prop === 'inOrOut'
       )
@@ -541,7 +460,7 @@ export default {
           break
       }
     },
-    async getOptions(prop, queryId, setKey, setLabel) {
+    async getOptions (prop, queryId, setKey, setLabel) {
       try {
         const { code, returnData, message } = await TempQuery({
           serviceId: queryId,
@@ -581,15 +500,15 @@ export default {
     height: 32px;
     line-height: 32px;
     font-size: 18px;
-    font-family: Helvetica, 'Microsoft YaHei';
+    font-family: Helvetica, "Microsoft YaHei";
     font-weight: bold;
     white-space: nowrap;
     position: relative;
     &::before {
-      content: '';
+      content: "";
       width: 4px;
       height: 20px;
-      background: #2d67e3;
+      background: #2f3480;
       position: absolute;
       top: 0;
       bottom: 0;
@@ -619,14 +538,14 @@ export default {
           }
           .el-input__inner {
             border-radius: 4px;
-            font-family: Helvetica, 'Microsoft YaHei';
+            font-family: Helvetica, "Microsoft YaHei";
             color: #303133;
             border-color: #ffffff;
             &:hover {
               border-color: #c0c4cc;
             }
             &:focus {
-              border-color: #409eff;
+              border-color: #2f3480;
             }
           }
         }
@@ -640,12 +559,12 @@ export default {
           border-radius: 4px;
           border-color: #ffffff;
           color: #303133;
-          font-family: Helvetica, 'Microsoft YaHei';
+          font-family: Helvetica, "Microsoft YaHei";
           &:hover {
             border-color: #c0c4cc;
           }
           &.is-active {
-            border-color: #409eff;
+            border-color: #2f3480;
           }
           .el-input__icon {
             color: #303133;
@@ -658,10 +577,10 @@ export default {
         .el-cascader {
           .el-input {
             .el-icon-arrow-up::before {
-              content: '\e78f';
+              content: "\e78f";
             }
             .el-icon-arrow-down::before {
-              content: '\e790';
+              content: "\e790";
             }
             &:not(.is-disabled) {
               .el-input__icon,
@@ -673,7 +592,7 @@ export default {
         }
         .el-button {
           border-radius: 4px;
-          font-family: Helvetica, 'Microsoft YaHei';
+          font-family: Helvetica, "Microsoft YaHei";
         }
         .btn-icon-only {
           width: 32px;

+ 21 - 55
src/views/statisticsCharts/components/statisticsTabs.vue

@@ -1,59 +1,25 @@
 <template>
   <div class="statistics-tabs">
-    <el-row
-      :gutter="16"
-      type="flex"
-    >
-      <el-col
-        v-for="(tab, index) in newTabList"
-        :key="index"
-        :span="4"
-      >
-        <el-dropdown
-          v-if="tab.children && tab.children.length"
-          placement="bottom"
-          @command="commandHandler"
-        >
+    <el-row :gutter="16" type="flex">
+      <el-col v-for="(tab, index) in newTabList" :key="index" :span="4">
+        <el-dropdown v-if="tab.children && tab.children.length" placement="bottom" @command="commandHandler">
           <div :class="['tab-bar', { 'tab-active': activeIndex === index }]">
-            <img
-              class="tab-icon"
-              :src="activeIndex === index ? activeIcon : defaultIcon"
-              :alt="tab.title"
-            />
-            <el-tooltip
-              :content="tab.title"
-              placement="top"
-            >
+            <img class="tab-icon" :src="activeIndex === index ? activeIcon : defaultIcon" :alt="tab.title" />
+            <el-tooltip :content="tab.title" placement="top">
               <span class="tab-title">{{ tab.title }}</span>
             </el-tooltip>
             <i class="icon-arrow el-icon-caret-bottom" />
           </div>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item
-              v-for="(childTab, childIndex) in tab.children"
-              :key="childIndex"
-              :command="[tab.path, childTab.path]"
-              >{{ childTab.title }}</el-dropdown-item
-            >
+            <el-dropdown-item v-for="(childTab, childIndex) in tab.children" :key="childIndex" :command="[tab.path, childTab.path]">{{ childTab.title }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <div
-          v-else
-          :class="[
+        <div v-else :class="[
             'tab-bar tab-bar-single',
             { 'tab-active': activeIndex === index },
-          ]"
-          @click="clickHandler(tab.path)"
-        >
-          <img
-            class="tab-icon"
-            :src="activeIndex === index ? activeIcon : defaultIcon"
-            :alt="tab.title"
-          />
-          <el-tooltip
-            :content="tab.title"
-            placement="top"
-          >
+          ]" @click="clickHandler(tab.path)">
+          <img class="tab-icon" :src="activeIndex === index ? activeIcon : defaultIcon" :alt="tab.title" />
+          <el-tooltip :content="tab.title" placement="top">
             <span class="tab-title">{{ tab.title }}</span>
           </el-tooltip>
         </div>
@@ -65,7 +31,7 @@
 <script>
 export default {
   name: 'StatisticsTabs',
-  data() {
+  data () {
     return {
       defaultIcon: require('@/assets/nav/ic_statistical_top_default.png'),
       activeIcon: require('@/assets/nav/ic_statistical_top_check.png'),
@@ -284,12 +250,12 @@ export default {
               title: '航站航班量统计',
             },
             {
-                path: 'numberair',
-                title: '航司航班量统计',
+              path: 'numberair',
+              title: '航司航班量统计',
             },
             {
-                path: 'volumeof',
-                title: '航线航班量统计',
+              path: 'volumeof',
+              title: '航线航班量统计',
             }]
         },
         {
@@ -341,7 +307,7 @@ export default {
     }
   },
   computed: {
-    newTabList() {
+    newTabList () {
       // const auths = JSON.parse(sessionStorage.getItem('userAuthList'))
       // return this.tabList.filter(
       //   tab => !tab.roles || tab.roles.every(role => auths.includes(role))
@@ -351,7 +317,7 @@ export default {
   },
   watch: {
     '$route.path': {
-      handler(path) {
+      handler (path) {
         let activeIndex = null
         this.newTabList.some((tab, index) => {
           if (path.includes(tab.path)) {
@@ -365,7 +331,7 @@ export default {
     },
   },
   methods: {
-    commandHandler(pathArray) {
+    commandHandler (pathArray) {
       if (pathArray.some(path => !path)) {
         this.$message.info('开发中')
         return
@@ -374,7 +340,7 @@ export default {
         path: pathArray.join('/'),
       })
     },
-    clickHandler(path) {
+    clickHandler (path) {
       if (!path) {
         this.$message.info('开发中')
         return
@@ -419,7 +385,7 @@ export default {
         padding-left: 12px;
         padding-right: 8px;
         font-size: 14px;
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         font-weight: bold;
         color: #101116;
         letter-spacing: 0;
@@ -428,7 +394,7 @@ export default {
         text-overflow: ellipsis;
       }
       &.tab-active {
-        background-color: #2d67e3;
+        background-color: #2f3480;
         .tab-title {
           color: #ffffff;
         }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 193 - 782
src/views/statisticsCharts/components/tableformbrs.vue


+ 11 - 11
src/views/systemSettings/views/newMachine/components/table.vue

@@ -284,7 +284,7 @@ export default {
       try {
         const { code, returnData } = await Query({
           serviceId: SERVICE_ID.sysUserAuthId,
-          dataContent: [{ auth_id: this.datasource_id,user_id: getToken('userid'), }],
+          dataContent: [{ auth_id: this.datasource_id, user_id: getToken('userid'), }],
           event: '0'
         });
         if (code == 0) {
@@ -781,14 +781,14 @@ export default {
     }
   }
   .bcButton {
-    background: #2579a0;
+    background: #2f3480;
     border-radius: 4px;
-    border-color: #2579a0;
+    border-color: #2f3480;
     color: #ffffff;
   }
   .bcButton.is-disabled {
     color: #8cc5ff;
-    background-color: #ecf5ff;
+    background-color: #2f3480;
     border-color: #d9ecff;
   }
   .bcTitle {
@@ -813,7 +813,7 @@ export default {
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }
@@ -865,7 +865,7 @@ export default {
       justify-content: center;
       float: left;
       span {
-        color: #2579a0;
+        color: #2f3480;
       }
     }
     .rmScser {
@@ -879,7 +879,7 @@ export default {
       justify-content: center;
       float: left;
       span {
-        color: #2d67e3;
+        color: #2f3480;
       }
     }
     .rmSc {
@@ -914,7 +914,7 @@ export default {
       .icon {
         width: 14px;
         height: 14px;
-        background: #2d67e3;
+        background: #2f3480;
         border-radius: 2px;
         display: inline-block;
         vertical-align: middle;
@@ -969,7 +969,7 @@ export default {
     transform: rotate(-180deg);
   }
   &.arrow-blue {
-    color: #2d7cff;
+    color: #2f3480;
     font-weight: bold;
   }
 }
@@ -979,10 +979,10 @@ export default {
 .data-table-dialog {
   ::v-deep .dialog-content {
     .title {
-      background-color: #2579a0;
+      background-color: #2f3480;
     }
     .bcButton {
-      background-color: #2579a0;
+      background-color: #2f3480;
     }
     .contents {
       padding: 24px;

+ 3 - 3
src/views/systemSettings/views/newMachine/css/index.scss

@@ -104,7 +104,7 @@
             }
             .start,
             .stop {
-              color: #2579a0;
+              color: #2f3480;
             }
             .error {
               color: #eb3434;
@@ -159,11 +159,11 @@
     }
     .serButton {
       border: 1px solid #b2cbde;
-      color: #2579a0;
+      color: #2f3480;
       border-radius: 4px;
     }
     .bcButton {
-      background: #2579a0;
+      background: #2f3480;
       border-radius: 4px;
     }
   }

+ 3 - 3
src/views/systemSettings/views/newService/css/index.scss

@@ -104,7 +104,7 @@
             }
             .start,
             .stop {
-              color: #2579a0;
+              color: #2f3480;
             }
             .error {
               color: #eb3434;
@@ -156,11 +156,11 @@
     }
     .serButton {
       border: 1px solid #b2cbde;
-      color: #2579a0;
+      color: #2f3480;
       border-radius: 4px;
     }
     .bcButton {
-      background: #2579a0;
+      background: #2f3480;
       border-radius: 4px;
     }
   }

+ 2 - 2
src/views/table/css/index.scss

@@ -32,7 +32,7 @@
     }
     .cell-click {
       cursor: pointer;
-      color: #2d7cff;
+      color: #2f3480;
       &.cell-clicked {
         color: purple;
       }
@@ -132,7 +132,7 @@
     transform: rotate(-180deg);
   }
   &.arrow-blue {
-    color: #2d7cff;
+    color: #2f3480;
     font-weight: bold;
   }
 }

+ 40 - 117
src/views/upload/index.vue

@@ -38,39 +38,15 @@
         <div class="flex">
           <div class="manageTitle">{{ title2 }}</div>
           <div>
-            <el-date-picker
-              v-model="input"
-              size="small"
-              value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="选择日期"
-            />
-            <el-button
-              class="btn-refresh"
-              type="primary"
-              icon="el-icon-refresh"
-              @click="getStateData"
-            />
+            <el-date-picker v-model="input" size="small" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" />
+            <el-button class="btn-refresh" type="primary" icon="el-icon-refresh" @click="getStateData" />
           </div>
         </div>
         <div class="upload-header-right">
           <!-- <el-date-picker v-model="flightDate" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" :clearable="false" />
           <el-button class="btn-refresh" type="primary" icon="el-icon-refresh" @click="getStateData" /> -->
-          <el-upload
-            ref="upload"
-            action="#"
-            multiple
-            :loading="exceed"
-            :accept="acceptTypesStr"
-            :show-file-list="false"
-            :http-request="uploadHandler"
-            :before-upload="beforeUpload"
-          >
-            <el-button
-              slot="trigger"
-              type="primary"
-              size="small"
-            >
+          <el-upload ref="upload" action="#" multiple :loading="exceed" :accept="acceptTypesStr" :show-file-list="false" :http-request="uploadHandler" :before-upload="beforeUpload">
+            <el-button slot="trigger" type="primary" size="small">
               上传文件
             </el-button>
           </el-upload>
@@ -78,73 +54,23 @@
       </header>
       <main class="upload-main">
         <div class="upload-main-content flex-wrap">
-          <div
-            v-loading="loading1"
-            element-loading-text="拼命加载中"
-            element-loading-spinner="el-icon-loading"
-            element-loading-background="rgba(0, 0, 0, 0.8)"
-            class="upload-main-content-left"
-          >
-            <el-table
-              :data="capData"
-              border
-              stripe
-              fit
-              height="100%"
-              class="state-table"
-              :cell-class-name="cellClass"
-              @cell-click="stateClick"
-            >
+          <div v-loading="loading1" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="upload-main-content-left">
+            <el-table :data="capData" border stripe fit height="100%" class="state-table" :cell-class-name="cellClass" @cell-click="stateClick">
               <el-table-column label="日期">
                 <template slot-scope="scope">
                   <div>{{ currDate(scope.row.thedate) }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                width="75"
-                prop="total"
-                label="总数"
-              />
-              <el-table-column
-                width="75"
-                prop="fail"
-                label="失败"
-              />
+              <el-table-column width="75" prop="total" label="总数" />
+              <el-table-column width="75" prop="fail" label="失败" />
             </el-table>
           </div>
-          <div
-            v-loading="loading"
-            element-loading-text="拼命加载中"
-            element-loading-spinner="el-icon-loading"
-            element-loading-background="rgba(0, 0, 0, 0.8)"
-            class="upload-main-content-right"
-          >
-            <el-table
-              :data="tableData"
-              border
-              stripe
-              fit
-              height="100%"
-              class="upload-table"
-              :cell-class-name="cellClass"
-            >
-              <el-table-column
-                v-for="column in tableColumns"
-                :key="column.key"
-                :prop="column.prop"
-                :label="column.prop"
-              >
+          <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="upload-main-content-right">
+            <el-table :data="tableData" border stripe fit height="100%" class="upload-table" :cell-class-name="cellClass">
+              <el-table-column v-for="column in tableColumns" :key="column.key" :prop="column.prop" :label="column.prop">
                 <template slot-scope="scope">
-                  <el-tooltip
-                    v-if="column.showTooltip"
-                    class="item"
-                    effect="dark"
-                    placement="top-start"
-                  >
-                    <div
-                      slot="content"
-                      class="tooltip-content"
-                    >
+                  <el-tooltip v-if="column.showTooltip" class="item" effect="dark" placement="top-start">
+                    <div slot="content" class="tooltip-content">
                       {{
                         formatter(
                           scope.row,
@@ -175,10 +101,7 @@
                 </template>
               </el-table-column>
               <template #empty>
-                <NoData
-                  :image-width="230"
-                  :image-height="160"
-                />
+                <NoData :image-width="230" :image-height="160" />
               </template>
             </el-table>
           </div>
@@ -211,7 +134,7 @@ const short = getUnit(maxSize)
 export default {
   name: 'Upload',
   components: { NoData },
-  data() {
+  data () {
     return {
       title: '速运行李上传',
       acceptTypesStr: acceptTypesStr,
@@ -274,15 +197,15 @@ export default {
     }
   },
   computed: {
-    currentProgressNum() {
+    currentProgressNum () {
       return this.totalProgressList.reduce((prevCount, currentProgress) => {
         return currentProgress.state > 0 ? prevCount : prevCount + 1
       }, 0)
     },
-    exceed() {
+    exceed () {
       return this.currentProgressNum >= this.limit
     },
-    currDate() {
+    currDate () {
       return function (time) {
         if (time) {
           return parseTime(new Date(time), '{y}-{m}-{d} {h}:{i}:{s}')
@@ -291,7 +214,7 @@ export default {
         }
       }
     },
-    capData() {
+    capData () {
       const val = this.input
       return this.stateData.filter(
         data => !val || (data.thedate && data.thedate.includes(val))
@@ -307,11 +230,11 @@ export default {
   //     immediate: true,
   //   },
   // },
-  created() {
+  created () {
     this.getStateData()
   },
   methods: {
-    beforeUpload(file) {
+    beforeUpload (file) {
       const progress = this.getProgress(file)
       if (progress && progress.state === 0) {
         this.$message.warning(`${file.name} 上传中,请勿重复上传`)
@@ -337,7 +260,7 @@ export default {
         return false
       }
     },
-    uploadHandler({ file }) {
+    uploadHandler ({ file }) {
       if (!this.exceed) {
         this.uploadFile(file)
       }
@@ -355,25 +278,25 @@ export default {
       }
       this.totalProgressList.push(newProgress)
     },
-    stateClass(state) {
+    stateClass (state) {
       const classMap = ['pending', 'success', 'failure']
       return `upload-list-item-state-${classMap[state]}`
     },
-    stateFormat(state) {
+    stateFormat (state) {
       const textMap = ['上传中···', '上传成功', '上传失败']
       return textMap[state]
     },
-    setState(file, state) {
+    setState (file, state) {
       const progress = this.getProgress(file)
       if (progress) {
         progress.state = state
       }
     },
-    getProgress(file) {
+    getProgress (file) {
       const key = `${file.name}${file.lastModified}`
       return this.totalProgressList.find(progress => progress.key === key)
     },
-    retry(progress) {
+    retry (progress) {
       if (this.exceed) {
         this.$message.warning('已达到最大同时上传数量,请稍后再试')
         return
@@ -381,7 +304,7 @@ export default {
       this.uploadFile(progress.file)
       progress.state = 0
     },
-    async uploadFile(file) {
+    async uploadFile (file) {
       try {
         const formData = new FormData()
         formData.append('file', file)
@@ -399,19 +322,19 @@ export default {
         this.setState(file, 2)
       }
     },
-    dateRangePickHandler({ maxDate, minDate }) {
+    dateRangePickHandler ({ maxDate, minDate }) {
       if (!maxDate) {
         this.pickedDate = minDate
       } else {
         this.pickedDate = null
       }
     },
-    dateRangeDisabled(date) {
+    dateRangeDisabled (date) {
       return this.pickedDate
         ? Math.abs(date - this.pickedDate) > 2 * 24 * 60 * 60 * 1000
         : false
     },
-    cellClass({ row, column, rowIndex, columnIndex }) {
+    cellClass ({ row, column, rowIndex, columnIndex }) {
       const classes = []
       if (column.property === 'createtime') {
         classes.push('pre-line')
@@ -424,7 +347,7 @@ export default {
       }
       return classes.join(' ')
     },
-    formatter(row, column, cellValue) {
+    formatter (row, column, cellValue) {
       const value = String(cellValue ?? '').trim()
       switch (column.property) {
         case 'createtime':
@@ -433,7 +356,7 @@ export default {
           return cellValue
       }
     },
-    async getTableData(cid = null, type = null) {
+    async getTableData (cid = null, type = null) {
       this.loading = true
       try {
         const dataContent = []
@@ -468,7 +391,7 @@ export default {
       }
       this.loading = false
     },
-    async getStateData() {
+    async getStateData () {
       this.loading1 = true
       try {
         const {
@@ -487,7 +410,7 @@ export default {
       }
       this.loading1 = false
     },
-    stateClick(row, column, cell, event) {
+    stateClick (row, column, cell, event) {
       const { dataObjectId } = row
       const type = column.property
       if (dataObjectId && ['total', 'fail'].includes(type) && row[type]) {
@@ -560,7 +483,7 @@ export default {
       }
       &-details {
         font-size: 14px;
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         > div {
           height: 16px;
           line-height: 16px;
@@ -589,10 +512,10 @@ export default {
         border-radius: 50%;
         margin-left: 16px;
         font-size: 14px;
-        color: #2d67e3;
+        color: #2f3480;
         cursor: pointer;
         &:hover {
-          background-color: #2d67e3;
+          background-color: #2f3480;
           color: #fff;
         }
       }
@@ -607,7 +530,7 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, 'Microsoft YaHei';
+      font-family: Helvetica, "Microsoft YaHei";
       letter-spacing: 0;
     }
     .el-table__header-wrapper,
@@ -626,7 +549,7 @@ export default {
       .el-table__cell {
         background-color: transparent !important;
         &.cell-click .cell {
-          color: #2d67e3;
+          color: #2f3480;
           cursor: pointer;
         }
 

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio