diff --git a/src/api/model/setup.js b/src/api/model/setup.js
new file mode 100644
index 0000000..b7fd029
--- /dev/null
+++ b/src/api/model/setup.js
@@ -0,0 +1,21 @@
+import config from "@/config";
+import http from "@/utils/request";
+
+export default {
+	room:{
+		add: {
+			url: `${config.API_URL}/machine.room.add`,
+			name: "新增机房配置",
+			post: async function (data = {}) {
+				return await http.post(this.url, data);
+			},
+		},
+		list: {
+			url: `${config.API_URL}/machine.room.list`,
+			name: "机房配置列表",
+			get: async function (data = {}) {
+				return await http.post(this.url, data);
+			},
+		},
+	}
+};
diff --git a/src/api/model/system.js b/src/api/model/system.js
index 175de2a..bf86218 100644
--- a/src/api/model/system.js
+++ b/src/api/model/system.js
@@ -481,5 +481,6 @@ export default {
 				return await http.post(this.url, params);
 			}
 		}
-	}
+	},
+	
 };
diff --git a/src/assets/icons/AgentMaintenance.vue b/src/assets/icons/AgentMaintenance.vue
new file mode 100644
index 0000000..94f4f78
--- /dev/null
+++ b/src/assets/icons/AgentMaintenance.vue
@@ -0,0 +1,13 @@
+<template>
+	<svg t="1721302566612" class="icon" viewBox="0 0 1029 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3587" width="200" height="200"><path d="M630.32888934 164.465778c-11.605333 24.632889-17.635556 51.768889-17.635556 79.872 0 50.062222 19.399111 96.881778 54.727111 132.209778a185.856 185.856 0 0 0 132.209778 54.727111c28.046222 0 55.239111-6.030222 79.872-17.806223-33.28 33.564444-77.937778 51.768889-124.928 51.768889-12.288 0-24.576-1.365333-36.522667-3.811555a58.88 58.88 0 0 0-53.76 15.928889L323.69777734 817.834667a101.546667 101.546667 0 0 0-97.848888-97.905778L566.04444434 379.448889c14.108444-14.051556 20.138667-34.133333 15.928889-53.703111a175.388444 175.388444 0 0 1 48.241778-161.336889h0.170666z m59.448888 513.365333l187.164445 187.107556a26.567111 26.567111 0 1 1-37.660445 37.546666l-187.107555-187.050666 37.603555-37.603556zM731.02222234 56.888889c-4.323556 0-8.817778 0.568889-13.368889 1.024a234.382222 234.382222 0 0 0-192.967111 280.177778L131.92533334 731.022222a127.658667 127.658667 0 0 0 0 180.906667 128.284444 128.284444 0 0 0 180.906667 0l392.874666-392.988445c131.982222 27.534222 259.527111-60.302222 280.007111-192.967111 5.006222-31.857778-7.793778-50.062222-24.632888-50.062222-7.793778 0-16.270222 3.754667-24.576 11.946667l-46.762667 46.762666a128.568889 128.568889 0 0 1-181.077333 0 127.886222 127.886222 0 0 1 0-181.077333l46.762666-46.762667c23.381333-23.210667 11.776-50.062222-24.405333-49.891555zM192.22755534 851.626667c-27.022222-27.079111-7.281778-72.817778 30.151111-72.817778 37.376 0 57.457778 45.738667 30.321778 72.817778a42.894222 42.894222 0 0 1-60.472889 0zM131.58400034 96.711111L71.11111134 157.013333l75.377778 105.699556 63.203555 33.28 147.968 147.911111 60.302222-60.302222L270.33600034 235.52l-33.223111-63.260444L131.58400034 96.711111z m543.118222 513.024l-90.453333 90.453333a21.333333 21.333333 0 0 0 0 30.151112l213.617777 213.617777a85.674667 85.674667 0 0 0 120.775111 0 85.504 85.504 0 0 0 0-120.775111l-213.617777-213.617778a21.390222 21.390222 0 0 0-30.321778 0.170667z" p-id="3588"></path></svg>
+</template>
+
+<script>
+export default {
+	name: "AgentMaintenance"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/assets/icons/CostAllocation.vue b/src/assets/icons/CostAllocation.vue
new file mode 100644
index 0000000..b21f3cc
--- /dev/null
+++ b/src/assets/icons/CostAllocation.vue
@@ -0,0 +1,13 @@
+<template>
+	<svg t="1721302855860" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3584" width="200" height="200"><path d="M203.36 134.72H134.72c-37.92 0-68.64 30.72-68.64 68.64V272c0 37.86666656 30.72 68.64 68.64 68.64h68.64c37.86666656 0 68.64-30.72 68.64-68.64V203.36c0-37.92-30.72-68.64-68.64-68.64z m0 137.28H134.72V203.36h68.64V272z m171.36 0h548.64a34.18666688 34.18666688 0 0 0 34.08-34.13333344 34.18666688 34.18666688 0 0 0-34.13333344-34.02666656H374.77333344a34.18666688 34.18666688 0 0 0-34.13333344 34.08c0 18.66666656 15.41333344 34.08 34.13333344 34.08zM203.36 409.28H134.72c-37.92 0-68.64 30.72-68.64 68.64v68.64c0 37.86666656 30.72 68.64 68.64 68.64h68.64c37.86666656 0 68.64-30.72 68.64-68.64V477.86666656c0-37.92-30.72-68.64-68.64-68.64z m0 136.8H134.72V477.86666656h68.64v68.16z m445.86666656-68.16H374.77333344a34.18666688 34.18666688 0 0 0-34.13333344 34.08c0 18.66666656 15.41333344 34.08 34.13333344 34.08h274.08a34.18666688 34.18666688 0 0 0 34.08-34.13333344 33.81333375 33.81333375 0 0 0-33.6-34.02666656z m-445.86666656 205.44H134.72c-37.92 0-68.64 30.72-68.64 68.64v68.64c0 37.86666656 30.72 68.64 68.64 68.64h68.64c37.86666656 0 68.64-30.72 68.64-68.64V752c0-37.92-30.72-68.64-68.64-68.64z m0 137.28H134.72V752h68.64v68.64z m445.86666656-68.64H374.77333344a34.18666688 34.18666688 0 0 0-34.13333344 34.08c0 18.66666656 15.41333344 34.08 34.13333344 34.08h274.08a34.18666688 34.18666688 0 0 0 34.08-34.13333344 33.81333375 33.81333375 0 0 0-33.6-34.02666656z m274.13333344-137.28a34.18666688 34.18666688 0 0 0 34.08-34.13333344 34.18666688 34.18666688 0 0 0-34.13333344-34.02666656h-33.06666656l46.08-46.08a34.18666688 34.18666688 0 0 0 0-48.53333344 34.18666688 34.18666688 0 0 0-48.53333344 0l-49.86666656 49.97333344-49.92-49.92a34.18666688 34.18666688 0 0 0-48.53333344 0 34.18666688 34.18666688 0 0 0 0 48.48l46.13333344 46.08h-33.6a34.18666688 34.18666688 0 0 0-34.13333344 34.08c0 18.66666656 15.41333344 34.08 34.13333344 34.08h51.36v68.64H752a34.18666688 34.18666688 0 0 0-34.13333344 34.08c0 18.66666656 15.41333344 34.08 34.13333344 34.08h51.36v102.72c0 18.66666656 15.36 34.08 34.08 34.08a34.18666688 34.18666688 0 0 0 34.08-34.13333344V752h51.36a34.18666688 34.18666688 0 0 0 34.08-34.13333344 34.18666688 34.18666688 0 0 0-34.13333344-34.02666656h-50.82666656v-68.64h51.36v-0.53333344z" p-id="3585"></path></svg>
+</template>
+
+<script>
+export default {
+	name: "CostAllocation"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/assets/icons/DataSource.vue b/src/assets/icons/DataSource.vue
new file mode 100644
index 0000000..06c96cb
--- /dev/null
+++ b/src/assets/icons/DataSource.vue
@@ -0,0 +1,13 @@
+<template>
+	<svg t="1721302812879" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3585" width="200" height="200"><path d="M489.0624 760.67271075v-25.8503104c0-5.0972448 0.72817813-10.0124448 1.7597632-14.9276448H166.4796448a31.85777813 31.85777813 0 0 1-31.85777813-31.85777813V242.45285902v-1.5170368l378.2883552 359.29505173 376.46791146-360.02322986v298.1281184c11.2867552 3.64088853 21.60260693 9.40562987 29.91597014 17.77967466l18.44717013 18.38648854c22.63419307 22.6948736 27.24598507 56.97991147 13.04651947 87.62405973 5.0365632 1.94180693 9.7090368 4.49042987 14.19946666 7.28177707V204.52693369c0-48.84859307-39.62500693-88.4736-88.4736-88.4736H147.48634027c-48.84859307 0-88.4736 39.62500693-88.4736 88.4736v502.50334826c0 48.84859307 39.62500693 88.4736 88.4736 88.4736h350.7389632a71.24005973 71.24005973 0 0 1-9.16290347-34.8311712z m371.24930347-569.07093333L512.91022187 520.07063715 165.44805973 191.60177742H860.31170347z" p-id="3586"></path><path d="M927.12201493 707.69777742l-33.13208853-7.40314027a151.09688853 151.09688853 0 0 0-9.8910816-23.78714133l17.9617184-29.85528853c6.6749632-10.74062187 10.0731264-26.4571264 0-36.59093334l-18.325808-18.2044448a25.18281493 25.18281493 0 0 0-18.20444373-7.03905173 34.4670816 34.4670816 0 0 0-19.17534827 5.88610453l-29.06642987 18.50785174a153.70619307 153.70619307 0 0 0-23.60509653-9.9517632l-7.46382187-33.49617814c-2.18453333-12.31834027-12.9858368-25.66826667-27.24598506-25.66826666h-25.85031147c-14.26014827 0-22.9982816 13.53197013-25.78962987 25.85031146l-8.31336213 33.13208854a155.4659552 155.4659552 0 0 0-25.18281493 10.61925973l-29.7339264-18.99330347a34.4064 34.4064 0 0 0-19.23602987-5.88610453 25.18281493 25.18281493 0 0 0-18.20444373 6.9783712l-18.2651264 18.26512533c-10.13380693 10.13380693-6.6749632 25.85031147 0 36.59093334l18.81125973 31.433008a152.91733333 152.91733333 0 0 0-9.10222293 22.20942186l-33.13208854 7.34245867c-12.25765973 2.24521493-25.60758507 12.9858368-25.60758506 27.30666667v25.78962986c0 14.26014827 13.53197013 23.0589632 25.85031146 25.85031147l33.55685867 8.3740448c2.30589653 7.16041493 5.1579264 13.95674027 8.495408 20.63170347l-18.87194133 31.43300693c-6.6749632 10.67994027-10.0731264 26.4571264 0 36.59093333l18.2651264 18.2044448c4.9152 4.9758816 11.5294816 7.03905173 18.20444373 7.03905174a34.5884448 34.5884448 0 0 0 19.17534827-5.82542187l29.8552896-19.11466667c8.0706368 4.24770347 16.5053632 7.88859307 25.30417706 10.67994027l8.3133632 33.071408c2.79134827 12.31834027 11.5294816 25.85031147 25.78962987 25.8503104h25.8503104c14.26014827 0 25.06145173-13.3499264 27.30666667-25.66826667l7.40314133-33.61754026c8.1313184-2.60930347 15.89854827-5.94678507 23.36237013-9.8304l29.12711147 18.56853333c5.27928853 3.64088853 12.25765973 5.88610347 19.17534827 5.88610347 6.6749632 0 13.3499264-2.06317013 18.20444373-6.97837014l18.325808-18.325808c10.0731264-10.0731264 6.6749632-25.78962987 0-36.53025173l-17.9617184-29.91597013c3.64088853-7.09973333 6.7356448-14.5028736 9.28426667-22.14874027l33.55685866-8.3740448c12.31834027-2.85202987 25.78962987-11.5294816 25.78962987-25.85031147v-25.8503104c0-14.26014827-13.3499264-25.00077013-25.60758507-27.24598613z m-180.70945173 101.5808a62.5019264 62.5019264 0 0 1-62.5019264-62.3198816 62.5019264 62.5019264 0 0 1 125.00385173 0 62.5019264 62.5019264 0 0 1-62.50192533 62.3198816z" p-id="3587"></path></svg>
+</template>
+
+<script>
+export default {
+	name: "DataSource"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/assets/icons/MachineRoom.vue b/src/assets/icons/MachineRoom.vue
new file mode 100644
index 0000000..2a4a1f4
--- /dev/null
+++ b/src/assets/icons/MachineRoom.vue
@@ -0,0 +1,13 @@
+<template>
+	<svg t="1721302382983" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3586" width="200" height="200"><path d="M432.924444 71.111111H116.451556a50.119111 50.119111 0 0 0-50.005334 50.005333v788.081778c0 27.534222 22.471111 50.062222 50.005334 50.062222H432.924444a50.119111 50.119111 0 0 0 50.062223-50.062222V121.173333a50.119111 50.119111 0 0 0-50.062223-50.005333z m-13.994666 824.092445H130.446222V135.111111h288.483556v760.092445zM917.617778 68.096h-316.416a50.119111 50.119111 0 0 0-50.005334 50.062222V906.24c0 27.477333 22.528 49.948444 50.005334 49.948444h316.529778a50.119111 50.119111 0 0 0 49.948444-49.948444V118.101333a50.289778 50.289778 0 0 0-50.062222-50.005333z m-13.994667 824.092444h-288.426667V132.152889h288.483556v760.035555h-0.056889z" p-id="3587"></path><path d="M161.905778 185.116444h221.980444v52.508445H161.905778v-52.508445z m0 83.968h221.980444v52.508445H161.905778V269.084444z m482.190222-86.983111h221.980444v52.508445h-221.980444v-52.508445z m0 84.024889h221.980444V318.577778h-221.980444v-52.508445zM231.310222 654.620444a43.52 43.52 0 1 0 87.04 0 43.52 43.52 0 0 0-87.04 0zM715.889778 656.042667a43.52 43.52 0 1 0 87.04 0 43.52 43.52 0 0 0-87.04 0z" p-id="3588"></path></svg>
+</template>
+
+<script>
+export default {
+	name: "MachineRoom"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index fa8dffd..f42eb7b 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -24,6 +24,10 @@ export { default as WechartRound } from './WechartRound.vue'
 export { default as Cost } from './Cost.vue'
 export { default as Finish } from './Finish.vue'
 export { default as FormXls } from './FormXls.vue'
+export { default as AgentMaintenance } from './AgentMaintenance.vue'
+export { default as CostAllocation } from './CostAllocation.vue'
+export { default as DataSource } from './DataSource.vue'
+export { default as MachineRoom } from './MachineRoom.vue'
 
 // 列表按钮
 export { default as Delete } from './Delete.vue'
diff --git a/src/views/setting/advanced/index.vue b/src/views/setting/advanced/index.vue
index 7ab4103..541b0b0 100644
--- a/src/views/setting/advanced/index.vue
+++ b/src/views/setting/advanced/index.vue
@@ -50,17 +50,17 @@ export default {
 					groupName: "账号设置",
 					list: [
 						{
-							icon: "sc-icon-Account",
+							icon: "sc-icon-MachineRoom",
 							title: "机房配置",
 							component: "account"
 						},
 						{
-							icon: "sc-icon-Cost",
+							icon: "sc-icon-CostAllocation",
 							title: "费用配置",
 							component: "password"
 						},
 						{
-							icon: "sc-icon-Secure",
+							icon: "sc-icon-AgentMaintenance",
 							title: "维保代理商维护",
 							component: "pushSettings"
 						},
@@ -70,8 +70,8 @@ export default {
 					groupName: "数据管理",
 					list: [
 						{
-							icon: "sc-icon-UserLog",
-							title: "数据源邮件账号设置",
+							icon: "sc-icon-DataSource",
+							title: "数据源邮件设置",
 							component: "logs"
 						}
 					]
diff --git a/src/views/setting/advanced/setup/computerRoom.vue b/src/views/setting/advanced/setup/computerRoom.vue
index 844ac3f..6b86ee5 100644
--- a/src/views/setting/advanced/setup/computerRoom.vue
+++ b/src/views/setting/advanced/setup/computerRoom.vue
@@ -1,5 +1,19 @@
 <template>
-	<view>机房</view>
+	<el-container>
+		<el-main class="nopadding">
+			<div class="searchMain">
+				<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
+
+				<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>
+				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
 </template>
 
 <script>
@@ -7,14 +21,28 @@ export default {
 	name: "computerRoom",
 	data(){
 		return{
-
+			size:'small',
+			list:{
+				apiObj: this.$API.setup.room.list,
+				column:[]
+			},
+			params: {},
+			searchList:[
+				{name:'机房代码',type:'text',code:'created_at', placeholder:"请输入机房代码",show:true},
+				{name:'机房城市',type:'text',code:'type', placeholder:"请输入机房城市",show: true},
+			],
 		}
 	},
 	mounted() {
 
 	},
 	methods:{
-
+		getSelectData(){
+			// let {data,params} = item;
+		},
+		save(){
+			console.log(this.params,700)
+		}
 	}
 }
 </script>
diff --git a/src/views/setting/role/index.vue b/src/views/setting/role/index.vue
index c79b160..b307571 100644
--- a/src/views/setting/role/index.vue
+++ b/src/views/setting/role/index.vue
@@ -1,9 +1,9 @@
 <template>
-	<el-container>
+	<el-container class="mainBox">
 		<el-header>
 			<div class="left-panel">
 				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增角色</el-button>
-				<el-button type="danger" :size="size" plain icon="el-icon-delete" :disabled="roleCheckList.length==0" @click="batch_del"></el-button>
+<!--				<el-button type="danger" :size="size" plain icon="el-icon-delete" :disabled="roleCheckList.length==0" @click="batch_del"></el-button>-->
 <!--				<el-button type="primary" :size="size" plain :disabled="roleCheckList.length!=1" @click="permission">权限设置</el-button>-->
 			</div>
 			<div class="right-panel">
@@ -17,7 +17,17 @@
 						<el-input placeholder="输入关键字进行过滤" :size="size" v-model="groupFilterText" clearable></el-input>
 					</el-header>
 					<el-main class="treeMain nopadding">
-						<el-tree ref="group" class="menu" node-key="id" show-checkbox :data="group" :default-checked-keys="roleCheckList" :current-node-key="role_id" :highlight-current="true" :expand-on-click-node="false" :filter-node-method="groupFilterNode" @check-change="groupChange" @node-click="groupClick"></el-tree>
+						<el-tree ref="group" class="menu" node-key="id" :data="group" :default-checked-keys="roleCheckList" :current-node-key="role_id" :highlight-current="true" :expand-on-click-node="false" :filter-node-method="groupFilterNode" @check-change="groupChange" @node-click="groupClick">
+							<template #default="{ node, data }">
+								<span class="custom-tree-node">
+								  <span>{{ node.label }}</span>
+								  <span class="btnBox">
+									  <el-icon class="btn" @click="table_edit(data)"><sc-icon-Edit/></el-icon>
+									  <el-icon class="btn" @click="table_del(data)"><sc-icon-Delete/></el-icon>
+								  </span>
+								</span>
+							</template>
+						</el-tree>
 					</el-main>
 				</el-container>
 			</el-aside>
@@ -444,4 +454,22 @@
 		right: 0;
 		z-index: 10;
 	}
+	.custom-tree-node{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		.btnBox{
+			display: none;
+			margin-right: 10px;
+			.btn{
+				margin: 0 5px;
+			}
+		}
+	}
+	.is-current .custom-tree-node .btnBox{
+		display: block;
+	}
+	.custom-tree-node:hover .btnBox{
+		display: block;
+	}
 </style>