From d5efc0139ee5b4c25f5adcd99f9376928608303d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 三月 2025 17:31:58 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/system/permission.vue | 1
admin/src/views/system/dict.vue | 1
admin/src/views/vehicle/category.vue | 173 ++++++++++----------
admin/src/views/business/empower.vue | 2
admin/src/views/business/deletePersonnel.vue | 1
admin/src/views/system/menu.vue | 1
admin/src/views/business/dangerStatic.vue | 5
admin/src/views/platform/LogisticsRecord/operation.vue | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java | 2
admin/src/views/business/blackmailPersonnel.vue | 1
admin/src/views/business/freezePersonnel.vue | 1
admin/src/views/business/wmsInterfaceLog.vue | 2
admin/src/views/platform/LogisticsRecord/leaveAuth.vue | 4
admin/src/views/business/interfaceLog.vue | 2
admin/src/views/business/approvalReport.vue | 2
admin/src/views/business/visitOrigin.vue | 3
admin/src/views/timer/timer.vue | 1
admin/src/views/vehicle/driver.vue | 4
admin/src/views/business/problemLog.vue | 1
admin/src/views/business/visitorSources.vue | 14 +
admin/src/views/platform/LogisticsRecord/subscribe.vue | 4
admin/src/components/common/tagsview.vue | 17 ++
admin/src/views/system/role.vue | 1
admin/src/views/platform/LogisticsRecord/waybill.vue | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java | 2
admin/src/views/statistics/platformRecord.vue | 4
admin/src/views/business/reportRecord.vue | 4
admin/src/components/base/BaseComputHeight.vue | 42 +++++
admin/src/views/business/strandedPersonnel.vue | 2
admin/src/views/business/approvalConfiguration.vue | 8
admin/src/views/business/deviceRole_f.vue | 1
admin/src/views/system/traceLog.vue | 2
admin/src/components/base/BaseComputHeightDefault.vue | 39 ++++
admin/src/views/business/position.vue | 1
admin/src/views/system/smsMessage.vue | 4
admin/src/views/meeting/roomStatistics.vue | 1
admin/src/views/vehicle/cars.vue | 2
admin/src/views/vehicle/visitPark.vue | 2
admin/src/components/base/BasePage.vue | 40 ----
admin/src/views/system/user.vue | 15 +
admin/src/views/business/userAction.vue | 1
admin/src/views/business/smsEmail.vue | 2
admin/src/views/vehicle/parkBook.vue | 1
admin/src/layouts/AppLayout.vue | 8
admin/src/views/business/problems.vue | 1
admin/src/views/platform/queueUp.vue | 4
admin/src/views/system/loginLog.vue | 2
admin/src/views/business/trainTime.vue | 2
admin/src/views/platform/LogisticsRecord/operationCity.vue | 4
admin/src/views/business/deviceRole.vue | 1
admin/src/store/index.js | 3
admin/src/views/business/tmsFactoryParam.vue | 1
admin/src/views/business/device.vue | 2
admin/src/views/task/index.vue | 6
admin/src/views/business/relativeMember.vue | 2
admin/src/views/system/publicMsg.vue | 4
admin/src/views/business/internalMember.vue | 2
57 files changed, 286 insertions(+), 180 deletions(-)
diff --git a/admin/src/components/base/BaseComputHeight.vue b/admin/src/components/base/BaseComputHeight.vue
new file mode 100644
index 0000000..6a876aa
--- /dev/null
+++ b/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>
diff --git a/admin/src/components/base/BaseComputHeightDefault.vue b/admin/src/components/base/BaseComputHeightDefault.vue
new file mode 100644
index 0000000..d319d28
--- /dev/null
+++ b/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>
diff --git a/admin/src/components/base/BasePage.vue b/admin/src/components/base/BasePage.vue
index 2980f99..1fe7afd 100644
--- a/admin/src/components/base/BasePage.vue
+++ b/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,
// 瓒呯骇绠＄悊鍛樿鑹瞔ode
adminCode: 'admin'
}
@@ -12,46 +13,11 @@
computed: {
...mapState(['userInfo']),
// 鏄惁涓鸿秴绾х鐞嗗憳
- isAdmin () {
+ isAdmin() {
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) {
diff --git a/admin/src/components/common/tagsview.vue b/admin/src/components/common/tagsview.vue
index 6f66b69..50d9800 100644
--- a/admin/src/components/common/tagsview.vue
+++ b/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)
+ })
},
// 閫氳繃鍒ゆ柇璺敱涓�鑷磋繑鍥炲竷灏斿�兼坊鍔燾lass锛屾坊鍔犻珮浜晥鏋�
isActive(route,params, index) {
diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index b2495b3..58730f9 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/admin/src/layouts/AppLayout.vue
@@ -26,23 +26,25 @@
<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() {
return {
isFinishData: false,
- orgBackground: ''
+ orgBackground: ''
}
},
computed: {
...mapState(['menuData', 'userInfo'])
},
+ mounted() {
- mounted() {
- },
+ },
methods: {
diff --git a/admin/src/store/index.js b/admin/src/store/index.js
index c66e8e3..fd55430 100644
--- a/admin/src/store/index.js
+++ b/admin/src/store/index.js
@@ -55,8 +55,9 @@
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) {
+ if (result === -1) {
state.tags.push({ ...val, keepAlive: false })
} else {
state.tags[result] = { ...val, keepAlive: true }
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index 56f5133..e8788e5 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -1,11 +1,11 @@
<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>
<el-tab-pane label="鏂藉伐璁垮" name="1"></el-tab-pane>
</el-tabs>
- <div class="config">
+ <div class="config" >
<div class="config_list">
<div class="config_list_head">
<span>閰嶇疆娴佺▼</span>
@@ -316,7 +316,7 @@
},
// 鑾峰彇缁勭粐鏍�
- getfindCompanyTreePage() {
+ getfindCompanyTreePage() {
fetchList(2)
.then(res => {
if (res && res.length > 0) {
@@ -356,7 +356,7 @@
this.$set(this.searchForm, 'erpOrgId', row.erpId)
this.$set(this.searchForm, 'objIdsT', this.searchForm.objIds)
console.log('searchForm.objIds', this.searchForm.objIds);
-
+
this.getMemberList()
},
TransferSub() {
diff --git a/admin/src/views/business/approvalReport.vue b/admin/src/views/business/approvalReport.vue
index d37953a..9da57fb 100644
--- a/admin/src/views/business/approvalReport.vue
+++ b/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">
diff --git a/admin/src/views/business/blackmailPersonnel.vue b/admin/src/views/business/blackmailPersonnel.vue
index 9e4fe7e..5f0f848 100644
--- a/admin/src/views/business/blackmailPersonnel.vue
+++ b/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
diff --git a/admin/src/views/business/dangerStatic.vue b/admin/src/views/business/dangerStatic.vue
index 39c4e08..0705e66 100644
--- a/admin/src/views/business/dangerStatic.vue
+++ b/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) {
diff --git a/admin/src/views/business/deletePersonnel.vue b/admin/src/views/business/deletePersonnel.vue
index 8a06251..f21317f 100644
--- a/admin/src/views/business/deletePersonnel.vue
+++ b/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
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index 987f067..584e995 100644
--- a/admin/src/views/business/device.vue
+++ b/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>
diff --git a/admin/src/views/business/deviceRole.vue b/admin/src/views/business/deviceRole.vue
index 97d0395..b3db126 100644
--- a/admin/src/views/business/deviceRole.vue
+++ b/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
diff --git a/admin/src/views/business/deviceRole_f.vue b/admin/src/views/business/deviceRole_f.vue
index dde4a02..3a3648b 100644
--- a/admin/src/views/business/deviceRole_f.vue
+++ b/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
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index 8aff320..7681c6b 100644
--- a/admin/src/views/business/empower.vue
+++ b/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>
diff --git a/admin/src/views/business/freezePersonnel.vue b/admin/src/views/business/freezePersonnel.vue
index c553700..9b786bb 100644
--- a/admin/src/views/business/freezePersonnel.vue
+++ b/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
diff --git a/admin/src/views/business/interfaceLog.vue b/admin/src/views/business/interfaceLog.vue
index f28b1df..d31cd1f 100644
--- a/admin/src/views/business/interfaceLog.vue
+++ b/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">
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index f7c1963..a716035 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/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}">
diff --git a/admin/src/views/business/position.vue b/admin/src/views/business/position.vue
index acf08e8..3ce84e0 100644
--- a/admin/src/views/business/position.vue
+++ b/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
diff --git a/admin/src/views/business/problemLog.vue b/admin/src/views/business/problemLog.vue
index 8517c93..1d34133 100644
--- a/admin/src/views/business/problemLog.vue
+++ b/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
diff --git a/admin/src/views/business/problems.vue b/admin/src/views/business/problems.vue
index c47eee2..0207bb4 100644
--- a/admin/src/views/business/problems.vue
+++ b/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
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 72b7d76..45e0aa9 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/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">
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index ac07890..062b72e 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/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,
diff --git a/admin/src/views/business/smsEmail.vue b/admin/src/views/business/smsEmail.vue
index ac668f6..9b4f24a 100644
--- a/admin/src/views/business/smsEmail.vue
+++ b/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>
diff --git a/admin/src/views/business/strandedPersonnel.vue b/admin/src/views/business/strandedPersonnel.vue
index 2455d22..240a888 100644
--- a/admin/src/views/business/strandedPersonnel.vue
+++ b/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>
diff --git a/admin/src/views/business/tmsFactoryParam.vue b/admin/src/views/business/tmsFactoryParam.vue
index 370b9b6..19c75ee 100644
--- a/admin/src/views/business/tmsFactoryParam.vue
+++ b/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
diff --git a/admin/src/views/business/trainTime.vue b/admin/src/views/business/trainTime.vue
index 4bfea6a..2c060c8 100644
--- a/admin/src/views/business/trainTime.vue
+++ b/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>
diff --git a/admin/src/views/business/userAction.vue b/admin/src/views/business/userAction.vue
index 0f1a5d6..cdfa2aa 100644
--- a/admin/src/views/business/userAction.vue
+++ b/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
diff --git a/admin/src/views/business/visitOrigin.vue b/admin/src/views/business/visitOrigin.vue
index 6b709b6..851b467 100644
--- a/admin/src/views/business/visitOrigin.vue
+++ b/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
diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index 84bdd07..fd34b2d 100644
--- a/admin/src/views/business/visitorSources.vue
+++ b/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;
diff --git a/admin/src/views/business/wmsInterfaceLog.vue b/admin/src/views/business/wmsInterfaceLog.vue
index ed8d436..41079ca 100644
--- a/admin/src/views/business/wmsInterfaceLog.vue
+++ b/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">
diff --git a/admin/src/views/meeting/roomStatistics.vue b/admin/src/views/meeting/roomStatistics.vue
index 1ab4e4f..41d03fd 100644
--- a/admin/src/views/meeting/roomStatistics.vue
+++ b/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
diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index 9760059..eac9711 100644
--- a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
+++ b/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,
diff --git a/admin/src/views/platform/LogisticsRecord/operation.vue b/admin/src/views/platform/LogisticsRecord/operation.vue
index 1dd0260..b00d6d3 100644
--- a/admin/src/views/platform/LogisticsRecord/operation.vue
+++ b/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,
diff --git a/admin/src/views/platform/LogisticsRecord/operationCity.vue b/admin/src/views/platform/LogisticsRecord/operationCity.vue
index 745eb24..2714f42 100644
--- a/admin/src/views/platform/LogisticsRecord/operationCity.vue
+++ b/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,
diff --git a/admin/src/views/platform/LogisticsRecord/subscribe.vue b/admin/src/views/platform/LogisticsRecord/subscribe.vue
index ba788b3..fe7f947 100644
--- a/admin/src/views/platform/LogisticsRecord/subscribe.vue
+++ b/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,
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index d5f8fc3..0069e50 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/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,
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 3ddafb0..40d2439 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/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,
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index 639894a..556fcc8 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/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
diff --git a/admin/src/views/system/dict.vue b/admin/src/views/system/dict.vue
index c1a6e61..e771de8 100644
--- a/admin/src/views/system/dict.vue
+++ b/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'}"
diff --git a/admin/src/views/system/loginLog.vue b/admin/src/views/system/loginLog.vue
index 11786a0..9ba199d 100644
--- a/admin/src/views/system/loginLog.vue
+++ b/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>
diff --git a/admin/src/views/system/menu.vue b/admin/src/views/system/menu.vue
index 27b05ad..3eb9fe1 100644
--- a/admin/src/views/system/menu.vue
+++ b/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"
diff --git a/admin/src/views/system/permission.vue b/admin/src/views/system/permission.vue
index 56a021b..d4e56f4 100644
--- a/admin/src/views/system/permission.vue
+++ b/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'}"
diff --git a/admin/src/views/system/publicMsg.vue b/admin/src/views/system/publicMsg.vue
index 259257b..5b5371f 100644
--- a/admin/src/views/system/publicMsg.vue
+++ b/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,
diff --git a/admin/src/views/system/role.vue b/admin/src/views/system/role.vue
index 0d44875..e10743f 100644
--- a/admin/src/views/system/role.vue
+++ b/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'}"
diff --git a/admin/src/views/system/smsMessage.vue b/admin/src/views/system/smsMessage.vue
index 4e60443..b6697fb 100644
--- a/admin/src/views/system/smsMessage.vue
+++ b/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,
diff --git a/admin/src/views/system/traceLog.vue b/admin/src/views/system/traceLog.vue
index 8724eb1..64d63da 100644
--- a/admin/src/views/system/traceLog.vue
+++ b/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>
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index 2295442..0c7edf7 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -32,13 +32,14 @@
<li v-permissions="['system:user:delete']"><el-button icon="el-icon-delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
</ul>
<el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- :default-sort = "{prop: 'createTime', order: 'descending'}"
- stripe
- @selection-change="handleSelectionChange"
- @sort-change="handleSortChange"
- >
+ :height="tableHeightNew"
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ :default-sort = "{prop: 'createTime', order: 'descending'}"
+ stripe
+ @selection-change="handleSelectionChange"
+ @sort-change="handleSortChange"
+ >
<el-table-column type="selection" width="55"></el-table-column>
<!-- <el-table-column prop="avatar" label="澶村儚" width="80px" class-name="table-column-avatar" fixed="left">-->
<!-- <template slot-scope="{row}">-->
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 6597ea4..7691976 100644
--- a/admin/src/views/task/index.vue
+++ b/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,
diff --git a/admin/src/views/timer/timer.vue b/admin/src/views/timer/timer.vue
index 8529d97..fc76f3e 100644
--- a/admin/src/views/timer/timer.vue
+++ b/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
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index 59ac763..08e133e 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/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>
diff --git a/admin/src/views/vehicle/category.vue b/admin/src/views/vehicle/category.vue
index 5b14a1b..0c7ef76 100644
--- a/admin/src/views/vehicle/category.vue
+++ b/admin/src/views/vehicle/category.vue
@@ -1,18 +1,18 @@
<template>
<TableLayout>
<!-- 鎼滅储琛ㄥ崟 -->
- <!-- <el-form ref="searchForm" slot="search-form" label-width="100px" inline>
- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="filters.status" placeholder="璇烽�夋嫨">
- <el-option label="鍚敤" value="0"></el-option>
- <el-option label="绂佺敤" value="1"></el-option>
- </el-select>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form> -->
+ <!-- <el-form ref="searchForm" slot="search-form" label-width="100px" inline>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="filters.status" placeholder="璇烽�夋嫨">
+ <el-option label="鍚敤" value="0"></el-option>
+ <el-option label="绂佺敤" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>-->
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:category:create', 'business:category:delete']">
@@ -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>
@@ -58,80 +58,79 @@
import OperaCategoryWindow from './components/OperaCategoryWindow'
import { fetchList, deleteById } from '@/api/business/category.js'
export default {
- name: 'Category',
- extends: BaseTable,
- components: { TableLayout, Pagination, OperaCategoryWindow },
- data() {
- return {
- // 鎼滅储
- filters: {
- parentId: ''
- },
- isShowEdit: false,
- loading: false,
- pagination: {
- pageSize: 10,
- page: 1,
- total: 0,
- },
- dataList: []
- }
- },
- created() {
- this.config({
- module: '杞﹁締淇℃伅琛�',
- api: '/business/category',
- 'field.id': 'id',
- 'field.main': 'id'
- })
- this.getList()
- },
- methods: {
- handleEdit(row) {
- this.isShowEdit = true
- let str = row && row.id ? '缂栬緫杞﹁締鍒嗙被' : '鏂板缓杞﹁締鍒嗙被'
- this.$nextTick(() => {
- this.$refs.operaCategoryWindow.open(str)
- this.$refs.operaCategoryWindow.getList()
- if (row && row.id) {
- this.$refs.operaCategoryWindow.getDetail(row.id)
- }
- })
- },
- deleteById(row) {
- this.$confirm(`鎮ㄧ‘璁よ鍒犻櫎璇ュ垎绫诲悧`, '娓╅Θ鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- deleteById(row.id).then(res => {
- this.getList()
- })
- })
-
- },
- getList(page) {
- const { pagination, filters } = this
- if (page) {
- pagination.page = page
- }
- this.loading = true
- fetchList({
- model: { ...filters },
- capacity: pagination.pageSize,
- page: pagination.page,
- }).then(res => {
- this.loading = false
- this.dataList = res.records || []
- this.pagination.total = res.total || 0
- }, () => {
- this.loading = false
- })
- },
- handleSizeChange(val){
- this.pagination.pageSize = val
- this.getList()
- }
+ name: 'Category',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaCategoryWindow },
+ data () {
+ return {
+ // 鎼滅储
+ filters: {
+ parentId: ''
+ },
+ isShowEdit: false,
+ loading: false,
+ pagination: {
+ pageSize: 10,
+ page: 1,
+ total: 0
+ },
+ dataList: []
}
+ },
+ created () {
+ this.config({
+ module: '杞﹁締淇℃伅琛�',
+ api: '/business/category',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.getList()
+ },
+ methods: {
+ handleEdit (row) {
+ this.isShowEdit = true
+ const str = row && row.id ? '缂栬緫杞﹁締鍒嗙被' : '鏂板缓杞﹁締鍒嗙被'
+ this.$nextTick(() => {
+ this.$refs.operaCategoryWindow.open(str)
+ this.$refs.operaCategoryWindow.getList()
+ if (row && row.id) {
+ this.$refs.operaCategoryWindow.getDetail(row.id)
+ }
+ })
+ },
+ deleteById (row) {
+ this.$confirm('鎮ㄧ‘璁よ鍒犻櫎璇ュ垎绫诲悧', '娓╅Θ鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ deleteById(row.id).then(res => {
+ this.getList()
+ })
+ })
+ },
+ getList (page) {
+ const { pagination, filters } = this
+ if (page) {
+ pagination.page = page
+ }
+ this.loading = true
+ fetchList({
+ model: { ...filters },
+ capacity: pagination.pageSize,
+ page: pagination.page
+ }).then(res => {
+ this.loading = false
+ this.dataList = res.records || []
+ this.pagination.total = res.total || 0
+ }, () => {
+ this.loading = false
+ })
+ },
+ handleSizeChange (val) {
+ this.pagination.pageSize = val
+ this.getList()
+ }
+ }
}
</script>
diff --git a/admin/src/views/vehicle/driver.vue b/admin/src/views/vehicle/driver.vue
index c8c0915..1e8ac2a 100644
--- a/admin/src/views/vehicle/driver.vue
+++ b/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
diff --git a/admin/src/views/vehicle/parkBook.vue b/admin/src/views/vehicle/parkBook.vue
index 51244de..46a531b 100644
--- a/admin/src/views/vehicle/parkBook.vue
+++ b/admin/src/views/vehicle/parkBook.vue
@@ -27,6 +27,7 @@
-->
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
diff --git a/admin/src/views/vehicle/visitPark.vue b/admin/src/views/vehicle/visitPark.vue
index 908a221..0f02cb5 100644
--- a/admin/src/views/vehicle/visitPark.vue
+++ b/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>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java
index 05e12cf..41bc9e3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java
+++ b/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", "銆怲MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟",
JSONObject.toJSONString(param), success, JSONObject.toJSONString(result),Constants.ONE);
}
return result;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
index 99f287c..72c6997 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
+++ b/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", "銆怲MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟",
JSONObject.toJSONString(param), success, JSONObject.toJSONString(result),Constants.ONE);
}
return result;
--
Gitblit v1.9.3