From 8d7721c95cc004e3af1493b6289ace05658bb967 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 一月 2024 21:59:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/monitor/log/usual.vue | 2
Source/UBCS-WEB/src/views/system/tenant.vue | 2
Source/UBCS-WEB/src/views/docking/data.vue | 1
Source/UBCS-WEB/src/views/monitor/log/api.vue | 2
Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue | 3
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 2
Source/UBCS-WEB/src/views/resource/attach.vue | 2
Source/UBCS-WEB/src/views/flow/model.vue | 2
Source/UBCS-WEB/src/views/monitor/log/operateLog.vue | 2
Source/UBCS-WEB/src/views/system/user.vue | 2
Source/UBCS-WEB/src/views/system/client.vue | 2
Source/UBCS-WEB/src/views/authority/role.vue | 3
Source/UBCS-WEB/src/views/flow/manager.vue | 2
Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue | 86 +++++++++++++++++++++-------
Source/UBCS-WEB/src/option/system/dictbiz.js | 2
Source/UBCS-WEB/src/views/system/dept.vue | 3
Source/UBCS-WEB/src/views/modeling/Version.vue | 1
Source/UBCS-WEB/src/views/code/Match.vue | 4
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 2
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 4
Source/UBCS-WEB/src/views/desk/notice.vue | 2
Source/UBCS-WEB/src/views/monitor/log/error.vue | 2
Source/UBCS-WEB/src/views/flow/follow.vue | 2
Source/UBCS-WEB/src/views/resource/oss.vue | 2
Source/UBCS-WEB/src/views/report/reportlist.vue | 2
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 2
Source/UBCS-WEB/src/option/system/param.js | 2
Source/UBCS-WEB/src/api/system/classifyAuth.js | 12 +++
28 files changed, 105 insertions(+), 50 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/system/classifyAuth.js b/Source/UBCS-WEB/src/api/system/classifyAuth.js
index 41c12d6..179fb9f 100644
--- a/Source/UBCS-WEB/src/api/system/classifyAuth.js
+++ b/Source/UBCS-WEB/src/api/system/classifyAuth.js
@@ -26,4 +26,14 @@
...params
}
})
-}
\ No newline at end of file
+}
+//鑿滃崟瑙掕壊鎸夐挳鏉冮檺
+export const getButtonsByRoleId = (params) => {
+ return request({
+ url: '/api/ubcs-system/menu/getButtonsByRoleId',
+ method: 'get',
+ params: {
+ ...params
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 4d87afc..75af1eb 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -231,7 +231,7 @@
<style lang="scss" scoped>
.app {
overflow: auto;
- height: calc(100vh - 150px);
+ height: calc(100vh - 145px);
}
.app::-webkit-scrollbar {
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index f18267a..44bc9d7 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -1208,7 +1208,7 @@
.main {
display: flex;
flex-direction: column;
- height: calc(100vh - 150px);
+ height: calc(100vh - 145px);
min-height: 400px;
}
diff --git a/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue b/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
index 2f17451..3baa5c7 100644
--- a/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
@@ -8,6 +8,7 @@
title="鍒嗙被鎺堟潈"
top="-45px" @close="closeDialog">
<el-table
+ :key="itemKey"
ref="dataTable"
v-loading="isLoading"
:data="classifyAuthData"
@@ -40,7 +41,7 @@
v-if="item.type === 'select'"
slot="prepend"
v-model="row[item.prop]"
- @change="roleChange"
+ @change="selectChange(row.roleData,row)"
>
<el-option
v-for="optionItem in roleList"
@@ -59,17 +60,18 @@
</el-input>
<el-checkbox
v-if="item.type === 'checkbox'"
- v-model="row[item.prop]">
+ v-model="row[item.prop]"
+ :disabled="row.allDisabled ? true :typeof row[item.prop] == 'undefined' || typeof row[item.prop] == null">
</el-checkbox>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
- <el-button type="info" plain @click="selectAllButton">鎸夐挳鍏ㄩ��</el-button>
- <el-button class="el-icon-plus" type="success" plain @click="addClassifyAuth"></el-button>
- <el-button class="el-icon-minus" type="warning" plain @click="subClassifyAuth"></el-button>
- <el-button type="primary" plain @click="submit">鎻� 浜�</el-button>
- <el-button type="danger" plain @click="isShowDialog = false">鍏� 闂�</el-button>
+ <el-button plain type="info" @click="selectAllButton">鎸夐挳鍏ㄩ��</el-button>
+ <el-button class="el-icon-plus" plain type="success" @click="addClassifyAuth"></el-button>
+ <el-button class="el-icon-minus" plain type="warning" @click="subClassifyAuth"></el-button>
+ <el-button plain type="primary" @click="submit">鎻� 浜�</el-button>
+ <el-button plain type="danger" @click="isShowDialog = false">鍏� 闂�</el-button>
</div>
</el-dialog>
</template>
@@ -77,7 +79,7 @@
<script>
import {getButtonByParentCode} from "@/api/system/menu"
import {getPage} from "@/api/system/role"
-import {saveOrUpdate, getClassifyAuthList} from "@/api/system/classifyAuth"
+import {saveOrUpdate, getClassifyAuthList, getButtonsByRoleId} from "@/api/system/classifyAuth"
import {v4 as uuidv4} from 'uuid';
export default {
@@ -108,6 +110,9 @@
roleList: [],
//褰撳墠閫変腑鐨勮〃鏍艰
selectList: [],
+ itemKey: '',
+ viewStatus: false,
+ addIndex: Number,
};
},
watch: {
@@ -139,12 +144,13 @@
let columnItem = {
label: item.name,
prop: item.id,
+ code: item.code,
type: "checkbox",
width: 180,
};
tempData.push(columnItem);
})
- this.classifyAuthHeader = tempData
+ this.classifyAuthHeader = tempData;
resolve();
}).catch(err => {
reject(err)
@@ -154,25 +160,29 @@
this.roleList = res.data.data.records;
});
// 鑾峰彇璇ュ垎绫讳笅宸叉巿鏉冪殑鍒嗙被鎺堟潈淇℃伅
- getClassifyAuthList({classifyId: this.classifyData.oid}).then(res => {
+ getClassifyAuthList({classifyId: this.classifyData.oid, authType: "classify_auth"}).then(res => {
//console.log(res.data.data);
let authDatas = res.data.data;
+ console.log('authDatas', authDatas)
if (authDatas.length > 0) {
- authDatas.forEach(authData => {
+ authDatas.forEach((authData,index) => {
let item = {
oid: authData.oid,
roleData: authData.roleId,
classifyItem: this.classifyData.label,
+ index:index,
uuid: uuidv4(),//鐢熸垚鍞竴鐨刬d
}
//灏嗘寜閽缃繘鍘�
authData.buttonIdList.forEach(data => {
Vue.set(item, data, true);
});
- //console.log(item)
this.classifyAuthData.push(item);
+ this.addIndex = this.classifyAuthData.length -1 ;
+ // console.log('classifyAuthData', this.classifyAuthData)
})
}
+ this.roleHandlerMethods('', 'create', 0)
});
});
}
@@ -184,25 +194,57 @@
created() {
},
methods: {
+ roleHandlerMethods(id, type, index) {
+ if (this.classifyAuthData.length > 0) {
+ let roleButtonId = type === 'select' ? id : this.classifyAuthData[0].roleData;
+ getButtonsByRoleId({roleId: roleButtonId, code: 'classifyTree'}).then(res => {
+ // 鎵惧埌this.classifyAuthButton涓病鏈夊搴旂殑灞炴��
+ const filteredItems = this.classifyAuthButton.filter(item => {
+ return !res.data.data.find(x => x.id === item.id);
+ });
+
+ this.classifyAuthHeader.forEach((item) => {
+ if (filteredItems.some(x => x.id === item.prop)) {
+ this.$nextTick(() => {
+
+ if(this.classifyAuthData[index] !== undefined && this.classifyAuthData[index] !== null){
+ Object.keys(this.classifyAuthData[index]).forEach((key) => {
+ if (item.prop === key) {
+ this.classifyAuthData[index] = Object.assign({}, this.classifyAuthData[index], { [key]: undefined });
+ if (item.code === "classify_view") {
+ this.$set(this.classifyAuthData[index],'allDisabled',true)
+ }
+ }
+ });
+ }
+ // console.log('classifyAuthData', this.classifyAuthData)
+ // console.log('item', item.prop)
+ this.itemKey = uuidv4();
+ })
+ }
+ });
+ })
+ }
+ },
+ selectChange(row,index) {
+ this.roleHandlerMethods(row, 'select',index.index);
+ },
// 鍏抽棴瀵硅瘽妗�
closeDialog() {
this.$emit('update:visible', false);
this.classifyAuthData = [];
},
- // 瑙掕壊鏀瑰彉鏃�
- roleChange(roleId){
- console.log(roleId);
-
- },
// 澧炲姞琛�
addClassifyAuth() {
- if(this.roleList.length<=0){
+ if (this.roleList.length <= 0) {
this.$message.warning("褰撳墠绉熸埛涓嶅瓨鍦ㄨ鑹蹭俊鎭紒");
return;
}
+ this.addIndex++;
let item = {
roleData: this.roleList[0].id,
classifyItem: this.classifyData.label,
+ index:this.addIndex,
uuid: uuidv4(),//鐢熸垚鍞竴鐨刬d
}
//灏嗘寜閽缃繘鍘�
@@ -210,8 +252,8 @@
Vue.set(item, data.id, false);
})
//console.log(item)
- this.classifyAuthData.push(item)
- // console.log(this.classifyAuthData);
+ this.classifyAuthData.push(item);
+ this.roleHandlerMethods('', 'add', this.addIndex)
},
// 鍒犻櫎琛�
subClassifyAuth() {
@@ -300,8 +342,8 @@
})
},
// 鍏ㄩ�夋寜閽�
- selectAllButton(){
- if(this.selectList.length!==1){
+ selectAllButton() {
+ if (this.selectList.length !== 1) {
this.$message.warning("璇峰彧閫夋嫨涓�琛岄渶瑕佸叏閫夌殑鎸夐挳鐨勬暟鎹锛�");
return;
}
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 9462ea6..d13d14f 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -277,7 +277,7 @@
<!-- 鍏ㄥ睆缂栬緫-->
<el-dialog :before-close="escEdit" :visible.sync="attrEditVisible" append-to-body fullscreen="true">
<attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" :crudArrayFlag="this.crudArrayFlag"
- :editOpenFlag="editOpenFlag" :editStyleFlag="editStyleFlag"
+ :editOpenFlag="editOpenFlag" :editStyleFlag="editStyleFlag" :btnAuthList="btnAuthList"
@editCloseChildren="editClose"></attrCrud>
</el-dialog>
<!-- 缁勫悎瑙勫垯-->
@@ -1563,7 +1563,7 @@
...mapGetters(["permission"]),
permissionList() {
return {
- busineStatus: this.vaildData(this.btnAuthList.attr_add, false),
+ busineStatus: this.vaildData(this.btnAuthList.attr_add, false) ,
fullscreenStatus: this.vaildData(this.btnAuthList.attr_view_edit, false),
ruleStatus: this.vaildData(this.btnAuthList.attr_rule, false),
attrStatus: this.vaildData(this.btnAuthList.attr_group, false),
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index d267825..c567321 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -1139,7 +1139,7 @@
getAuthButtonList({classifyId: data.oid,code: "classifyTree",authType: "classify_auth"}).then(res => {
this.btnAuthList = res.data.data;
}).catch(error => {
- window.console.log(error)
+ console.log(error)
})
//鎿嶄綔鏂板鍜屼慨鏀圭殑涓氬姟绫诲瀷闅愯棌
this.TreeFlagCode = !data;
diff --git a/Source/UBCS-WEB/src/option/system/dictbiz.js b/Source/UBCS-WEB/src/option/system/dictbiz.js
index ace45a3..0ac6855 100644
--- a/Source/UBCS-WEB/src/option/system/dictbiz.js
+++ b/Source/UBCS-WEB/src/option/system/dictbiz.js
@@ -1,6 +1,6 @@
export const optionParent = {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/option/system/param.js b/Source/UBCS-WEB/src/option/system/param.js
index e0b8447..cd1cc88 100644
--- a/Source/UBCS-WEB/src/option/system/param.js
+++ b/Source/UBCS-WEB/src/option/system/param.js
@@ -1,6 +1,6 @@
export default {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/Source/UBCS-WEB/src/views/authority/role.vue b/Source/UBCS-WEB/src/views/authority/role.vue
index 6ac1858..9ad91ca 100644
--- a/Source/UBCS-WEB/src/views/authority/role.vue
+++ b/Source/UBCS-WEB/src/views/authority/role.vue
@@ -29,7 +29,7 @@
鍒� 闄�
</el-button>
<!-- v-if="userInfo.role_name.includes('admin')" -->
- <el-button v-if="permissionList.authSettingBtn"
+ <el-button v-if="permissionList.authSettingBtn"
size="small"
icon="el-icon-setting"
@click="handleRole"
@@ -115,6 +115,7 @@
option: {
height: "auto",
tip: false,
+ calcHeight: 20,
columnBtn:false,
// simplePage: true,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/views/code/Match.vue b/Source/UBCS-WEB/src/views/code/Match.vue
index 1713b75..4b79c58 100644
--- a/Source/UBCS-WEB/src/views/code/Match.vue
+++ b/Source/UBCS-WEB/src/views/code/Match.vue
@@ -101,8 +101,8 @@
findvisible: false,
selectRow: [],
option: {
- height: 700,
- calcHeight: 80,
+ height: 'auto',
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/Source/UBCS-WEB/src/views/desk/notice.vue b/Source/UBCS-WEB/src/views/desk/notice.vue
index cd1a525..71e8485 100644
--- a/Source/UBCS-WEB/src/views/desk/notice.vue
+++ b/Source/UBCS-WEB/src/views/desk/notice.vue
@@ -53,7 +53,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
dialogWidth: 950,
columnBtn:false,
tip: false,
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index 2118a26..6c651c6 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -87,7 +87,6 @@
data:[],
option: {
height:'auto',
- calcHeight: 0,
columnBtn:false,
tip: false,
searchShow: false,
diff --git a/Source/UBCS-WEB/src/views/flow/follow.vue b/Source/UBCS-WEB/src/views/flow/follow.vue
index f7d4b95..bcf406a 100644
--- a/Source/UBCS-WEB/src/views/flow/follow.vue
+++ b/Source/UBCS-WEB/src/views/flow/follow.vue
@@ -65,7 +65,7 @@
deleteReason: '',
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/views/flow/manager.vue b/Source/UBCS-WEB/src/views/flow/manager.vue
index a8c6a30..0e4db1b 100644
--- a/Source/UBCS-WEB/src/views/flow/manager.vue
+++ b/Source/UBCS-WEB/src/views/flow/manager.vue
@@ -121,7 +121,7 @@
}],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/views/flow/model.vue b/Source/UBCS-WEB/src/views/flow/model.vue
index a32f017..466eeed 100644
--- a/Source/UBCS-WEB/src/views/flow/model.vue
+++ b/Source/UBCS-WEB/src/views/flow/model.vue
@@ -202,7 +202,7 @@
flowBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/views/modeling/Version.vue b/Source/UBCS-WEB/src/views/modeling/Version.vue
index e837168..74baaf3 100644
--- a/Source/UBCS-WEB/src/views/modeling/Version.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Version.vue
@@ -60,6 +60,7 @@
form: {},
option: {
height: 'auto',
+ calcHeight: 20,
headerAlign: 'center',
align: 'center',
border: true,
diff --git a/Source/UBCS-WEB/src/views/monitor/log/api.vue b/Source/UBCS-WEB/src/views/monitor/log/api.vue
index 5f43186..56024f0 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/api.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/api.vue
@@ -36,7 +36,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/views/monitor/log/error.vue b/Source/UBCS-WEB/src/views/monitor/log/error.vue
index 7e29bdd..a9dc542 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/error.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/error.vue
@@ -36,7 +36,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
index a36e69b..e77e7d9 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
@@ -45,7 +45,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/views/monitor/log/usual.vue b/Source/UBCS-WEB/src/views/monitor/log/usual.vue
index 1bb5eb4..a2bd6d1 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/usual.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/usual.vue
@@ -36,7 +36,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/views/report/reportlist.vue b/Source/UBCS-WEB/src/views/report/reportlist.vue
index e4aeebf..461c6f1 100644
--- a/Source/UBCS-WEB/src/views/report/reportlist.vue
+++ b/Source/UBCS-WEB/src/views/report/reportlist.vue
@@ -68,7 +68,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/views/resource/attach.vue b/Source/UBCS-WEB/src/views/resource/attach.vue
index 26c683b..03253a7 100644
--- a/Source/UBCS-WEB/src/views/resource/attach.vue
+++ b/Source/UBCS-WEB/src/views/resource/attach.vue
@@ -75,7 +75,7 @@
option: {
columnBtn:false,
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/Source/UBCS-WEB/src/views/resource/oss.vue b/Source/UBCS-WEB/src/views/resource/oss.vue
index fd1690d..54bd5e2 100644
--- a/Source/UBCS-WEB/src/views/resource/oss.vue
+++ b/Source/UBCS-WEB/src/views/resource/oss.vue
@@ -80,7 +80,7 @@
option: {
columnBtn:false,
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
index 18325bc..f850c83 100644
--- a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
+++ b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
@@ -93,6 +93,8 @@
},
option() {
return {
+ height: 'auto',
+ calcHeight: 20,
headerAlign: 'center',
align: 'center',
columnBtn: false,
@@ -101,7 +103,6 @@
rowKey: 'id',
addBtn: this.permissionList.addBtn,
editBtn: false,
- height: 700,
delBtn: false,
refreshBtn: false,
column: [
diff --git a/Source/UBCS-WEB/src/views/system/client.vue b/Source/UBCS-WEB/src/views/system/client.vue
index 50b482f..b1bd0b8 100644
--- a/Source/UBCS-WEB/src/views/system/client.vue
+++ b/Source/UBCS-WEB/src/views/system/client.vue
@@ -51,7 +51,7 @@
option: {
height: 'auto',
columnBtn:false,
- calcHeight: 30,
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/Source/UBCS-WEB/src/views/system/dept.vue b/Source/UBCS-WEB/src/views/system/dept.vue
index ce22ee0..8c166cf 100644
--- a/Source/UBCS-WEB/src/views/system/dept.vue
+++ b/Source/UBCS-WEB/src/views/system/dept.vue
@@ -77,6 +77,7 @@
lazy: true,
tip: false,
height:'auto',
+ calcHeight: 20,
maxHeight:600,
columnBtn:false,
//simplePage: true,
@@ -196,7 +197,7 @@
};
},
created() {
-
+
},
computed: {
...mapGetters(["userInfo", "permission"]),
diff --git a/Source/UBCS-WEB/src/views/system/tenant.vue b/Source/UBCS-WEB/src/views/system/tenant.vue
index b740917..7282f2b 100644
--- a/Source/UBCS-WEB/src/views/system/tenant.vue
+++ b/Source/UBCS-WEB/src/views/system/tenant.vue
@@ -231,7 +231,7 @@
return{
height: 'auto',
columnBtn:false,
- calcHeight: 30,
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 9fc25cd..e2892d9 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -434,7 +434,7 @@
option() {
return{
height:'auto',
- calcHeight: 80,
+ calcHeight: 70,
tip: false,
searchShow: true,
searchMenuSpan: 6,
--
Gitblit v1.9.3