修改

src/views/newArrival/index.vue

@@ -52,7 +52,7 @@
     </div>
     <!--表格-->
     <div class="terminal-table">
-      <Table :istableChild="true" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" />
+      <Table :istableChild="true" :pageSize="9999" @tableLoad="tableLoad" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" />
     </div>
   </div>
 </template>
@@ -156,6 +156,15 @@ export default {
       }
       this.setNumberTransform();
     },
+    setNumberTransform () {
+      const numberItems = this.$refs.numberItem; // 拿到数字的ref，计算元素数量
+      const numberArr = this.orderNum.filter((item) => !isNaN(item));
+      // 结合CSS 对数字字符进行滚动,显示订单数量
+      for (let index = 0; index < numberItems.length; index++) {
+        const elem = numberItems[index];
+        elem.style.transform = `translate(-50%, -${numberArr[index] * 10}%)`;
+      }
+    },
     exportHandler (refName, tableName) {
       if (this.loading) {
         return;
@@ -164,6 +173,13 @@ export default {
       const fileName = `${tableName}-${this.currentAirport}-${this.startDate}-${this.endDate}.xlsx`;
       throttledExportToExcel(table, tableName, fileName);
     },
+    tableLoad (arr) {
+      let num = 0
+      arr.forEach(item => {
+        num += Number(item.estimated_load_number)
+      })
+      this.toOrderNum(num)
+    }
   },
 };
 </script>

src/views/newDeparture/index.vue

@@ -52,7 +52,7 @@
     </div>
     <!--表格-->
     <div class="terminal-table">
-      <Table style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" />
+      <Table style="height:100%" :pageSize="9999" :btnStyle="{ 'top':'-43px','right':'8px' }" @tableLoad="tableLoad" :istableCol="true" :tableTag="tableTag" ref="table" />
     </div>
   </div>
 </template>
@@ -156,6 +156,15 @@ export default {
       }
       this.setNumberTransform();
     },
+    setNumberTransform () {
+      const numberItems = this.$refs.numberItem; // 拿到数字的ref，计算元素数量
+      const numberArr = this.orderNum.filter((item) => !isNaN(item));
+      // 结合CSS 对数字字符进行滚动,显示订单数量
+      for (let index = 0; index < numberItems.length; index++) {
+        const elem = numberItems[index];
+        elem.style.transform = `translate(-50%, -${numberArr[index] * 10}%)`;
+      }
+    },
     exportHandler (refName, tableName) {
       if (this.loading) {
         return;
@@ -164,6 +173,13 @@ export default {
       const fileName = `${tableName}-${this.currentAirport}-${this.startDate}-${this.endDate}.xlsx`;
       throttledExportToExcel(table, tableName, fileName);
     },
+    tableLoad (arr) {
+      let num = 0
+      arr.forEach(item => {
+        num += Number(item.estimated_load_number)
+      })
+      this.toOrderNum(num)
+    }
   },
 };
 </script>

src/views/newFlightView/index.vue

