国际化依赖升级并适配

package-lock.json

@@ -2812,6 +2812,29 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
+      },
+      "dependencies": {
+        "@vue/vue-loader-v15": {
+          "version": "npm:vue-loader@15.11.1",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
+          "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
+          "dev": true,
+          "requires": {
+            "@vue/component-compiler-utils": "^3.1.0",
+            "hash-sum": "^1.0.2",
+            "loader-utils": "^1.1.0",
+            "vue-hot-reload-api": "^2.3.0",
+            "vue-style-loader": "^4.1.0"
+          },
+          "dependencies": {
+            "hash-sum": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+              "dev": true
+            }
+          }
+        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2969,27 +2992,6 @@
         "eslint-plugin-import": "^2.25.3"
       }
     },
-    "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.11.1",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
-      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-          "dev": true
-        }
-      }
-    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",

src/HDrpManagement/projectData/index.vue

@@ -3,7 +3,7 @@
   <normalLayout style="background: #f8f8f8;">
     <template #refresh>
       <div style="margin-right:15px">
-        <el-button style="font-size:14px !important;color: #3874f6" type="text" size="small" @click="$refs.scroll.wrap.scrollTop=0">返回顶部</el-button>
+        <el-button style="font-size:14px !important;color: #3874f6" type="text" size="small" @click="$refs.scroll.wrap.scrollTop=0">{{ $t('返回顶部') }}</el-button>
       </div>
       <!-- <i class="el-icon-refresh-right" @click="refresh" v-loading.fullscreen.lock="fullscreenLoading"></i> -->
     </template>

src/HDrpManagement/salerpriceData/index.vue

@@ -8,7 +8,7 @@
           type="text"
           size="small"
           @click="$refs.rollRef.scrollTop = 0"
-          >返回顶部</el-button
+          >{{ $t('返回顶部') }}</el-button
         >
       </div>
       <!-- <i class="el-icon-refresh-right" @click="refresh" v-loading.fullscreen.lock="fullscreenLoading"></i> -->

src/components/newLayout/index.vue

@@ -29,8 +29,7 @@
             ref="divContent"
             :style="{ marginTop: divTop, height: divHeight }"
           >
-            <keep-alive :include="pageCache">
-            </keep-alive>
+            <keep-alive :include="pageCache"> </keep-alive>
           </div>
         </div>
       </div>
@@ -95,8 +94,7 @@ export default {
       this.$refs.AsideTemp.systemList = JSON.parse(
         sessionStorage.getItem("module_info")
       );
-      //部分路由切换后依旧不刷新，强制重新渲染
-      if(["salesfunnel"].includes(this.$route.name)) this.dateNow = false
+      this.dateNow = false;
       this.$nextTick(() => {
         this.debouned();
         this.dateNow = Date.now();

src/components/newLayout/modules/header.vue

@@ -141,7 +141,7 @@ export default {
       languagename: "",
     };
   },
-  props:['onRender'],
+  props: ["onRender"],
   computed: {
     ...mapGetters({
       siteinfo: "siteinfo",
@@ -235,6 +235,8 @@ export default {
         val: this.searchValue,
       });
 
+      //activeApp
+
       this.$router.push({ path: clickApp[0].path });
     },
 
@@ -276,8 +278,15 @@ export default {
                 return e.systemmoduleid == active_modules.systemmoduleid;
               });
               if (item) {
-                console.log("重新获取权限",item)
                 active_modules = item;
+                try {
+                  let activeApp = item.apps.find(
+                    (v) =>
+                      v.systemmoduleid ==
+                      this.$store.getters.activeApp.systemmoduleid
+                  );
+                  this.$store.commit("activeApp", activeApp);
+                } catch (error) {}
               }
             });
             sessionStorage.setItem("module_info", JSON.stringify(res.data));
@@ -286,7 +295,7 @@ export default {
               JSON.stringify(active_modules)
             );
             this.basicData.querySite_Parameter();
-            this.$emit('onRender')
+            this.$emit("onRender");
           });
       });
     },

src/components/normal-basic-layout-new/normal.vue

@@ -2,7 +2,7 @@
   <div class="basic__layout__panel">
     <div style="padding:16px 16px 0 16px;" class="flex-align-center flex-between" >
       <div class="flex-align-center ">
-        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
+        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{$t(customTitle ? customTitle : activeApp.meta.title)}}&nbsp;
           <div v-if="!customTitle" style="display:inline">
             <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
             <img width="20" v-else src="@/assets/icons/uncoll.svg" @click="addToAsideBar" alt="">

src/components/normal-basic-layout-new/normalBook.vue

@@ -4,7 +4,7 @@
       <div class="layout-header-panel container normal-panel">
         <div class="flex-align-center flex-between">
           <div class="normal-margin flex-align-center">
