优化

src/components/uploadFile/index.vue

@@ -69,6 +69,7 @@ const uploadList: any = computed({
 });
 const headers = {
   Authorization: "Bearer " + store.getters.access_token
+  // "Content-Type": "multipart/form-data;charset=UTF-8"
 };
 const fileData = {
   bucket: "reservoir"

src/hooks/detailQuery/getQuery.ts

@@ -0,0 +1,6 @@
+import store from "@/store";
+
+export function getQuery(path: string) {
+  const query = store.getters.detailQuery;
+  return query[path] || {};
+}

src/hooks/detailQuery/index.ts

@@ -0,0 +1,4 @@
+import { setQuery } from "./setQuery";
+import { getQuery } from "./getQuery";
+
+export { setQuery, getQuery };

src/hooks/detailQuery/setQuery.ts

@@ -0,0 +1,10 @@
+import store from "@/store";
+import router from "@/router";
+import { nextTick } from "vue";
+
+export function setQuery(path: string, query: any) {
+  store.commit("ADD_QUERY", { path, query });
+  nextTick(() => {
+    router.push({ path });
+  });
+}

src/store/getters.ts

@@ -8,5 +8,7 @@ export default {
   tagWel: (state: any) => state.tag.tagWel,
   tagList: (state: any) => state.tag.tagList,
 
-  website: (state: any) => state.common.website
+  website: (state: any) => state.common.website,
+
+  detailQuery: (state: any) => state.query.detailQuery
 };

src/store/index.ts

@@ -3,12 +3,14 @@ import getters from "./getters";
 import user from "./modules/user";
 import tag from "./modules/tag";
 import common from "./modules/common";
+import query from "./modules/query";
 
 export default createStore({
   getters,
   modules: {
     user,
     tag,
-    common
+    common,
+    query
   }
 });

src/store/modules/query.ts

@@ -0,0 +1,27 @@
+import cache from "@/utils/cache";
+
+export default {
+  state: () => ({
+    detailQuery: cache.session.getJSON("detailQuery") || {}
+  }),
+  mutations: {
+    ADD_QUERY: (state: any, query: any) => {
+      state.detailQuery[query.path] = query.query;
+      cache.session.setJSON("detailQuery", state.detailQuery);
+    },
+    DEL_QUERY: (state: any, path: string) => {
+      delete state.detailQuery[path];
+      cache.session.setJSON("detailQuery", state.detailQuery);
+    },
+    DEL_ALL_QUERY: (state: any) => {
+      state.detailQuery = {};
+      cache.session.setJSON("detailQuery", state.detailQuery);
+    },
+    DEL_OTHER_QUERY: (state: any, path: string) => {
+      state.detailQuery = {
+        [path]: state.detailQuery[path]
+      };
+      cache.session.setJSON("detailQuery", state.detailQuery);
+    }
+  }
+};

src/store/modules/tag.ts

@@ -1,10 +1,11 @@
 import cache from "@/utils/cache";
-import { diff } from "@/utils/util";
 import website from "@/const/website";
-import { ITagType } from "@/const/interface_type";
+
 import { ref } from "vue";
+import { diff } from "@/utils/util";
+import { ITagType } from "@/const/interface_type";
+import store from "..";
 
-const isFirstPage = website.isFirstPage;
 const tagWel = website.fistPage;
 const tagObj = ref<ITagType>({
   label: "", // 标题名称
@@ -14,20 +15,6 @@ const tagObj = ref<ITagType>({
   // group: [] // 分组
 });
 
-// 处理首个标签
-function setFistTag(list: ITagType[]) {
-  if (list.length === 1) {
-    list[0].close = false;
-  } else {
-    list.forEach((ele) => {
-      if (ele.value === tagWel.value && isFirstPage === false) {
-        ele.close = false;
-      } else {
-        ele.close = true;
-      }
-    });
-  }
-}
 export default {
   state: () => ({
     tagList: cache.session.getJSON("tagList") || [],
@@ -40,29 +27,31 @@ export default {
       cache.session.setJSON("tag", state.tag);
       if (state.tagList.some((ele: any) => diff(ele, action))) return;
       state.tagList.push(action);
-      setFistTag(state.tagList);
       cache.session.setJSON("tagList", state.tagList);
     },
     DEL_TAG: (state: any, action: ITagType) => {
+      const query = store.getters.detailQuery;
+      const isDel = Object.keys(query).find((item) => action.value.includes(item));
+      if (isDel) store.commit("DEL_QUERY", isDel);
       state.tagList = state.tagList.filter((item: ITagType) => {
         return !diff(item, action);
       });
-      setFistTag(state.tagList);
       cache.session.setJSON("tagList", state.tagList);
     },
     DEL_ALL_TAG: (state: any) => {
       state.tagList = [];
+      store.commit("DEL_ALL_QUERY");
       cache.session.setJSON("tagList", state.tagList);
     },
     DEL_TAG_OTHER: (state: any) => {
+      const query = store.getters.detailQuery;
+      const isRetain = Object.keys(query).find((item) => state.tag.value.includes(item));
+      if (isRetain) store.commit("DEL_OTHER_QUERY", isRetain);
       state.tagList = state.tagList.filter((item: ITagType) => {
         if (item.value === state.tag.value) {
           return true;
-        } else if (!website.isFirstPage && item.value === website.fistPage.value) {
-          return true;
         }
       });
-      setFistTag(state.tagList);
       cache.session.setJSON("tagList", state.tagList);
     }
   },