Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

lanceJiang 10 mēneši atpakaļ
vecāks
revīzija
f9747413c5

+ 9 - 0
README.md

@@ -35,3 +35,12 @@ cursor-pointer: 鼠标呈现手指样式
 # 发起审批
 <LeIcon class="text-lg text-icon-color" icon-class="icon-processInfo-navigation" />
 ```
+
+
+```
+
+<el-button plain :icon="Plus" @click="addHandler" type="primary">新增</el-button>
+<el-button plain :icon="Key" :disabled="!curSelectionRows.length || curSelectionRows.length !== 1" @click="visiblePermission = true">权限设置</el-button>
+<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" @click="batch_del" type="danger">删除</el-button>
+
+```

+ 1 - 1
src/components/SearchForm.vue

@@ -375,4 +375,4 @@ export const SearchForm = defineComponent({
 	}
 })
 export default SearchForm
-</script>
+</script>

+ 42 - 51
src/views/setting/app/index.vue

@@ -14,16 +14,8 @@
 				:columns="activeColumns"
 			>
 				<template #toolLeft>
-					<el-button type="primary" @click="addHandler">
-						<el-icon class="btn-icon">
-							<Plus />
-						</el-icon>
-					</el-button>
-					<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
-						<el-icon class="btn-icon">
-							<Delete />
-						</el-icon>
-					</el-button>
+					<el-button plain :icon="Plus" @click="addHandler" type="primary">新增</el-button>
+					<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" @click="batch_del" type="danger">删除</el-button>
 				</template>
 
 				<template #statusSlot="scope">
@@ -65,21 +57,21 @@ const activeData = ref({})
 const formsDialog = [
 	{
 		prop: 'identification',
-		label: '标识',
+		label: '应用标识',
 		itemType: 'input',
-		rules: [{ required: true, message: '请输入标识', trigger: 'blur' }]
+		rules: [{ required: true, message: '请输入应用标识', trigger: 'blur' }]
 	},
 	{
 		prop: 'name',
-		label: '名称',
+		label: '应用名称',
 		itemType: 'input',
-		rules: [{ required: true, message: '请输入名称', trigger: 'blur' }]
+		rules: [{ required: true, message: '请输入应用名称', trigger: 'blur' }]
 	},
 	{
 		prop: 'secretKey',
-		label: '密钥',
+		label: '应用密钥',
 		itemType: 'input',
-		rules: [{ required: true, message: '请输入密钥', trigger: 'blur' }]
+		rules: [{ required: true, message: '请输入应用密钥', trigger: 'blur' }]
 	},
 	{
 		prop: 'expire',
@@ -91,7 +83,7 @@ const formsDialog = [
 
 	{
 		prop: 'status',
-		label: '状态',
+		label: '应用状态',
 		itemType: 'switch',
 		activeText: '正常',
 		inactiveText: '禁用'
@@ -123,21 +115,21 @@ const treeRef = ref<InstanceType<typeof ElTree>>()
 const forms = ref([
 	{
 		prop: 'keyword',
-		label: '标识:',
+		label: '应用标识:',
 		itemType: 'input',
-		placeholder: '请输入标识'
+		placeholder: '请输入应用标识'
 	},
 	{
 		prop: 'name',
-		label: '名称:',
+		label: '应用名称:',
 		itemType: 'input',
-		placeholder: '请输入名称'
+		placeholder: '请输入应用名称'
 	},
 	{
 		prop: 'status',
-		label: '状态:',
+		label: '应用状态:',
 		itemType: 'select',
-		placeholder: '请选择状态',
+		placeholder: '请选择应用状态',
 		options: [
 			{
 				label: '禁用',
@@ -173,47 +165,46 @@ const queryList = async () => {
 const columns = [
 	{
 		prop: 'identification',
-		label: '标识',
-		minWidth: 80
-	},
-	{
-		prop: 'status',
-		label: '状态',
-		minWidth: 60,
-		slots: {
-			default: 'statusSlot'
-		}
+		label: '应用标识'
 	},
 	{
 		prop: 'name',
-		label: '名称',
+		label: '应用名称',
 		minWidth: 100
 	},
 	{
 		prop: 'secretKey',
-		label: '密钥',
+		label: '应用密钥',
 		minWidth: 100
 	},
+	{
+		prop: 'status',
+		label: '应用状态',
+		minWidth: 60,
+		slots: {
+			default: 'statusSlot'
+		}
+	},
 	{
 		prop: 'sort',
 		label: '排序',
 		minWidth: 80
 	},
-	{
-		prop: 'updateBy',
-		label: '修改人',
-		minWidth: 100
-	},
-	{
-		prop: 'updateTime',
-		label: '修改时间',
-		minWidth: 150
-	},
-	{
-		prop: 'createBy',
-		label: '创建人',
-		minWidth: 100
-	},
+	// {
+	// 	prop: 'updateBy',
+	// 	label: '修改人',
+	// 	minWidth: 100
+	// },
+	// {
+	// 	prop: 'updateTime',
+	// 	label: '修改时间',
+	// 	minWidth: 150
+	// },
+	// {
+	// 	prop: 'createBy',
+	// 	label: '创建人',
+	// 	minWidth: 100
+	// },
 	{
 		prop: 'createTime',
 		label: '创建时间',
@@ -317,7 +308,7 @@ const addHandler = () => {
 }
 
 const handleStatusChange = (row: any) => {
-	// 状态 0、禁用 1、正常
+	// 应用状态 0、禁用 1、正常
 	const status = row.status
 	let text = Number(row.status) === 0 ? '禁用' : '启用'
 	ElMessageBox.confirm('请确认是否' + text + '当前数据?', '提示', { type: 'warning' })

+ 2 - 10
src/views/setting/post/index.vue

@@ -14,16 +14,8 @@
 				:columns="activeColumns"
 			>
 				<template #toolLeft>
-					<el-button type="primary" @click="addHandler">
-						<el-icon class="btn-icon">
-							<Plus />
-						</el-icon>
-					</el-button>
-					<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
-						<el-icon class="btn-icon">
-							<Delete />
-						</el-icon>
-					</el-button>
+					<el-button plain :icon="Plus" @click="addHandler" type="primary">新增</el-button>
+					<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" @click="batch_del" type="danger">删除</el-button>
 				</template>
 
 				<template #statusSlot="scope">

+ 5 - 13
src/views/setting/region/index.vue

@@ -14,16 +14,8 @@
 				:columns="activeColumns"
 			>
 				<template #toolLeft>
-					<el-button type="primary" @click="addHandler">
-						<el-icon class="btn-icon">
-							<Plus />
-						</el-icon>
-					</el-button>
-					<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
-						<el-icon class="btn-icon">
-							<Delete />
-						</el-icon>
-					</el-button>
+					<el-button plain :icon="Plus" @click="addHandler" type="primary">新增</el-button>
+					<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" @click="batch_del" type="danger">删除</el-button>
 				</template>
 
 				<template #levelSlot="scope">
@@ -191,8 +183,7 @@ const forms = ref([
 const columns = [
 	{
 		prop: 'name',
-		label: '区域名称',
-		minWidth: 250
+		label: '区域名称'
 	},
 	{
 		prop: 'code',
@@ -249,7 +240,8 @@ const { searchData, tableOpts, checkedColumns, activeColumns, updateParams } = u
 		options: {
 			showIndex: false,
 			defaultExpandAll: false,
-			onSelectionChange: selectionChange
+			onSelectionChange: selectionChange,
+			showPagination: false
 		},
 		// 需要展示的列
 		columns,

+ 5 - 3
src/views/setting/role/index.vue

@@ -14,9 +14,11 @@
 				:columns="activeColumns"
 			>
 				<template #toolLeft>
-					<el-button plain :icon="Plus" @click="addHandler" type="primary">新增</el-button>
-					<el-button plain :icon="Key" :disabled="!curSelectionRows.length || curSelectionRows.length !== 1" @click="visiblePermission = true">权限设置</el-button>
-					<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" @click="batch_del" type="danger">删除</el-button>
+					<el-button plain :icon="Plus" type="primary" @click="addHandler">新增</el-button>
+					<el-button plain :icon="Key" :disabled="!curSelectionRows.length || curSelectionRows.length !== 1" @click="visiblePermission = true"
+						>权限设置</el-button
+					>
+					<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" type="danger" @click="batch_del">删除</el-button>
 				</template>
 
 				<template #statusSlot="scope">

+ 6 - 14
src/views/setting/user/index.vue

@@ -39,19 +39,11 @@
 				:columns="activeColumns"
 			>
 				<template #toolLeft>
-					<el-button type="primary" @click="addHandler">
-						<el-icon class="btn-icon">
-							<Plus />
-						</el-icon>
-					</el-button>
-					<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
-						<el-icon class="btn-icon">
-							<Delete />
-						</el-icon>
-					</el-button>
-					<el-button plain :disabled="curSelectionRows.length === 0" @click="chooseThing('role')"> 分配角色</el-button>
-					<el-button plain :disabled="curSelectionRows.length === 0" @click="chooseThing('department')"> 分配部门 </el-button>
-					<el-button plain :disabled="curSelectionRows.length === 0" @click="resetPwdVisibile = true"> 密码重置 </el-button>
+					<el-button plain :icon="Plus" type="primary" @click="addHandler">新增</el-button>
+					<el-button plain :icon="Delete" :disabled="curSelectionRows.length === 0" type="danger" @click="batch_del">删除</el-button>
+					<el-button plain :icon="User" :disabled="curSelectionRows.length === 0" @click="chooseThing('role')">分配角色</el-button>
+					<el-button plain :icon="Connection" :disabled="curSelectionRows.length === 0" @click="chooseThing('department')">分配部门</el-button>
+					<el-button plain :icon="Key" :disabled="curSelectionRows.length === 0" @click="resetPwdVisibile = true">密码重置</el-button>
 				</template>
 
 				<template #filterAvatarSlot="scope">
@@ -108,7 +100,7 @@ import department from '@/api/system/department'
 import { computed, nextTick, ref, watch } from 'vue'
 import { ElMessage, ElMessageBox, ElTree } from 'element-plus'
 import { useTablePage } from '@/hooks/useTablePage'
-import { Plus, Delete } from '@element-plus/icons-vue'
+import { Plus, Delete, Key, Connection, User } from '@element-plus/icons-vue'
 import AssignRoleDialog from './assign-role.vue'
 import ResetPwd from './reset-pwd.vue'