@@ -90,11 +90,12 @@ export default {
       checkStates: [],
       table1: {},
       table2: {},
-      showObj: {}
+      showObj: {},
+      deArrs: [],
+      deArrsNum: []
     }
   },
   async created () {
-    const datas = []
     const query = this.$route.query
     const { flightNo, flightDate, depStation_iataCd, arrStation_iataCd } = query
     const showObj = {
@@ -109,65 +110,60 @@ export default {
     const res = await this.getViewInfo(query)
     this.infoObj = res[0]
     const sts = await this.getViewInfo({ flightNo, flightDate })
-    // sts.push({
-    //   depStation_iataCd: 'ADD',
-    //   arrStation_iataCd: 'HSG'
-    // })
-    // sts.push({
-    //   depStation_iataCd: 'HSG',
-    //   arrStation_iataCd: 'WTQ'
-    // })
-    // sts.push({
-    //   depStation_iataCd: 'WTQ',
-    //   arrStation_iataCd: 'MHK'
-    // })
     if (sts && sts.length) {
       for (const p of sts) {
         const { depStation_iataCd, arrStation_iataCd } = p
-        datas.push({
+        this.deArrs.push({
           depStation_iataCd,
           arrStation_iataCd
         })
       }
     }
-    const newDatas = _.cloneDeep(datas)
-    const m = this.combine(newDatas, 'depStation_iataCd', 'arrStation_iataCd')
-    const cm = []
-    m.forEach((item, index) => {
-      const obj = {
-        name: item,
-        index: index + 1
-      }
-      cm.push(obj)
-    })
-    console.log(cm)
-    this.checkStates = m
+    const newDatas = _.cloneDeep(this.deArrs)
+    if (newDatas && newDatas.length) {
+      const m = this.combine3(newDatas, 'depStation_iataCd', 'arrStation_iataCd')
+      m.forEach((item, index) => {
+        const obj = {
+          item,
+          index
+        }
+        this.deArrsNum.push(obj)
+      })
+      this.checkStates = m
+    }
   },
   mounted () {
     this.table1 = this.dataContent
     this.table2 = this.showObj
+
   },
   methods: {
-    combine (array, startKey, endKey, result = []) {
-      if (!array.length) {
-        return result
-      }
-      if (result.length) {
-        for (let i = 0; i < array.length; i++) {
-          if (array[i]?.[startKey] === result[result.length - 1]) {
-            const current = array.splice(i, 1)[0]
-            result.push(current[endKey])
+    combine3 (array, startKey, endKey) {
+      const caculatedArray = []
+      const weightMap = {}
+      const set = new Set()
+      array.forEach(item => {
+        const caculated = caculatedArray.some(
+          caculatedItem =>
+            item[startKey] === caculatedItem[startKey] &&
+            item[endKey] === caculatedItem[endKey]
+        )
+        if (!caculated) {
+          caculatedArray.push(item)
+          set.add(item[startKey])
+          set.add(item[endKey])
+          if (!weightMap[item[startKey]]) {
+            weightMap[item[startKey]] = 0
           }
-          if (array[i]?.[endKey] === result[0]) {
-            const current = array.splice(i, 1)[0]
-            result.unshift(current[startKey])
+          if (weightMap[item[endKey]]) {
+            weightMap[item[endKey]] += 1
+          } else {
+            weightMap[item[endKey]] = 1
           }
         }
-      } else {
-        const first = array.pop()
-        result.push(first[startKey], first[endKey])
-      }
-      return this.combine(array, startKey, endKey, result)
+      })
+      const result = [...set]
+      return result.sort((a, b) => weightMap[a] - weightMap[b])
     },
     // 获取基本信息
     async getViewInfo (dataContent = this.dataContent) {
@@ -191,14 +187,27 @@ export default {
     },
     // 选中
     async checkChange (arr) {
+      const datas = []
       const result = [...arr]
       if (result && result.length) {
         const c1 = result.join('-')
         const c2 = c1.split('-')
-        console.log(c2)
-        const depStation = c2[0]
-        const arrStation = c2[c2.length - 1]
-        console.log(depStation, arrStation)
+        const c3 = _.uniq(c2)
+        this.deArrsNum.forEach(item => {
+          c3.forEach(p => {
+            if (item.item == p) {
+              const obj = {
+                name: item.item,
+                index: item.index
+              }
+              datas.push(obj)
+            }
+          })
+        })
+        const caps = datas.sort((a, b) => a.index - b.index)
+        const c4 = caps[0].name //起飞
+        const c5 = caps[caps.length - 1].name //降落
+        console.log(c4, c5)
       }
     }
   }

src/views/newQuery/components/table.vue

@@ -287,6 +287,7 @@ export default {
             this.loading = false
           }
           this.tableData.push(...returnData)
+          this.$emit('tableLoad', [...this.tableData])
           setTimeout(() => {
             this.initTableData()
             this.loading = false

src/views/newRole/index.vue

@@ -68,7 +68,7 @@
                 </el-table-column>
                 <el-table-column prop="columnLabel" label="列名">
                 </el-table-column>
-                <el-table-column label="行授权">
+                <el-table-column v-if="isAuth" label="行授权">
                   <template slot-scope="scope">
                     <el-input size="small" placeholder="请输入内容" v-model="scope.row.row_auth" clearable>
                     </el-input>
@@ -161,7 +161,8 @@ export default {
       checkGroups: [],
       multipleTable: [],
       rmFlag: false,
-      msgUserId: ''
+      msgUserId: '',
+      userId: getToken('userid')
     }
   },
   watch: {
@@ -175,6 +176,15 @@ export default {
       this.checkArrs = []
     }
   },
+  computed: {
+    isAuth () {
+      if (this.userId == 1 || this.userId == 5555 || this.userId == 9999) {
+        return true
+      } else {
+        return false
+      }
+    }
+  },
   created () {
     const { title, qid } = this.$route.meta
     this.title = title

src/views/newUserManagement/index.vue

@@ -24,7 +24,7 @@
             <el-button @click="handleAdd" class="serButton" size="small">新增</el-button>
           </div>
           <div class="search">
-            <el-input size="small" placeholder="请输入内容" clearable prefix-icon="el-icon-search" v-model="search">
+            <el-input size="small" placeholder="请输入内容" clearable prefix-icon="el-icon-search" :filter-node-method="filterArrNode" v-model="search">
             </el-input>
           </div>
         </div>
@@ -32,14 +32,24 @@
           <template v-if="dataList.length">
             <el-scrollbar ref="scroll" style="height: 100%">
               <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
-                <div v-for="(item,index) in dataList" :key="index" @click.stop="handleNodeClick(item,index)" :class="index == activeIndex ? 'active':''" class="contents flex">
+                <!-- <div v-for="(item,index) in dataList" :key="index" @click.stop="handleNodeClick(item,index)" :class="index == activeIndex ? 'active':''" class="contents flex">
                   <div class="left">
                     <span class="txt">{{ item.user_group_name }}</span>
                   </div>
                   <div v-show="activeIndex == index" class="right">
                     <span @click.stop="handleRemove(item)" class="error">删除</span>
                   </div>
-                </div>
+                </div> -->
+                <el-tree ref="treeArr" :data="arrs" :props="defaultArrProps" highlight-current :filter-node-method="filterArrNode" default-expand-all node-key="user_group_id" @node-click="handleNodeClick" :expand-on-click-node="false">
+                  <span class="custom-tree-node" slot-scope="{ node,data }">
+                    <div class="flex">
+                      <span class="customTxt">{{ node.label }}</span>
+                      <span v-show="treeCheckId == data.user_group_id" class="customBtn">
+                        <span v-if="data.user_group_id != 0" @click.stop="handleRemove(data)">删除</span>
+                      </span>
+                    </div>
+                  </span>
+                </el-tree>
               </div>
             </el-scrollbar>
           </template>
@@ -196,6 +206,7 @@ import Dialog from '@/layout/components/Dialog'
 import pf from '@/layout/mixin/publicFunc'
 import MD5 from 'blueimp-md5'
 import { getToken } from '@/utils/auth'
+import { setTree } from '@/utils/validate'
 export default {
   name: 'NewManageMent',
   components: { Dialog },
@@ -264,7 +275,12 @@ export default {
       dialogFlag: false,
       checkedKeysTemp: [],
       userId: '',
-      arrs: []
+      arrs: [],
+      authId: null,
+      defaultArrProps: {
+        children: 'children',
+        label: 'user_group_name'
+      },
     }
   },
   mounted () {
@@ -272,20 +288,24 @@ export default {
   },
   computed: {
     dataList () {
-      return this.arrs.filter(data => !this.search || data.user_group_name.toLowerCase().includes(this.search.toLowerCase()))
+      return this.arrs
     },
   },
   methods: {
     async getTreeData () {
-      const { code, returnData } = await this.getQueryList(this.queryId, [{
-        user_id: getToken('userid')
+      const { code, returnData } = await this.getQueryListAuth(this.queryId, [{
+        user_id: getToken('userid'),
       }])
       if (code == 0) {
         if (returnData && returnData.length) {
-          this.arrs = [...returnData]
+          const treeMenu = setTree(returnData, 'up_user_group_id', 'user_group_id')
+          this.arrs = treeMenu
         }
       }
-
+    },
+    filterArrNode (value, data) {
+      if (!value) return true;
+      return data.user_group_name.indexOf(value) !== -1;
     },
     handleAdd () {
       const datas = this.arrs.filter(item => item.user_group_name == '新建账号组')
@@ -536,7 +556,16 @@ export default {
 .newUserManagement {
   padding: 24px;
   height: calc(100vh - 80px);
-
+  .custom-tree-node {
+    flex: 1;
+    font-size: 14px;
+    padding-right: 24px;
+    .customBtn {
+      color: #dd3838;
+      font-size: 12px;
+      margin-top: 3px;
+    }
+  }
   &-content {
     height: 100%;
     .title {