Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/views/iot/device/instance/component/excel.vue

@@ -155,11 +155,11 @@ export default defineComponent({
       });
     };
     const down=()=>{
-      const fileURL = '/example.xlsx';
+      const fileURL = '/deviceImportExample.xlsx';
       // 创建下载链接
       const link = document.createElement('a');
       link.href = fileURL;
-      link.setAttribute('download', 'example.xlsx');
+      link.setAttribute('download', 'deviceImportExample.xlsx');
 
       // 模拟点击下载链接进行下载
       document.body.appendChild(link);

src/views/system/assess/totalIndex/component/addItem.vue

@@ -4,15 +4,15 @@
 			<el-form :model="ruleForm" size="default" label-width="90px">
 				<!-- <el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> -->
-						<el-form-item label="评价名称" required>
-							<el-input size="small" v-model="ruleForm.userName" placeholder="请输入评价名称" clearable></el-input>
-						</el-form-item>
-					<!-- </el-col>
+				<el-form-item label="评价名称" required>
+					<el-input size="small" v-model="ruleForm.userName" placeholder="请输入评价名称" clearable></el-input>
+				</el-form-item>
+				<!-- </el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20"> -->
-						<el-form-item label="描述">
-							<el-input width="400"  size="small" v-model="ruleForm.describe" type="textarea" placeholder="请输入描述" maxlength="150"></el-input>
-						</el-form-item>
-					<!-- </el-col> -->
+				<el-form-item label="描述">
+					<el-input width="400" size="small" v-model="ruleForm.describe" type="textarea" placeholder="请输入描述" maxlength="150"></el-input>
+				</el-form-item>
+				<!-- </el-col> -->
 				<!-- </el-row> -->
 			</el-form>
 			<el-button size="default" type="primary" class="mb10 mt10" @click="onOpenAddSign">
@@ -26,9 +26,9 @@
 				<el-table-column align="center" prop="userName" label="标识" show-overflow-tooltip></el-table-column>
 				<el-table-column align="center" prop="dataType" label="数据项" show-overflow-tooltip></el-table-column>
 				<el-table-column align="center" prop="num" label="权重(%)" width="90" show-overflow-tooltip></el-table-column>
-				<el-table-column align="center" prop="description" label="取值范围" show-overflow-tooltip width="200" >
+				<el-table-column align="center" prop="description" label="取值范围" show-overflow-tooltip width="200">
 					<template #default="scope">
-						<el-tag size="small" class="mr6" v-for="(item, index) in scope.row.range.split(', ')" :key="index">{{item}}</el-tag>
+						<el-tag size="small" class="mr6" v-for="(item, index) in scope.row.range.split(', ')" :key="index">{{ item }}</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column align="center" label="操作" width="160">
@@ -39,18 +39,8 @@
 					</template>
 				</el-table-column>
 			</el-table>
-			<el-pagination
-				@size-change="onHandleSizeChange"
-				@current-change="onHandleCurrentChange"
-				class="mt15"
-				:pager-count="5"
-				:page-sizes="[10, 20, 30]"
-				v-model:current-page="tableData.param.pageNum"
-				background
-				v-model:page-size="tableData.param.pageSize"
-				layout="total, sizes, prev, pager, next, jumper"
-				:total="tableData.total"
-			>
+			<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15" :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="tableData.param.pageNum" background v-model:page-size="tableData.param.pageSize"
+				layout="total, sizes, prev, pager, next, jumper" :total="tableData.total">
 			</el-pagination>
 
 			<template #footer>
@@ -124,7 +114,7 @@ interface ItemState {
 
 export default defineComponent({
 	name: 'systemAddUser',
-	components: { AddSign, SetTask},
+	components: { AddSign, SetTask },
 	setup() {
 		const addSignRef = ref();
 		const setTaskRef = ref();
@@ -186,7 +176,7 @@ export default defineComponent({
 		};
 		// 删除标识项
 		const onRowDel = (row: TableDataRow) => {
-			ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.userName}”，是否继续?`, '提示', {
+			ElMessageBox.confirm(`此操作将永久删除账户：“${row.userName}”，是否继续?`, '提示', {
 				confirmButtonText: '确认',
 				cancelButtonText: '取消',
 				type: 'warning',
@@ -194,7 +184,7 @@ export default defineComponent({
 				.then(() => {
 					ElMessage.success('删除成功');
 				})
-				.catch(() => {});
+				.catch(() => { });
 		};
 		// 分页改变
 		const onHandleSizeChange = (val: number) => {
@@ -247,9 +237,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-
-
 ::v-deep .el-form {
+
 	// display: flex;
 	// justify-self: center;
 	// flex-direction: column;
@@ -258,19 +247,20 @@ export default defineComponent({
 		width: 500px;
 		margin: 8px auto;
 	}
+
 	::v-deep .el-input__inner,
 	::v-deep .el-textarea__inner {
 		width: 400px;
 		// flex-grow: 0;
 	}
+
 	::v-deep .el-input__inner {
 		padding: 1px 10px;
 	}
+
 	::v-deep .el-input__wrapper {
 		flex-grow: 0;
 		padding: 0
 	}
 }
-
-
 </style>

src/views/system/assess/totalIndex/component/editItem.vue

@@ -196,7 +196,7 @@ export default defineComponent({
 		};
 		// 删除标识项
 		const onRowDel = (row: TableDataRow, index: number) => {
-			ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.title}”，是否继续?`, '提示', {
+			ElMessageBox.confirm(`此操作将永久删除账户：“${row.title}”，是否继续?`, '提示', {
 				confirmButtonText: '确认',
 				cancelButtonText: '取消',
 				type: 'warning',

src/views/system/assess/totalIndex/index.vue

@@ -132,7 +132,7 @@ export default defineComponent({
     };
     // 删除
     const onRowDel = (row: TableDataRow) => {
-      ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.title}”，是否继续?`, '提示', {
+      ElMessageBox.confirm(`此操作将永久删除账户：“${row.title}”，是否继续?`, '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
@@ -176,6 +176,6 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 ::v-deep .el-dialog__body {
-	border-top: 1px var(--el-border-color) var(--el-border-style);
+  border-top: 1px var(--el-border-color) var(--el-border-style);
 }
 </style>

src/views/system/manage/role/component/editPer.vue

@@ -1,30 +1,30 @@
 <template>
-  <el-dialog custom-class="custom-dialog" title="分配数据权限" v-model="isShowDialog" width="500px">
-    <el-form ref="formRef" :model="ruleForm" label-width="90px">
-      <el-form-item label="角色名称" prop="name">
-        <el-input v-model="ruleForm.name" disabled placeholder="请输入账户名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item label="权限范围" prop="dataScope">
-        <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-select>
-      </el-form-item>
-      <el-form-item label="数据权限" prop="deptIds" v-if="ruleForm.dataScope===2">
-        <div class="tree">
-          <el-tree ref="treeRef" :data="deptData" show-checkbox default-expand-all node-key="deptId" highlight-current :props="defaultProps" check-on-click-node :expand-on-click-node="false" />
-        </div>
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="onCancel" size="default">取 消</el-button>
-        <el-button type="primary" @click="onSubmit" size="default">确定</el-button>
-      </span>
-    </template>
-  </el-dialog>
+	<el-dialog custom-class="custom-dialog" title="分配数据权限" v-model="isShowDialog" width="500px">
+		<el-form ref="formRef" :model="ruleForm" label-width="90px">
+			<el-form-item label="角色名称" prop="name">
+				<el-input v-model="ruleForm.name" disabled placeholder="请输入角色名称" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="权限范围" prop="dataScope">
+				<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-select>
+			</el-form-item>
+			<el-form-item label="数据权限" prop="deptIds" v-if="ruleForm.dataScope === 2">
+				<div class="tree">
+					<el-tree ref="treeRef" :data="deptData" show-checkbox default-expand-all node-key="deptId" highlight-current :props="defaultProps" check-on-click-node :expand-on-click-node="false" />
+				</div>
+			</el-form-item>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="onCancel" size="default">取 消</el-button>
+				<el-button type="primary" @click="onSubmit" size="default">确定</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script lang="ts">

src/views/system/manage/user/component/editUser.vue

@@ -3,22 +3,22 @@
 		<el-dialog :title="(ruleForm.id ? '修改' : '添加') + '用户'" 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="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="!ruleForm.id">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="!ruleForm.id">
 						<el-form-item label="用户名" prop="userName">
-							<el-input v-model="ruleForm.userName" placeholder="请输入账户名称" clearable></el-input>
+							<el-input v-model="ruleForm.userName" placeholder="请输入用户名" clearable></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="!ruleForm.id">
-						<el-form-item label="账户密码" prop="userPassword">
-							<el-input v-model="ruleForm.userPassword" placeholder="请输入" type="password" clearable></el-input>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="!ruleForm.id">
+						<el-form-item label="密码" prop="userPassword">
+							<el-input v-model="ruleForm.userPassword" placeholder="请输入密码" type="password" clearable></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="用户昵称" prop="userNickname">
-							<el-input v-model="ruleForm.userNickname" placeholder="请输入用户昵称" clearable></el-input>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="姓名" prop="userNickname">
+							<el-input v-model="ruleForm.userNickname" placeholder="请输入姓名" clearable></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="关联角色" prop="roleIds">
 							<el-cascader :options="roleData" :props="{ checkStrictly: true, multiple: true, emitPath: false, value: 'id', label: 'name' }" placeholder="请选择角色" clearable class="w100" v-model="ruleForm.roleIds">
 								<template #default="{ node, data }">
@@ -28,7 +28,7 @@
 							</el-cascader>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<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 }">
@@ -38,17 +38,17 @@
 							</el-cascader>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="手机号" prop="mobile">
 							<el-input v-model="ruleForm.mobile" placeholder="请输入手机号" clearable></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="邮箱" prop="userEmail">
 							<el-input v-model="ruleForm.userEmail" placeholder="请输入" clearable></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="性别" prop="sex">
 							<el-select v-model="ruleForm.sex" placeholder="请选择" clearable class="w100">
 								<el-option label="保密" :value="0" />
@@ -57,9 +57,9 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<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>
@@ -67,20 +67,20 @@
 							</el-cascader>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="用户状态">
 							<el-switch v-model="ruleForm.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁"></el-switch>
 						</el-form-item>
 					</el-col>
-					<el-col :span="24">
+					<!-- <el-col :span="24">
 						<el-form-item label="用户类型">
 							<el-radio-group v-model="ruleForm.isAdmin">
 								<el-radio :label="1">后台管理员</el-radio>
 								<el-radio :label="0">前台用户</el-radio>
 							</el-radio-group>
 						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+					</el-col> -->
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="用户描述">
 							<el-input v-model="ruleForm.remark" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input>
 						</el-form-item>

src/views/system/manage/user/index.vue

@@ -14,11 +14,11 @@
 					<div class="system-user-search mb15">
 						<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
 							<el-form-item label="关键字" prop="keyWords">
-								<el-input v-model="tableData.param.keyWords" placeholder="请输入用户账号或姓名" clearable size="default" style="width: 240px" @keyup.enter.native="userList" />
-							</el-form-item>
-							<el-form-item label="手机号码" prop="mobile">
-								<el-input v-model="tableData.param.mobile" placeholder="请输入手机号码" clearable size="default" style="width: 240px" @keyup.enter.native="userList" />
+								<el-input v-model="tableData.param.keyWords" placeholder="请输入用户名或姓名" clearable size="default" style="width: 240px" @keyup.enter.native="userList" />
 							</el-form-item>
+							<!--							<el-form-item label="手机号码" prop="mobile">-->
+							<!--								<el-input v-model="tableData.param.mobile" placeholder="请输入手机号码" clearable size="default" style="width: 240px" @keyup.enter.native="userList" />-->
+							<!--							</el-form-item>-->
 							<el-form-item label="状态" prop="status" style="width: 200px;">
 								<el-select v-model="tableData.param.status" placeholder="用户状态" size="default" style="width: 240px">
 									<el-option label="全部" :value="-1" />
@@ -61,8 +61,9 @@
 					<el-table :data="tableData.data" style="width: 100%" v-loading="loading" @selection-change="handleSelectionChange">
 						<!-- <el-table-column type="selection" width="55" align="center" /> -->
 						<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="userName" label="用户名" v-col="'userName'" min-width="120" show-overflow-tooltip></el-table-column>
+						<el-table-column prop="userNickname" 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 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>