cloud-web-corejs 1.0.54-dev.195 → 1.0.54-dev.197

package/src/views/user/login/default.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login-container" :class="backgroundClass" ref="login-container" v-show="showContent">
     <div class="login-main" style="height: auto;">
-      <el-tabs v-model="activeName">
+      <el-tabs v-model="activeName" @tab-click="changeTab">
         <el-tab-pane label="账号登录" name="first">
           <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="box-form login" autocomplete="on"
                    label-position="left">
@@ -56,6 +56,11 @@
             <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
           </el-form>
         </el-tab-pane>
+        <el-tab-pane label="二维码登录" name="third">
+          <div class="qr" style="height: 305px">
+            <img class="qr__img" :src="qrBase64" style="left: 20%;position: absolute;" v-if="activeName==='third'"/>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </div>
     <div class="tc copyright">
@@ -69,6 +74,7 @@
 
 <script>
 import mixin from "./indexMixin";
+import QRcode from 'qrcode'
 
 export default {
   name: 'Login',
@@ -128,4 +134,8 @@ export default {
     color: #8a8686;
   }
 }
+
+::v-deep .login-main .el-tabs__header .el-tabs__nav .el-tabs__item {
+  width: 33%;
+}
 </style>

package/src/views/user/login/indexMixin.js

@@ -1,5 +1,6 @@
 import {encode} from "js-base64";
 import settingConfig from "@/settings";
+import QRcode from "qrcode";
 
 function getUrlParams(url) {
   let result = {};
@@ -54,7 +55,13 @@ export default {
       },
       activeName: "first",
       searchParam: {},
-      showContent: true
+      showContent: true,
+
+      qrTimer1: null,
+      qrTimer2: null,
+      qrContent: null,
+      qrCodeFlag: 0,
+      qrBase64: ""
     };
   },
   watch: {
@@ -69,6 +76,9 @@ export default {
       immediate: true
     }
   },
+  beforeDestroy() {
+    this.clearQrLoginTimer();
+  },
   created() {
     this.init();
   },
@@ -110,6 +120,7 @@ export default {
       if (e.keyCode == 13 && e.target.nodeName != 'INPUT') {
         let closeBtn = document.querySelector('.el-dialog__close');
         closeBtn && closeBtn.click();
+        if (this.activeName == "third") return
         this.handleLogin();
       }
     },
@@ -420,6 +431,84 @@ export default {
             });
           }
         });
+    },
+
+    /**二维码登录begin*/
+    guid() {
+      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (t) {
+        var e = 16 * Math.random() | 0;
+        return ("x" == t ? e : 3 & e | 8).toString(16);
+      });
+    },
+    initQR() {
+      this.qrCodeFlag = 0;
+      let option = {width: 300, height: 300};
+      this.qrContent = this.guid();
+      this.createQR(this.qrContent, option).then(url => {
+        this.qrBase64 = url
+        this.qrCodeFlag = 1;
+      })
+    },
+    // 生成二维码
+    createQR(content, options) {
+      return new Promise((resolve, reject) => {
+        QRcode.toDataURL(content, options).then(url => {
+          resolve(url)
+        })
+      })
+    },
+    changeTab() {
+      // this.initQR();
+      // return
+      if (this.activeName == "third") {
+        this.createQrLoginTimer();
+      } else {
+        this.clearQrLoginTimer();
+      }
+    },
+    clearQrLoginTimer() {
+      if (this.qrTimer1) {
+        clearInterval(this.qrTimer1)
+        this.qrTimer1 = null;
+      }
+      if (this.qrTimer2) {
+        clearInterval(this.qrTimer2)
+        this.qrTimer2 = null;
+      }
+    },
+    createQrLoginTimer() {
+      this.qrTimer1 = setInterval(() => {
+        this.checkQrLoginStatus();
+      }, 3000)
+      this.qrTimer2 = setInterval(() => {
+        this.initQR()
+      }, 30000)
+      this.initQR();
+    },
+    checkQrLoginStatus() {
+      if (this.qrCodeFlag !== 1) return
+      this.$http({
+        url: USER_PREFIX + '/auth/login',
+        method: `post`,
+        data: {as: this.qrContent},
+        // isLoading: true,
+        failMsg: false,
+        success: res => {
+          let token = res.objx;
+          if (token) {
+            console.log("token", token)
+            this.$store.dispatch('user/addToken', {token}).then(res => {
+              localStorage.removeItem('currentMenuId');
+              this.rememberPassword();
+              this.loading = false;
+              window.removeEventListener('keydown', this.keyDown, false);
+              this.handleRedirectUrl();
+            });
+          }
+        }
+      });
     }
+    /**二维码登录end*/
+
   }
 }

package/src/views/user/project_tag/list.vue

@@ -114,13 +114,13 @@ export default {
             width: 250
           },
           {
-            field: 'createDate',
-            title: this.$t1('创建时间'),
+            field: '_createBy',
+            title: this.$t1('创建人'),
             width: 150
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
+            field: 'createDate',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -128,6 +128,11 @@ export default {
             title: this.$t1('更新人'),
             width: 150
           },
+          {
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
+            width: 150
+          },
           {
             width: 47,
             fixed: 'right',