最新版本541200007

jiangping

2025-03-07 d5efc0139ee5b4c25f5adcd99f9376928608303d

最新版本541200007

 admin/src/components/base/BaseComputHeight.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
<script>
export default {
  name: 'BaseComputeHeight',
  data () {
    return {
      tableHeightNew: 300
    }
  },
  created() {
    this.computeTableHeight()
  },
  mounted () {
    this.computeTableHeight()
    window.addEventListener('resize', this.computeTableHeight)
  },
  activated() {
    this.computeTableHeight()
  },
  methods: {
    computeTableHeight () {
      this.$nextTick(() => {
        const height = window.innerHeight -(document.getElementsByClassName('common-header') && document.getElementsByClassName('common-header')[0]?document.getElementsByClassName('common-header')[0].clientHeight:0)
        // alert(height)
        const height3 = document.getElementsByClassName('main-header') && document.getElementsByClassName('main-header')[0]?document.getElementsByClassName('main-header')[0].clientHeight:0
        const height4 = document.getElementsByClassName('table-pagination') && document.getElementsByClassName('table-pagination')[0]? document.getElementsByClassName('table-pagination')[0].clientHeight:0
        const height2 = document.getElementsByClassName('toolbar') && document.getElementsByClassName('toolbar')[0]?document.getElementsByClassName('toolbar')[0].clientHeight:0
        const height5 = document.getElementsByTagName('thead') && document.getElementsByTagName('thead')[0]? document.getElementsByTagName('thead')[0].clientHeight:0
        const height6 = document.getElementsByClassName('doumee-filter') && document.getElementsByClassName('doumee-filter')[0]? document.getElementsByClassName('doumee-filter')[document.getElementsByClassName('doumee-filter').length-1].clientHeight:0
        const height7 = (document.getElementsByClassName('pt16') && document.getElementsByClassName('pt16')[0]?1+document.getElementsByClassName('pt16')[0].clientHeight:0)
        const height9 = document.getElementsByClassName('static_wrap') && document.getElementsByClassName('static_wrap')[0]? 20+document.getElementsByClassName('df_sb')[0].clientHeight:0
        const height10 = document.getElementsByClassName('query_btns') && document.getElementsByClassName('query_btns')[0]? document.getElementsByClassName('query_btns')[0].clientHeight:0
        const height11 = document.getElementsByClassName('el-tabs-ele') && document.getElementsByClassName('el-tabs-ele')[0]? document.getElementsByClassName('el-tabs-ele')[0].clientHeight:0
        const height12 = document.getElementsByClassName('platgroup_tabs') && document.getElementsByClassName('platgroup_tabs')[0]?20+ document.getElementsByClassName('platgroup_tabs')[0].clientHeight:0
        // this.tableHeightNew = height-height4-height3-height2-height1-height5-height6-height7-height8-height9 -height10// æ‰“印高度
       this.tableHeightNew = height-height3 -height5-height6-height2-height7-height4-height9-height10 -height11 -height12
        console.log('self',height,height3 ,height5,(height6==0?20:height6),height2,height7,height4,height9,height10 ,height11 ,height12)
        console.log('self',this.tableHeightNew)
      })
    }
  }
}
</script>

 admin/src/components/base/BaseComputHeightDefault.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
