From 4e13584a74c860f9fa8fd2d6aee3021fe6bb6b77 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 11 四月 2023 20:07:26 +0800
Subject: [PATCH] 对象建模
---
Source/UBCS-WEB/src/views/system/user.vue | 89 ++++++++++++++++++++------------------------
1 files changed, 41 insertions(+), 48 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index b69c093..b07450c 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -1,16 +1,20 @@
<template>
<el-row>
- <el-col :span="5">
+ <el-col :span="5" v-if="userflag">
<div class="box">
- <el-scrollbar>
+ <el-scrollbar style="height: auto;border-bottom-right-radius:8px ">
<basic-container>
- <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"/>
+ <div class="abox">
+ <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"/>
+ </div>
+
</basic-container>
</el-scrollbar>
</div>
</el-col>
- <el-col :span="19">
+ <el-col :span="usernumber">
<basic-container>
+ <div class="bbox">
<avue-crud ref="crud"
v-model="form"
:before-open="beforeOpen"
@@ -98,6 +102,7 @@
<el-tag>{{ row.userTypeName }}</el-tag>
</template>
</avue-crud>
+ </div>
<el-dialog :visible.sync="roleBox"
append-to-body
title="鐢ㄦ埛瑙掕壊閰嶇疆"
@@ -156,36 +161,6 @@
<el-button type="primary" @click="passhandle">纭� 瀹�</el-button>
</span>
</el-dialog>
- <!-- <el-dialog title="鐢ㄦ埛骞冲彴閰嶇疆"-->
- <!-- append-to-body-->
- <!-- :visible.sync="platformBox">-->
- <!-- <avue-crud :option="platformOption"-->
- <!-- :table-loading="platformLoading"-->
- <!-- :data="platformData"-->
- <!-- ref="platformCrud"-->
- <!-- v-model="platformForm"-->
- <!-- :before-open="platformBeforeOpen"-->
- <!-- :page.sync="platformPage"-->
- <!-- :permission="platformPermissionList"-->
- <!-- @row-update="platformRowUpdate"-->
- <!-- @search-change="platformSearchChange"-->
- <!-- @search-reset="platformSearchReset"-->
- <!-- @selection-change="platformSelectionChange"-->
- <!-- @current-change="platformCurrentChange"-->
- <!-- @size-change="platformSizeChange"-->
- <!-- @refresh-change="platformRefreshChange"-->
- <!-- @on-load="platformOnLoad">-->
- <!-- <template slot-scope="{row}"-->
- <!-- slot="tenantName">-->
- <!-- <el-tag>{{row.tenantName}}</el-tag>-->
- <!-- </template>-->
- <!-- <template slot-scope="{row}"-->
- <!-- slot="userTypeName">-->
- <!-- <el-tag>{{row.userTypeName}}</el-tag>-->
- <!-- </template>-->
- <!-- -->
- <!-- </avue-crud>-->
- <!-- </el-dialog>-->
</basic-container>
</el-col>
</el-row>
@@ -274,7 +249,9 @@
treeDeptId: '',
treeData: [],
treeOption: {
+ height:"auto",
nodeKey: 'id',
+ border: true,
lazy: true,
treeLoad: function (node, resolve) {
const parentId = (node.level === 0) ? 0 : node.data.id;
@@ -298,7 +275,7 @@
}
},
option: {
- height: 'auto',
+ height:'auto',
calcHeight: 80,
tip: false,
searchShow: true,
@@ -355,7 +332,7 @@
{
label: "鐢ㄦ埛骞冲彴",
type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
props: {
label: "dictValue",
value: "dictKey"
@@ -382,7 +359,7 @@
label: "鎵�灞炵鎴�",
prop: "tenantId",
type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
+ dicUrl: "/api/ubcs-system/tenant/select",
props: {
label: "tenantName",
value: "tenantId"
@@ -410,7 +387,7 @@
{
label: "鐢ㄦ埛骞冲彴",
type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
props: {
label: "dictValue",
value: "dictKey"
@@ -625,7 +602,7 @@
{
label: "鐢ㄦ埛骞冲彴",
type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
props: {
label: "dictValue",
value: "dictKey"
@@ -669,7 +646,7 @@
res: 'data'
},
tip: '璇蜂笂浼� .xls,.xlsx 鏍囧噯鏍煎紡鏂囦欢',
- action: "/api/blade-user/import-user"
+ action: "/api/ubcs-user/import-user"
},
{
label: "鏁版嵁瑕嗙洊",
@@ -709,7 +686,9 @@
UserPwdstrategyVO:{
userIds:[],
pwdstrategyId:''
- }
+ },
+ userflag:true,
+ usernumber:0
};
},
watch: {
@@ -721,7 +700,7 @@
'excelForm.isCovered'() {
if (this.excelForm.isCovered !== '') {
const column = this.findObject(this.excelOption.column, "excelFile");
- column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+ column.action = `/api/ubcs-user/import-user?isCovered=${this.excelForm.isCovered}`;
}
}
},
@@ -759,6 +738,14 @@
},
created() {
this.selecload()
+ const arr=JSON.parse(localStorage.getItem("updataid"))
+ if(arr.user_id != '0' && arr.tenant_id !== '000000'){
+ this.userflag=false
+ this.usernumber=24
+ }else {
+ this.userflag=true
+ this.usernumber=19
+ }
},
methods: {
//esc鍙栨秷閿搷浣�
@@ -781,6 +768,7 @@
this.passVisible=true;
}
console.log("selectionList",this.selectionList)
+ console.log(this.UserPwdstrategyVO)
},
// 璁剧疆瀵嗙爜绛栫暐锛屼紶閫掍笅鎷夋鐨刬d鍜屽閫夋鐨刬d
passhandle(){
@@ -791,18 +779,19 @@
//瑕佷紶閫掔殑id锛屼竴涓槸鏁扮粍鍙︿竴涓槸瀛楃涓�
this.UserPwdstrategyVO.userIds=this.selid;
this.UserPwdstrategyVO.pwdstrategyId=this.id
- console.log(this.UserPwdstrategyVO)
+ console.log("1",this.UserPwdstrategyVO)
+ console.log("2",this.UserPwdstrategyVO.userIds)
//璇锋眰
- insert(this.UserPwdstrategyVO).then(()=>{
+ insert(this.UserPwdstrategyVO.userIds).then(()=>{
this.passVisible=false
this.$message({
type: "success",
message: "閰嶇疆鎴愬姛!"
});
- this.selectionList=[]
this.onLoad(this.page)
- console.log("selectionList",this.selectionList)
+ this.selid=[]
}).catch(res=>{
+ this.selid=[]
this.$message({
type: "warning",
message: res
@@ -1020,14 +1009,14 @@
type: "warning"
}).then(() => {
NProgress.start();
- exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
+ exportBlob(`/api/ubcs-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
downloadXls(res.data, `鐢ㄦ埛鏁版嵁琛�${dateNow()}.xlsx`);
NProgress.done();
})
});
},
handleTemplate() {
- exportBlob(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+ exportBlob(`/api/ubcs-user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
downloadXls(res.data, "鐢ㄦ埛鏁版嵁妯℃澘.xlsx");
})
},
@@ -1148,4 +1137,8 @@
.seloption{
margin-left: 10px;
}
+.abox{
+ height: 771px;
+}
+
</style>
--
Gitblit v1.9.3