修改bug

src/store/user.ts

@@ -20,6 +20,7 @@ import {
 import { QuoteScene } from "./scene";
 import { encodePwd } from "@/util";
 import { countdownFactory } from "@/hook/countdown";
+import { appConstant } from "@/app";
 
 export type UserInfo = {
   avatar: string;
@@ -46,8 +47,9 @@ export const getUserPagging = async (params: PaggingReq<Params>) =>
 export const getUsers = async (deptId?: string) =>
   (await axios.get<UserInfo[]>(getUserListSelect, { params: { deptId } })).data;
 // 当前用户的信息
+
 export const user = ref({
-  token: getLocal("fuseToken", ""),
+  token: getLocal(`${appConstant.deptId}Token`, ""),
   info: getLocal("info", {} as UserInfo),
 });
 
@@ -133,7 +135,7 @@ export const transformSWToken = async (scene: QuoteScene) => {
   return res.data.token;
 };
 
-changSaveLocal("fuseToken", () => user.value.token);
+changSaveLocal(`${appConstant.deptId}Token`, () => user.value.token);
 changSaveLocal("info", () => user.value.info);
 
 // 设置全局请求hook

src/view/camera/bind.vue

@@ -46,6 +46,13 @@ const users = ref<UserInfo[]>([]);
 watchEffect(async () => {
   if (bindCamera.value.deptId) {
     users.value = await getUsers(bindCamera.value.deptId);
+    if (
+      bindCamera.value.userId &&
+      !users.value.some((user) => user.id === bindCamera.value.userId)
+    ) {
+      bindCamera.value.userId = undefined as any;
+    }
+
     if (users.value.length === 1 && !bindCamera.value.userId) {
       bindCamera.value.userId = users.value[0].id;
     }

src/view/organization/edit.vue

@@ -94,7 +94,7 @@ const updateSuperiorValue = (value: string[]) => {
 defineExpose<QuiskExpose>({
   async submit() {
     const { name, deptType, parentId, phone } = bindDept.value;
-    if (!name.trim()) {
+    if (!name || !name.trim()) {
       ElMessage.error("组织名称不能为空！");
       throw "组织名称不能为空！";
     } else if (!deptType) {
@@ -103,7 +103,7 @@ defineExpose<QuiskExpose>({
     } else if (!parentId) {
       ElMessage.error("上级组织不能为空！");
       throw "上级组织不能为空！";
-    } else if (phone && !PHONE.REG.test(phone)) {
+    } else if (!phone || !PHONE.REG.test(phone)) {
       ElMessage.error("请输入11位正确手机号。");
       throw "请输入11位正确手机号。";
     }

src/view/system/updatePsw.vue

@@ -81,6 +81,10 @@ defineExpose<QuiskExpose>({
       openErrorMsg(PSW.tip);
       throw PSW.tip;
     }
+    if (!data.value.code || !data.value.code.trim()) {
+      openErrorMsg("请输入验证码");
+      throw "请输入验证码";
+    }
 
     await updatePassword({
       userName: data.value.phone,

src/view/user/edit.vue

@@ -103,7 +103,7 @@ const deptPath = ref<string[]>([]);
 
 defineExpose<QuiskExpose>({
   async submit() {
-    if (!bindUser.value.nickName.trim()) {
+    if (!bindUser.value.nickName || !bindUser.value.nickName.trim()) {
       ElMessage.error("请输入用户姓名");
       throw "请输入用户姓名";
     }

src/view/user/index.vue

@@ -41,8 +41,8 @@
           {{ state.pag.size * (state.pag.currentPage - 1) + $index + 1 }}
         </div>
       </el-table-column>
-      <el-table-column label="手机号（账号）" prop="userName"></el-table-column>
-      <el-table-column label="用户名称" prop="nickName"></el-table-column>
+      <el-table-column label="用户账号（手机号）" prop="userName"></el-table-column>
+      <el-table-column label="用户姓名" prop="nickName"></el-table-column>
       <el-table-column label="所属架构" prop="deptName"></el-table-column>
       <el-table-column label="角色" prop="roleName"></el-table-column>
       <el-table-column label="状态" v-slot:default="{ row }">
@@ -108,7 +108,7 @@ const { state, queryReset, refresh, changPageCurrent, changPageSize } = usePaggi
 const delInfo = async (row: UserInfo) => {
   if (
     await confirm(
-      "用户被删除后，无法登陆使用，无法编辑场景（可将该用户关联的相机绑定到其他管理员），确认要删除组织吗？"
+      "用户被删除后，无法登录使用，无法编辑场景（可将该用户关联的相机绑定到其他管理员），确认要删除用户吗？"
     )
   ) {
     delUser(row.id);