Merge branch 'testToMerge' into blueBranch

.idea/misc.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="WebPackConfiguration">
     <option name="mode" value="DISABLED" />
   </component>

src/optionSystem/valveOption/DieFa.vue

@@ -185,6 +185,7 @@
           <MyTable
               :height="tableHeight"
               ref="guangtouRef"
+              fixedName="operation"
               :layout="tool.tabelCol($route.name)['guangtouTable'].tablecols"
               :param="guangtouParam"
               :opwidth="200"

src/utils/i18n.js

@@ -35,6 +35,7 @@ api.requested({
     languages = res.data;
     localStorage.setItem('languages', JSON.stringify(languages))
 })
+console.log("locale", localStorage.getItem('lang') )
 // 准备翻译的语言环境信息
 const i18n = new VueI18n({
     locale: localStorage.getItem('lang') || "ZH", //将语言标识存入localStorage或sessionStorage中，页面刷新不会默认中文显示
@@ -44,4 +45,4 @@ const i18n = new VueI18n({
     fallbackLocale: 'ZH', // 指定的locale没有找到对应的资源或当前语种不存在时，默认设置当前语种为中文
 });
 
-export default i18n
+export default i18n

src/views/login/login.vue

@@ -37,14 +37,14 @@
           </el-dropdown>
         </div>
       </div>
-      <div class="login-wrap">
+      <div class="login-wrap" v-if="nowType">
         <div>
           <div class="logo">
             <span> {{ $t("营销管理平台") }}</span
             ><br />
             <small>SALE-MANAGE-SYSTEM</small>
           </div>
-          <div class="login-form">
+          <div class="login-form" v-if="languagename">
             <h4 class="title">{{ $t("登录") }}</h4>
             <el-tabs v-model="activeName">
               <el-tab-pane :label="$t(`账号登录`)" name="first">
@@ -176,9 +176,18 @@ export default {
     this.languagelist();
     try {
       this.languagename = localStorage.getItem("languagename") || "简体中文";
+      this.nowType = localStorage.getItem("lang") || "ZH";
+      console.log('输出预约',this.languagename)
+      console.log(this.nowType)
     } catch (error) {
       this.languagename = "简体中文";
+      this.nowType = "ZH";
     }
+    this.$nextTick(() => {
+      this.$i18n.locale = this.nowType;
+      console.log(this.nowType,'输出')
+    });
+    // this.i18nChangeLanguage(this.nowType)
     /*this.qusetLanguage();*/
   },
   methods: {
@@ -250,7 +259,7 @@ export default {
         if (flag === 1) {
           this.checked
             ? localStorage.setItem("phonenumber", this.loginForm.phonenumber)
-            : localStorage.clear("phonenumber");
+            : localStorage.removeItem("phonenumber");
           sessionStorage.setItem(
             "account_list",
             JSON.stringify(res.account_list)
@@ -309,7 +318,7 @@ export default {
         if (flag === 1) {
           this.checked
             ? localStorage.setItem("phonenumber", this.loginForm.phonenumber)
-            : localStorage.clear("phonenumber");
+            : localStorage.removeItem("phonenumber");
           sessionStorage.setItem(
             "account_list",
             JSON.stringify(res.account_list)
@@ -322,12 +331,19 @@ export default {
           sessionStorage.setItem("active_password", res.remindchangepassword);
           this.basicData.query_userauth().then(() => {
             this.basicData.querySite_Parameter();
-            let usertype = JSON.parse(sessionStorage.getItem('active_account')).usertype
-            let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
-            if ((usertype == 1 || usertype == 0) && (siteid == 'HY' || siteid == 'YOSTEST1') ){
-              sessionStorage.setItem('isFull','1')
-              this.$router.push('/serviceDataScreen')
-            }else {
+            let usertype = JSON.parse(
+              sessionStorage.getItem("active_account")
+            ).usertype;
+            let siteid = JSON.parse(
+              sessionStorage.getItem("active_account")
+            ).siteid;
+            if (
+              (usertype == 1 || usertype == 0) &&
+              (siteid == "HY" || siteid == "YOSTEST1")
+            ) {
+              sessionStorage.setItem("isFull", "1");
+              this.$router.push("/serviceDataScreen");
+            } else {
               this.$router.push({ path: "/main" });
             }
             this.getAccountInfo();
@@ -367,7 +383,27 @@ export default {
       localStorage.setItem("lang", type);
       this.$nextTick(() => {
         this.$i18n.locale = type;
-        // location.reload();
+
+        this.rules = {
+          phonenumber: [
+            { required: true, message: this.$t("请输入账号"), trigger: "blur" },
+          ],
+          password: [
+            {
+              required: true,
+              message: this.$t("请输入验证码"),
+              trigger: "blur",
+            },
+          ],
+        };
+        this.rules2 = {
+          phonenumber: [
+            { required: true, message: this.$t("请输入账号"), trigger: "blur" },
+          ],
+          password: [
+            { required: true, message: this.$t("请输入密码"), trigger: "blur" },
+          ],
+        };
       });
       this.languagename =
         this.langusge.find((v) => v.languagecode == this.nowType)