From c96af61f159cd7498647f3803c8e5f2753bb1907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=99=8C?= <xiaomo.drip@gmail.com>
Date: Tue, 18 Jul 2023 20:17:38 +0800
Subject: [PATCH] no message

---
 src/config/index.js                |  6 +--
 src/views/app/apartment/index.vue  | 18 ++++++--
 src/views/app/apartment/update.vue |  2 -
 src/views/system/table/index.vue   |  1 -
 src/views/user/role.vue            | 72 ++++++++++++++++++++----------
 src/views/user/role/save.vue       | 50 ++++++++++++++++-----
 6 files changed, 105 insertions(+), 44 deletions(-)

diff --git a/src/config/index.js b/src/config/index.js
index f68c258..4a0ac62 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -66,12 +66,10 @@ const DEFAULT_CONFIG = {
 	//控制台首页默认布局
 	DEFAULT_GRID: {
 		//默认分栏数量和宽度 例如 [24] [18,6] [8,8,8] [6,12,6]
-		layout: [12, 6, 6],
+		layout: [24],
 		//小组件分布，com取值:views/home/components 文件名
 		copmsList: [
-			['welcome'],
-			['about', 'ver'],
-			['time', 'progress']
+			['welcome']
 		]
 	}
 }
diff --git a/src/views/app/apartment/index.vue b/src/views/app/apartment/index.vue
index 915797c..2219337 100644
--- a/src/views/app/apartment/index.vue
+++ b/src/views/app/apartment/index.vue
@@ -82,9 +82,9 @@
 
 	<room-dialog v-if="dialog.room" ref="roomDialog" @success="handleSuccess" @closed="dialog.room=false"></room-dialog>
 	<update v-if="dialog.update" ref="update" @success="handleSuccess" @closed="dialog.update=false"></update>
-	<images v-if="dialog.images" ref="images" @success="handleSuccess" @closed="dialog.images=false"></images>
-	<videos v-if="dialog.videos" ref="videos" @success="handleSuccess" @closed="dialog.videos=false"></videos>
-	<lives v-if="dialog.lives" ref="lives" @success="handleSuccess" @closed="dialog.lives=false"></lives>
+	<images v-if="dialog.images" ref="images" @success="attachmenthandleSuccess" @closed="dialog.images=false"></images>
+	<videos v-if="dialog.videos" ref="videos" @success="attachmenthandleSuccess" @closed="dialog.videos=false"></videos>
+	<lives v-if="dialog.lives" ref="lives" @success="attachmenthandleSuccess" @closed="dialog.lives=false"></lives>
 </template>
 
 <script>
@@ -211,8 +211,20 @@
 			selectionChange(selection){
 				this.selection = selection;
 			},
+
+			async attachmenthandleSuccess(data, o){
+				var res = await api.post('attachmentSubmit', data)		
+				if (res.code==200) {		
+					o.close();
+					this.$refs.table.refresh()
+					this.$message.success("操作成功")		
+					return ;		
+				}		
+				this.$alert(res.message, "提示", {type: 'error'})		
+			},
 			//本地更新数据
 			async handleSuccess(){
+
 				this.$refs.table.refresh()
 			}
 		}
