bill hai 1 ano
pai
achega
b5f977750f

+ 1 - 0
src/request/urls.ts

@@ -11,6 +11,7 @@ export const getListByDeptId = "/fusion/web/role/getAllRoleList";
 export const userLogin = "/fusion/fdLogin";
 // 权限
 export const userperInfo = "/fusion/web/user/getPerInfo";
+export const userInfo = "/fusion/web/user/getUserInfo";
 // 注册
 export const userReg = "/web/user/register";
 // 发送注册短信

+ 2 - 1
src/store/role.ts

@@ -127,7 +127,8 @@ export const refreshRole = async () => {
   roleLevel.value = user.value.info.isAdmin
     ? RoleLevel.systemAdmin
     : RoleLevel.corps;
-  setPermission(userPermListCover((await axios.get(userperInfo)).data));
+  // console.log(, user.value.info.permsList);
+  setPermission(userPermListCover(user.value.info.permsList));
 
   // const { perm, level } = await getRole(roleId.value);
   // setPermission(serviceCoverUserPermission(perm as any));

+ 15 - 6
src/store/system.ts

@@ -1,4 +1,9 @@
-import { axios, userLogin, uploadFile as uploadFileUrl } from "@/request";
+import {
+  axios,
+  userLogin,
+  uploadFile as uploadFileUrl,
+  userInfo,
+} from "@/request";
 import { encodePwd } from "@/util";
 import { user } from "./user";
 import { refreshRole } from "./role";
@@ -16,21 +21,25 @@ export const desc = ref(appConstant.desc);
 
 watchEffect(() => (document.title = title.value + " | " + desc.value));
 
+const refreshUserInfo = async (data: any) => {
+  user.value.info = data;
+  await refreshRole();
+};
+
 export const login = async (props: LoginProps) => {
   const res = await axios.post(userLogin, {
     ...props,
     deptId: appConstant.deptId,
     password: encodePwd(props.password),
   });
-
   user.value.token = res.data.token;
-  user.value.info = res.data.tmUser;
-
-  await refreshRole();
+  refreshUserInfo(res.data.tmUser);
 };
 
 if (user.value.token) {
-  refreshRole();
+  axios.get(userInfo).then((res) => {
+    refreshUserInfo(res.data);
+  });
 }
 
 export const uploadFile = async (file: File) => {

+ 1 - 0
src/view/camera/index.vue

@@ -97,6 +97,7 @@ const del = async (camera: Camera) => {
     )
   ) {
     await delCamera(camera);
+    refresh();
     ElMessage.success("解绑成功");
   }
 };

+ 1 - 0
src/view/case/addCaseFile.vue

@@ -18,6 +18,7 @@
         class="upload-demo"
         :multiple="false"
         :limit="1"
+        :disabled="!!file"
         :before-upload="upload"
         :http-request="() => {}"
         :on-preview="previewFile"

+ 1 - 1
src/view/case/addScenes.vue

@@ -23,7 +23,7 @@
           v-if="pagging.state.query.type === SceneType.SWMX"
         />
         <el-table-column label="拍摄时间" prop="createTime" v-slot:default="{ row }">
-          {{ row.createTime }}
+          {{ row.createTime.substr(0, 16) }}
         </el-table-column>
       </el-table>
     </template>

+ 1 - 0
src/view/case/caseFile.vue

@@ -35,6 +35,7 @@
             v-model="row.filesTitle"
             placeholder="请输入文件名"
             focus
+            :maxleng="50"
             style="width: 280px"
           >
             <template #append>

+ 3 - 1
src/view/case/sceneList.vue

@@ -10,7 +10,9 @@
     <el-table-column label="类型" v-slot:default="{ row }: { row: Scene }">
       {{ SceneTypeDesc[row.type] }}
     </el-table-column>
-    <el-table-column label="拍摄/创建时间" prop="createTime"></el-table-column>
+    <el-table-column label="拍摄/创建时间" prop="createTime" v-slot:default="{ row }">
+      {{ row.createTime.substr(0, 16) }}
+    </el-table-column>
     <el-table-column label="操作" v-slot:default="{ row }: { row: Scene }">
       <span
         class="oper-span"

+ 1 - 0
src/view/system/updatePsw.vue

@@ -31,6 +31,7 @@
       <el-input
         v-model="data.password"
         type="password"
+        :maxlength="16"
         placeholder="请输入8-16位数字、英文大小写组合"
       ></el-input>
     </el-form-item>

+ 8 - 1
src/view/user/index.vue

@@ -125,7 +125,14 @@ const editHandler = async (row: UserInfo) => {
   if (!row.status) {
     return ElMessage.error("请先启用用户");
   }
-  (await editUser({ user: row })) && refresh();
+  if (await editUser({ user: row })) {
+    if (row.id === user.value.info.id) {
+      console.error("修改自己");
+      location.reload();
+    } else {
+      refresh();
+    }
+  }
 };
 
 const switchUserStatus = async (row: UserInfo) => {

+ 1 - 1
src/view/vrmodel/sceneContent.vue

@@ -19,7 +19,7 @@
     <el-table-column label="S/N码" prop="snCode"></el-table-column>
     <!-- <el-table-column label="浏览数量" prop="viewCount"></el-table-column> -->
     <el-table-column label="拍摄时间" prop="createTime" v-slot:default="{ row }">
-      {{ row.createTime }}
+      {{ row.createTime.substr(0, 16) }}
     </el-table-column>
     <el-table-column label="状态" v-slot:default="{ row }: { row: QuoteScene }">
       {{ QuoteSceneStatusDesc[row.status] }}

+ 1 - 1
vite.config.ts

@@ -3,7 +3,7 @@ import vue from "@vitejs/plugin-vue";
 import { resolve } from "path";
 import ElementPlus from "unplugin-element-plus/vite";
 
-let app = "criminal";
+let app = "fire";
 if (process.argv.length > 3) {
   app = process.argv[process.argv.length - 1].trim();
 }