system-clients 3.2.1-9 → 3.2.1-aodeToV4

package/src/components/server/Login.vue

@@ -1,59 +1,52 @@
 <template>
   <div class="syslogin">
-    <div class="login-title" >
-      <div class="row auto">
-        <marquee style="width:80%;margin-top:25px"><span  style="font-size: 1.8rem;color: white;">{{notice}}</span></marquee>
-        <div class="login-title-chi" style="white-space: nowrap;margin-right:-5%">
-          <img src="../../../static/newStyle/login-info.png"/>
-          <span @click="showus=true">关于我们</span>
-          <!--          <img src="../../../static/newStyle/login-con.png"/>-->
-          <!--          <span>联系我们</span>-->
-        </div>
+    <div class="login-title">
+      <div class="login-title-chi" style="white-space: nowrap">
+        <img src="../../../static/newStyle/login-info.png"/>
+        <span>关于我们</span>
+        <img src="../../../static/newStyle/login-con.png"/>
+        <span>联系我们</span>
       </div>
     </div>
-
-    <modal :show.sync="showus"  backdrop="true" width="50%" style="width:auto;">
-      <article slot="modal-body" class="modal-body" >
-        <img style="height:100%;width:100%" src="../../../static/newStyle/about-us.png"/>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-      </footer>
-    </modal>
-
-
-    <div class="logoew" v-if="logoandroid" >
+    <div class="logopic">
+      <div class="aodelogo"></div>
+    </div>
+    <div class="logoew" v-if="logoandroid">
       <div v-if="logoandroid" class="imglogo"></div>
       <p class="logocontent">燃气客服系统Android版</p>
-      <p  class="logofooter">(仅浏览器扫描)</p>
+      <p class="logofooter">(仅浏览器扫描)</p>
     </div>
     <!--输入框-->
     <div class="loginmain">
       <!-- <img src="../../../static/login_title1.png" alt="图片加载未完成" class="img-responsive" style="margin: 0 auto; padding-top: 150px;" /> -->
       <div class="loginmain-left">
-        <img  class="loginmain-left-img" src="../../../static/newStyle/login-left.png">
+        <img class="loginmain-left-img" src="../../../static/newStyle/login-left.png">
       </div>
-      <div class="loginmain-right">
+      <div class="loginmain-right" style="width:45%">
 
-        <p @click="theme()" style="white-space: nowrap">{{config.title}}</p>
+        <p @click="theme()" style="white-space: nowrap">燃气客服系统</p>
 
         <form v-show="!login">
           <!--                    <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">-->
           <div class="login-input">
             <img src="../../../static/newStyle/login-user.png"/>
-            <input type="text" style="display: inline;background-color: white!important;" placeholder="用户名" v-model="model.ename"/>
+            <input type="text" style="display: inline;background-color: white!important;" placeholder="用户名"
+                   v-model="model.ename"/>
           </div>
           <div class="login-input">
             <img src="../../../static/newStyle/login-pwd.png"/>
-            <input type="password" placeholder="密码" style="display: inline;background-color: darkgray;" v-model="model.password"
+            <input type="password" placeholder="密码" style="display: inline;background-color: darkgray;"
+                   v-model="model.password"
                    @keyup.enter="confirm('key')"/>
           </div>
           <div class="login-input-1">
             <img src="../../../static/newStyle/login-check.png"/>
-            <input v-if="$login.Verification" class="login-check"  type="text" placeholder="请输入验证码"
+            <input v-if="$login.Verification" class="login-check" type="text" placeholder="请输入验证码"
                    v-model="picLyanzhengma" @keyup.enter="confirm('key')"/>
           </div>
-          <div class="login-input-2" >
-            <input v-if="$login.Verification" class="login-check-1" style="display: inline;background-color:#eeeeee !important;"
+          <div class="login-input-2">
+            <input v-if="$login.Verification" class="login-check-1"
+                   style="display: inline;background-color:#eeeeee !important;"
                    type="button" @click="createCode" v-model="checkCode"/>
           </div>
           <div class="login-bt">
@@ -78,7 +71,7 @@
       技术支持：西安奥枫软件有限公司
     </div>
 
