Explorar o código

修复用户管理上来就报错

yanglzh %!s(int64=3) %!d(string=hai) anos
pai
achega
20434051ee

+ 1 - 1
src/api/common/dict/data.ts

@@ -20,7 +20,7 @@ export function useDict(...args: string[]): ToRefs<any> {
   args.forEach((d: string) => {
     res.value[d] = [];
     getDicts(d).then(resp => {
-      res.value[d] = resp.list.map((p: any) => ({ label: p.dictLabel, value: p.dictValue, isDefault: p.isDefault }))
+      res.value[d] = (resp.list || []).map((p: any) => ({ label: p.dictLabel, value: p.dictValue, isDefault: p.isDefault }))
     })
   })
   return toRefs(res.value);

+ 0 - 28
src/api/system/monitor/loginLog/index.ts

@@ -1,28 +0,0 @@
-import request from '/@/utils/request';
-
-
-export function logList(query:object) {
-    return request({
-        url: '/system/loginLog/list',
-        method: 'get',
-        params:query
-    })
-}
-
-
-export function deleteLog(ids:number[]) {
-    return request({
-        url: '/system/loginLog/delete',
-        method: 'delete',
-        params:{ids}
-    })
-}
-
-
-
-export function clearLog() {
-    return request({
-        url: '/system/loginLog/clear',
-        method: 'delete',
-    })
-}

+ 0 - 9
src/api/system/monitor/server/index.ts

@@ -1,9 +0,0 @@
-import request from '/@/utils/request';
-
-
-export function getSysInfo() {
-    return request({
-        url: '/system/monitor/server',
-        method: 'get'
-    })
-}

+ 2 - 2
src/views/system/user/component/editUser.vue

@@ -245,8 +245,8 @@ export default defineComponent({
 		const initTableData = () => {
       //获取角色岗位选项
       getParams().then((res:any)=>{
-        roleList.value = res.data.roleList??[];
-        postList.value = res.data.posts??[];
+        roleList.value = res.roleList??[];
+        postList.value = res.posts??[];
       });
 		};
 		// 页面加载时

+ 5 - 5
src/views/system/user/index.vue

@@ -69,9 +69,9 @@
               </template>
             </el-table-column>
             <el-table-column prop="mobile" label="手机号" width="120" align="center"></el-table-column>
-            <el-table-column prop="userStatus" label="用户状态" width="120" align="center">
+            <el-table-column prop="status" label="用户状态" width="120" align="center">
               <template #default="scope">
-                <el-switch v-model="scope.row.userStatus" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)">
+                <el-switch v-model="scope.row.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)">
                 </el-switch>
               </template>
             </el-table-column>
@@ -249,20 +249,20 @@ export default defineComponent({
 		};
 		// 用户状态修改
 		const handleStatusChange = (row: any) => {
-			let text = row.userStatus === 1 ? '启用' : '停用';
+			let text = row.status === 1 ? '启用' : '停用';
 			ElMessageBox.confirm('确认要"' + text + '":"' + row.userName + '"用户吗?', '警告', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
 			})
 				.then(function () {
-					return changeUserStatus(row.id, row.userStatus);
+					return changeUserStatus(row.id, row.status);
 				})
 				.then(() => {
 					ElMessage.success(text + '成功');
 				})
 				.catch(function () {
-					row.userStatus = row.userStatus === 0 ? 1 : 0;
+					row.status = row.status === 0 ? 1 : 0;
 				});
 		};
 		/** 重置按钮操作 */