diff --git a/.env.development b/.env.development
index c30aa15..aa3b3f4 100644
--- a/.env.development
+++ b/.env.development
@@ -17,8 +17,8 @@ VITE_PROXY_API = /dev-api
 # VITE_PROXY = [ ["/dev-api", "http://192.168.110.186:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]]
 # VITE_UPLOAD_URL = http://192.168.110.186
 # 陈游
-VITE_PROXY = [ ["/dev-api", "http://192.168.110.10:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]]
-VITE_UPLOAD_URL = http://192.168.110.10
+VITE_PROXY = [ ["/dev-api", "http://192.168.110.10:8017" ],["/dev-img-api", "http://42.193.40.239:8017" ]]
+VITE_UPLOAD_URL = http://42.193.40.239:8888/
 # 
 VITE_GLOB_UPLOAD_URL=/dev-api
 VITE_UPLOAD_IMG_URL=/dev-img-api
diff --git a/src/api/Sys.ts b/src/api/Sys.ts
index e248b35..3b1e9b8 100644
--- a/src/api/Sys.ts
+++ b/src/api/Sys.ts
@@ -356,6 +356,27 @@ export function saveUser(data) {
     method: "POST",
   });
 }
+/**
+ *日志管理-分页查询登录日志
+ */
+ export function loginLogPage(params) {
+  return request({
+    url: `/admin/Sys/loginLogPage`,
+    method: "GET",
+    params:params,
+  });
+}
+/**
+ *日志管理-分页查询操作日志
+ */
+ export function operationLogPage(params) {
+  return request({
+    url: `/admin/Sys/operationLogPage`,
+    method: "GET",
+    params:params,
+  });
+}
+
 
 
 