-    <modal v-if="depPromptShow" :show.sync="depPromptShow" :backdrop="false" v-ref:modal >
+    <modal v-if="depPromptShow" :show.sync="depPromptShow" :backdrop="false" v-ref:modal>
       <header slot="modal-header" class="modal-header">
         <h4 class="modal-title">登录信息</h4>
       </header>
@@ -88,19 +81,25 @@
             <div class="col-sm-12 form-group">
               <label class="col-sm-5 control-label">当前登录人</label>
               <div class="col-sm-7">
-                <p class="form-control-static">{{$login.f.name}}</p>
+                <p class="form-control-static">{{ $login.f.name }}</p>
+              </div>
+            </div>
+            <div class="col-sm-12 form-group">
+              <label class="col-sm-5 control-label">组&nbsp;织&nbsp;编&nbsp;码</label>
+              <div class="col-sm-7">
+                <p class="form-control-static">{{ $login.f.number }}</p>
               </div>
             </div>
             <div class="col-sm-12 form-group">
               <label class="col-sm-5 control-label">所在销售点</label>
               <div class="col-sm-7">
-                <p class="form-control-static">{{$login.f.deps}}</p>
+                <p class="form-control-static">{{ $login.f.deps }}</p>
               </div>
             </div>
           </div>
         </form>
       </article>
-      <footer  slot="modal-footer" class="modal-footer">
+      <footer slot="modal-footer" class="modal-footer">
         <button class="button_search" @click="depPromptConfirm">确认</button>
         <button class="button_clear" @click="depPromptCancel">取消</button>
       </footer>
@@ -116,33 +115,23 @@
 import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-
-
-
-let saveGen = function *(self) {
+import cryptJS from '../../plugins/EncryptUtil'
+let saveGen = function* (self) {
   try {
-    if(self.$login){
-      yield self.$login.login(self.model.ename, self.model.password)
-    }
-    if(self.$appdata){
-      yield self.$appdata.load()
+    yield self.$login.login(self.model.ename, self.model.password)
+    yield self.$appdata.load()
 
-    }
+    // 热力系统登录
     if (Vue.$heatCompatibility) {
       try {
-        if(self.$loginHeat){
-          yield self.$loginHeat.login(self.model.ename, self.model.password)
-        }
-        if(self.$appdataHeat){
-          yield self.$appdataHeat.load()
-        }
+        yield self.$loginHeat.login(self.model.ename, self.model.password)
+        yield self.$appdataHeat.load()
       } catch (e) {
         console.log('热力系统登陆失败!')
       }
     }
-    //吴小平
-    // yield self.$getConfig(self, 'Login')
+
+    yield self.$getConfig(self, 'Login')
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
@@ -175,21 +164,17 @@ let saveGen = function *(self) {
       }
     }
     // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(self.model.password))) {
+    if (self.config.weakPassword && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(self.model.password))) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
-        self.modifyPwShow = true
+          self.modifyPwShow = true
       })
-    } else if ((!self.otherLogin) && self.config.depPrompt) {
+    } else if (self.config.depPrompt) {
       self.depPromptShow = true
     } else {
       self.$goto('home-page', {functions: self.$login.f})
-      // if (self.otherLogin){
-      //   window.history.pushState(null,null,'')
-      // }
       if (self.$login) {
         console.log('登录信息', self.$login.f)
-        global.login=self.$login.f
+        global.login = self.$login.f
         console.log('登录信息', global.login)
       }
     }
@@ -202,9 +187,7 @@ let saveGen = function *(self) {
     }
     if (ret.status === 0) {
       msg = '服务连接错误，请确认服务状态'
-    } else if (ret.status === 401) {
-      msg = ret.data
-    } else if (ret.status === 710) {
+    } else {
       msg = ret.data
     }
     self.createCode()
