Merge branch 'master' of http://git.mes123.com/zhouyx/mes-ui

components/page/import/detailExcel.vue

@@ -83,13 +83,13 @@ export default {
             tabData.forEach(ele => {
                 let objData = {}
                 tabColum.forEach(el => {
-                    objData[el.title] = ele[el.key]
+                    objData[el.title] = ele[el.key].replace(/\s/g, "")
                 })
                 arrData.push(objData)
             })
             //处理title和key一致
             tabColum.forEach(el => {
-                el.key = el.title
+                el.key = el.title.replace(/\s/g, "")
             })
 
             this.columnsImport = tabColum;

components/page/import/process.vue

@@ -374,8 +374,8 @@ export default {
             });
             headers.forEach((elHead) => {
                 let headObj = {};
-                headObj.title = elHead;
-                headObj.key = elHead;
+                headObj.title = elHead.replace(/\s/g, "");
+                headObj.key = elHead.replace(/\s/g, "");
                 headersNow.push(headObj);
             });
             this.columnsImport = headersNow;
@@ -384,7 +384,7 @@ export default {
                 var obj = {};
                 var currentline = lines[i].split(",");
                 for (var j = 0; j < headers.length; j++) {
-                    obj[headers[j]] = currentline[j];
+                    obj[headers[j]] = currentline[j].replace(/\s/g, "");
                 }
                 result.push(obj);
             }

pages/account/login/index.vue

 <template>
-<div class="account">
+  <div class="account">
     <!-- <Carousel v-model="value1" autoplay :autoplay-speed="5000" loop class="zmd">
       <CarouselItem>
         <div class="bg bg1"></div>
@@ -31,28 +31,31 @@
           </div>
           <h2 class="mb20">登 录</h2>
           <Login @on-submit="handleSubmit" class="form_sub">
-                    <div class="mb20" style="height:40px;">
-                        <Input v-model="tenantCode" size="large">
+            <div class="mb20" style="height: 40px">
+              <Input ref="iTenantCode" v-model="tenantCode" size="large">
                 <span slot="prepend">租户号</span>
               </Input>
             </div>
             <UserName name="username" class="user_name" value="" />
-                    <Password name="password" class="pass_word" value="" enter-to-submit />
+            <Password
+              name="password"
+              class="pass_word"
+              value=""
+              enter-to-submit
+            />
             <div class="sub_btn">
-                        <Submit class="shadown">{{ $t('page.login.submit') }}</Submit>
+              <Submit class="shadown">{{ $t("page.login.submit") }}</Submit>
             </div>
           </Login>
         </div>
       </div>
     </div>
-</div>
+  </div>
 </template>
 
 <script>
 import iCopyright from "@/components/copyright";
-import {
-    mapActions
-} from "vuex";
+import { mapActions } from "vuex";
 import mixins from "../mixins";
 import Oidc from "oidc-client";
 import util from "@/libs/util";
@@ -61,19 +64,24 @@ export default {
   layout: "empty",
   mixins: [mixins],
   components: {
-        iCopyright
+    iCopyright,
   },
   data() {
     return {
       value1: 0,
       autoLogin: true,
       imgFlag: true,
-            tenantCode: '000001'
+      //tenantCode: '000001'
+      tenantCode: "000004",
     };
   },
   created() {
     // this.oidc();
   },
+  mounted() {
+          //正确写法
+          this.$refs.iTenantCode.focus();
+  },
   methods: {
     ...mapActions("admin/account", ["login"]),
     /**
@@ -81,35 +89,37 @@ export default {
      * 表单校验已有 iView Pro 自动完成，如有需要修改，请阅读 iView Pro 文档
      */
     handleSubmit(valid, values) {
+      if (this.tenantCode == "") {
+        this.$Message.error("租户号不能为空");
+        this.$refs.iTenantCode.focus();
+        return;
+      }
       if (valid) {
-                values.tenantcode = this.tenantCode
-                const {
-                    username,
-                    password,
-                    tenantcode
-                } = values;
+        values.tenantcode = this.tenantCode;
+        const { username, password, tenantcode } = values;
         this.login({
           username,
           password,
-                    tenantcode
-                }).then(r => {
+          tenantcode,
+        })
+          .then((r) => {
             if (r > 0) {
               this.$Message.success("登录成功！");
               this.initUserInfo(r);
             } else {
               this.$Message.error("登录失败！");
             }
-                }).catch(e => {
-                    console.log(e)
+          })
+          .catch((e) => {
             // this.$Message.error(e.message)
           });
       }
     },
     initUserInfo(id) {
       let parma = {
-                Id: id
+        Id: id,
       };
-            this.$http.sysUser.getuserinfo(parma).then(res => {
+      this.$http.sysUser.getuserinfo(parma).then((res) => {
         if (res.result) {
           if (
             res.result.avatarUrl &&
@@ -124,11 +134,11 @@ export default {
           info.userId = info.id;
           info.name = info.userName;
           this.$store.dispatch("admin/user/set", info, {
-                        root: true
+            root: true,
           });
           // setUserInfo
           this.$store.commit("setUserInfo", info);
-                    this.$router.replace('/welcome')
+          this.$router.replace("/welcome");
           // this.$router.replace(this.$route.query.redirect || "/");
         } else {
           this.$Message.error("用户信息22查询失败!");
@@ -136,9 +146,9 @@ export default {
       });
     },
     handlTrance() {
-            this.imgFlag = !this.imgFlag
-        }
-    }
+      this.imgFlag = !this.imgFlag;
+    },
+  },
 };
 </script>
 
@@ -242,7 +252,7 @@ export default {
             position: relative;
             cursor: pointer;
             width: 90px;
-                        height: 85PX;
+            height: 85px;
             float: right;
 
             .sanjiao {