diff --git a/src/api/base.ts b/src/api/base.ts
index f571ad7..5c91373 100644
--- a/src/api/base.ts
+++ b/src/api/base.ts
@@ -53,7 +53,7 @@ export function domicileDel(params) {
   });
 }
 /**
-*户籍管理-户籍人员注销
+*户籍管理-户籍注销
 */
 export function domicileCancel(params) {
   return request({
@@ -63,6 +63,15 @@ export function domicileCancel(params) {
   });
 }
 /**
+*户籍管理-户籍恢复
+*/
+export function domicileRestore(params) {
+  return request({
+    url: `/admin/people/domicileRestore/${params.domicileId}`,
+    method: "PUT",
+  });
+}
+/**
 *户籍管理-户籍人员详情信息
 */
 export function domicileDetail(params) {
diff --git a/src/api/file.ts b/src/api/file.ts
index ff3758a..8b11ed6 100644
--- a/src/api/file.ts
+++ b/src/api/file.ts
@@ -1,4 +1,5 @@
-import request from "@/utils/request";
+// import request from "@/utils/request";
+import {fileRequest} from "@/utils/request";
 
 function getMethod(type: string) {
   if (type.startsWith("/upload")) return "POST";
@@ -19,7 +20,7 @@ export function apiFile(
   type: string,
   data: { OTCId: string }
 ) {
-  return request({
+  return fileRequest({
     url: type,
     method: getMethod(type),
     params: {
@@ -46,7 +47,7 @@ export function uploadFile(
   otcType: string,
   data: object
 ) {
-  return request({
+  return fileRequest({
     url: "/common/upload/uploadFile",
     method: "POST",
     params: {
@@ -62,7 +63,7 @@ export function uploadFile(
  */
  export function getFile(otcid:string,otctype:string) {
   
-  return request({
+  return fileRequest({
     url: `/common/upload/getFile`,
     method: "GET",
     params:{ otcid,otctype }
@@ -72,7 +73,7 @@ export function uploadFile(
  *文件删除
  */
  export function delFile(documentId) {
-  return request({
+  return fileRequest({
     url: `/common/upload/delFile`,
     method: "GET",
     params:{ documentId }
diff --git a/src/router/modules/emergency.js b/src/router/modules/emergency.js
index 8b95c89..1d2f43d 100644
--- a/src/router/modules/emergency.js
+++ b/src/router/modules/emergency.js
@@ -111,7 +111,7 @@ export default {
             meta: {
                 icon: 'point',
                 auth: "emer.command",
-                title: '指挥体系',
+                title: '应急通讯录',
                 breadcrumb: true, //是否显示面包屑
             }
         },
@@ -122,7 +122,7 @@ export default {
             meta: {
                 icon: 'point',
                 auth: "emer.address",
-                title: '应急通讯录',
+                title: '指挥体系',
                 breadcrumb: true, //是否显示面包屑
             }
         }
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 980d6bc..f97606d 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -42,7 +42,7 @@ function configRequest(service: {
       const tokencancel = localStorage.getItem('token-cancel');
       let user= JSON.parse(localStorage.getItem("user_df"));
       if (!tokencancel && token) {
-        // config.headers["userToken"] = token || "";
+        config.headers["Token"] = token || "";
         config.headers[user.tokenName] = user.tokenValue;
       }
       return config;
diff --git a/src/views/base-manage/flow/index.vue b/src/views/base-manage/flow/index.vue
index 897a429..ac47a57 100644
--- a/src/views/base-manage/flow/index.vue
+++ b/src/views/base-manage/flow/index.vue
@@ -145,6 +145,7 @@
         >
           <template #default="scope">
             <span
+            v-if="scope.row.domicileState == 1"
               class="operate"
               @click="
                 (form = scope.row),
@@ -162,7 +163,7 @@
               <svg-icon name="detail" class="icon"></svg-icon>
               <span class="detail">详情</span>
             </span>
-            <span class="operate" @click="del(scope.row.peopleId)">
+            <span v-if="scope.row.domicileState == 1" class="operate" @click="del(scope.row.peopleId)">
               <svg-icon name="delete" class="icon"></svg-icon>
               <span class="func">删除</span>
             </span>
diff --git a/src/views/base-manage/permanent/index.vue b/src/views/base-manage/permanent/index.vue
index 7d8b891..0240812 100644
--- a/src/views/base-manage/permanent/index.vue
+++ b/src/views/base-manage/permanent/index.vue
@@ -145,6 +145,7 @@
         >
           <template #default="scope">
             <span
+            v-if="scope.row.domicileState == 1"
               class="operate"
               @click="
                 (form = scope.row),
@@ -162,7 +163,7 @@
               <svg-icon name="detail" class="icon"></svg-icon>
               <span class="detail">详情</span>
             </span>
-            <span class="operate" @click="del(scope.row.peopleId)">
+            <span class="operate" v-if="scope.row.domicileState == 1" @click="del(scope.row.peopleId)">
               <svg-icon name="delete" class="icon"></svg-icon>
               <span class="func">删除</span>
             </span>
diff --git a/src/views/base-manage/poor/index.vue b/src/views/base-manage/poor/index.vue
index 9804df0..67e9519 100644
--- a/src/views/base-manage/poor/index.vue
+++ b/src/views/base-manage/poor/index.vue
@@ -145,6 +145,7 @@
         >
           <template #default="scope">
             <span
+            v-if="scope.row.domicileState == 1"
               class="operate"
               @click="
                 (form = scope.row),
@@ -162,7 +163,7 @@
               <svg-icon name="detail" class="icon"></svg-icon>
               <span class="detail">详情</span>
             </span>
-            <span class="operate" @click="del(scope.row.peopleId)">
+            <span class="operate" v-if="scope.row.domicileState == 1" @click="del(scope.row.peopleId)">
               <svg-icon name="delete" class="icon"></svg-icon>
               <span class="func">删除</span>
             </span>
diff --git a/src/views/base-manage/residence/index.vue b/src/views/base-manage/residence/index.vue
index 0fb301e..d596976 100644
--- a/src/views/base-manage/residence/index.vue
+++ b/src/views/base-manage/residence/index.vue
@@ -250,7 +250,7 @@
 </template>
 <script lang='ts' setup>
 import { onMounted, reactive, ref } from "vue";
-import { domicilePage, domicileDel } from "@/api/base";
+import { domicilePage, domicileDel, domicileRestore } from "@/api/base";
 import AddEdit from "./dialog/add-edit.vue";
 import Cancel from "./dialog/cancel.vue";
 import { ElMessage, ElMessageBox } from "element-plus";
@@ -327,18 +327,18 @@ const restore = (id) => {
     let params = {
       domicileId: id,
     };
-    // domicileDel(params).then((res: any) => {
-    //   if (res.code == 1) {
-    //     ElMessage.success({
-    //       message: "删除成功",
-    //     });
-    //   } else {
-    //     ElMessage.error({
-    //       message: res.message,
-    //     });
-    //   }
-    //   getList();
-    // });
+    domicileRestore(params).then((res: any) => {
+      if (res.code == 1) {
+        ElMessage.success({
+          message: "删除成功",
+        });
+      } else {
+        ElMessage.error({
+          message: res.message,
+        });
+      }
+      getList();
+    });
   });
 };
 //调整详情
diff --git a/src/views/emergency/address-book/index.vue b/src/views/emergency/address-book/index.vue
index a9b7e86..707948d 100644
--- a/src/views/emergency/address-book/index.vue
+++ b/src/views/emergency/address-book/index.vue
@@ -1,77 +1,103 @@
 <template>
- <div class="percentage-content">
+  <div class="percentage-content">
     <div class="content">
-
-		<div class="tree-wrap">
-
-			<vue3-tree-org style="margin-top: 10px;" ref="tree" :data="data" :center="true" :horizontal="horizontal"
-				:collapsable="collapsable" :label-style="style" :node-draggable="true" :scalable="true"
-				:only-one-node="onlyOneNode" :default-expand-level="3" :filter-node-method="filterNodeMethod"
-				:clone-node-drag="cloneNodeDrag" @on-restore="restore" @on-contextmenu="onMenus" :on-expand-all="expandAll"
-				@on-node-blur="nodeBlur" @on-node-delete="nodeDelete" :props="props" :define-menus="defineMenus">
-				<!-- :define-menus="defineMenus" -->
-				<template v-slot="{ node }">
-					<div class="tree-org-node__text node-label tree-div">
-						<div>{{ node.label }}</div>
-                        <!-- <input type="text"> -->
-					</div>
-				</template>
-			</vue3-tree-org>
-
-		</div>
-		<div>
-			<el-button class="topButton" type="primary" @click="click">提交</el-button>
-		</div>
-	</div>
-</div>
+      <div class="tree-wrap">
+        <vue3-tree-org
+          style="margin-top: 10px;"
+          ref="tree"
+          :data="dataList"
+          :center="true"
+          :horizontal="horizontal"
+          :collapsable="collapsable"
+          :label-style="style"
+          :node-draggable="true"
+          :scalable="true"
+          :only-one-node="onlyOneNode"
+          :default-expand-level="2"
+          :filter-node-method="filterNodeMethod"
+          :clone-node-drag="cloneNodeDrag"
+          @on-restore="restore"
+          @on-contextmenu="onMenus"
+          :on-expand-all="expandAll"
+          @on-node-blur="nodeBlur"
+          @on-node-delete="nodeDelete"
+          :props="props"
+          :define-menus="defineMenus"
+        >
+          <!-- :define-menus="defineMenus" -->
+          <template v-slot="{ node }">
+            <div class="tree-org-node__text node-label tree-div">
+              <div>{{ node.label }}</div>
+              <!-- <input type="text"> -->
+            </div>
+          </template>
+        </vue3-tree-org>
+      </div>
+      <div>
+        <el-button class="topButton" type="primary" @click="click"
+          >提交</el-button
+        >
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup lang='ts'>
 import { reactive, ref, onMounted } from "vue";
 // import { getEmergencyUserTree, saveEmergencyUser, delEmergencyUser } from "@/api/emergency";
 import { getUUID } from "@/utils/common";
-import { ElMessage } from 'element-plus'
-const data = ref({
-    id:1,label:"道孚县鲜水镇",
-          children:[
-              {
-                  id:2,pid:1,label:"街道",
-                  style:{color:"#fff",background:"#108ffe"},
-                  children:[
-                      {id:6,pid:2,label:"办公室",disabled:true},
-                      {id:8,pid:2,label:"安居办",noDragging:true},
-                      {id:10,pid:2,label:"规划办"}
-                  ]
-              },
-              {
-                  id:3,pid:1,label:"应急",
-                  children:[
-                      {id:11,pid:3,label:"应急一部"},
-                      {id:12,pid:3,label:"应急二部"}
-                  ]
-              },
-          ]});
+import { ElMessage } from "element-plus";
+const dataList = ref({
+  id: getUUID(),
+  label: "道孚县鲜水镇",
+  children: [
+    {
+      id: 2,
+      label: "街道",
+      style: { color: "#fff", background: "#108ffe" },
+      children: [
+        { id: 6, label: "办公室" },
+        { id: 8, label: "安居办" },
+        { id: 10, label: "规划办" },
+      ],
+    },
+    {
+      id: 3,
+      label: "应急",
+      children: [
+        {
+          id: 11,
+          label: "应急一部",
+          children: [
+            { id: 15, label: "应急一部" },
+            { id: 16, label: "应急二部" },
+          ],
+        },
+        { id: 12, label: "应急二部" },
+      ],
+    },
+  ],
+});
 const horizontal = ref(false);
 const collapsable = ref(true);
 const onlyOneNode = ref(true);
 const cloneNodeDrag = ref(true);
 const expandAll = ref(true);
 const style = reactive({
-	background: "#fff",
-	color: "#5e6d82",
-	height: "50%"
+  background: "#fff",
+  color: "#5e6d82",
+  height: "50%",
 });
 const props = reactive({
-	id: 'id',
-	pid: 'pid',
-	label: 'label',
-	children: 'children'
+  id: "id",
+  label: "label",
+  children: "children",
 });
 const defineMenus = ref([
-	{ name: '新增', command: 'add' },
-	{ name: '编辑', command: 'edit' },
-	{ name: '删除', command: 'delete' },
-])
+  { name: "新增", command: "add" },
+  { name: "编辑", command: "edit" },
+  { name: "删除", command: "delete" },
+]);
 /* defineMenus:[
 					{ name:'复制', command: 'copy' },
 					{ name:'新建', command: 'add' },
@@ -79,78 +105,79 @@ const defineMenus = ref([
 					{ name:'自定义', command: 'defind' },
 			], */
 //删除应急组织机构对象
-const deleteData = ref([])
+const deleteData = ref([]);
 //新增/修改应急组织机构对象
-const addModifyData = ref([])
+const addModifyData = ref([]);
 
-const onMenus = ({ node, command }) => {
-};
-const restore = () => {
-};
+const onMenus = ({ node, command }) => {};
+const restore = () => {};
 const filterNodeMethod = (value, data) => {
-	console.log(value, data)
-	if (!value) return true;
-	return data.label.indexOf(value) !== -1;
+  console.log(value, data);
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
 };
 //提交
 const click = () => {
-	addModifyData.value = [...new Set(addModifyData.value)];
-	//新增
-	addModifyData.value.forEach(item => {
-		console.log(item);
-		let emergencyUserId = '';
-		if (item.newNode == true) {
-			emergencyUserId = getUUID();
-		} else {
-			emergencyUserId = item.emergencyUserId;
-		}
-		let params = {
-			emergencyUserId: emergencyUserId,
-			name: item.name,
-			superId: item.superId,
-		}
-        console.log(params,'params====>');
-        
-		// saveEmergencyUser(params).then((res: any) => {
-		// });
-	});
-	//删除
-	// deleteData.value.forEach(item => {
-	// 	delEmergencyUser({ emergencyUserId: item.emergencyUserId }).then((res: any) => {
-	// 	});
-	// })
+  addModifyData.value = [...new Set(addModifyData.value)];
+  //新增
+  addModifyData.value.forEach((item) => {
+    console.log(item);
+    let emergencyUserId = "";
+    if (item.newNode == true) {
+      emergencyUserId = getUUID();
+    } else {
+      emergencyUserId = item.emergencyUserId;
+    }
+    let params = {
+      emergencyUserId: emergencyUserId,
+      name: item.name,
+      superId: item.superId,
+    };
+    console.log(params, "params====>");
 
-	// setTimeout(() => {
-	// 	ElMessage({
-	// 		message: '修改成功',
-	// 		type: 'success',
-	// 	})
-	// 	deleteData.value = [];
-	// 	addModifyData.value = [];
-	// 	getEmergencyUserTrees();
-	// }, 2000)
+    // saveEmergencyUser(params).then((res: any) => {
+    // });
+  });
+  //删除
+  // deleteData.value.forEach(item => {
+  // 	delEmergencyUser({ emergencyUserId: item.emergencyUserId }).then((res: any) => {
+  // 	});
+  // })
 
+  // setTimeout(() => {
+  // 	ElMessage({
+  // 		message: '修改成功',
+  // 		type: 'success',
+  // 	})
+  // 	deleteData.value = [];
+  // 	addModifyData.value = [];
+  // 	getEmergencyUserTrees();
+  // }, 2000)
 };
 //节点失去焦点-添加入增加修改数组
 const nodeBlur = (e, data) => {
-	addModifyData.value.push(data)
+  console.log(e, data, "e, data=>");
+
+  addModifyData.value.push(data);
+  console.log(addModifyData.value, "addModifyData.value==>");
+  console.log(dataList.value, "data===>");
 };
 //添加入删除节点数组
 const nodeDelete = (e) => {
-	deleteData.value.push(e)
-}
+  deleteData.value.push(e);
+  console.log(dataList.value, "data===>");
+};
 //获取应急工作处理领导小组树形
 const getEmergencyUserTrees = () => {
-	// getEmergencyUserTree().then((res: any) => {
-	// 	console.log(data.value, '	data.value ');
-	// 	if (res.code == 1) {
-	// 		data.value = res.data[0]
-
-	// 	}
-	// });
-}
+  // getEmergencyUserTree().then((res: any) => {
+  // 	console.log(data.value, '	data.value ');
+  // 	if (res.code == 1) {
+  // 		dataList.value = res.data[0]
+  // 	}
+  // });
+};
 onMounted(() => {
-	getEmergencyUserTrees();
+  getEmergencyUserTrees();
 });
 </script>
 
@@ -192,16 +219,13 @@ onMounted(() => {
 }
 .tree-div {
     padding: 20px 10px;
-    >div {
+    > div {
         font-size: 18px;
     }
 }
-</style>
-
-<style lang="scss" scoped>
 .tree-wrap {
     padding-top: 52px;
-    height: 700px;
+    height: 100%;
     position: relative;
     margin-top: -50px;
 }
diff --git a/src/views/emergency/address-book/index1.vue b/src/views/emergency/address-book/index1.vue
deleted file mode 100644
index 79cfa3e..0000000
--- a/src/views/emergency/address-book/index1.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-<!-- <template>
-  <div class="percentage-content">
-    <div class="content">
-      <div class="tree-wrap">
-        <vue3-tree-org
-          style="margin-top: 10px;"
-          ref="tree"
-          :data="data"
-          :center="true"
-          :horizontal="horizontal"
-          :collapsable="collapsable"
-          :label-style="style"
-          :node-draggable="true"
-          :scalable="true"
-          :only-one-node="onlyOneNode"
-          :default-expand-level="3"
-          :filter-node-method="filterNodeMethod"
-          :clone-node-drag="cloneNodeDrag"
-          @on-restore="restore"
-          @on-contextmenu="onMenus"
-          :on-expand-all="expandAll"
-          @on-node-blur="nodeBlur"
-          @on-node-delete="nodeDelete"
-          :props="props"
-          :define-menus="defineMenus"
-        >
-          <template v-slot="{ node }">
-            <div class="tree-org-node__text node-label tree-div">
-              <div>{{ node.label }}</div>
-            </div>
-          </template>
-        </vue3-tree-org>
-      </div>
-      <div>
-        <el-button class="topButton" type="primary" @click="click"
-          >提交</el-button
-        >
-      </div>
-    </div>
-  </div>
-</template>
-  
-  <script lang='ts' setup>
-import { onMounted, reactive, ref } from "vue";
-
-import useUserStore from "@/store/modules/user";
-const userStore = useUserStore();
-const user = ref(JSON.parse(userStore.userInfo));
-const userId = ref(user.value.userId);
-// import { getEmergencyUserTree, saveEmergencyUser, delEmergencyUser } from "@/api/emergency";
-import { getUUID } from "@/utils/common";
-import { ElMessage } from 'element-plus'
-const data = ref({});
-const horizontal = ref(false);
-const collapsable = ref(true);
-const onlyOneNode = ref(true);
-const cloneNodeDrag = ref(true);
-const expandAll = ref(true);
-const style = reactive({
-	background: "#fff",
-	color: "#5e6d82",
-	height: "50%"
-});
-const props = reactive({
-	id: 'emergencyUserId',
-	pid: 'superId',
-	label: 'name',
-	children: 'children'
-});
-const defineMenus = ref([
-	{ name: '新增', command: 'add' },
-	{ name: '编辑', command: 'edit' },
-	{ name: '删除', command: 'delete' },
-])
-/* defineMenus:[
-					{ name:'复制', command: 'copy' },
-					{ name:'新建', command: 'add' },
-					{ name:'编辑', command: 'edit' },
-					{ name:'自定义', command: 'defind' },
-			], */
-//删除应急组织机构对象
-const deleteData = ref([])
-//新增/修改应急组织机构对象
-const addModifyData = ref([])
-
-const onMenus = ({ node, command }) => {
-};
-const restore = () => {
-};
-const filterNodeMethod = (value, data) => {
-	console.log(value, data)
-	if (!value) return true;
-	return data.label.indexOf(value) !== -1;
-};
-//提交
-const click = () => {
-	addModifyData.value = [...new Set(addModifyData.value)];
-	//新增
-	addModifyData.value.forEach(item => {
-		console.log(item);
-		let emergencyUserId = '';
-		if (item.newNode == true) {
-			emergencyUserId = getUUID();
-		} else {
-			emergencyUserId = item.emergencyUserId;
-		}
-		let params = {
-			emergencyUserId: emergencyUserId,
-			name: item.name,
-			superId: item.superId,
-		}
-		// saveEmergencyUser(params).then((res: any) => {
-		// });
-	});
-	//删除
-	deleteData.value.forEach(item => {
-		// delEmergencyUser({ emergencyUserId: item.emergencyUserId }).then((res: any) => {
-		// });
-	})
-
-	setTimeout(() => {
-		ElMessage({
-			message: '修改成功',
-			type: 'success',
-		})
-		deleteData.value = [];
-		addModifyData.value = [];
-		// getEmergencyUserTrees();
-	}, 2000)
-
-};
-//节点失去焦点-添加入增加修改数组
-const nodeBlur = (e, data) => {
-	addModifyData.value.push(data)
-};
-//添加入删除节点数组
-const nodeDelete = (e) => {
-	deleteData.value.push(e)
-}
-//获取应急工作处理领导小组树形
-const getEmergencyUserTrees = () => {
-	// getEmergencyUserTree().then((res: any) => {
-	// 	console.log(data.value, '	data.value ');
-	// 	if (res.code == 1) {
-	// 		data.value = res.data[0]
-
-	// 	}
-	// });
-}
-onMounted(() => {
-	// getEmergencyUserTrees();
-});
-</script>
-    
-  <style lang="scss" scoped>
-.content {
-    width: 100%;
-    background: #fff;
-    border-radius: 0.26042vw;
-    box-shadow: 0 0 0.41667vw 0 rgb(8 33 85 / 10%);
-    height: 100%;
-    padding: 0.83333vw;
-    overflow-y: auto;
-    overflow-x: hidden !important;
-    /* stylelint-disable-next-line property-no-vendor-prefix */
-    -moz-box-sizing: border-box;
-    /* stylelint-disable-next-line property-no-vendor-prefix */
-    -webkit-box-sizing: border-box;
-    /* stylelint-disable-next-line property-no-vendor-prefix */
-    -o-box-sizing: border-box;
-    /* stylelint-disable-next-line property-no-vendor-prefix */
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-}
-</style>
-<style lang="scss" scoped>
-.box-style {
-    display: flex !important;
-}
-:deep(.el-table--border th.el-table__cell) {
-    color: #333;
-    background-color: #e6e6e6;
-}
-:deep(.cell) {
-    color: #777;
-}
-.filter-border {
-    border: 1px solid rgb(220 220 220);
-    background-color: #e6e6e6;
-    width: 40%;
-    height: 32px;
-    text-align: center;
-}
-:deep(.el-input__inner) {
-    border-radius: 0%;
-}
-.size-style {
-    color: #787878;
-    font-size: 13px;
-    position: relative;
-    top: 5px;
-}
-.topButton {
-    position: absolute;
-    width: 100px;
-    height: 35px;
-    left: 50%;
-    bottom: 50px;
-    font-size: 18px;
-    margin-left: -100px;
-}
-.tree-div {
-    padding: 20px 10px;
-    > div {
-        font-size: 18px;
-    }
-}
-</style>
-<style lang="scss" scoped>
-.tree-wrap {
-    padding-top: 52px;
-    height: 700px;
-    position: relative;
-    margin-top: -50px;
-}
-.search-box {
-    padding: 8px 15px;
-    position: absolute;
-    top: 0;
-    left: 0;
-    input {
-        width: 200px;
-        height: 32px;
-        border: 1px solid #ddd;
-        outline: none;
-        border-radius: 5px;
-        padding-left: 10px;
-    }
-}
-.tree-org-node__text {
-    text-align: left;
-    font-size: 14px;
-    .custom-content {
-        padding-bottom: 8px;
-        margin-bottom: 8px;
-        border-bottom: 1px solid currentcolor;
-    }
-}
-</style>
-
- -->
diff --git a/src/views/system/log/auth/index.vue b/src/views/system/log/auth/index.vue
index 30c99cb..e4ff878 100644
--- a/src/views/system/log/auth/index.vue
+++ b/src/views/system/log/auth/index.vue
@@ -3,17 +3,30 @@
     <div class="content">
       <div class="h-layout space-between h-center">
         <div>
-          <div class="h-layout">
+          <div class="h-layout h-center">
             <div class="tool-item" @click="getList">
               <svg-icon name="refurbish" class="icon" />
               <span>刷新</span>
             </div>
+            <div class="label-select filter-tab">
+              <label>时间</label>
+              <el-date-picker
+                v-model="search.date"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="起始时间"
+                end-placeholder="结束时间"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                @change="getList"
+              />
+            </div>
           </div>
         </div>
-        <div style="width: 30%">
+        <div style="width: 30%;">
           <div>
             <el-input
-              v-model="search"
+              v-model="search.condition"
               @keydown.enter.native="getList"
               placeholder="请输入关键字"
               class="search-input"
@@ -46,20 +59,16 @@
             {{ scope.$index + 1 + (currentPage - 1) * pageSize }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="performclassname"
-          :resizable="true"
-          label="登录用户"
-        >
+        <el-table-column prop="authUserName" :resizable="true" label="登录用户">
         </el-table-column>
         <el-table-column
-          prop="performname"
+          prop="authOptIp"
           :resizable="true"
           align="center"
           label="IP地址"
         >
         </el-table-column>
-        <el-table-column prop="areaPathName" :resizable="true" label="登录时间">
+        <el-table-column prop="authOptTime" :resizable="true" label="登录时间">
         </el-table-column>
       </el-table>
       <!-- 分页 -->
@@ -81,8 +90,11 @@
 
 <script lang='ts' setup>
 import { onMounted, reactive, ref } from "vue";
-
-const search = ref([]);
+import { loginLogPage } from "@/api/Sys";
+const search = ref({
+  condition: "",
+  date: "",
+});
 const tableData = ref<any>([]);
 const currentPage = ref(1);
 const pageSize = ref(10);
@@ -93,15 +105,20 @@ const tableDataloading = ref(false);
 const getList = () => {
   tableDataloading.value = true;
   let params = {
-    condition: search.value,
+    condition: search.value.condition,
     limit: pageSize.value,
     page: currentPage.value,
-    state: null,
-    unitId: null,
+    startTime: search.value.date ? search.value.date[0] : "",
+    endTime: search.value.date ? search.value.date[1] : "",
   };
-
-  tableData.value = [{}, {}];
-  total.value = 10;
+  loginLogPage(params).then((res: any) => {
+    tableData.value = res.data.list;
+    total.value = res.data.total;
+    tableDataloading.value = false;
+  });
+};
+const text1 = () => {
+  console.log(search.value);
 };
 
 onMounted(() => {
@@ -114,17 +131,21 @@ onMounted(() => {
   width: 100%;
   background: #fff;
   border-radius: 0.26042vw;
-  box-shadow: 0 0 0.41667vw 0 rgba(8, 33, 85, 0.1);
+  box-shadow: 0 0 0.41667vw 0 rgb(8 33 85 / 10%);
   height: 100%;
   padding: 0.83333vw;
   overflow-y: auto;
   overflow-x: hidden !important;
+  /* stylelint-disable-next-line property-no-vendor-prefix */
   -moz-box-sizing: border-box;
+  /* stylelint-disable-next-line property-no-vendor-prefix */
   -webkit-box-sizing: border-box;
+  /* stylelint-disable-next-line property-no-vendor-prefix */
   -o-box-sizing: border-box;
+  /* stylelint-disable-next-line property-no-vendor-prefix */
   -ms-box-sizing: border-box;
+  /* stylelint-disable-next-line indentation */
   box-sizing: border-box;
-
   .table {
     margin-top: 16px;
   }
diff --git a/src/views/system/log/option/index.vue b/src/views/system/log/option/index.vue
index 4a72423..0c3ece2 100644
--- a/src/views/system/log/option/index.vue
+++ b/src/views/system/log/option/index.vue
@@ -3,17 +3,30 @@
     <div class="content">
       <div class="h-layout space-between h-center">
         <div>
-          <div class="h-layout">
+          <div class="h-layout h-center">
             <div class="tool-item" @click="getList">
               <svg-icon name="refurbish" class="icon" />
               <span>刷新</span>
             </div>
+            <div class="label-select filter-tab">
+              <label>时间</label>
+              <el-date-picker
+                v-model="search.date"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="起始时间"
+                end-placeholder="结束时间"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                @change="getList"
+              />
+            </div>
           </div>
         </div>
-        <div style="width: 30%">
+        <div style="width: 30%;">
           <div>
             <el-input
-              v-model="search"
+              v-model="search.condition"
               @keydown.enter.native="getList"
               placeholder="请输入关键字"
               class="search-input"
@@ -46,11 +59,7 @@
             {{ scope.$index + 1 + (currentPage - 1) * pageSize }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="performclassname"
-          :resizable="true"
-          label="操作用户"
-        >
+        <el-table-column prop="nickname" :resizable="true" label="操作用户">
         </el-table-column>
         <el-table-column
           prop="ipAddress"
@@ -85,8 +94,11 @@
 
 <script lang='ts' setup>
 import { onMounted, reactive, ref } from "vue";
-
-const search = ref([]);
+import { operationLogPage } from "@/api/Sys";
+const search = ref({
+  condition: "",
+  date: "",
+});
 const tableData = ref<any>([]);
 const currentPage = ref(1);
 const pageSize = ref(10);
@@ -97,15 +109,17 @@ const tableDataloading = ref(false);
 const getList = () => {
   tableDataloading.value = true;
   let params = {
-    condition: search.value,
+    condition: search.value.condition,
     limit: pageSize.value,
     page: currentPage.value,
-    state: null,
-    unitId: null,
+    startTime: search.value.date ? search.value.date[0] : "",
+    endTime: search.value.date ? search.value.date[1] : "",
   };
-
-  tableData.value = [{}, {}];
-  total.value = 10;
+  operationLogPage(params).then((res: any) => {
+    tableData.value = res.data.list;
+    total.value = res.data.total;
+    tableDataloading.value = false;
+  });
 };
 
 onMounted(() => {
@@ -118,17 +132,21 @@ onMounted(() => {
   width: 100%;
   background: #fff;
   border-radius: 0.26042vw;
-  box-shadow: 0 0 0.41667vw 0 rgba(8, 33, 85, 0.1);
+  box-shadow: 0 0 0.41667vw 0 rgb(8 33 85 / 10%);
   height: 100%;
   padding: 0.83333vw;
   overflow-y: auto;
   overflow-x: hidden !important;
+  /* stylelint-disable-next-line property-no-vendor-prefix */
   -moz-box-sizing: border-box;
+  /* stylelint-disable-next-line property-no-vendor-prefix */
   -webkit-box-sizing: border-box;
+  /* stylelint-disable-next-line property-no-vendor-prefix */
   -o-box-sizing: border-box;
+  /* stylelint-disable-next-line property-no-vendor-prefix */
   -ms-box-sizing: border-box;
+  /* stylelint-disable-next-line indentation */
   box-sizing: border-box;
-
   .table {
     margin-top: 16px;
   }
diff --git a/src/views/work-trends/index.vue b/src/views/work-trends/index.vue
index 9146ab1..a233433 100644
--- a/src/views/work-trends/index.vue
+++ b/src/views/work-trends/index.vue
@@ -197,7 +197,7 @@ const clickRadio = ()=>{
     }
   });
   getList()
-}
+};
 //关闭新增弹窗
 const onclone = () => {
   dialogVisible.value = false;