国际化修复切换bug

src/HDrpManagement/contractManage/components/tab.vue

@@ -2,7 +2,7 @@
   <div class="normal-panel tab__panel">
     <div>
       <el-tabs v-model="activeName">
-        <el-tab-pane v-for="(tab,index) in tabs" :key="index" :label="tab" :name="'tab' + index"></el-tab-pane>
+        <el-tab-pane v-for="(tab,index) in tabs" :key="index" :label="$t(tab)" :name="'tab' + index"></el-tab-pane>
         <el-tab-pane :label="$t('附件')" name="file"></el-tab-pane>
         <el-tab-pane :label="$t('操作记录')" name="log"></el-tab-pane>
       </el-tabs>

src/HDrpManagement/publicCustomer/index.vue

@@ -388,7 +388,7 @@ export default {
     },
     /*删除客户*/
     deleteData(){
-      this.$confirm(this.$t('是否确认彻底删除数据，一旦删除，无法恢复')+'?', this.$t('提示'), {
+      this.$confirm(this.$t('是否确认彻底删除数据,一旦删除,无法恢复')+'?', this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         closeOnClickModal:false,

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -318,7 +318,7 @@ export default {
     },
     /*删除客户*/
     deleteData(){
-      this.$confirm(this.$t('是否确认彻底删除数据，一旦删除，无法恢复')+'?', this.$t('提示'), {
+      this.$confirm(this.$t('是否确认彻底删除数据,一旦删除,无法恢复')+'?', this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         closeOnClickModal:false,

src/HManagement/addressList/addressBook/detail/index.vue

@@ -17,7 +17,7 @@
     <template slot="customOperation">
       <div class="inline-16">
         <portraitDetail ref="portraitDetail" v-if="portraitShow" :data="mainData"></portraitDetail>
-        <el-button type="primary" size="mini" @click="portraitShowFun" v-if="tool.checkAuth($route.name,'portrait')">360°画像</el-button>
+        <el-button type="primary" size="mini" @click="portraitShowFun" v-if="tool.checkAuth($route.name,'portrait')">{{ $t('360°画像') }}</el-button>
       </div>
       <edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :data="mainData" :group="group" :tagList="tagList" :disabled="mainData.disabled"  @onEditSuccess="queryMainData();$refs.detailsRef.$refs.tag.queryTag()"></edit>
       <el-button class="inline-16" v-if="tool.checkAuth($route.name,'delete')"  :type="!mainData.disabled?'':'primary'" size="mini"  @click="onDel" :disabled="!mainData.disabled">{{$t(`删 除`)}}</el-button>

src/HManagement/addressList/addressBook/detail/index.vuerecords.csv

@@ -1 +0,0 @@
-original,replaced,text

src/HManagement/clueManage/clue_private/modules/recall.vue

@@ -9,7 +9,7 @@ export default {
   props:['data'],
   methods:{
     onShow() {
-      this.$confirm('确定撤回当前线索吗'+'?', this.$t('提示'), {
+      this.$confirm(this.$t('确定撤回当前线索吗')+'?', this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         type: 'warning',

src/HManagement/ecycle/modules/delData.vue

@@ -10,7 +10,7 @@ export default {
   props:["sys_object","ownerid"],
   methods:{
     onshow() {
-      this.$confirm(this.$t('是否确认彻底删除数据,一旦删除，无法恢复')+'?', this.$t('提示'), {
+      this.$confirm(this.$t('是否确认彻底删除数据,一旦删除,无法恢复')+'?', this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         closeOnClickModal:false,

src/HManagement/marketing2/saler/area/detail/index.vue

@@ -18,7 +18,7 @@
       <div slot="customOperation" >
         <div class="inline-16">
           <PortraitDetail ref="PortraitDetail" v-if="PortraitShow" :data="mainData"></PortraitDetail>
-          <el-button type="primary" size="mini" @click="portraitShowFun">360°画像</el-button>
+          <el-button type="primary" size="mini" @click="portraitShowFun">{{ $t('360°画像') }}</el-button>
         </div>
         <!-- <mindmap class="inline-16" ref="mindmap" :id="mainData.hrid" name="saler"></mindmap> -->
         <el-button class="inline-16" v-if="tool.checkAuth($route.name,'delete')" type="primary" size="mini" @click="deleteSaler">{{$t(`删 除`)}}</el-button>

src/HManagement/notice/list/modules/message.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" size="mini" @click="query_message()">查看留言</el-button>
+    <el-button type="text" size="mini" @click="query_message()">{{$t('查看留言')}}</el-button>
     <el-drawer
         title="查看留言"
         :visible.sync="dialogTableVisible"
@@ -9,33 +9,33 @@
         size="1110px"
         append-to-body>
         <div class="container normal-panel">
-          <p style="font-size:16px;font-weight:bold">留言明细</p>
+          <p style="font-size:16px;font-weight:bold">{{$t('留言明细')}}</p>
         </div>
       <div class="container normal-panel" style="padding-top:0;display:flex">
         <div class="label_center">
-          <p class="search__label">用户类型:</p>
+          <p class="search__label">{{$t('用户类型')}}:</p>
           <el-select
             class="inline-16"
             size="small"
             v-model="status"
-            placeholder="请选择用户类型"
+            :placeholder="$t('请选择用户类型')"
             @change="handleSelectChange"
             clearable
           >
             <el-option
               v-for="(item,index) in accountType()"
-              :label="item.remarks"
+              :label="$t(item.remarks)"
               :value="item.value"
               :key="index"
             ></el-option>
           </el-select>
         </div>
         <div class="label_center">
-        <p class="search__label">留言时间:</p>
+        <p class="search__label">{{$t('留言时间')}}:</p>
           <time-select class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
         </div>
         <el-input
-            placeholder="请输入搜索内容"
+            :placeholder="$t('请输入搜索内容')"
             suffix-icon="el-icon-search"
             v-model="search"
             @keyup.native.enter="queryClick(params.content.pageNumber=1)"
@@ -50,10 +50,10 @@
         <tableLayout :layout="tablecols" ref="list" :data="list" :opwidth="200" :custom="true" height="calc(100vh - 300px)">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'usertype'">
-              <p v-if="scope.column.data.usertype === 1">企业员工</p>
-              <p v-else-if="scope.column.data.usertype === 21">经销商</p>
-              <p v-else-if="scope.column.data.usertype === 22">经销商员工</p>
-              <p v-else>未知</p>
+              <p v-if="scope.column.data.usertype === 1">{{$t('企业员工')}}</p>
+              <p v-else-if="scope.column.data.usertype === 21">{{$t('经销商')}}</p>
+              <p v-else-if="scope.column.data.usertype === 22">{{$t('经销商员工')}}</p>
+              <p v-else>{{$t('未知')}}</p>
             </div>
             <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
           </template>

src/HManagement/siteManage/securityConfig/index.vue

@@ -17,7 +17,7 @@
           <img width="72" height="72" src="../../../assets/icons/login_type_1.png" alt="">
           <div class="text-panel">
             <p class="explain-title">{{ $t('密码安全强制要求') }}</p>
-            <p class="explain-tips">{{ $t('当前设置') }}:<span class="color-yellow">{{$t('密码')}}{{obj.password_length+$t('位数')+'，'}}{{obj.password_needcapital == 1?$t('大写英文字母')+'，':''}}{{obj.password_needlowercase==1?this.$t('小写英文字母，'):''}}{{obj.password_neednum==1?this.$t('数字0-9，'):''}}{{obj.password_needspecialchar == 1?$t('特殊符号~,!,@,#,$,%,^;'):''}}</span></p>
+            <p class="explain-tips">{{ $t('当前设置') }}:<span class="color-yellow">{{$t('密码')}}{{obj.password_length+$t('位数')+'，'}}{{obj.password_needcapital == 1?$t('大写英文字母')+'，':''}}{{obj.password_needlowercase==1?this.$t('小写英文字母，'):''}}{{obj.password_neednum==1?this.$t('数字0-9，'):''}}{{obj.password_needspecialchar == 1?$t('特殊符号')+'~,!,@,#,$,%,^;':''}}</span></p>
           </div>
         </div>
         <set-password v-if="tool.checkAuth($route.name,'psdValidate')" @setPassword="querySite_Parameter"></set-password>

src/HManagement/siteManage/securityConfig/modules/customerCheckRule.vue

@@ -121,11 +121,11 @@ export default {
       relations: [
         {
           value:'and',
-          label: '并且'
+          label: this.$t('并且')
         },
         {
           value:'or',
-          label: '或者'
+          label: this.$t('或者')
         }
       ],
       relation:''

src/HManagement/siteManage/securityConfig/modules/password.vue

@@ -21,7 +21,7 @@
                 <el-checkbox label="password_needcapital">{{ $t('大写英文字母') }}</el-checkbox>
                 <el-checkbox label="password_needlowercase">{{ $t('小写英文字母') }}</el-checkbox>
                 <el-checkbox label="password_neednum">{{ $t('数字0-9') }}</el-checkbox>
-                <el-checkbox label="password_needspecialchar">{{ $t('特殊符号~,!,@,#,$,%,^;') }}</el-checkbox>
+                <el-checkbox label="password_needspecialchar">{{ $t('特殊符号') }}~,!,@,#,$,%,^;</el-checkbox>
               </el-checkbox-group>
             </div>
           </div>

src/HManagement/siteManage/securityConfig/modules/projectCheckRule.vue

@@ -200,11 +200,11 @@ export default {
       relations: [
         {
           value:'and',
-          label: '并且'
+          label: this.$t('并且')
         },
         {
           value:'or',
-          label: '或者'
+          label: this.$t('或者')
         }
       ],
       relation:''

src/HManagement/siteManage/securityConfig/modules/projectReportRule.vue

@@ -42,7 +42,7 @@ export default {
       fields3: [],
       relations: [{
         value:'并且',
-        label: '并且'
+        label: this.$t('并且')
       }],
       relation:''
     }

src/WebsiteManagement/marketproductMag/modules/add.vue

@@ -89,7 +89,7 @@
                   <el-option
                     v-for="item in classData"
                     :key="item.value"
-                    :label="item.remarks"
+                    :label="$t(item.remarks)"
                     :value="item.value"
                   >
                   </el-option>

src/WebsiteManagement/marketproductMag/modules/edit.vue

@@ -84,7 +84,7 @@
                   <el-option
                     v-for="item in classData"
                     :key="item.value"
-                    :label="item.remarks"
+                    :label="$t(item.remarks)"
                     :value="item.value"
                   >
                   </el-option>

src/components/newDetailTemp/modules/tabs/tab.vue

@@ -2,7 +2,7 @@
   <div class="normal-panel tab__panel">
     <div>
       <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane v-for="(tab,index) in tabs" :key="index" :label="tab" :name="'tab' + index"></el-tab-pane>
+        <el-tab-pane v-for="(tab,index) in tabs" :key="index" :label="$t(tab)" :name="'tab' + index"></el-tab-pane>
         <el-tab-pane :label="$t(`附件`)" name="file"></el-tab-pane>
         <el-tab-pane :label="$t(`操作记录`)" name="log"></el-tab-pane>
       </el-tabs>

src/components/newLayout/modules/header.vue

@@ -242,8 +242,6 @@ export default {
         val: this.searchValue,
       });
 
-      //activeApp
-
       this.$router.push({ path: clickApp[0].path });
     },
 
@@ -289,10 +287,17 @@ export default {
                 try {
                   let activeApp = item.apps.find(
                     (v) =>
-                      v.systemmoduleid ==
-                      this.$store.getters.activeApp.systemmoduleid
+                      v.systemappid == this.$store.getters.activeApp.systemappid
                   );
-                  this.$store.commit("activeApp", activeApp);
+                  const link = () => {
+                    this.$router.push({ path: app.path });
+                  };
+                  this.$store.dispatch("setActiveApp", {
+                    name: activeApp.systemappname,
+                    app: activeApp,
+                    val: this.searchValue,
+                    link,
+                  });
                 } catch (error) {}
               }
             });
@@ -301,8 +306,8 @@ export default {
               "active_modules",
               JSON.stringify(active_modules)
             );
-            this.basicData.querySite_Parameter();
             this.$emit("onRender");
+            this.basicData.querySite_Parameter();
           });
       });
     },

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

@@ -34,7 +34,7 @@
             <span v-if="item.label === '关联应用数据'"  :style="item.style?item.style():''">
               <span v-if="item.value !== ''">
                 <el-button v-if="item.value !== '--'" type="text" @click="onGoto()" style="margin: 0;padding: 0">
-                  {{item.value}}
+                  {{$t(item.value)}}
                 </el-button>
                 <span v-else>--</span>
               </span>

src/components/normal-basic-layout-new/details/modules/tabs/tab.vue

@@ -2,7 +2,7 @@
   <div class="normal-panel tab__panel">
     <div>
       <el-tabs v-model="activeName"  @tab-click="handleClick">
-        <el-tab-pane v-for="(tab,index) in tabs" :key="index" :label="tab" :name="'tab' + index"></el-tab-pane>
+        <el-tab-pane v-for="(tab,index) in tabs" :key="index" :label="$t(tab)" :name="'tab' + index"></el-tab-pane>
         <el-tab-pane :label="$t('附件')" name="file"></el-tab-pane>
         <el-tab-pane :label="$t('操作记录')" name="log"></el-tab-pane>
       </el-tabs>

src/optionSystem/executeManage/modules/add copy.vue

@@ -26,7 +26,7 @@
                 <el-select v-model="form.actuatortype" style="width:100%" :placeholder="$t(`请选择执行器类型`)">
                   <el-option
                     v-for="item in actuatortype()"
-                    :label="item.remarks"
+                    :label="$t(item.remarks)"
                     :value="item.value"
                     :key="item.index"
                   ></el-option>
@@ -38,7 +38,7 @@
                 <el-select v-model="form.actuatordrivetype" style="width:100%" :placeholder="$t(`请选择执行器驱动类型`)">
                   <el-option
                     v-for="item in actuatordrivetype()"
-                    :label="item.remarks"
+                    :label="$t(item.remarks)"
                     :value="item.value"
                     :key="item.index"
                   ></el-option>
@@ -117,7 +117,7 @@
                 <el-select v-model="form.bodystructure" style="width:100%" :placeholder="$t(`请选择结构`)">
                   <el-option
                     v-for="item in bodystructure()"
-                    :label="item.remarks"
+                    :label="$t(item.remarks)"
                     :value="item.value"
                     :key="item.index"
                   ></el-option>
@@ -129,7 +129,7 @@
                 <el-select v-model="form.func" style="width:100%" :placeholder="$t(`请选择功能`)">
                   <el-option
                     v-for="item in func()"
-                    :label="item.remarks"
+                    :label="$t(item.remarks)"
                     :value="item.value"
                     :key="item.index"
                   ></el-option>

src/optionSystem/speedBoxManage/modules/add copy.vue

@@ -56,7 +56,7 @@
                 <el-select v-model="form.gearboxlevel" style="width:100%" :placeholder="$t(`请选择减速箱效率`)">
                   <el-option
                     v-for="item in gearboxlevel()"
-                    :label="item.remarks"
+                    :label="$t(item.remarks)"
                     :value="item.value"
                     :key="item.index"
                   ></el-option>