From 06638fe04cca99a82b08dc86ddbcc6ce83879751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Tue, 30 Jul 2024 15:45:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E6=A1=A3=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scTable/index.vue              | 44 +++++++++++++++----
 src/config/table.js                           |  3 +-
 src/views/docsManager/document.vue            |  4 +-
 .../setting/advanced/setup/computerRoom.vue   | 36 ++++++++++++---
 4 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue
index ca9b2be..713b989 100644
--- a/src/components/scTable/index.vue
+++ b/src/components/scTable/index.vue
@@ -9,7 +9,7 @@
 
 <template>
 	<div class="scTable" :style="{'height':_height}" ref="scTableMain" v-loading="loading">
-		<div class="scTable-table" :style="{'height':_table_height}">
+		<div class="scTable-table" :class="hidePagination && hideDo?'bottomNoBorder':''" :style="{'height':_table_height}">
 			<el-table v-bind="$attrs" :header-cell-style="{'background': '#F5F7FA','color':'#606266'}" :data="tableData" :row-key="rowKey" :key="toggleIndex" ref="scTable" :height="height=='auto'?null:'100%'" :size="config.size" :border="config.config.border" :stripe="config.config.stripe" :summary-method="remoteSummary?remoteSummaryMethod:summaryMethod" @sort-change="sortChange" @filter-change="filterChange">
 				<slot></slot>
 				<template v-for="(item, index) in userColumn" :key="index">
@@ -95,7 +95,8 @@
 			hideRefresh: { type: Boolean, default: false },
 			hideSetting: { type: Boolean, default: false },
 			paginationLayout: { type: String, default: config.paginationLayout },
