瀏覽代碼

修改bug

bill 1 年之前
父節點
當前提交
d87cce585c

+ 1 - 1
src/app/criminal/view/example/edit.vue

@@ -17,7 +17,7 @@ import { ElMessage } from "element-plus";
 import { QuiskExpose } from "@/helper/mount";
 
 const props = defineProps<{ example?: Example }>();
-const bindExample = ref<Example>(props.example || ({} as Example));
+const bindExample = ref<Example>(props.example ? { ...props.example } : ({} as Example));
 
 defineExpose<QuiskExpose>({
   async submit() {

+ 2 - 2
src/app/fire/view/dispatch/editFire.vue

@@ -81,7 +81,7 @@ import { QuiskExpose } from "@/helper/mount";
 
 const props = defineProps<{ fire?: Fire }>();
 
-const bindFire = ref<Fire>(props.fire || ({} as Fire));
+const bindFire = ref<Fire>(props.fire ? { ...props.fire } : ({} as Fire));
 
 const fireReason = genCascaderValue(bindFire, "fireReason");
 const projectSite = genCascaderValue(bindFire, "projectSite");
@@ -125,4 +125,4 @@ defineExpose<QuiskExpose>({
   },
 });
 </script>
-@/hook/helper/cascader@/helper/mount
+@/hook/helper/cascader@/helper/mount

+ 13 - 12
src/store/user.ts

@@ -1,5 +1,5 @@
 import { getLocal, changSaveLocal } from "@/util/localUtil";
-import { ref } from "vue";
+import { ref, watchEffect } from "vue";
 import {
   PaggingReq,
   PaggingRes,
@@ -46,7 +46,6 @@ 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", ""),
@@ -139,13 +138,15 @@ changSaveLocal("fuseToken", () => user.value.token);
 changSaveLocal("info", () => user.value.info);
 
 // 设置全局请求hook
-setAuthHook(() => ({
-  token: user.value.token,
-  userId: user.value.info.id,
-  clear: () => {
-    user.value = {
-      token: "",
-      info: {} as UserInfo,
-    };
-  },
-}));
+setAuthHook(() => {
+  return {
+    token: user.value.token,
+    userId: user.value.info.id,
+    clear: () => {
+      user.value = {
+        token: "",
+        info: {} as UserInfo,
+      };
+    },
+  };
+});

+ 1 - 1
src/view/organization/edit.vue

@@ -76,7 +76,7 @@ const queryPathById = (id: string, current: Organization[]): string[] | null =>
   }
   return null;
 };
-const bindDept = ref<Organization>(props.dept || ({} as Organization));
+const bindDept = ref<Organization>((props.dept ? { ...props.dept } : {}) as Organization);
 const organTrees = ref<Organization[]>([]);
 const superiorValue = computed(() => {
   if (bindDept.value.parentId) {

+ 1 - 1
src/view/user/edit.vue

@@ -86,7 +86,7 @@ import { QuiskExpose } from "@/helper/mount";
 const props = defineProps<{ user?: UserInfo }>();
 
 const isAdd = computed(() => !props.user?.id);
-const bindUser = ref<UserInfo>(props.user || ({} as UserInfo));
+const bindUser = ref<UserInfo>(props.user ? { ...props.user } : ({} as UserInfo));
 const plainFlag = ref(false);
 const disabledChangeDept = ref(false);
 const roleOptions = ref<{ label: string; value: string }[]>([]);

+ 2 - 2
vite.config.ts

@@ -78,10 +78,10 @@ export default defineConfig({
       },
       "/laser": {
         target: dev
-          ? "https://uat-laser.4dkankan.com/uat"
+          ? "https://uat-laser.4dkankan.com"
           : "https://laser.4dkankan.com",
         changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/swss`), ""),
+        rewrite: (path) => path.replace(new RegExp(`^/laser`), "/laser"),
       },
       "/fdkk": {
         target: dev