<script>
export default {
  name: 'BaseComputeHeight',
  data () {
    return {
      tableHeightNew: 300
    }
  },
  created() {
    this.computeTableHeight()
  },
  mounted () {
    this.computeTableHeight()
    window.addEventListener('resize', this.computeTableHeight)
  },
  activated() {
    this.computeTableHeight()
  },
  methods: {
    computeTableHeight () {
      this.$nextTick(() => {
        let height = window.innerHeight
        let height6 = (document.getElementsByClassName('common-header') && document.getElementsByClassName('common-header')[0] ? document.getElementsByClassName('common-header')[0].clientHeight:0)
        // alert(height)
        let height1 = (document.getElementsByClassName('table-search-form') && document.getElementsByClassName('table-search-form')[0])? document.getElementsByClassName('table-search-form')[document.getElementsByClassName('table-search-form').length-1].clientHeight:0
        height1 = height1===0? 40:height1+10
        let height3 = document.getElementsByClassName('main-header') && document.getElementsByClassName('main-header')[0]?document.getElementsByClassName('main-header')[0].clientHeight:0
        let height4 = document.getElementsByClassName('table-pagination') && document.getElementsByClassName('table-pagination')[0]? document.getElementsByClassName('table-pagination')[0].clientHeight:0
        let height2 = document.getElementsByClassName('toolbar') && document.getElementsByClassName('toolbar')[0]?document.getElementsByClassName('toolbar')[0].clientHeight:0
        let height5 = document.getElementsByTagName('thead') && document.getElementsByTagName('thead')[0]? document.getElementsByTagName('thead')[0].clientHeight:0
        // this.tableHeightNew = height-height4-height3-height2-height1-height5-height6-height7-height8-height9 -height10// æ‰“印高度
        this.tableHeightNew = height-height4-height3-height2-height1-height5 -height6
        console.log('defualt',height,height6,height3 ,height1,height2,height4,height4)
        console.log('defualt',this.tableHeightNew)
      })
    }
  }
}
</script>

 admin/src/components/base/BasePage.vue