-			rowChild:{type:Boolean, default:true}
+			rowChild:{type:Boolean, default:true},
+			docsSort:{type:Boolean, default:false},
 		},
 		watch: {
 			//监听从props里拿到值了
@@ -122,7 +123,7 @@
 		data() {
 			return {
 				scPageSize: this.pageSize,
-				isActivat: true,
+				isAvatar: true,
 				emptyText: "暂无数据",
 				toggleIndex: 0,
 				tableData: [],
@@ -130,6 +131,7 @@
 				currentPage: 1,
 				prop: null,
 				order: null,
+				sort_orders:{},
 				loading: false,
 				tableHeight:'100%',
 				tableParams: this.params,
@@ -161,12 +163,12 @@
 			}
 		},
 		activated(){
-			if(!this.isActivat){
+			if(!this.isAvatar){
 				this.$refs.scTable.doLayout()
 			}
 		},
 		deactivated(){
-			this.isActivat = false;
+			this.isAvatar = false;
 		},
 		methods: {
 			//获取列
@@ -181,8 +183,14 @@
 					[config.request.page]: this.currentPage,
 					[config.request.pageSize]: this.scPageSize,
 					[config.request.prop]: this.prop,
-					[config.request.order]: this.order
+					[config.request.order]: this.order,
 				};
+				if(this.docsSort){
+					reqData[config.request.sort_orders] = this.sort_orders;
+					delete reqData[config.request.prop]
+					delete reqData[config.request.order]
+					console.log(this.tableParams,344)
+				}
 				if(this.hidePagination){
 					delete reqData[config.request.page]
 					delete reqData[config.request.pageSize]
@@ -311,8 +319,25 @@
 					this.prop = null
 					this.order = null
 				}
+				this.sort_orders = {};
+				this.addObjectProperty(this.sort_orders,{key:obj.prop, value:obj.order});
+
 				this.getData()
 			},
+			addObjectProperty(obj, { key, value }) {
+				let val = value=='ascending'?'asc':value=='descending'?'desc':'';
+				if (!(key in obj)) {
+					obj[key] = val;
+					if(this.docsSort && key == 'name'){
+						obj.client_file_name = val;
+					}
+				}else{
+					obj[key] = val;
+					if(this.docsSort && key == 'name'){
+						obj.client_file_name = val;
+					}
+				}
+			},
 			//本地过滤
 			filterHandler(value, row, column){
 				const property = column.property;
@@ -430,7 +455,8 @@
 	.scTable-table {height: calc(100% - 50px);}
 	.scTable-page {height:50px;display: flex;align-items: center;justify-content: space-between;padding:0 15px;}
 	.scTable-do {white-space: nowrap;}
-	.scTable:deep(.el-table__footer) .cell {font-weight: bold;}
-	.scTable:deep(.el-table__body-wrapper) .el-scrollbar__bar.is-horizontal {height: 12px;border-radius: 12px;}
-	.scTable:deep(.el-table__body-wrapper) .el-scrollbar__bar.is-vertical {width: 12px;border-radius: 12px;}
+	.scTable ::v-deep .el-table__footer .cell {font-weight: bold;}
+	.scTable ::v-deep .el-table__body-wrapper .el-scrollbar__bar.is-horizontal {height: 12px;border-radius: 12px;}
+	.scTable ::v-deep .el-table__body-wrapper .el-scrollbar__bar.is-vertical {width: 12px;border-radius: 12px;}
+	.bottomNoBorder ::v-deep .el-table__inner-wrapper:before{height: 0;}
 </style>
diff --git a/src/config/table.js b/src/config/table.js
index 940b393..f50de19 100644
--- a/src/config/table.js
+++ b/src/config/table.js
@@ -21,7 +21,8 @@ export default {
 		page: 'page',					//规定当前分页字段
 		pageSize: 'pageSize',			//规定一页条数字段
 		prop: 'prop',					//规定排序字段名字段
-		order: 'order'					//规定排序规格字段
+		order: 'order',					//规定排序规格字段
+		sort_orders: 'sort_orders',		//规定排序字段
 	},
 	/**
 	 * 自定义列保存处理
diff --git a/src/views/docsManager/document.vue b/src/views/docsManager/document.vue
index 9fc972c..6908d94 100644
--- a/src/views/docsManager/document.vue
+++ b/src/views/docsManager/document.vue
@@ -61,7 +61,7 @@
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="list.apiObj" :column="list.column"  @selection-change="selectionChange" :params="params" :size="size" stripe :rowChild="false">
+			<scTable ref="table" :apiObj="list.apiObj" :column="list.column"  @selection-change="selectionChange" :params="params" :size="size" docsSort remoteSort stripe :rowChild="false">
 				<el-table-column type="selection" align="center" width="40"></el-table-column>
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
 				<template #name="scope">
@@ -136,8 +136,6 @@ export default {
 				keyword: "",
 				folder_id:"",
 				name:"",
-				sort_by:"name",
-				sort_order:"asc",  // asc desc。默认asc
 			}
 		}
 	},
diff --git a/src/views/setting/advanced/setup/computerRoom.vue b/src/views/setting/advanced/setup/computerRoom.vue
index b686394..55013e4 100644
--- a/src/views/setting/advanced/setup/computerRoom.vue
+++ b/src/views/setting/advanced/setup/computerRoom.vue
@@ -6,11 +6,25 @@
 
 				<div class="searchItem searchBtn">
 					<el-button :size="size" type="primary" @click="save">保存配置</el-button>
-<!--					<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="8"></scExport>-->
 				</div>
 			</div>
-			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow>
+			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow :hideDo="true" :hidePagination="true">
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
+				<el-table-column width="200" label="机房名称" prop="name"></el-table-column>
+				<el-table-column width="200" label="机房代码" prop="code"></el-table-column>
+				<el-table-column width="200" label="机房城市" prop="city"></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="160">
+					<template #default="scope">
+						<el-dropdown>
+							<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
+							<template #dropdown>
+								<el-dropdown-menu>
+									<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除配置</el-dropdown-item>
+								</el-dropdown-menu>
+							</template>
+						</el-dropdown>
+					</template>
+				</el-table-column>
 			</scTable>
 		</el-main>
 	</el-container>
@@ -28,8 +42,9 @@ export default {
 			},
 			params: {},
 			searchList:[
+				{name:'机房名称',type:'text',code:'name', placeholder:"请输入机房名称",show:true},
 				{name:'机房代码',type:'text',code:'code', placeholder:"请输入机房代码",show:true},
-				{name:'机房城市',type:'text',code:'city', placeholder:"请输入机房城市",show: true},
+				{name:'机房城市',type:'text',code:'city', placeholder:"请输入机房城市",show:true},
 			],
 		}
 	},
@@ -37,11 +52,18 @@ export default {
 
 	},
 	methods:{
-		getSelectData(){
-			// let {data,params} = item;
+		getSelectData(item){
+			let {params} = item;
+			this.params = params;
 		},
-		save(){
-			console.log(this.params,700)
+		async save() {
+			const res = await this.$API.setup.room.add.post(this.params);
+			if(res.code == 200){
+				this.$refs.table.refresh();
+			}
+		},
+		table_del(row){
+			console.log(row)
 		}
 	}
 }