@@ -218,42 +201,31 @@ let saveGen = function *(self) {
 }
 export default {
   title: '登录',
-  async ready () {
-    try{
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/sql/singleTable',
-        {data:{
-            tablename: 't_changedeclare',
-            condition: ` f_type ='变更通知' `
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-      if(res.data.length>0){
-        console.log("---------------获取通知",res.data[0].f_change_message)
-        this.notice=res.data[0].f_change_message
-      }
-    }catch(e){}
-
-    this.loginother();
+  ready() {
+    if (this.$login && this.$login.getUrlCompileParames('name') && this.$login.getUrlCompileParames('password')) {
+      this.model.ename = this.$login.getUrlCompileParames('name')
+      this.model.password = this.$login.getUrlCompileParames('password')
+      this.confirm()
+    }
+    if(this.$login&&this.$login.getUrlParames('token')){
+      console.log(this.$login.getUrlParames('token'))
+      let param =  cryptJS.AESDecrypt(this.$login.getUrlParames('token'),'3KMKqvgwR8ULbR8Z')
+      console.log(param)
+      // param = JSON.parse(param)
+      this.$login.Verification = false
+      this.model.ename = param.username
+      this.model.password = param.password
+      this.confirm()
+    }
     $('#login-button').click(function (event) {
       event.preventDefault()
       $('form').fadeOut(500)
-    })
-    if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
-      const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
-      console.log(subUrl)
-      this.model.ename = window.atob(subUrl[0])
-      this.model.password = window.atob(subUrl[1])
-      console.log('this.model.ename',this.model.ename)
-      this.otherLogin = true
-      this.confirm()
-    }else{
-      //跳转不需要验证码
+    }),
       this.createCode()
-    }
   },
-  data () {
+  data() {
     return {
-      image:{
+      image: {
         img1: '/images/newStyle/login-info.png',
         img2: '/images/newStyle/login-con.png',
         img3: '/images/newStyle/login-left.png',
@@ -265,90 +237,66 @@ export default {
       config: {
         isMac: false,
         depPrompt: false,
-        weakPassword: false,
-        title: '燃气客服系统',
-        distanceLogin: false
+        weakPassword: true
       },
-      otherLogin:false,
       login: false,
       depPromptShow: false,
       model: {},
       show: false,
       checkCode: '',
-      login_do:true,
+      login_do: true,
       picLyanzhengma: '',
       // 修改密码弹框展示
       modifyPwShow: false,
-      logoandroid:false,
-      showus:false,
-      notice:'',
-      loginotherflag :true
+      logoandroid: true
     }
   },
   methods: {
-    async loginother(){
-      if (this.config.distanceLogin) {
-        if (this.$login && this.$login.getUrlParames('name') ) {
-          let ename = this.$login.getUrlParames('name');
-          let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
-          if(logininfo.data){
-            if(logininfo.data.ename && logininfo.data.password){
-              this.model.ename = logininfo.data.ename
-              this.model.password =logininfo.data.password
-              let gen = saveGen(this)
-              return co(gen)
-            }
-          }
-        }
-      }
-    },
-    theme(){
+    theme() {
       // var  elementList = document.querySelectorAll('body');
       //   console.log(elementList)
       //   document.querySelectorAll('body')[0].className='themeTwo'
       //   var  elementList = document.querySelectorAll('body');
       //   console.log(elementList)
     },
-    onReady () {
+    onReady() {
       this.$emit('ready')
     },
-    confirm (key) {
-      this.login_do=!this.login_do
-      // return
+    confirm(key) {
+      this.login_do = !this.login_do
       if (key == 'key') {
         $('form').fadeOut(500)
       }
       this.login = true
       // let gen = saveGen(this)
       // return co(gen)
-      if((!this.otherLogin) && this.$login && this.$login.Verification){
-        console.log('跳转过来的不走验证')
-        if(this.picLyanzhengma == '') {
-          this.$showMessage("请输入验证码！").then(()=>{
+      if (this.$login.Verification) {
+        if (!this.picLyanzhengma) {
+          this.$showMessage("请输入验证码！").then(() => {
             this.login = false
             $('form').fadeIn(500)
             this.createCode()
           })
-        }else if(this.picLyanzhengma.toUpperCase() != this.checkCode ) {
+        } else if (this.picLyanzhengma.toUpperCase() != this.checkCode) {
           //若输入的验证码与产生的验证码不一致时
-          this.$showMessage("验证码不正确").then(()=>{
+          this.$showMessage("验证码不正确").then(() => {
             this.login = false
             $('form').fadeIn(500)
             this.createCode();//刷新验证码
             this.picLyanzhengma = '';
           })
-        }else {
+        } else {
           this.login = true
           let gen = saveGen(this)
           return co(gen)
         }
-      }else {
+      } else {
         this.login = true
         let gen = saveGen(this)
         return co(gen)
       }
     },
-    createCode(){
+    createCode() {
       let code = "";
       let codeLength = 4;//验证码的长度
       let random = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
@@ -361,12 +309,12 @@ export default {
       this.checkCode = code;//把code值赋给验证码
     },
 
-    async depPromptConfirm () {
+    async depPromptConfirm() {
       this.depPromptShow = false
       return this.$goto('home-page', {functions: this.$login.f})
     },
 
-    depPromptCancel () {
+    depPromptCancel() {
       this.depPromptShow = false
       this.createCode()
       this.picLyanzhengma = ''
@@ -377,7 +325,7 @@ export default {
     }
   },
   watch: {
-    'modifyPwShow' (val){
+    'modifyPwShow'(val) {
       if (!val) {
         window.location.reload()
       }
@@ -394,21 +342,20 @@ export default {
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  font-weight: 400;
-  outline: none;
+  font-weight: 300;
 }
 
 body {
   font-family: 'Source Sans Pro', sans-serif;
   color: white;
-  font-weight: 400;
+  font-weight: 300;
 }
 
 body ::-webkit-input-placeholder {
   /* WebKit browsers */
   font-family: 'Source Sans Pro', sans-serif;
   color: white;
-  font-weight: 400;
+  font-weight: 300;
 }
 
 body :-moz-placeholder {
@@ -416,7 +363,7 @@ body :-moz-placeholder {
   font-family: 'Source Sans Pro', sans-serif;
   color: white;
   opacity: 1;
-  font-weight: 400;
+  font-weight: 300;
 }
 
 body ::-moz-placeholder {
@@ -424,14 +371,14 @@ body ::-moz-placeholder {
   font-family: 'Source Sans Pro', sans-serif;
   color: white;
   opacity: 1;
-  font-weight: 400;
+  font-weight: 300;
 }
 
 body :-ms-input-placeholder {
   /* Internet Explorer 10+ */
   font-family: 'Source Sans Pro', sans-serif;
   color: white;
-  font-weight: 400;
+  font-weight: 300;
 }
 
 .wrapper {
@@ -500,7 +447,7 @@ body :-ms-input-placeholder {
   color: white;
   -webkit-transition-duration: 0.25s;
   transition-duration: 0.25s;
-  font-weight: 400;
+  font-weight: 300;
 }
 
 .form input:hover {
@@ -712,28 +659,47 @@ body :-ms-input-placeholder {
   -webkit-animation-delay: 11s;
   animation-delay: 11s;
 }
-.logofooter{
+
+.logofooter {
   font-size: 12px;
-  color:#fff;
-  width:150px;
+  color: #fff;
+  width: 150px;
   margin-left: 17px;
 }
-.logocontent{
+
+.logocontent {
   font-size: 14px;
-  color:#fff;
-  width:150px;
+  color: #fff;
+  width: 150px;
   margin: 3px -15px;
 }
+
+.aodelogo {
+  background: url(../../../static/aodelogo.png);
+  background-size: 100%;
+  background-repeat: no-repeat;
+}
+
 .imglogo {
-  background:url(../../../static/logo.png);
-  background-size:100%;
+  background: url(../../../static/ewmlogo.png);
+  background-size: 100%;
+  background-repeat: no-repeat;
 }
+
 .logoew {
-  width:120px;
-  height:120px;
-  float:right;
-  margin-right:8.5%;
-  margin-top:10px;
+  width: 120px;
+  height: 120px;
+  float: right;
+  margin-right: 8.5%;
+  margin-top: 10px;
+}
+
+.logopic {
+  width: 23%;
+  height: 100px;
+  float: left;
+  margin-left: 3.5%;
+  margin-top: 10px;
 }
 
 @-webkit-keyframes square {