-            <div v-if="activeApp" style="font-size:26px;font-weight:300;flex-shrink:0">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
+            <div v-if="activeApp" style="font-size:26px;font-weight:300;flex-shrink:0">{{$t(customTitle ? customTitle : activeApp.meta.title)}}&nbsp;
               <!-- <i v-if="!customTitle" @click="addToAsideBar" style="color:#999" :class="showAppCollection()?'el-icon-star-on collection':'el-icon-star-off'"></i> -->
               <div v-if="!customTitle" style="display:inline">
                 <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">

src/components/normal-basic-layout-new/normalData.vue

@@ -2,7 +2,7 @@
   <div class="basic__layout__panel">
     <div style="padding:16px 16px 0 16px;" class="flex-align-center flex-between" >
       <div class="flex-align-center ">
-        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
+        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{$t(customTitle ? customTitle : activeApp.meta.title)}}&nbsp;
           <div v-if="!customTitle" style="display:inline">
             <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
             <img width="20" v-else src="@/assets/icons/uncoll.svg" @click="addToAsideBar" alt="">

src/components/normal-basic-layout-new/normalNew.vue

@@ -2,7 +2,7 @@
   <div class="basic__layout__panel">
     <div style="padding:16px 16px 16px 16px;" class="flex-align-center flex-between" >
       <div class="flex-align-center ">
-        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
+        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{$t(customTitle ? customTitle : activeApp.meta.title)}}&nbsp;
           <div v-if="!customTitle" style="display:inline">
             <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
             <img width="20" v-else src="@/assets/icons/uncoll.svg" @click="addToAsideBar" alt="">

src/components/normal-basic-layout/normalBook.vue

@@ -4,7 +4,7 @@
       <div class="layout-header-panel container normal-panel">
         <div class="flex-align-center flex-between">
           <div class="normal-margin flex-align-center">
-            <div v-if="activeApp" style="font-size:26px;font-weight:300;flex-shrink:0">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
+            <div v-if="activeApp" style="font-size:26px;font-weight:300;flex-shrink:0">{{$t(customTitle ? customTitle : activeApp.meta.title)}}&nbsp;
               <!-- <i v-if="!customTitle" @click="addToAsideBar" style="color:#999" :class="showAppCollection()?'el-icon-star-on collection':'el-icon-star-off'"></i> -->
               <div v-if="!customTitle" style="display:inline">
                 <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">

src/components/normal-basic-layout/normalData.vue

@@ -2,7 +2,7 @@
   <div class="basic__layout__panel">
     <div style="padding:16px 16px 0 16px;" class="flex-align-center flex-between" >
       <div class="flex-align-center ">
-        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
+        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{$t(customTitle ? customTitle : activeApp.meta.title)}}&nbsp;
           <div v-if="!customTitle" style="display:inline">
             <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
             <img width="20" v-else src="@/assets/icons/uncoll.svg" @click="addToAsideBar" alt="">

src/components/normal-basic-layout/normalNew.vue

@@ -2,7 +2,7 @@
   <div class="basic__layout__panel">
     <div style="padding:16px 16px 16px 16px;" class="flex-align-center flex-between" >
       <div class="flex-align-center ">
-        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
+        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{$t(customTitle ? customTitle : activeApp.meta.title)}}&nbsp;
           <div v-if="!customTitle" style="display:inline">
             <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
             <img width="20" v-else src="@/assets/icons/uncoll.svg" @click="addToAsideBar" alt="">
@@ -63,6 +63,7 @@ export default {
   mounted () {
   },
   created () {
+    console.log("123123123",this.activeApp)
   }
 }
 

src/views/clueData/index.vue

@@ -2,7 +2,7 @@
   <div style="background: #f8f8f8;">
     <normalLayout>
       <template #refresh>
-        <el-button size="mini" type="text" style="margin-right: 15px;color: #3874f6;font-size: 14px" @click="toTop">返回顶部</el-button>
+        <el-button size="mini" type="text" style="margin-right: 15px;color: #3874f6;font-size: 14px" @click="toTop">{{ $t('返回顶部') }}</el-button>
 <!--        <i class="el-icon-refresh-right"></i>-->
       </template>
       <template #content>

src/views/salesData/index.vue

@@ -2,7 +2,7 @@
   <div style="background: #f8f8f8;">
     <normalLayout>
       <template #refresh>
-        <el-button size="mini" type="text" style="margin-right: 15px;color: #3874f6;font-size: 14px" @click="toTop">返回顶部</el-button>
+        <el-button size="mini" type="text" style="margin-right: 15px;color: #3874f6;font-size: 14px" @click="toTop">{{ $t('返回顶部') }}</el-button>
 <!--        <i class="el-icon-refresh-right"></i>-->
       </template>
       <template #content>