@@ -1,10 +1,11 @@
<script>
import { mapState } from 'vuex'
import BaseComputHeightDefault from '@/components/base/BaseComputHeightDefault'
export default {
  extends: BaseComputHeightDefault,
  name: 'BasePage',
  data () {
    return {
      tableHeightNew: 300,
      // è¶…级管理员角色code
      adminCode: 'admin'
    }
@@ -16,42 +17,7 @@
      return this.userInfo.roles.findIndex(code => code === this.adminCode) > -1
    }
  },
  created() {
    this.computeTableHeight()
  },
  mounted () {
    this.computeTableHeight()
    window.addEventListener('resize', this.computeTableHeight)
  },
  activated() {
    this.computeTableHeight()
  },
  methods: {
    computeTableHeight () {
      this.$nextTick(() => {
        // const height = window.innerHeight
        const height = document.getElementsByClassName('el-container') && document.getElementsByClassName('el-container')[0]?document.getElementsByClassName('el-container')[0].clientHeight:0
        // alert(height)
        const height1 =  (document.getElementsByClassName('table-search-form') && document.getElementsByClassName('table-search-form')[0]? document.getElementsByClassName('table-search-form')[0].clientHeight:0)
        const height2 = document.getElementsByClassName('toolbar') && document.getElementsByClassName('toolbar')[0]?document.getElementsByClassName('toolbar')[0].clientHeight:0
        const height3 = document.getElementsByClassName('main-header') && document.getElementsByClassName('main-header')[0]?document.getElementsByClassName('main-header')[0].clientHeight:0
        const height4 = document.getElementsByClassName('table-pagination') && document.getElementsByClassName('table-pagination')[0]? document.getElementsByClassName('table-pagination')[0].clientHeight:0
        const height5 = document.getElementsByTagName('thead') && document.getElementsByTagName('thead')[0]? document.getElementsByTagName('thead')[0].clientHeight:0
        const height6 = document.getElementsByClassName('doumee-filter') && document.getElementsByClassName('doumee-filter')[0]? document.getElementsByClassName('doumee-filter')[0].clientHeight:0
        const height7 =( document.getElementsByClassName('pt16') && document.getElementsByClassName('pt16')[0]?  1+document.getElementsByClassName('pt16')[0].clientHeight:0)
        const height8 = document.getElementsByClassName('df_sb') && document.getElementsByClassName('df_sb')[0]? document.getElementsByClassName('df_sb')[0].clientHeight:0
        const height9 = document.getElementsByClassName('static_wrap') && document.getElementsByClassName('static_wrap')[0]? document.getElementsByClassName('df_sb')[0].clientHeight:0
        const height10 = document.getElementsByClassName('query_btns') && document.getElementsByClassName('query_btns')[0]? document.getElementsByClassName('query_btns')[0].clientHeight:0
        // this.tableHeightNew = height-height4-height3-height2-height1-height5-height6-height7-height8-height9 -height10// æ‰“印高度

        if(document.getElementsByClassName('main_app') && document.getElementsByClassName('main_app')[0]){
          this.tableHeightNew = height- height5-height6-height2-height7-height4-height8-height9-height10// æ‰“印高度
        }else{
          this.tableHeightNew = height-height4-height3-height2-height1-height5
        }
         console.log(this.tableHeightNew)
      })
    },
    // æ˜¯å¦åŒ…含指定角色
    containRoles (roles) {
      if (roles == null) {

 admin/src/components/common/tagsview.vue

@@ -148,6 +148,23 @@
          tagsDiv.scrollTo(index * 110, 0)
        }
      }
      this.computeTableHeightView();
    },
    computeTableHeightView () { state.tags = []
      this.$nextTick(() => {
        let height = window.innerHeight
        let height6 = (document.getElementsByClassName('common-header') && document.getElementsByClassName('common-header')[0] ? document.getElementsByClassName('common-header')[0].clientHeight:0)
        // alert(height)
        let height1 = (document.getElementsByClassName('table-search-form') && document.getElementsByClassName('table-search-form')[0])? document.getElementsByClassName('table-search-form')[document.getElementsByClassName('table-search-form').length-1].clientHeight:0
        height1 = height1===0? 40:height1+10
        let height3 = document.getElementsByClassName('main-header') && document.getElementsByClassName('main-header')[0]?document.getElementsByClassName('main-header')[0].clientHeight:0
        let height4 = document.getElementsByClassName('table-pagination') && document.getElementsByClassName('table-pagination')[0]? document.getElementsByClassName('table-pagination')[0].clientHeight:0
        let height2 = document.getElementsByClassName('toolbar') && document.getElementsByClassName('toolbar')[0]?document.getElementsByClassName('toolbar')[0].clientHeight:0
        let height5 = document.getElementsByTagName('thead') && document.getElementsByTagName('thead')[0]? document.getElementsByTagName('thead')[0].clientHeight:0
        // this.tableHeightNew = height-height4-height3-height2-height1-height5-height6-height7-height8-height9 -height10// æ‰“印高度
        console.log('view',height,height6,height3 ,height1,height2,height4,height4)
        console.log('view', height-height4-height3-height2-height1-height5 -height6)
      })
    },
    // é€šè¿‡åˆ¤æ–­è·¯ç”±ä¸€è‡´è¿”回布尔值添加class，添加高亮效果
    isActive(route,params, index) {

 admin/src/layouts/AppLayout.vue

@@ -26,9 +26,11 @@
<script>
import { mapState } from 'vuex'
import Header from '@/components/common/Header'
import BaseComputHeight from '@/components/base/BaseComputHeight'
import CommonHeader from '@/components/common/CommonHeader'
import Menu from '@/components/common/Menu'
export default {
  extends: BaseComputHeight,
  name: 'DefaultLayout',
  components: { AppHeader: Header, Menu, CommonHeader },
  data() {
@@ -40,8 +42,8 @@
  computed: {
    ...mapState(['menuData', 'userInfo'])
  },

    mounted() {

    },

    methods: {

 admin/src/store/index.js

@@ -55,6 +55,7 @@
  pushtags (state, val) {
    // å¦‚果等于-1说明tabs不存在那么插入，否则什么都不做
    // findindex找角标，循环判断一下，如果等于那么就代表有相同的，就不必添加，如果找不到那就是-1.就添加
    // state.tags = [{ ...val, keepAlive: false }]
    const result = state.tags.findIndex(item => item.index === val.index)
    if (result === -1) {
      state.tags.push({ ...val, keepAlive: false })

 admin/src/views/business/approvalConfiguration.vue

@@ -1,5 +1,5 @@
<template>
  <TableLayout>
  <TableLayout :style="'overflow: auto;height: 100%;'">
    <template v-slot:table-wrap>
      <el-tabs v-model="activeType" @tab-click="handleClick">
        <el-tab-pane label="普通访客" name="0"></el-tab-pane>

 admin/src/views/business/approvalReport.vue

@@ -1,5 +1,5 @@
<template>
  <TableLayout>
  <TableLayout :style="'overflow: auto;height: 100%;'">
    <template v-slot:table-wrap>
      <div class="config">
        <div class="config_list">

 admin/src/views/business/blackmailPersonnel.vue

@@ -35,6 +35,7 @@
                <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">移出</el-button></li>
            </ul>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe

 admin/src/views/business/dangerStatic.vue

@@ -35,7 +35,7 @@
  data() {
    return {
      filters: {
        fastdate: '0',
        fastdate: '',
        queryStartTime: '',
        queryEndTime: ''
      },
@@ -70,7 +70,8 @@
    }
  },
  mounted() {
    this.changeRadio('0')
    // this.changeRadio('0')
    this.getData()
  },
  methods: {
    changeRadio(day) {

 admin/src/views/business/deletePersonnel.vue

@@ -25,6 +25,7 @@
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe

 admin/src/views/business/device.vue

@@ -34,7 +34,7 @@
      <ul class="toolbar">
        <li><el-button type="primary" @click="synchronousData">同步</el-button></li>
      </ul>
      <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column label="序号" width="55" fixed><template slot-scope="scope">{{ scope.$index + 1
            }}</template></el-table-column>
        <el-table-column prop="name" label="设备名称"></el-table-column>

 admin/src/views/business/deviceRole.vue

@@ -17,6 +17,7 @@
                <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:devicerole:delete']">删除</el-button></li>
            </ul>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe

 admin/src/views/business/deviceRole_f.vue

@@ -16,6 +16,7 @@
                <li><el-button type="primary"  v-permissions="['business:hksync:privilege']" @click="synchronousData">同步</el-button></li>
            </ul>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe

 admin/src/views/business/empower.vue

@@ -50,7 +50,7 @@
        <!--                <li><el-button type="primary" v-permissions="['business:empower:create']">立即下发</el-button></li>-->
        <!--                <li><el-button type="primary" v-permissions="['business:empower:create']">取消下发</el-button></li>-->
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="memberName" label="姓名" min-width="80px"></el-table-column>
        <el-table-column prop="memberPhone" label="手机号" min-width="120px"></el-table-column>

 admin/src/views/business/freezePersonnel.vue

@@ -30,6 +30,7 @@
                <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @click="exportExcel">导出</el-button></li>
            </ul>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe

 admin/src/views/business/interfaceLog.vue

@@ -39,7 +39,7 @@
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="name" label="接口名称" min-width="180px"></el-table-column>
        <el-table-column prop="url" label="地址信息" min-width="180px"></el-table-column>
        <el-table-column label="类型" min-width="100px">

 admin/src/views/business/internalMember.vue

@@ -72,7 +72,7 @@
            @change="search">是否包含下级组织</el-checkbox>
        </li>
      </ul>
      <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column fixed="left" prop="name" label="姓名" min-width="80px">
          <template slot-scope="{row}">

 admin/src/views/business/position.vue

@@ -17,6 +17,7 @@
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:position:delete']">批量删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
          v-loading="isWorking.search"
          :data="tableData.list"
          stripe

 admin/src/views/business/problemLog.vue

@@ -26,6 +26,7 @@
                <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @click="exportExcel">导出</el-button></li>
            </ul>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe

 admin/src/views/business/problems.vue

@@ -23,6 +23,7 @@
                <li><el-button type="primary" @click="$refs.operaProblemsWindow.open('新建试题信息表')" icon="el-icon-plus" v-permissions="['business:problems:create']">新建</el-button></li>
            </ul>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe

 admin/src/views/business/relativeMember.vue

@@ -84,7 +84,7 @@
            @click="exportExcel">导出</el-button></li>

      </ul>
      <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
        @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column fixed="left" prop="name" label="姓名" min-width="80px">

 admin/src/views/business/reportRecord.vue

@@ -106,12 +106,12 @@
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
// import ReportDetail from './page-components/ReportDetail.vue'
import BasePage from '@/components/base/BasePage'
import ReportDetail from '@/views/task/visReportDetail.vue'
import OperaVisitsReportWindow from '@/components/business/operaVisitsReportWindow.vue'
import { fetchList, exportExcel, deleteById } from '@/api/business/visits'
import BaseComputHeight from "@/components/base/BaseComputHeight";
export default {
  extends: BasePage,
  extends: BaseComputHeight,
  components: {
    ReportDetail,
    QueryForm,

 admin/src/views/business/smsEmail.vue

@@ -45,7 +45,7 @@
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
      <el-table  :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="phone" label="手机号/邮箱" min-width="150px">
          <template slot-scope="{ row }">
            <span v-if="row.type == 0">{{ row.phone }}</span>

 admin/src/views/business/strandedPersonnel.vue

@@ -24,7 +24,7 @@
      <!--            <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">-->
      <!--                <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">离场</el-button></li>-->
      <!--            </ul>-->
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <!--                <el-table-column type="selection" width="55"></el-table-column>-->
        <el-table-column prop="name" label="姓名" min-width="80px"></el-table-column>
        <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>

 admin/src/views/business/tmsFactoryParam.vue

@@ -20,6 +20,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:tmsfactoryparam:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe

 admin/src/views/business/trainTime.vue

@@ -29,7 +29,7 @@
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="name" label="人员姓名" min-width="100px"></el-table-column>
        <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
        <el-table-column prop="idcardNo" label="证件号" min-width="150px"></el-table-column>

 admin/src/views/business/userAction.vue

@@ -64,6 +64,7 @@
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe

 admin/src/views/business/visitOrigin.vue

@@ -1,5 +1,5 @@
<template>
  <TableLayout :permissions="['business:member:query']">
  <TableLayout :permissions="['business:visitreason:query']" >
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
      <el-form-item label="拜访事由" prop="name">
@@ -17,6 +17,7 @@
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:visitreason:delete']">批量删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
          v-loading="isWorking.search"
          :data="tableData.list"
          stripe

 admin/src/views/business/visitorSources.vue

@@ -1,5 +1,5 @@
<template>
  <div class="box">
  <div class="box" style="height:100%;overflow-y: auto" >
    <el-form :model="form" ref="form" label-width="140px">
      <div>
        <span style="font-size: 15px; font-weight: bold">人员授权配置：</span>
@@ -241,8 +241,18 @@
  }
}
</script>

<style lang="scss" scoped>
.el-container /deep/  .el-main{
  width: 100%;
  overflow-y: auto  !important ;
  height: calc(100% - 94px);
}
/deep/ .el-main{
  width: 100%;
  //height: 100%;
  overflow-y: auto  !important ;
  height: calc(100% - 94px);
}
.box {
  width: 100%;
  padding: 30px;

 admin/src/views/business/wmsInterfaceLog.vue

@@ -39,7 +39,7 @@
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="name" label="接口名称" min-width="180px"></el-table-column>
        <el-table-column prop="url" label="地址信息" min-width="180px"></el-table-column>
        <el-table-column label="类型" min-width="100px">

 admin/src/views/meeting/roomStatistics.vue

@@ -54,6 +54,7 @@
        <li><el-button @click="deleteByIdInBatch" v-permissions="['business:rooms:delete']">删除</el-button></li> -->
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe

 admin/src/views/platform/LogisticsRecord/leaveAuth.vue

@@ -67,7 +67,6 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import BasePage from '@/components/base/BasePage'
import { platformJobPage, platformJobExport, platformPowerLevel } from '@/api'
import { statusMap } from '../config'
import DriverDetail from "@/views/task/driverDetail"
@@ -75,7 +74,9 @@
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import BaseComputHeight from "@/components/base/BaseComputHeight";
export default {
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm,
@@ -83,7 +84,6 @@
    GlobalWindow,
    UploadFaceImg
  },
  extends: BasePage,
  data() {
    return {
      statusMap,

 admin/src/views/platform/LogisticsRecord/operation.vue

@@ -57,10 +57,10 @@
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
import BasePage from '@/components/base/BasePage'
dayjs.extend(duration);
import BaseComputHeight from "@/components/base/BaseComputHeight";
export default {
  extends: BasePage,
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm,

 admin/src/views/platform/LogisticsRecord/operationCity.vue

@@ -56,10 +56,10 @@
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
import BasePage from '@/components/base/BasePage'
dayjs.extend(duration)
import BaseComputHeight from "@/components/base/BaseComputHeight";
export default {
  extends: BasePage,
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm,

 admin/src/views/platform/LogisticsRecord/subscribe.vue

@@ -105,7 +105,6 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import BasePage from '@/components/base/BasePage'
import { platformBooksPage, platformReasonList, platformBooksApply, platformBooksExport } from '@/api'
import { checkSurplusNum, deletebooksById } from '@/api/platform/platform'
import DriverDetail from '@/views/task/driverDetail'
@@ -113,7 +112,9 @@
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import BaseComputHeight from "@/components/base/BaseComputHeight";
export default {
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm,
@@ -121,7 +122,6 @@
    GlobalWindow,
    UploadAvatarImage
  },
  extends: BasePage,
  data () {
    return {
      isShowDriver: false,

 admin/src/views/platform/LogisticsRecord/waybill.vue

@@ -61,7 +61,6 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import BasePage from '@/components/base/BasePage'
import { platformJobPage, platformJobExport, platformJobDel } from '@/api'
import { statusMap } from '../config'
import WaybillDetailRef from "../components/WaybillDetail.vue"
@@ -69,7 +68,9 @@
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import BaseComputHeight from "@/components/base/BaseComputHeight";
export default {
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm,
@@ -77,7 +78,6 @@
    GlobalWindow,
    UploadFaceImg
  },
  extends: BasePage,
  data() {
    return {
      statusMap,

 admin/src/views/platform/queueUp.vue

@@ -119,9 +119,11 @@
} from '@/api'
import { queryQueueUpConfig } from './config'
import WaybillDetail from './components/WaybillDetail.vue'
import DriverDetail from "@/views/task/driverDetail.vue"
import DriverDetail from '@/views/task/driverDetail.vue'
import PlatformSign from './components/PlatformSign.vue'
import BaseComputHeight from '@/components/base/BaseComputHeight'
export default {
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm,

 admin/src/views/statistics/platformRecord.vue

@@ -24,13 +24,13 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import BasePage from '@/components/base/BasePage'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
import { platformLogPage, getPlatformGroupList } from '@/api'
import BaseComputHeight from '@/components/base/BaseComputHeight'
dayjs.extend(duration)
export default {
  extends: BasePage,
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm

 admin/src/views/system/dict.vue

@@ -20,6 +20,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:dict:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        :default-sort = "{prop: 'createTime', order: 'descending'}"

 admin/src/views/system/loginLog.vue

@@ -40,7 +40,7 @@
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe :height="tableHeightNew"
        :default-sort="{ prop: 'loginTime', order: 'descending' }" @sort-change="handleSortChange">
        <el-table-column prop="loginUsername" label="登录用户名" min-width="100px"></el-table-column>
        <el-table-column prop="ip" label="登录IP" min-width="120px"></el-table-column>

 admin/src/views/system/menu.vue

@@ -9,6 +9,7 @@
        <li><el-button @click="sort('bottom')" :loading="isWorking.sort" icon="el-icon-sort-down" v-permissions="['system:menu:sort']">下移</el-button></li>
      </ul>
      <el-table
        :height="tableHeightNew"
        ref="table"
        v-loading="isWorking.search"
        :data="tableData.list"

 admin/src/views/system/permission.vue

@@ -20,6 +20,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:permission:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        :default-sort = "{prop: 'createTime', order: 'descending'}"

 admin/src/views/system/publicMsg.vue

@@ -6,7 +6,7 @@
      <el-button type="primary" @click="batchStatus(0)" v-permissions="['business:platformjob:update']">批量启用</el-button>
      <el-button @click="batchStatus(1)" v-permissions="['business:platformjob:update']">批量禁用</el-button>
    </div>
    <el-table @selection-change="handleSelectionChange" class="mb20" v-loading="loading" :data="list" stripe>
    <el-table :height="tableHeightNew" @selection-change="handleSelectionChange" class="mb20" v-loading="loading" :data="list" stripe>
      <el-table-column align="center" type="selection" width="55">
      </el-table-column>
      <el-table-column prop="titile" label="消息标题" min-width="160" show-overflow-tooltip />
@@ -32,7 +32,9 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import BaseComputHeight from '@/components/base/BaseComputHeight'
export default {
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm,

 admin/src/views/system/role.vue

@@ -20,6 +20,7 @@
        <li v-permissions="['system:role:delete']"><el-button @click="deleteByIdInBatch" icon="el-icon-delete">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        :default-sort = "{prop: 'createTime', order: 'descending'}"

 admin/src/views/system/smsMessage.vue

@@ -6,7 +6,7 @@
      <el-button type="primary" @click="batchStatus(0)" v-permissions="['business:platformjob:update']">批量启用</el-button>
      <el-button @click="batchStatus(1)" v-permissions="['business:platformjob:update']">批量禁用</el-button>
    </div>
    <el-table @selection-change="handleSelectionChange" class="mb40" v-loading="loading" :data="list" stripe>
    <el-table :height="tableHeightNew" @selection-change="handleSelectionChange" class="mb40" v-loading="loading" :data="list" stripe>
      <el-table-column align="center" type="selection" width="55">
      </el-table-column>
      <el-table-column prop="name" label="消息标题" min-width="160" show-overflow-tooltip />
@@ -31,8 +31,10 @@

import GlobalWindow from '@/components/common/GlobalWindow'
import { Message } from 'element-ui'
import BaseComputHeight from '@/components/base/BaseComputHeight'
import dayjs from 'dayjs'
export default {
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm,

 admin/src/views/system/traceLog.vue

@@ -53,7 +53,7 @@
    </div>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe :height="tableHeightNew"
        :default-sort="{ prop: 'operaTime', order: 'descending' }" :row-class-name="tableRowClassName"
        @sort-change="handleSortChange">
        <el-table-column prop="operaModule" label="业务模块" min-width="100px"></el-table-column>

 admin/src/views/system/user.vue

@@ -32,6 +32,7 @@
        <li v-permissions="['system:user:delete']"><el-button icon="el-icon-delete" @click="deleteByIdInBatch">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        :default-sort = "{prop: 'createTime', order: 'descending'}"

 admin/src/views/task/index.vue

@@ -11,7 +11,7 @@
      </template>
    </QueryForm>
    <!--  -->
    <el-tabs v-model="filters.queryType" @tab-click="(e) => getHeadData(1)">
    <el-tabs v-model="filters.queryType" @tab-click="(e) => getHeadData(1)" class="el-tabs-ele">
      <el-tab-pane label="待处理" name="0">
        <template #label>
          <span>待处理
@@ -33,7 +33,7 @@
        </template>
      </el-tab-pane>
    </el-tabs>
    <el-table v-loading="loading" :data="dataList" stripe row-key="id" class="mb40" default-expand-all>
    <el-table :height="tableHeightNew" v-loading="loading" :data="dataList" stripe row-key="id"   default-expand-all>
      <el-table-column label="处理事项" min-width="160">
        <template slot-scope="{ row }"> {{ row.title }}
        </template>
@@ -82,7 +82,9 @@
  taskCenterPage,
  taskSignRead
} from '@/api'
import BaseComputHeight from '@/components/base/BaseComputHeight'
export default {
  extends: BaseComputHeight,
  components: {
    TaskDetail,
    VisReportDetail,

 admin/src/views/timer/timer.vue

@@ -20,6 +20,7 @@
        <li><el-button type="primary" @click="$refs.OperaTimerWindow.open('新建任务')" icon="el-icon-plus" v-permissions="['business:devices:create']">新建</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe

 admin/src/views/vehicle/cars.vue

@@ -57,7 +57,7 @@
        <li><el-button type="primary" @click="startEmpowerBatch" icon="el-icon-plus"
            v-permissions="['business:parkbook:create']">下发授权</el-button></li>
      </ul>
      <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
        @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="code" label="车牌号" fixed="left" min-width="100px"></el-table-column>

 admin/src/views/vehicle/category.vue

@@ -21,7 +21,7 @@
                <li v-permissions="['business:category:exportExcel']"><el-button type="primary"
                        @click="exportExcel">导出</el-button></li>
            </ul>
            <el-table row-key="id" :tree-props="{ children: 'childCategoryList' }" v-loading="isWorking.search"
            <el-table :height="tableHeightNew" row-key="id" :tree-props="{ children: 'childCategoryList' }" v-loading="isWorking.search"
                :data="dataList" stripe @selection-change="handleSelectionChange">
                <el-table-column prop="name" label="分类名称" min-width="100px"></el-table-column>
                <el-table-column prop="remark" label="备注" min-width="100px"></el-table-column>
@@ -72,7 +72,7 @@
            pagination: {
                pageSize: 10,
                page: 1,
                total: 0,
        total: 0
            },
            dataList: []
        }
@@ -89,7 +89,7 @@
    methods: {
        handleEdit(row) {
            this.isShowEdit = true
            let str = row && row.id ? '编辑车辆分类' : '新建车辆分类'
      const str = row && row.id ? '编辑车辆分类' : '新建车辆分类'
            this.$nextTick(() => {
                this.$refs.operaCategoryWindow.open(str)
                this.$refs.operaCategoryWindow.getList()
@@ -99,7 +99,7 @@
            })
        },
        deleteById(row) {
            this.$confirm(`您确认要删除该分类吗`, '温馨提示', {
      this.$confirm('您确认要删除该分类吗', '温馨提示', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning'
@@ -108,7 +108,6 @@
                    this.getList()
                })
            })

        },
        getList(page) {
            const { pagination, filters } = this
@@ -119,7 +118,7 @@
            fetchList({
                model: { ...filters },
                capacity: pagination.pageSize,
                page: pagination.page,
        page: pagination.page
            }).then(res => {
                this.loading = false
                this.dataList = res.records || []

 admin/src/views/vehicle/driver.vue

@@ -2,7 +2,7 @@
  <div class="main_app">
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
    </QueryForm>
    <el-table v-loading="loading" :data="list" stripe row-key="id" class="mb20" default-expand-all>
    <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe row-key="id" class="mb20" default-expand-all>
      <el-table-column prop="username" label="登录账号" min-width="100"></el-table-column>
      <el-table-column prop="realname" label="姓名" min-width="100"></el-table-column>
      <el-table-column prop="openid" label="微信openid" min-width="100px"></el-table-column>
@@ -16,7 +16,9 @@
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import { pageDriverList  } from '@/api/system/user.js'
import BaseComputHeight from '@/components/base/BaseComputHeight'
export default {
  extends: BaseComputHeight,
  components: {
    QueryForm,
    Pagination

 admin/src/views/vehicle/parkBook.vue

@@ -27,6 +27,7 @@
-->
            </ul>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe

 admin/src/views/vehicle/visitPark.vue

@@ -17,7 +17,7 @@
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:visitpark:create', 'business:visitpark:delete']">
      </ul>
      <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
        @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="carCode" label="车牌号" fixed min-width="100px"></el-table-column>

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java

@@ -115,7 +115,7 @@
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "推送取消出库单通知任务",
            wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "【TMS】推送取消出库单通知任务",
                    JSONObject.toJSONString(param),  success, JSONObject.toJSONString(result),Constants.ONE);
        }
        return result;

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java

@@ -117,7 +117,7 @@
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "推送取消出库单通知任务",
            wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "【TMS】推送取消出库单通知任务",
                    JSONObject.toJSONString(param),  success, JSONObject.toJSONString(result),Constants.ONE);
        }
        return result;