diff --git a/src/views/app/apartment/update.vue b/src/views/app/apartment/update.vue
index b775f86..26fc497 100644
--- a/src/views/app/apartment/update.vue
+++ b/src/views/app/apartment/update.vue
@@ -39,7 +39,6 @@
 			submit(){
 				this.$refs.formref.validate( async (valid, obj) => {
 					if (valid) {
-						console.log(this.info)
 
 						var res = await api.post('submit', {info:this.info,id:this.id,token:this.token})
 						if (res.code==200) {
@@ -67,7 +66,6 @@
 			setConfig(){
 				var that = this;
 				api.get('config', {}).then((res) => {
-					console.log(res)
 					that.config = res.data;	
 				});
 				return this;
diff --git a/src/views/system/table/index.vue b/src/views/system/table/index.vue
index 83b42fb..95656a4 100644
--- a/src/views/system/table/index.vue
+++ b/src/views/system/table/index.vue
@@ -98,7 +98,6 @@
 			}
 		},
 		mounted() {
-
 			if (this.name) {
 				this.tablename = this.name || this.$route.meta.tablename;
 			}
diff --git a/src/views/user/role.vue b/src/views/user/role.vue
index 91eb18e..fadb810 100644
--- a/src/views/user/role.vue
+++ b/src/views/user/role.vue
@@ -5,38 +5,64 @@
 		</el-card>
 		<el-card class="userlose" shadow="never" style="margin-top: 10px;">
 			<el-container>
-				<el-header>	
+				<el-header v-auths="['user.group']">	
 					<div class="left-panel">
 						<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
 					</div>
 				</el-header>
 				<el-main class="nopadding">
 				<x-table :api="api" ref="table" :params="filterData" :hidePagination="true">
-					<el-table-column prop="id" fixed sortable label="GroupID" width="100" />
+					<el-table-column prop="id" fixed sortable label="GroupID" align="center" width="100" />
 
-					<el-table-column prop="title" label="title" width="180" />
+					<el-table-column prop="title" label="名称" width="180" />
+					<el-table-column prop="alias" label="别名" width="180" />
 
-					<el-table-column prop="status" label="status" width="180" />
+					<el-table-column prop="status" label="状态" width="90">
+						<template #default="scope">
+							<x-status-indicator pulse type="success" v-if="scope.row.status==1" label="开启" />
+							<x-status-indicator pulse type="info" v-if="scope.row.status==0" label="关闭" />
+						</template>
+					</el-table-column>
+					<el-table-column prop="anicount" label="积分" width="100" v-if="filterData.type=='member'" />
 
-					<el-table-column prop="anicount" sortable label="anicount" width="180" v-if="filterData.type=='member'" />
-
-					<el-table-column prop="aid" label="aid" width="180" v-if="filterData.type=='member'" />
-
-					<el-table-column label="排序" prop="sort" width="80"></el-table-column>
+					<el-table-column prop="anicount" label="主图" width="100" v-if="filterData.type=='member'">
+						<template #default="scope">
+							<el-image :preview-src-list="[scope.row.image.url]" :preview-teleported="true" hide-on-click-modal="true" lazy="true" style="width: 30px; height: 30px" fit="cover" :src="scope.row.image.url">
+								<template #error>
+						          	<div class="image-slot">
+						          		无图
+						          	</div>
+						        </template>
+							</el-image>
+						</template>
+					</el-table-column>
 
 
-					<el-table-column prop="message" label="备注" width="180" />
+					<el-table-column prop="aid" label="控制台模块" width="100" v-if="filterData.type=='system'">
+						<template #default="scope">
+							<el-badge :value="scope.row.authority.grid ? scope.row.authority.grid.length:0"  type="warning"></el-badge>
+						</template>
+					</el-table-column>
+					<el-table-column prop="aid" label="菜单" width="80" v-if="filterData.type=='system'">
+						<template #default="scope">
+							<el-badge :value="scope.row.authority.menu ? scope.row.authority.menu.length:0"  type="primary"></el-badge>
+						</template>
+					</el-table-column>
 
-					<el-table-column />
+					<el-table-column prop="message" label="备注">
+						<template #default="scope">
+							<input class="el-input__inner" type="text" readonly :value="scope.row.message">
+						</template>
+					</el-table-column>
 
 					<el-table-column label="操作" fixed="right" align="right" width="160">
 					   <template #default="scope">
 	   						<el-button-group>
-	   							<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
-	   							<el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button>
-	   							<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
+	   							<el-button text type="primary" size="small" @click="group_show(scope.row, scope.$index)">查看</el-button>
+	   							<el-button text type="primary" size="small" @click="group_edit(scope.row, scope.$index)" v-auths="['user.group']">编辑</el-button>
+	   							<el-popconfirm title="确定删除吗？" @confirm="group_del(scope.row, scope.$index)" >
 	   								<template #reference>
-	   									<el-button text type="primary" size="small">删除</el-button>
+	   									<el-button text type="primary" size="small" v-auths="['user.group']">删除</el-button>
 	   								</template>
 	   							</el-popconfirm>
 	   						</el-button-group>
@@ -124,18 +150,18 @@
 			add(){
 				this.dialog.save = true
 				this.$nextTick(() => {
-					this.$refs.saveDialog.open()
+					this.$refs.saveDialog.open().setData({type:this.filterData.type})
 				})
 			},
 			//编辑
-			table_edit(row){
+			group_edit(row){
 				this.dialog.save = true
 				this.$nextTick(() => {
 					this.$refs.saveDialog.open('edit').setData(row)
 				})
 			},
 			//查看
-			table_show(row){
+			group_show(row){
 				this.dialog.save = true
 				this.$nextTick(() => {
 					this.$refs.saveDialog.open('show').setData(row)
@@ -149,15 +175,15 @@
 				})
 			},
 			//删除
-			async table_del(row){
+			async group_del(row){
 				var reqData = {id: row.id}
-				var res = await this.$api.demo.post.post(reqData);
+				var res = await this.$http.post('system/group/delete',reqData);
 				if(res.code == 200){
 					this.$refs.table.refresh()
-					this.$message.success("删除成功")
-				}else{
-					this.$alert(res.message, "提示", {type: 'error'})
+					this.$message.success("删除成功");
+					return false;
 				}
+				this.$alert(res.message, "提示", {type: 'error'})
 			},
 			change(selected){
 				this.filterData = selected
diff --git a/src/views/user/role/save.vue b/src/views/user/role/save.vue
index a540f5c..d68c052 100644
--- a/src/views/user/role/save.vue
+++ b/src/views/user/role/save.vue
@@ -7,6 +7,11 @@
 				<el-input v-model="form.title" clearable></el-input>
 			</el-form-item>
 
+			<el-form-item label="别名" prop="title">
+				<el-input v-model="form.alias" clearable></el-input>
+				<div class="el-form-item-msg">用于权限判断,可以留空; 不可重复</div>
+			</el-form-item>
+
 			<el-form-item label="升级点数" prop="anicount" v-if="form.type=='member'">
 				<el-input v-model="form.anicount" clearable></el-input>
 			</el-form-item>
@@ -39,7 +44,7 @@
 					<el-tab-pane label="数据权限">
 						<el-form label-width="100px" label-position="left">
 							<el-form-item label="规则类型">
-								<el-select v-model="form.dataType" placeholder="请选择">
+								<el-select v-model="form.authority.dataType" placeholder="请选择">
 									<el-option label="全部可见" value="1"></el-option>
 									<el-option label="本人可见" value="2"></el-option>
 									<el-option label="所在部门可见" value="3"></el-option>
@@ -50,11 +55,11 @@
 							</el-form-item>
 							<el-form-item label="选择部门" v-show="form.dataType=='5'">
 								<div class="treeMain" style="width: 100%;">
-									<el-tree ref="dept" node-key="id" :data="form.list" :props="form.props" show-checkbox></el-tree>
+									<el-tree ref="dept" node-key="id" :data="dept.list" :props="dept.props" :default-checked-keys="dept.checked" show-checkbox></el-tree>
 								</div>
 							</el-form-item>
 							<el-form-item label="规则值" v-show="form.dataType=='6'">
-								<el-input v-model="form.rule" clearable type="textarea" :rows="6" placeholder="请输入自定义规则代码"></el-input>
+								<el-input v-model="form.authority.dataRule" clearable type="textarea" :rows="6" placeholder="请输入自定义规则代码"></el-input>
 							</el-form-item>
 						</el-form>
 					</el-tab-pane>
@@ -110,11 +115,13 @@
 				form: {
 					id:"",
 					title: "",
+					alias: "",
 					status: 1,
 					message: "",
 					authority:{
 						menu:[],
 						grid:[],
+						dataType: 1,
 					}
 				},
 				//验证规则
@@ -122,10 +129,13 @@
 					title: [
 						{required: true, message: '请填写名称'}
 					],
+					alias: [
+						{required: true, message: '请填写别名'}
+					],
 				},
 				menu: {
 					list: [],
-					checked: [17,35],
+					checked: [],
 					props: {
 						label: (data)=>{
 							return data.meta.title
@@ -144,6 +154,18 @@
 						}
 					}
 				},
+				dept: {
+					list: [],
+					checked: [],
+					props: {
+						label: (data)=>{
+							return data.title
+						},
+						disabled: (data)=>{
+							return data.isFixed
+						}
+					}
+				},
 			}
 		},
 		mounted() {
@@ -160,8 +182,15 @@
 			submit(){
 
 				//选中的和半选的合并后传值接口
-				this.form.authority.menu = this.$refs.menu.getCheckedKeys().concat(this.$refs.menu.getHalfCheckedKeys())
-				this.form.authority.grid = this.$refs.grid.getCheckedKeys().concat(this.$refs.grid.getHalfCheckedKeys())
+				if (this.form.type == 'system') {
+					this.form.authority.menu = this.$refs.menu.getCheckedKeys().concat(this.$refs.menu.getHalfCheckedKeys())
+					this.form.authority.grid = this.$refs.grid.getCheckedKeys().concat(this.$refs.grid.getHalfCheckedKeys())
+				}else{
+					this.form.authority = {
+						menu:[],
+						grid:[],
+					};
+				}
 
 				this.$refs.dialogForm.validate(async (valid) => {
 					if (valid) {
@@ -185,16 +214,15 @@
 
 				this.menu.checked = this.form.authority.menu || [];
 				this.grid.checked = this.form.authority.grid || [];
-
-
-				console.log(this.menu)
+				this.dept.checked = this.form.authority.dept || [];
 
 				if (this.form.type=='system') {
 					this.$http.post('system/group/menuSystem',{}).then((res) => {
 						if (res.code==200) {
 							// Object.assign(this.$data, res.data);
-							this.menu.list = res.data.menu;
-							this.grid.list = res.data.grid;
+							this.menu.list = res.data.menu || [];
+							this.grid.list = res.data.grid || [];
+							this.dept.list = res.data.dept || [];
 							return false;
 						}
 						this.$alert(res.message, "提示", {type: 'error'});