system-clients 3.3.2 → 3.3.3

package/src/filiale/ruihua/Login.vue

@@ -34,14 +34,15 @@
       <p  class="logofooter">(仅浏览器扫描)</p>
     </div>
     <!--输入框-->
-    <div class="loginmain">
+    <div class="loginmain" v-show="showlogin">
       <!-- <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/ruihua/logo.jpg">
       </div>
       <div class="loginmain-right">
 
-        <p @click="theme()" style="white-space: nowrap">{{config.title}}</p>
+        <p style="white-space: nowrap;font-size: 36px;margin: 0  !important;">瑞华能源集团有限公司</p>
+        <p @click="theme()" style="white-space: nowrap;margin: 0 !important;">{{config.title}}</p>
 
         <form v-show="!login">
           <!--                    <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">-->
@@ -81,6 +82,11 @@
         </div>
       </div>
     </div>
+    <div v-show="!showlogin && isSso" class="loginmain-img">
+      <div class="ssoLoadingImg">
+        <img src="../../../static/newStyle/login-do.gif">
+      </div>
+    </div>
     <div class="login-foot" v-show="false">
       技术支持：西安奥枫软件有限公司
     </div>
@@ -172,7 +178,6 @@ let saveGen = function *(self) {
     }
     yield self.$getConfig(self, 'Login')
     console.log('登录配置', self.config)
-    console.log('!ruihua!','mac验证地址:http://127.0.0.1:8004/loadmac')
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
       let getMacs = yield self.$resetpost('api/af-system/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
@@ -183,7 +188,7 @@ let saveGen = function *(self) {
       })
       console.log('MAC地址信息', getMacs)
       // 获取本地mac地址
-      let getLocalMac = yield self.$resetget('http://127.0.0.1:8004/loadmac', {
+      let getLocalMac = yield self.$resetget('http://127.0.0.1:8003/loadmac', {
         resolveMsg: null,
         rejectMsg: null
       }).catch(() => {
@@ -249,6 +254,11 @@ let saveGen = function *(self) {
     self.model.ename = ''
     self.model.password = ''
     self.login = false
+    if (self.isSso) {
+      if (window.parent && window.parent !== window) {
+        window.parent.postMessage('reload', '*')
+      }
+    }
     $('form').fadeIn(500)
   }
 }
@@ -263,11 +273,19 @@ export default {
       $('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)
+      let url = window.location.search.split('?')[1]
+      let obj = {}
+      for (let params of url.split("&")) {
+        let kv = params.split("=")
+        obj[kv[0]] = kv[1]
+      }
+      console.log('参数', obj)
+      if (window.location.search.indexOf('ticket')) {
+        this.isSso = true
+        this.showlogin = false
+      }
+      this.model.ename = window.atob(obj.af_key)
+      this.model.password = window.atob(obj.af_n)
       this.otherLogin = true
       this.confirm()
     }else{
@@ -289,7 +307,7 @@ export default {
         img7: '/images/newStyle/login-do.png',
       },
       config: {
-        isMac: true,
+        isMac: false,
         depPrompt: false,
         weakPassword: false,
         title: '燃气客服系统',
@@ -323,7 +341,9 @@ export default {
       //安检待办
       safecheckDaiBan:[],
       // 预约待处理
-      OrderDaiBan: ''
+      OrderDaiBan: '',
+      showlogin: true,
+      isSso: false
     }
   },
   methods: {
@@ -420,7 +440,7 @@ export default {
       //   if (this.$login && this.$login.getUrlParames('name') ) {
       //     let ename = this.$login.getUrlParames('name');
       //     // todo v4
-      //     let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
+      //     let logininfo = await this.$resetpost('api/af-revenue/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
@@ -546,4 +566,11 @@ export default {
 <style>
 .my_button_search{width: 100px; height: 25px;position: relative; padding-left:2px;top: 0px;line-height: 25px; background:rgba(0,0,0,0);  border-radius: 4px;    border:none; font-family: PingFang; font-size: 15px}
 .my_button_search:hover img{    filter: opacity(0.8);}
+.loginmain-img{
+  margin: 8% 23% 6% 23%;
+  width: 54%;
+  height: 58%;
+  border-radius: 30px;
+  text-align: center;
+}
 </style>