Browse Source

优化:将部门字样改为组织字样

microrain 2 years ago
parent
commit
148f65e642

+ 1 - 1
CHANGELOG.md

@@ -77,7 +77,7 @@
 - 🌟 更新 依赖更新最新版本
 - 🎯 优化 深色模式
 - 🎯 优化 `/@/utils` 文件夹,合并删除单一内容
-- 🎯 优化 系统设置:菜单管理(新增、修改)、角色管理(新增菜单权限)、用户管理、部门管理、字典管理
+- 🎯 优化 系统设置:菜单管理(新增、修改)、角色管理(新增菜单权限)、用户管理、组织管理、字典管理
 - 🎯 优化 登录界面逻辑、权限管理逻辑
 - 🎯 优化 同步 [vue-next-admin-images](https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu) 后端控制菜单模拟数据
 - 🎉 新增 适配 Font Icon 向 SVG Icon 迁移(改动大,"element-plus": "^1.2.0-beta.4" 谨慎更新)

+ 1 - 1
src/i18n/lang/zh-cn.ts

@@ -6,7 +6,7 @@ export default {
 		systemMenu: '菜单管理',
 		systemRole: '角色管理',
 		systemUser: '用户管理',
-		systemDept: '部门管理',
+		systemDept: '组织管理',
 		systemDic: '字典管理',
 		limits: '权限管理',
 		limitsFrontEnd: '前端控制',

+ 2 - 2
src/i18n/pages/formI18n/zh-cn.ts

@@ -2,12 +2,12 @@
 export default {
 	formI18nLabel: {
 		name: '姓名',
-		email: '用户归属部门',
+		email: '用户归属组织',
 		autograph: '登陆账户名',
 	},
 	formI18nPlaceholder: {
 		name: '请输入姓名',
-		email: '请输入用户归属部门',
+		email: '请输入用户归属组织',
 		autograph: '请输入登陆账户名',
 	},
 };

+ 1 - 1
src/views/iot/device/instance/index.vue

@@ -56,7 +56,7 @@
         <el-table-column label="设备名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
         <el-table-column label="设备类型" prop="product.deviceType" :show-overflow-tooltip="true" v-col="'deviceType'" />
         <el-table-column label="产品名称" prop="productName" :show-overflow-tooltip="true" v-col="'productName'" />
-        <!-- <el-table-column label="部门" prop="deptName" :show-overflow-tooltip="true" v-col="'deptName'"/> -->
+        <!-- <el-table-column label="组织" prop="deptName" :show-overflow-tooltip="true" v-col="'deptName'"/> -->
 
         <el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">
           <template #default="scope">

+ 1 - 1
src/views/iot/device/product/detail.vue

@@ -27,7 +27,7 @@
 									<td class="ant-descriptions-item-content" colspan="1">{{ detail.key }}</td>
 									<th class="ant-descriptions-item-label ant-descriptions-item-colon">所属品类</th>
 									<td class="ant-descriptions-item-content" colspan="1">{{ detail.categoryName }}</td>
-									<!-- <th class="ant-descriptions-item-label ant-descriptions-item-colon">所属部门</th>
+									<!-- <th class="ant-descriptions-item-label ant-descriptions-item-colon">所属组织</th>
 									<td class="ant-descriptions-item-content" colspan="1">{{ detail.deptName }}</td> -->
 									<th class="ant-descriptions-item-label ant-descriptions-item-colon">设备类型</th>
 									<td class="ant-descriptions-item-content" colspan="1">{{ detail.deviceType }}</td>

+ 1 - 1
src/views/iot/device/product/index.vue

@@ -52,7 +52,7 @@
         <el-table-column label="标识" prop="key" :show-overflow-tooltip="true" v-col="'key'" />
         <el-table-column label="名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
         <el-table-column label="分类" prop="categoryName" :show-overflow-tooltip="true" v-col="'categoryName'" />
-        <!-- <el-table-column label="部门" prop="deptName" :show-overflow-tooltip="true" v-col="'deptName'"/> -->
+        <!-- <el-table-column label="组织" prop="deptName" :show-overflow-tooltip="true" v-col="'deptName'"/> -->
         <el-table-column label="消息协议" prop="messageProtocol" :show-overflow-tooltip="true" v-col="'messageProtocol'" />
         <el-table-column label="接入方式" prop="transportProtocol" :show-overflow-tooltip="true" v-col="'transportProtocol'" />
         <el-table-column label="类型" prop="deviceType" :show-overflow-tooltip="true" v-col="'deviceType'" />

+ 24 - 2
src/views/iot/scene/manage/component/sceneItem.vue

@@ -22,7 +22,7 @@
         </el-form-item>
         <el-form-item label="设备:" prop="device_key">
           <el-select v-model="item.device_key" filterable placeholder="请选择设备">
-            <el-option v-for="it in sourceData" :key="it.key" :label="it.name" :value="it.key">
+            <el-option v-for="it in deviceListData" :key="it.key" :label="it.name" :value="it.key">
               <span style="float: left">{{ it.name }}</span>
               <span style="float: right; font-size: 13px">{{ it.key }}</span>
             </el-option>
@@ -134,6 +134,25 @@ const props = defineProps({
       'name': '测试',
     }]
   },
