feat:cache

src/apis/user/axios.js

@@ -54,12 +54,15 @@ export default async (
         config.data.token = getToken()
       }
       
-      //todo:区分是否超管决定传递关联公司
-      // const relaComNo = store.state.user.currentCompany;
-      // const { noCompany } = config.data;
-      // noCompany ? "" : relaComNo
-      config.data.relaComNo = "";
-      // noCompany && delete config.data['noCompany']
+      const { currentCompany, isSupertube } = store.state.user;
+      const { noRelation } = config.data;
+      console.log(config.data);
+
+      //决定传递关联公司:非超管用户且单独的请求中data中没有设置noRelation
+      const isAllowRelaComNo = !isSupertube && !noRelation;
+      console.log(isAllowRelaComNo)
+      config.data.relaComNo = isAllowRelaComNo ? currentCompany : '';
+      if ('noRelation' in config.data) delete config.data.noRelation    
       return config
     },
     error => {

src/apis/user/index.js

@@ -2,10 +2,14 @@ import http from "@/apis/user/axios";
 import urlConfig from "@/apis/url-config";
 // 登录
 export function login(data) {
+  const _data = {
+    ...data,
+    noRelation: true
+  }
   return http({
     url: `${urlConfig.baseURL}admin/login`,
     method: "post",
-    data,
+    data: _data,
   });
 }
 // 获取个人信息
@@ -34,13 +38,14 @@ export function dingdingdetail(data) {
 }
 // 获取账号详情
 export function usergetinfo(data) {
+  const _data = {
+    ...data,
+    noRelation: true
+  }
   return http({
     url: `${urlConfig.baseURL}admin/userinfo`,
     method: "post",
-    data:{
-      noCompany:true,
-      ...data
-    },
+    data: _data
   });
 }
 // 获取角色流程节点详情
@@ -53,7 +58,7 @@ export function roleProcessInfo(data) {
 }
 
 //获取用户的企业列表
-export function requsetCompanyList(data){
+export function requsetCompanyList(data) {
   return http({
     url: `${urlConfig.baseURL}admin/businesslist`,
     method: "post",
@@ -62,7 +67,7 @@ export function requsetCompanyList(data){
 }
 
 //超管用户获取所有企业列表
-export function requsetSupertubeCompany(data){
+export function requsetSupertubeCompany(data) {
   return http({
     url: `${urlConfig.baseURL}admin/comprehensiveList`,
     method: "post",
@@ -71,7 +76,7 @@ export function requsetSupertubeCompany(data){
 }
 
 //普通用户获取绑定的企业列表
-export function requsetBindCompany(data){
+export function requsetBindCompany(data) {
   return http({
     url: `${urlConfig.baseURL}admin/userCompanyList`,
     method: "post",

src/layout/components/company-select/index.vue

@@ -70,14 +70,15 @@ export default {
   },
   computed: {
     ...mapState({
-      currentCompany: state => state.user.currentCompany
+      currentCompany: state => state.user.currentCompany,
+      isSupertube: state => state.user.isSupertube
     })
   },
   data() {
     return {
       companylist: [],
       ScrollWrapper: null,
-      inital: true,
+      initialization: true,
       state: {
         loading: false,
         noMore: false
@@ -113,20 +114,37 @@ export default {
     setCurrentCompany(currentCompany) {
       this.$emit("update:value", currentCompany);
       this.$emit("change", currentCompany);
-      //作为通用组件使用不设置全局选中公司
-      if (!this.global) return null;
+     
+     if (!this.global){
+         return null; //作为通用组件使用不设置全局选中公司
+      }
+
       this.$store.commit("user/setCurrentCompany", currentCompany);
       setUserCompany(currentCompany);
-      //非超管用户刷新路由
-      if (this.inital) return this.inital = false;
-      // this.changeRouterWithCompany();
+
+      if (this.initialization && !this.isSupertube) {
+        return (this.initialization = false); //超管用户&初始化不刷新路由
+      }
+
+      this.changeRouterWithCompany();
     },
-    changeRouterWithCompany() {
-      const { path, query: sourceQuery } = this.$route;
-      this.$router.replace("/reload?redirect=" + path, {
-        redirect: path,
-        sourceQuery:JSON.stringify(sourceQuery)
-      });
+    async changeRouterWithCompany() {
+      const { path, query } = this.$route;
+      query.redirect = path;
+      const keys = Object.keys(query).filter(key => key);
+
+      //1.保存query透传参数
+      let queryString = "";
+      const chunk = (qs, key, index) => {
+        const next = `${key}=${query[key]}${index === keys.length ? "" : "&"}`;
+        return qs + next;
+      };
+      //2.重新获取用户信息和菜单
+      const result = await this.$store.dispatch('user/getMenuList')
+      console.log(result);
+      
+      queryString = keys.reduce(chunk, "?");
+      this.$router.replace("/reload" + queryString);
     },
 
     getScrollWrapper() {
@@ -150,7 +168,7 @@ export default {
       const { loading, noMore } = this.state;
 
       //是否允许下拉加载
-      const isAllowLoad =  !loading && !noMore;
+      const isAllowLoad = !loading && !noMore;
       if (height + scrollTop >= scrollHeight && isAllowLoad) {
         const list = await this.loadMore();
         this.companylist = [...this.companylist, ...list];
@@ -160,13 +178,14 @@ export default {
     async loadMore() {
       this.state.loading = true;
       //todo:区分是否超管用户请求不同接口
-      const { data } = await requsetSupertubeCompany(this.params)
+      const { data } = await requsetSupertubeCompany(this.params);
       this.state.loading = false;
       //是否越界
-      const isTransboundary = this.companylist.length >= Number(data.count)
+      const isTransboundary = this.companylist.length >= Number(data.count);
+
       if (isTransboundary || data.list.length < 10) {
-        this.state.noMore = true
-        this.sate.lading = false
+        this.state.noMore = true;
+        this.sate.lading = false;
         return [];
       }
       this.params.page++;

src/mixins/reloadData.js

@@ -6,7 +6,8 @@ import { mapState } from "vuex";
 const reloadData = {
   computed: {
     ...mapState({
-      currentCompany: (state) => state.user.currentCompany
+      currentCompany: (state) => state.user.currentCompany,
+      isSupertube: state => state.user.isSupertube
     })
   },
   methods:{
@@ -19,11 +20,9 @@ const reloadData = {
   watch: {
     currentCompany: {
       handler() {
-        const context = this;
-        const { onCompanyChange,onCompanyChangeInner } = context;
-        //超管角色刷新列表 todo:区分是否超管 非超管不执行
-        const isSupertube = true;
-        if(!isSupertube) return null;
+        const vm = this;
+        const { onCompanyChange, onCompanyChangeInner } = vm;
+        if (!vm.isSupertube) return null //非超管用户不执行
         onCompanyChange ? onCompanyChange() : onCompanyChangeInner();
       },
       //

src/store/modules/user.js

@@ -49,7 +49,8 @@ const state = {
   business_companyNo: get_business_companyNo() || "",
   private_field: get_private_field() || [],
   roleProcess: get_action_data() || [],
-  currentCompany: getUserCompany()
+  currentCompany: getUserCompany(),
+  isSupertube: false
 };
 const mutations = {
   SET_TOKEN: (state, token) => {
@@ -105,6 +106,9 @@ const mutations = {
   },
   setCurrentCompany(state,val){
     state.currentCompany = val;
+  },
+  setSupertube(state, val) {
+    state.isSupertube = val;
   }
 };
 
@@ -154,11 +158,12 @@ const actions = {
       if (!getToken()) {
         resolve("noToken");
       } else {
-        const { ucode, udata, umsg } = await getUserInfo();
+        const { ucode, udata, umsg, isSupertube = true } = await getUserInfo();
 
         if (ucode >= 100 && ucode <= 104) {
           resolve("noToken");
         } else if (ucode !== 0) {
+          commit('user/setSupertube', isSupertube)
           resolve({ code: ucode, data: udata, massage: umsg });
         } else {
         
@@ -238,6 +243,7 @@ const actions = {
 };
 async function getUserInfo() {
   const { code, data, meaasge } = await usergetinfo({});
+  //todo:从用户详情中获取是否超管保存到全局
   return {
     ucode: code,
     udata: data,
@@ -246,7 +252,6 @@ async function getUserInfo() {
 }
 
 async function initalUserInfo() {
-
   const { code, data } = await usergetinfo({});
   if (code === 0) {
     store.commit("user/SET_NAME", data.nickname);

src/views/reload/index.vue

@@ -1,11 +1,20 @@
 <script>
 export default {
+  render:() => null,
   created() {
     const { query } = this.$route;
-    this.$router.replace(query.redirect);
-  },
-  render: function() {
-    return "";
+    let redirect = query.redirect;
+    if (redirect) delete query.redirect;
+    const keys = Object.keys(query).filter(key => key);
+    let queryString = "";
+
+    const chunk = (qs, key, index) => {
+      const next = `${key}=${query[key]}${index === keys.length ? "" : "&"}`;
+      return qs + next;
+    };
+
+    queryString = keys.reduce(chunk, "?");
+    this.$router.replace(redirect + queryString);
   }
-};
+}
 </script>

src/views/serviceParam/terrace/index.vue

@@ -224,8 +224,8 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      const tran =
-        this.$store.getters.btnList.find((i) => i.menu_route == "terrace") || {};
+      const { btnList } = this.$store.getters;
+      const tran = btnList.find((i) => i.menu_route == "terrace") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },