bill 9 tháng trước cách đây
mục cha
commit
4831a95224
4 tập tin đã thay đổi với 27 bổ sung20 xóa
  1. 8 1
      src/App.vue
  2. 2 0
      src/request/index.ts
  3. 4 14
      src/view/layout/nav.vue
  4. 13 5
      src/view/relics-scene/index.vue

+ 8 - 1
src/App.vue

@@ -13,7 +13,8 @@
 <script lang="ts" setup>
 import Locale from "@/config/locale.vue";
 import { ElLoading } from "element-plus";
-import { lifeHook } from "./request/state";
+import { errorHook, lifeHook } from "./request/state";
+import { router } from "./router";
 
 let loading: ReturnType<typeof ElLoading.service> | null = null;
 let timeout: ReturnType<typeof setTimeout>;
@@ -44,4 +45,10 @@ lifeHook.push({
     }
   },
 });
+errorHook.push((code) => {
+  console.error(code);
+  if (code === 4008) {
+    router.replace({ name: "login" });
+  }
+});
 </script>

+ 2 - 0
src/request/index.ts

@@ -149,6 +149,8 @@ export const addRelicsFetch = (relics: Relics) => {
   });
 };
 
+
+
 export const delRelicsFetch = (relicsId: number) =>
   sendFetch(URL.delRelics, {
     method: "post",

+ 4 - 14
src/view/layout/nav.vue

@@ -33,12 +33,8 @@
 
           <template #dropdown>
             <el-dropdown-menu>
-              <el-dropdown-item @click="passwordHandler"
-                >修改密码</el-dropdown-item
-              >
-              <el-dropdown-item @click="logoutHandler"
-                >退出登录</el-dropdown-item
-              >
+              <el-dropdown-item @click="passwordHandler">修改密码</el-dropdown-item>
+              <el-dropdown-item @click="logoutHandler">退出登录</el-dropdown-item>
             </el-dropdown-menu>
           </template>
         </el-dropdown>
@@ -99,23 +95,17 @@ const passwordHandler = async () => {
     userName: "",
     roleNames: "",
   });
-  const userinfo = {
+  const userinfo = ({
     ...userObj,
     ...user.value,
     phoneNum: user.value.userName,
-  } as any as UserType;
+  } as any) as UserType;
   console.log("passwordHandler", userinfo);
   await usersPasswordEdit({
     user: userinfo,
     submit: changePassword,
   });
 };
-errorHook.push((code) => {
-  if (code === 4008) {
-    router.replace({ name: "login" });
-  }
-});
-
 const showBack = computed(() => {
   if (name.value === "pano") {
     return true;

+ 13 - 5
src/view/relics-scene/index.vue

@@ -38,7 +38,8 @@ import { getSceneLink, getSliceLink, Scene, SceneType } from "@/store/scene";
 import { dateFormat } from "@/util";
 import { computed, ref, watch } from "vue";
 import ZoomIn from "@/assets/screen_s.svg";
-import { router } from "@/router";
+import { router, setDocTitle } from "@/router";
+import { sendFetch } from "@/request";
 
 const scenes = ref<Scene[]>([]);
 const currentId = ref<number>();
@@ -50,7 +51,7 @@ watch(currentId, async (id) => {
   if (!id) {
     url.value = void 0;
   } else {
-    url.value = await getSceneLink(current.value, true);
+    url.value = await getSceneLink(current.value, false);
   }
 });
 
@@ -58,13 +59,20 @@ const gotoSlice = () => {
   window.open(getSliceLink(relicsId.value));
 };
 
-const relicsId = computed(() => Number(router.currentRoute.value.params.relicsId));
+const relicsId = computed(
+  () => (router.currentRoute.value.params.relicsId as unknown) as number
+);
 const fetchScenes = async () => {
+  console.log(relicsId.value);
   if (!relicsId.value) {
-    scenes.value = [];
-    currentId.value = void 0;
     return;
   }
+  const res: any = await sendFetch(`/relics/artifact/getInfo/${relicsId.value}`, {});
+  if (!res) {
+    return router.replace({ name: "scene" });
+  }
+  setDocTitle(res.artifactName);
+
   await setTimeout(() => {}, 100);
   const codes = ["SG-wh-gSLkoDR4yki", "SG-wh-yr0t9VgE0FA", "SG-wh-w7a5kIyJ7PQ"];
   scenes.value = codes.map(