+  deviceListData: {
+    type: Array as PropType<testIValueType[]>,
+    default: () => [{
+      'key': 'all',
+      'name': '全部设备',
+    }, {
+      'key': '3242342424',
+      'name': 'A21楼智能电表',
+    }, {
+      'key': '453423424',
+      'name': '五楼温湿度传感设备',
+    }, {
+      'key': '4534323311',
+      'name': '1楼震动传感设备',
+    }, {
+      'key': 'aworr324242',
+      'name': '2号院充电桩',
+    }]
+  },
   sourceTypeData: {
     type: Array as PropType<testIValueType[]>,
     default: () => [{
@@ -150,7 +169,10 @@ const props = defineProps({
       'name': '修改属性',
     }, {
       'key': 'reportAttribute',
-      'name': '上报属性',
+      'name': '属性上报',
+    }, {
+      'key': 'reportEvent',
+      'name': '事件上报',
     }, {
       'key': 'functionCall',
       'name': '功能调用',

+ 2 - 2
src/views/system/assess/component/editFun.vue

@@ -62,7 +62,7 @@ export default defineComponent({
 
     const state = reactive<DicState>({
       isShowDialog: false,
-      typeData: [], // 
+      typeData: [], //
 
       ruleForm: {
         id: 0,
@@ -81,7 +81,7 @@ export default defineComponent({
           { required: true, message: "功能定义标识不能为空", trigger: "blur" }
         ],
         accessMode: [{ required: true, message: '功能定义分类不能为空', trigger: 'blur' }],
-        deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '所属组织不能为空', trigger: 'blur' }],
         deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
       }
     });

+ 7 - 7
src/views/system/assess/component/editPro.vue

@@ -23,8 +23,8 @@
           </el-cascader>
         </el-form-item>
 
-        <el-form-item label="所属部门" prop="deptId">
-          <el-cascader :options="deptData" :props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }" placeholder="请选择所属部门" clearable class="w100" v-model="ruleForm.deptId">
+        <el-form-item label="所属组织" prop="deptId">
+          <el-cascader :options="deptData" :props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }" placeholder="请选择所属组织" clearable class="w100" v-model="ruleForm.deptId">
             <template #default="{ node, data }">
               <span>{{ data.deptName }}</span>
               <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -105,10 +105,10 @@ export default defineComponent({
     const state = reactive<DicState>({
       isShowDialog: false,
       cateData: [], // 分类数据
-      deptData: [], // 
-      messageData: [], // 
-      tranData: [], // 
-      imageUrl: "", // 
+      deptData: [], //
+      messageData: [], //
+      tranData: [], //
+      imageUrl: "", //
       singleImg: baseURL + "/product/icon/upload",
 
       ruleForm: {
@@ -130,7 +130,7 @@ export default defineComponent({
           { required: true, message: "产品标识不能为空", trigger: "blur" }
         ],
         parentId: [{ required: true, message: '产品分类不能为空', trigger: 'blur' }],
-        deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '所属组织不能为空', trigger: 'blur' }],
         messageProtocol: [{ required: true, message: '消息协议不能为空', trigger: 'blur' }],
         transportProtocol: [{ required: true, message: '传输协议不能为空', trigger: 'blur' }],
         deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],

+ 4 - 4
src/views/system/assess/totalIndex/component/addItem.vue

@@ -134,7 +134,7 @@ export default defineComponent({
 				userName: '', // 账户名称
 				userNickname: '', // 用户昵称
 				roleSign: '', // 关联角色
-				department: [], // 部门
+				department: [], // 组织
 				phone: '', // 手机号
 				email: '', // 邮箱
 				sex: '', // 性别
@@ -143,7 +143,7 @@ export default defineComponent({
 				status: true, // 用户状态
 				describe: '', // 用户描述
 			},
-			// deptData: [], // 部门数据
+			// deptData: [], // 组织数据
 			// 标识列表数据
 			tableData: {
 				data: [],
@@ -175,7 +175,7 @@ export default defineComponent({
 		const onOpenAddSign = () => {
 			addSignRef.value.openDialog();
 		};
-				
+
 		// 打开编辑弹窗
 		const onOpenEditSign = (row: TableDataRow) => {
 			addSignRef.value.openDialog(row);
@@ -204,7 +204,7 @@ export default defineComponent({
 		const onHandleCurrentChange = (val: number) => {
 			state.tableData.param.pageNum = val;
 		};
-		// 初始化部门数据
+		// 初始化组织数据
 		const initTableData = () => {
 			const data: Array<TableDataRow> = [];
 			for (let i = 0; i < 6; i++) {

+ 8 - 8
src/views/system/assess/totalIndex/component/addSign.vue

@@ -114,7 +114,7 @@ export default defineComponent({
 		});
 		// 打开弹窗
 		const openDialog = (row:any, index: any, isEdit: Boolean) => {
-			
+
 			if(!isEdit) {
 				state.ruleForm = {
 					name: '', // 标识
@@ -140,8 +140,8 @@ export default defineComponent({
 		};
 		// // 新增
 		// const onSubmit = () => {
-			
-			
+
+
 		// };
 		// 保存数据
 		const onSubmit = async (formEl: FormInstance | undefined) => {
@@ -153,7 +153,7 @@ export default defineComponent({
 						const { start_value, end_value, base_value } = item
 						if(!start_value || !end_value || !base_value.toString()) {
 							ElMessage.error('请完善表单');
-							return 
+							return
 						}
 					}
 					emit('handleChange', state.ruleForm, state.index, state.isEdit)
@@ -161,14 +161,14 @@ export default defineComponent({
 				}
 			})
 		}
-		// 初始化部门数据
+		// 初始化组织数据
 		// const initTableData = () => {
 		// 	state.deptData.push({
 		// 		deptName: 'vueNextAdmin',
 		// 		createTime: new Date().toLocaleString(),
 		// 		status: true,
 		// 		sort: Math.random(),
-		// 		describe: '顶级部门',
+		// 		describe: '顶级组织',
 		// 		id: Math.random(),
 		// 		children: [
 		// 			{
@@ -208,7 +208,7 @@ export default defineComponent({
 			const { start_value, end_value, base_value } = item
 			if(!start_value || !end_value || !base_value.toString()) {
 				ElMessage.error('请完善表单');
-				return 
+				return
 			}
 			state.ruleForm.ranges.push({
 				start_value: '',
@@ -221,7 +221,7 @@ export default defineComponent({
 			// const { minVal, maxVal, score } = item
 			// if(!minVal || !maxVal || !score.toString()) {
 			// 	ElMessage.error('请完善表单');
-			// 	return 
+			// 	return
 			// }
 			// state.ruleForm.list.push({
 			// 	minVal: '',

+ 1 - 1
src/views/system/assess/totalIndex/component/detailItem.vue

@@ -126,7 +126,7 @@ export default defineComponent({
     const onSubmit = () => {
       closeDialog();
     };
-    // 初始化部门数据
+    // 初始化组织数据
     const initTableData = () => {
 
     };

+ 2 - 2
src/views/system/assess/totalIndex/component/editItem.vue

@@ -111,7 +111,7 @@ export default defineComponent({
 				item_code: '',
 				targets: []
 			},
-			// deptData: [], // 部门数据
+			// deptData: [], // 组织数据
 			// 标识列表数据
 			tableData: {
 				data: [],
@@ -214,7 +214,7 @@ export default defineComponent({
 		const onHandleCurrentChange = (val: number) => {
 			state.tableData.param.pageNum = val;
 		};
-		// 初始化部门数据
+		// 初始化组织数据
 		const initTableData = () => {
 			const data: Array<TableDataRow> = [];
 			for (let i = 0; i < 6; i++) {

+ 1 - 1
src/views/system/assess/totalIndex/component/setTask.vue

@@ -280,7 +280,7 @@ export default defineComponent({
 		const onCancel = () => {
 			closeDialog();
 		};
-		// 初始化部门数据
+		// 初始化组织数据
 		const initTableData = () => { };
 		// 页面加载时
 		onMounted(() => {

+ 10 - 10
src/views/system/manage/dept/component/edit.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="system-edit-dept-container">
-		<el-dialog :title="(ruleForm.deptId ? '修改' : '添加') + '部门'" v-model="isShowDialog" width="769px">
+		<el-dialog :title="(ruleForm.deptId ? '修改' : '添加') + '组织'" v-model="isShowDialog" width="769px">
 			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px">
 				<el-row :gutter="35">
 					<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
@@ -14,8 +14,8 @@
 						</el-form-item>
 					</el-col> -->
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="上级部门">
-							<el-cascader :options="deptData" :props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }" placeholder="请选择部门" clearable class="w100" v-model="ruleForm.parentId">
+						<el-form-item label="上级组织">
+							<el-cascader :options="deptData" :props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }" placeholder="请选择组织" clearable class="w100" v-model="ruleForm.parentId">
 								<template #default="{ node, data }">
 									<span>{{ data.deptName }}</span>
 									<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -24,8 +24,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="部门名称" prop="deptName">
-							<el-input v-model="ruleForm.deptName" placeholder="请输入部门名称" clearable></el-input>
+						<el-form-item label="组织名称" prop="deptName">
+							<el-input v-model="ruleForm.deptName" placeholder="请输入组织名称" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
@@ -49,7 +49,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="部门状态">
+						<el-form-item label="组织状态">
 							<el-switch v-model="ruleForm.status" :active-value="1" :inactive-value="0" inline-prompt active-text="启" inactive-text="禁"></el-switch>
 						</el-form-item>
 					</el-col>
@@ -92,8 +92,8 @@ interface DeptSate {
 }
 
 const baseForm: RuleFormState = {
-	parentId: -1, // 上级部门
-	deptName: '', // 部门名称
+	parentId: -1, // 上级组织
+	deptName: '', // 组织名称
 	organizationId: 1, // 组织名称
 	orderNum: 0,
 	leader: '',
@@ -111,11 +111,11 @@ export default defineComponent({
 			ruleForm: {
 				...baseForm,
 			},
-			deptData: [], // 部门数据
+			deptData: [], // 组织数据
 			orgData: [], // 组织数据
 			rules: {
 				organizationId: [{ required: true, message: '组织不能为空', trigger: 'blur' }],
-				deptName: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
+				deptName: [{ required: true, message: '组织名称不能为空', trigger: 'blur' }],
 				leader: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
 				phone: [{ validator: phoneValidate, trigger: 'blur' }],
 				email: [{ type: 'email', message: '请输入正确邮箱', trigger: 'blur' }],

+ 6 - 6
src/views/system/manage/dept/index.vue

@@ -3,8 +3,8 @@
     <el-card shadow="hover">
       <div class="system-dept-search mb15">
         <el-form :model="tableData.param" :inline="true" ref="queryRef">
-          <el-form-item label="部门名称" prop="deptName">
-            <el-input size="default" v-model="tableData.param.deptName" placeholder="请输入部门名称" class="w-50" clearable />
+          <el-form-item label="组织名称" prop="deptName">
+            <el-input size="default" v-model="tableData.param.deptName" placeholder="请输入组织名称" class="w-50" clearable />
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select size="default" placeholder="请选择状态" class="w-50" v-model="tableData.param.status">
@@ -30,14 +30,14 @@
               <el-icon>
                 <ele-FolderAdd />
               </el-icon>
-              新增部门
+              新增组织
             </el-button>
           </el-form-item>
         </el-form>
       </div>
       <el-table :data="tableData.data" style="width: 100%" row-key="deptId" default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-loading="tableData.loading">
-        <el-table-column prop="deptName" label="部门名称" v-col="'deptName'" show-overflow-tooltip> </el-table-column>
-        <el-table-column prop="status" label="部门状态" v-col="'status'" align="center" min-width="120">
+        <el-table-column prop="deptName" label="组织名称" v-col="'deptName'" show-overflow-tooltip> </el-table-column>
+        <el-table-column prop="status" label="组织状态" v-col="'status'" align="center" min-width="120">
           <template #default="scope">
             <el-tag type="success" size="small" v-if="scope.row.status === 1">启用</el-tag>
             <el-tag type="info" size="small" v-else>禁用</el-tag>
@@ -131,7 +131,7 @@ export default defineComponent({
     };
     // 删除当前行
     const onTabelRowDel = (row: TableDataRow) => {
-      ElMessageBox.confirm(`此操作将永久删除部门:${row.deptName}, 是否继续?`, '提示', {
+      ElMessageBox.confirm(`此操作将永久删除组织:${row.deptName}, 是否继续?`, '提示', {
         confirmButtonText: '删除',
         cancelButtonText: '取消',
         type: 'warning',

+ 4 - 4
src/views/system/manage/role/component/editPer.vue

@@ -8,8 +8,8 @@
         <el-select v-model="ruleForm.dataScope" placeholder="请选择" clearable class="w100">
           <el-option label="全部数据权限" :value="1" />
           <el-option label="自定数据权限" :value="2" />
-          <el-option label="本部门数据权限" :value="3" />
-          <el-option label="本部门及以下数据权限" :value="4" />
+          <el-option label="本组织数据权限" :value="3" />
+          <el-option label="本组织及以下数据权限" :value="4" />
         </el-select>
       </el-form-item>
       <el-form-item label="数据权限" prop="deptIds" v-if="ruleForm.dataScope===2">
@@ -35,8 +35,8 @@ import { ElMessage } from 'element-plus';
 interface DialogRow {
 	id?: number;
 	name: string;
-	dataScope: 1 | 2 | 3 | 4; // 数据范围(1:全部数据权限 2:自定数据权限 3:本部门数据权限 4:本部门及以下数据权限)
-	deptIds: number[]; // 部门id
+	dataScope: 1 | 2 | 3 | 4; // 数据范围(1:全部数据权限 2:自定数据权限 3:本组织数据权限 4:本组织及以下数据权限)
+	deptIds: number[]; // 组织id
 }
 
 const baseForm: DialogRow = {

+ 6 - 6
src/views/system/manage/user/component/editUser.vue

@@ -29,8 +29,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="部门" prop="deptId">
-							<el-cascader :options="deptData" :props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }" placeholder="请选择部门" clearable class="w100" v-model="ruleForm.deptId">
+						<el-form-item label="组织" prop="deptId">
+							<el-cascader :options="deptData" :props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }" placeholder="请选择组织" clearable class="w100" v-model="ruleForm.deptId">
 								<template #default="{ node, data }">
 									<span>{{ data.deptName }}</span>
 									<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -59,7 +59,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="岗位" prop="postIds">
-							<el-cascader :options="postData" :props="{ checkStrictly: true, multiple: true, emitPath: false, value: 'postId', label: 'postName' }" placeholder="请选择部门" clearable class="w100" v-model="ruleForm.postIds">
+							<el-cascader :options="postData" :props="{ checkStrictly: true, multiple: true, emitPath: false, value: 'postId', label: 'postName' }" placeholder="请选择组织" clearable class="w100" v-model="ruleForm.postIds">
 								<template #default="{ node, data }">
 									<span>{{ data.postName }}</span>
 									<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -106,7 +106,7 @@ interface DialogRow {
 	id?: number;
 	userName: string; // 用户名
 	userNickname: string; // 用户昵称
-	deptId: number | null; // 部门id
+	deptId: number | null; // 组织id
 	mobile: string; // 中国手机不带国家代码,国际手机号格式为:国家代码-手机号
 	roleIds: number[]; // 角色ID数组
 	postIds: number[]; // 岗位ID数组
@@ -171,7 +171,7 @@ export default defineComponent({
 			rules: {
 				userName: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
 				userNickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
-				deptId: [{ required: true, message: '归属部门不能为空', trigger: 'blur' }],
+				deptId: [{ required: true, message: '归属组织不能为空', trigger: 'blur' }],
 				postIds: [{ required: true, message: '岗位不能为空', trigger: 'blur' }],
 				roleIds: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
 				mobile: [{ required: true, message: '手机号不能为空', trigger: 'blur' }],
@@ -227,7 +227,7 @@ export default defineComponent({
 				}
 			});
 		};
-		// 初始化部门数据
+		// 初始化组织数据
 		const initTableData = () => {
 		};
 		// 页面加载时

+ 2 - 2
src/views/system/manage/user/index.vue

@@ -4,7 +4,7 @@
 			<el-col :span="5">
 				<el-card shadow="hover">
 					<el-scrollbar>
-						<el-input :prefix-icon="search" v-model="filterText" placeholder="请输入部门名称" clearable size="default" style="width: 100%;" />
+						<el-input :prefix-icon="search" v-model="filterText" placeholder="请输入组织名称" clearable size="default" style="width: 100%;" />
 						<el-tree ref="treeRef" class="filter-tree mt-4" :data="deptData" :props="deptProps" default-expand-all :filter-node-method="deptFilterNode" @node-click="handleNodeClick" />
 					</el-scrollbar>
 				</el-card>
@@ -63,7 +63,7 @@
 						<el-table-column type="index" label="序号" width="60" align="center" />
 						<el-table-column prop="userName" label="账户名称" v-col="'userName'" min-width="120" show-overflow-tooltip></el-table-column>
 						<el-table-column prop="userNickname" label="用户昵称" v-col="'userNickname'" min-width="160" show-overflow-tooltip></el-table-column>
-						<el-table-column prop="dept.deptName" label="部门" v-col="'deptName'" show-overflow-tooltip></el-table-column>
+						<el-table-column prop="dept.deptName" label="组织" v-col="'deptName'" show-overflow-tooltip></el-table-column>
 						<el-table-column label="角色" min-width="120" prop="rolesNames" v-col="'rolesNames'" :show-overflow-tooltip="true"></el-table-column>
 						<el-table-column prop="mobile" label="手机号" v-col="'mobile'" width="120" align="center"></el-table-column>
 						<el-table-column prop="status" label="用户状态" width="120" v-col="'status'" align="center">

+ 1 - 1
src/views/system/monitor/operLog/index.vue

@@ -75,7 +75,7 @@
           </template>
         </el-table-column>
         <el-table-column label="操作人员" v-col="'operName'" align="center" prop="operName" :show-overflow-tooltip="true" />
-        <el-table-column label="部门名称" align="center" prop="deptName" />
+        <el-table-column label="组织名称" align="center" prop="deptName" />
         <el-table-column label="主机" show-overflow-tooltip align="center" prop="operIp" />
         <el-table-column label="操作地点" v-col="'operLocation'" show-overflow-tooltip align="center" prop="operLocation" />
         <el-table-column label="操作时间" v-col="'operTime'" show-overflow-tooltip align="center" prop="operTime" />