system-clients 3.2.39 → 3.2.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.39",
+  "version": "3.2.41",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/filiale/furuike/Login.vue

@@ -1,556 +1,558 @@
-<template>
-  <div class="syslogin">
-    <img style="position: fixed; left: 50px; top: 50px; height: 70px" src="../../../static/furuike/logo2.jpg">
-    <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%">
-          <div v-if="titleShow">
-            <img src="../../../static/newStyle/login-info.png"/>
-            <span @click="showus=true">关于我们</span>
-          </div>
-        </div>
-      </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 v-if="logoandroid" class="imglogo"></div>
-      <p class="logocontent">燃气客服系统Android版</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">
-      </div>
-      <div class="loginmain-right" style="padding-top: 1%">
-
-        <div style="display: flex;align-items: center;gap: 10px;height: fit-content">
-          <img style="height: 50px; width: 60px" src="../../../static/furuike/logo1.jpg">
-          <p @click="theme()" style="white-space: nowrap">{{config.title}}</p>
-        </div>
-
-
-        <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"/>
-          </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"
-                   @keyup.enter="confirm('key')"/>
-          </div>
-          <div class="login-input-1" v-if="$login.Verification">
-            <img src="../../../static/newStyle/login-check.png"/>
-            <input class="login-check"  type="text" placeholder="请输入验证码"
-                   v-model="picLyanzhengma" @keyup.enter="confirm('key')"/>
-          </div>
-          <div class="login-input-2" v-if="$login.Verification">
-            <input class="login-check-1" style="display: inline;background-color:#eeeeee !important;"
-                   type="button" @click="createCode" v-model="checkCode"/>
-          </div>
-          <div class="login-bt" :style="{marginTop: $login.Verification ? '30%' : '10%'}">
-            <button type="button" id="login-button" class="login-button" @click.prevent="confirm('click')">登录</button>
-          </div>
-        </form>
-        <div v-show="login" class="login_load">
-          <img src="../../../static/newStyle/login-do.gif">
-        </div>
-      </div>
-    </div>
-    <div class="login-foot" v-show="false">
-      技术支持：西安奥枫软件有限公司
-    </div>
-    <div class="login-foot" v-show="$login.BAinformation">
-      {{{ $login.BAinformation }}}
-    </div>
-
-    <modal v-if="depPromptShow" :show.sync="depPromptShow" :backdrop="false" v-ref:modal >
-      <header slot="modal-header" style="height: 8vh" class="modal-header">
-        <!--<h4 class="modal-title">登录信息</h4>-->
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <form class="form-horizontal">
-          <div class="row">
-            <div class="col-sm-12 form-group">
-              <label class="col-sm-5 ">当前登录人:</label>
-              <label style="font-weight:normal">{{$login.f.name}}</label>
-            </div>
-            <!--<div class="col-sm-12 form-group" v-if="$login.f.number">-->
-            <!--<label class="col-sm-5 ">组&nbsp;织&nbsp;编&nbsp;码:</label>-->
-            <!--<label style="font-weight:normal">{{$login.f.number}}</label>-->
-            <!-- <div class="col-sm-7">
-              <span >{{$login.f.number}}</span>
-            </div> -->
-            <!--</div>-->
-            <div class="col-sm-12 form-group">
-              <label class="col-sm-5">所在销售点:</label>
-              <label style="font-weight:normal">{{$login.f.deps}}</label>
-              <!-- <div class="col-sm-7">
-                <span >{{$login.f.deps}}</span>
-              </div> -->
-            </div>
-            <div class="col-sm-12 " v-if="AppDaiBan !==''">
-              <label class="col-sm-2">报装待办:</label>
-              <span style="font-weight:normal">{{AppDaiBan}}</span>
-            </div>
-            <div class="col-sm-12 " v-if="OrderDaiBan !==''">
-              <label class="col-sm-2">预约待办:</label>
-              <span style="font-weight:normal">{{OrderDaiBan}}</span>
-            </div>
-            <div class="col-sm-12 "  v-for="daibanitem in safecheckDaiBan">
-              <label class="col-sm-2">{{daibanitem.oldData.title}}:</label>
-              <span style="font-weight:normal">{{daibanitem.text}}</span>
-            </div>
-          </div>
-        </form>
-      </article>
-      <footer  slot="modal-footer" style="height: 8vh" class="modal-footer">
-        <button class="button_search" @click="depPromptConfirm">确认</button>
-        <button class="button_clear" @click="depPromptCancel">取消</button>
-      </footer>
-    </modal>
-
-    <!-- 修改密码组件 -->
-    <modify-pw :show.sync="modifyPwShow" v-if="modifyPwShow"></modify-pw>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import $ from 'jquery'
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-
-let daibanJson = require('../../util/Daiban.json')
-
-
-let saveGen = function *(self) {
-  try {
-    if(self.$login){
-      // 账号ename，密码password，是否显示异地登陆
-      yield self.$login.login(self.model.ename, self.model.password, true)
-    }
-    if(self.$appdata){
-      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()
-        }
-      } catch (e) {
-        console.log('热力系统登陆失败!')
-      }
-    }
-    yield self.$getConfig(self, 'Login')
-    console.log('登录配置', self.config)
-    if (self.config.isMac) {
-      // 获取该登录人分公司下的mac配置
-      let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).catch(() => {
-        throw new Error('获取mac配置失败')
-      })
-      console.log('MAC地址信息', getMacs)
-      // 获取本地mac地址
-      let getLocalMac = yield self.$resetget('http://127.0.0.1:8003/loadmac', {
-        resolveMsg: null,
-        rejectMsg: null
-      }).catch(() => {
-        throw new Error('获取本地mac配置失败')
-      })
-      console.log('本地MAC地址信息', getLocalMac)
-      // 对Mac地址进行匹配
-      let macValidate = false
-      for (let i = 0; i < getLocalMac.data.mac.length; i++) {
-        for (let j = 0; j < getMacs.data.length; j++) {
-          if (getMacs.data[j].f_mac_number.toLocaleUpperCase() === getLocalMac.data.mac[i]) {
-            macValidate = true
-          }
-        }
-      }
-      if (!macValidate) {
-        throw new Error('Mac地址验证失败, 请联系管理员！！')
-      }
-    }
-    console.log(self.$login.depPrompt)
-    // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
-      self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
-        self.modifyPwShow = true
-      })
-    } else if ((!self.otherLogin) && self.$login.depPrompt) {
-      self.depPromptShow = true
-      if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
-        // 获取待办
-        self.getDaiBan()
-
-      }
-      if (self.$login.showDaiBan && self.$login.r.includes('登录预约信息')){
-        // 获取待办  在util下有个Daiban.jsond 文件 ，在里面进行配置，在功能权限界面增加登录预约信息
-        self.getDaiBanA()
-      }
-    } else {
-      self.$goto('home-page', {functions: self.$login.f,config: self.config})
-      // if (self.otherLogin){
-      //   window.history.pushState(null,null,'')
-      // }
-      if (self.$login) {
-        console.log('登录信息', self.$login.f)
-        global.login=self.$login.f
-        console.log('登录信息', global.login)
-      }
-    }
-
-  } catch (ret) {
-    console.error('登录失败', ret)
-    let msg
-    if (ret instanceof Error) {
-      msg = ret
-    }
-    if (ret.status === 0) {
-      msg = '服务连接错误，请确认服务状态'
-    } else if (ret.status === 401) {
-      msg = ret.data
-    } else if (ret.status === 710) {
-      msg = ret.data
-    }
-    self.createCode()
-    self.picLyanzhengma = ''
-    yield self.$showMessage(msg)
-    self.model.ename = ''
-    self.model.password = ''
-    self.login = false
-    $('form').fadeIn(500)
-  }
-}
-export default {
-  title: '登录',
-  async ready () {
-    if (window.location.href.includes('ticket')) {
-      let url = window.location.href.split("?")[1]
-      let obj = {}
-      for (let params of url.split("&")) {
-        let kv = params.split("=")
-        obj[kv[0]] = kv[1]
-      }
-      let params = {
-        st: obj.ticket,
-        serviceKey: this.config.serviceKey
-      }
-      this.$resetpost('/sso/logic/serviceValidate', params,{resolveMsg: null, rejectMsg: null}).then((re) => {
-        // this.$showMessage("re----" + JSON.stringify(re))
-        if (re.data.code === 200) {
-          let condition = `ename = '${re.data.data.userName}'`
-          this.$resetpost('rs/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            if (res.data && res.data.length > 0) {
-              this.model.ename = res.data[0].ename
-              this.model.password = res.data[0].password
-              // this.$showMessage("re----" + JSON.stringify(this.model))
-              let gen = saveGen(this)
-              return co(gen)
-            }
-          })
-        }
-      })
-    } else {
-      this.titleShow = this.$appdata.getSingleValue('关于我们')
-      window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
-      this.vTime = this.format(new Date(window.versionTime));
-      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();
-      $('#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()
-      }
-      console.log(this.$login)
-    }
-  },
-  data () {
-    return {
-      vTime: '',
-      image:{
-        img1: '/images/newStyle/login-info.png',
-        img2: '/images/newStyle/login-con.png',
-        img3: '/images/newStyle/login-left.png',
-        img4: '/images/newStyle/login-user.png',
-        img5: '/images/newStyle/login-pwd.png',
-        img6: '/images/newStyle/login-check.png',
-        img7: '/images/newStyle/login-do.png',
-      },
-      config: {
-        isMac: false,
-        depPrompt: false,
-        weakPassword: false,
-        title: '燃气客服系统',
-        distanceLogin: false,
-        // 那些角色可以定时获取预约提示
-        isTip : false,
-        // 那些角色可以定时获取预约提示
-        msgRole : '预约处理人员',
-        // 定时获取提示间隔 单位：分钟
-        times: 25,
-        serviceKey: '931c5577c71047b9b58e1a7638b4e999'
-      },
-      titleShow: true, //标题显示
-      otherLogin:false,
-      login: false,
-      depPromptShow: false,
-      model: {},
-      show: false,
-      checkCode: '',
-      login_do:true,
-      picLyanzhengma: '',
-      // 修改密码弹框展示
-      modifyPwShow: false,
-      logoandroid:false,
-      showus:false,
-      notice:'',
-      loginotherflag :true,
-      // 报建待办
-      AppDaiBan: '',
-      //安检待办
-      safecheckDaiBan:[],
-      // 预约待处理
-      OrderDaiBan: ''
-    }
-  },
-  methods: {
-    //格式化时间
-    format(dat){
-      //获取年月日，时间
-      const year = dat.getFullYear();
-      const mon = (dat.getMonth()+1) < 10 ? "0"+(dat.getMonth()+1) : dat.getMonth()+1;
-      const data = dat.getDate()  < 10 ? "0"+(dat.getDate()) : dat.getDate();
-      const hour = dat.getHours()  < 10 ? "0"+(dat.getHours()) : dat.getHours();
-      const min =  dat.getMinutes()  < 10 ? "0"+(dat.getMinutes()) : dat.getMinutes();
-      const seon = dat.getSeconds() < 10 ? "0"+(dat.getSeconds()) : dat.getSeconds();
-
-      return year + "-" + mon + "-" + data + " " + hour + ":" + min + ":" + seon;
-    },
-    async getDaiBan(){
-      let http = new HttpResetClass()
-      let condition = ''
-      if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
-      } else {
-        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
-      }
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
-          OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
-          OrderDaiBan[item.f_ordertype].push(item)
-        })
-        this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
-        if (res.data.length> 0){
-          this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
-        }
-      })
-      let data = {
-        condition: '1 = 1',
-        data: {
-          orgid: this.$login.f.orgid,
-          id: this.$login.f.id
-        }
-      }
-      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then((res) => {
-        let AppDaiBan = {}
-        res.data.forEach(item=>{
-          AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
-          AppDaiBan[item.defname].push(item)
-        })
-        this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
-        if (res.data.length> 0){
-          this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
-        }
-      })
-
-    },
-    async getDaiBanA(){
-      // 是否全局开启待办通知
-      if (daibanJson.enable) {
-        console.log("当前获取到待办配置为" + JSON.stringify(daibanJson))
-        let http = new HttpResetClass()
-        let daibanArray = []
-        for (let daibanItem of daibanJson.daiban) {
-          console.log("开始处理待办任务：" + daibanItem.title + "当前任务状态：" + daibanItem.enable?"开启":"关闭" )
-          if (daibanItem.enable) { // 控制每一项通知是否开启
-            let postResult = ''; //提示信息为
-            await http.load("POST",daibanItem.url,{data:daibanItem.data},{ resolveMsg: null, rejectMsg: null})
-              .then((res)=>{
-                let responseData = res.data
-                for (let item of responseData) {
-                  postResult += eval(daibanItem.text) + "\n"
-                }
-                postResult += '\t'
-                daibanArray.push({text:postResult,oldData:daibanItem})
-              })
-          }
-        }
-        console.log("安检数据为："+JSON.stringify(daibanArray))
-        this.safecheckDaiBan = daibanArray
-      }else {
-        console.log("待办提醒全局关闭。")
-      }
-
-
-
-
-    },
-
-    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(){
-      // var  elementList = document.querySelectorAll('body');
-      //   console.log(elementList)
-      //   document.querySelectorAll('body')[0].className='themeTwo'
-      //   var  elementList = document.querySelectorAll('body');
-      //   console.log(elementList)
-    },
-    onReady () {
-      this.$emit('ready')
-    },
-    confirm (key) {
-      this.login_do=!this.login_do
-      // return
-      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(()=>{
-            this.login = false
-            $('form').fadeIn(500)
-            this.createCode()
-          })
-        }else if(this.picLyanzhengma.toUpperCase() != this.checkCode ) {
-          //若输入的验证码与产生的验证码不一致时
-          this.$showMessage("验证码不正确").then(()=>{
-            this.login = false
-            $('form').fadeIn(500)
-            this.createCode();//刷新验证码
-            this.picLyanzhengma = '';
-          })
-        }else {
-          this.login = true
-          let gen = saveGen(this)
-          return co(gen)
-        }
-      }else {
-        this.login = true
-        let gen = saveGen(this)
-        return co(gen)
-      }
-    },
-    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',
-        'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');//随机数
-      for (let i = 0; i < codeLength; i++) {
-        //循环操作
-        let index = Math.floor(Math.random() * 36);//取得随机数的索引（0~35）
-        code += random[index];//根据索引取得随机数加到code上
-      }
-      this.checkCode = code;//把code值赋给验证码
-    },
-
-    async depPromptConfirm () {
-      this.depPromptShow = false
-      return this.$goto('home-page', {functions: this.$login.f,config: this.config})
-    },
-
-    depPromptCancel () {
-      this.depPromptShow = false
-      this.createCode()
-      this.picLyanzhengma = ''
-      this.model.ename = ''
-      this.model.password = ''
-      this.login = false
-      $('form').fadeIn(500)
-    }
-  },
-  watch: {
-    'modifyPwShow' (val){
-      if (!val) {
-        window.location.reload()
-      }
-    }
-  }
-}
-</script>
-
-<style>
-</style>
+<template>
+  <div class="syslogin" v-if="showlogin">
+    <img style="position: fixed; left: 50px; top: 50px; height: 70px" src="../../../static/furuike/logo2.jpg">
+    <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%">
+          <div v-if="titleShow">
+            <img src="../../../static/newStyle/login-info.png"/>
+            <span @click="showus=true">关于我们</span>
+          </div>
+        </div>
+      </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 v-if="logoandroid" class="imglogo"></div>
+      <p class="logocontent">燃气客服系统Android版</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">
+      </div>
+      <div class="loginmain-right" style="padding-top: 1%">
+
+        <div style="display: flex;align-items: center;gap: 10px;height: fit-content">
+          <img style="height: 50px; width: 60px" src="../../../static/furuike/logo1.jpg">
+          <p @click="theme()" style="white-space: nowrap">{{config.title}}</p>
+        </div>
+
+
+        <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"/>
+          </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"
+                   @keyup.enter="confirm('key')"/>
+          </div>
+          <div class="login-input-1" v-if="$login.Verification">
+            <img src="../../../static/newStyle/login-check.png"/>
+            <input class="login-check"  type="text" placeholder="请输入验证码"
+                   v-model="picLyanzhengma" @keyup.enter="confirm('key')"/>
+          </div>
+          <div class="login-input-2" v-if="$login.Verification">
+            <input class="login-check-1" style="display: inline;background-color:#eeeeee !important;"
+                   type="button" @click="createCode" v-model="checkCode"/>
+          </div>
+          <div class="login-bt" :style="{marginTop: $login.Verification ? '30%' : '10%'}">
+            <button type="button" id="login-button" class="login-button" @click.prevent="confirm('click')">登录</button>
+          </div>
+        </form>
+        <div v-show="login" class="login_load">
+          <img src="../../../static/newStyle/login-do.gif">
+        </div>
+      </div>
+    </div>
+    <div class="login-foot" v-show="false">
+      技术支持：西安奥枫软件有限公司
+    </div>
+    <div class="login-foot" v-show="$login.BAinformation">
+      {{{ $login.BAinformation }}}
+    </div>
+
+    <modal v-if="depPromptShow" :show.sync="depPromptShow" :backdrop="false" v-ref:modal >
+      <header slot="modal-header" style="height: 8vh" class="modal-header">
+        <!--<h4 class="modal-title">登录信息</h4>-->
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <form class="form-horizontal">
+          <div class="row">
+            <div class="col-sm-12 form-group">
+              <label class="col-sm-5 ">当前登录人:</label>
+              <label style="font-weight:normal">{{$login.f.name}}</label>
+            </div>
+            <!--<div class="col-sm-12 form-group" v-if="$login.f.number">-->
+            <!--<label class="col-sm-5 ">组&nbsp;织&nbsp;编&nbsp;码:</label>-->
+            <!--<label style="font-weight:normal">{{$login.f.number}}</label>-->
+            <!-- <div class="col-sm-7">
+              <span >{{$login.f.number}}</span>
+            </div> -->
+            <!--</div>-->
+            <div class="col-sm-12 form-group">
+              <label class="col-sm-5">所在销售点:</label>
+              <label style="font-weight:normal">{{$login.f.deps}}</label>
+              <!-- <div class="col-sm-7">
+                <span >{{$login.f.deps}}</span>
+              </div> -->
+            </div>
+            <div class="col-sm-12 " v-if="AppDaiBan !==''">
+              <label class="col-sm-2">报装待办:</label>
+              <span style="font-weight:normal">{{AppDaiBan}}</span>
+            </div>
+            <div class="col-sm-12 " v-if="OrderDaiBan !==''">
+              <label class="col-sm-2">预约待办:</label>
+              <span style="font-weight:normal">{{OrderDaiBan}}</span>
+            </div>
+            <div class="col-sm-12 "  v-for="daibanitem in safecheckDaiBan">
+              <label class="col-sm-2">{{daibanitem.oldData.title}}:</label>
+              <span style="font-weight:normal">{{daibanitem.text}}</span>
+            </div>
+          </div>
+        </form>
+      </article>
+      <footer  slot="modal-footer" style="height: 8vh" class="modal-footer">
+        <button class="button_search" @click="depPromptConfirm">确认</button>
+        <button class="button_clear" @click="depPromptCancel">取消</button>
+      </footer>
+    </modal>
+
+    <!-- 修改密码组件 -->
+    <modify-pw :show.sync="modifyPwShow" v-if="modifyPwShow"></modify-pw>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import $ from 'jquery'
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+
+let daibanJson = require('../../util/Daiban.json')
+
+
+let saveGen = function *(self) {
+  try {
+    if(self.$login){
+      // 账号ename，密码password，是否显示异地登陆
+      yield self.$login.login(self.model.ename, self.model.password, true)
+    }
+    if(self.$appdata){
+      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()
+        }
+      } catch (e) {
+        console.log('热力系统登陆失败!')
+      }
+    }
+    yield self.$getConfig(self, 'Login')
+    console.log('登录配置', self.config)
+    if (self.config.isMac) {
+      // 获取该登录人分公司下的mac配置
+      let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).catch(() => {
+        throw new Error('获取mac配置失败')
+      })
+      console.log('MAC地址信息', getMacs)
+      // 获取本地mac地址
+      let getLocalMac = yield self.$resetget('http://127.0.0.1:8003/loadmac', {
+        resolveMsg: null,
+        rejectMsg: null
+      }).catch(() => {
+        throw new Error('获取本地mac配置失败')
+      })
+      console.log('本地MAC地址信息', getLocalMac)
+      // 对Mac地址进行匹配
+      let macValidate = false
+      for (let i = 0; i < getLocalMac.data.mac.length; i++) {
+        for (let j = 0; j < getMacs.data.length; j++) {
+          if (getMacs.data[j].f_mac_number.toLocaleUpperCase() === getLocalMac.data.mac[i]) {
+            macValidate = true
+          }
+        }
+      }
+      if (!macValidate) {
+        throw new Error('Mac地址验证失败, 请联系管理员！！')
+      }
+    }
+    console.log(self.$login.depPrompt)
+    // 弱口令验证
+    //跳转过来的不进行验证
+    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+      self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
+        self.modifyPwShow = true
+      })
+    } else if ((!self.otherLogin) && self.$login.depPrompt) {
+      self.depPromptShow = true
+      if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
+        // 获取待办
+        self.getDaiBan()
+
+      }
+      if (self.$login.showDaiBan && self.$login.r.includes('登录预约信息')){
+        // 获取待办  在util下有个Daiban.jsond 文件 ，在里面进行配置，在功能权限界面增加登录预约信息
+        self.getDaiBanA()
+      }
+    } else {
+      self.$goto('home-page', {functions: self.$login.f,config: self.config})
+      // if (self.otherLogin){
+      //   window.history.pushState(null,null,'')
+      // }
+      if (self.$login) {
+        console.log('登录信息', self.$login.f)
+        global.login=self.$login.f
+        console.log('登录信息', global.login)
+      }
+    }
+
+  } catch (ret) {
+    console.error('登录失败', ret)
+    let msg
+    if (ret instanceof Error) {
+      msg = ret
+    }
+    if (ret.status === 0) {
+      msg = '服务连接错误，请确认服务状态'
+    } else if (ret.status === 401) {
+      msg = ret.data
+    } else if (ret.status === 710) {
+      msg = ret.data
+    }
+    self.createCode()
+    self.picLyanzhengma = ''
+    yield self.$showMessage(msg)
+    self.model.ename = ''
+    self.model.password = ''
+    self.login = false
+    $('form').fadeIn(500)
+  }
+}
+export default {
+  title: '登录',
+  async ready () {
+    if (window.location.href.includes('ticket')) {
+      this.showlogin = false
+      let url = window.location.href.split("?")[1]
+      let obj = {}
+      for (let params of url.split("&")) {
+        let kv = params.split("=")
+        obj[kv[0]] = kv[1]
+      }
+      let params = {
+        st: obj.ticket,
+        serviceKey: this.config.serviceKey
+      }
+      this.$resetpost('/sso/logic/serviceValidate', params,{resolveMsg: null, rejectMsg: null}).then((re) => {
+        // this.$showMessage("re----" + JSON.stringify(re))
+        if (re.data.code === 200) {
+          let condition = `ename = '${re.data.data.userName}'`
+          this.$resetpost('rs/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            if (res.data && res.data.length > 0) {
+              this.model.ename = res.data[0].ename
+              this.model.password = res.data[0].password
+              // this.$showMessage("re----" + JSON.stringify(this.model))
+              let gen = saveGen(this)
+              return co(gen)
+            }
+          })
+        }
+      })
+    } else {
+      this.titleShow = this.$appdata.getSingleValue('关于我们')
+      window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
+      this.vTime = this.format(new Date(window.versionTime));
+      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();
+      $('#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()
+      }
+      console.log(this.$login)
+    }
+  },
+  data () {
+    return {
+      vTime: '',
+      image:{
+        img1: '/images/newStyle/login-info.png',
+        img2: '/images/newStyle/login-con.png',
+        img3: '/images/newStyle/login-left.png',
+        img4: '/images/newStyle/login-user.png',
+        img5: '/images/newStyle/login-pwd.png',
+        img6: '/images/newStyle/login-check.png',
+        img7: '/images/newStyle/login-do.png',
+      },
+      config: {
+        isMac: false,
+        depPrompt: false,
+        weakPassword: false,
+        title: '燃气客服系统',
+        distanceLogin: false,
+        // 那些角色可以定时获取预约提示
+        isTip : false,
+        // 那些角色可以定时获取预约提示
+        msgRole : '预约处理人员',
+        // 定时获取提示间隔 单位：分钟
+        times: 25,
+        serviceKey: '5d83a22dd2824234b1580ede32530e99'
+      },
+      showlogin: true,
+      titleShow: true, //标题显示
+      otherLogin:false,
+      login: false,
+      depPromptShow: false,
+      model: {},
+      show: false,
+      checkCode: '',
+      login_do:true,
+      picLyanzhengma: '',
+      // 修改密码弹框展示
+      modifyPwShow: false,
+      logoandroid:false,
+      showus:false,
+      notice:'',
+      loginotherflag :true,
+      // 报建待办
+      AppDaiBan: '',
+      //安检待办
+      safecheckDaiBan:[],
+      // 预约待处理
+      OrderDaiBan: ''
+    }
+  },
+  methods: {
+    //格式化时间
+    format(dat){
+      //获取年月日，时间
+      const year = dat.getFullYear();
+      const mon = (dat.getMonth()+1) < 10 ? "0"+(dat.getMonth()+1) : dat.getMonth()+1;
+      const data = dat.getDate()  < 10 ? "0"+(dat.getDate()) : dat.getDate();
+      const hour = dat.getHours()  < 10 ? "0"+(dat.getHours()) : dat.getHours();
+      const min =  dat.getMinutes()  < 10 ? "0"+(dat.getMinutes()) : dat.getMinutes();
+      const seon = dat.getSeconds() < 10 ? "0"+(dat.getSeconds()) : dat.getSeconds();
+
+      return year + "-" + mon + "-" + data + " " + hour + ":" + min + ":" + seon;
+    },
+    async getDaiBan(){
+      let http = new HttpResetClass()
+      let condition = ''
+      if(this.$login.f.deps!=='柠条塔'){
+        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+      } else {
+        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
+      }
+      await http.load('POST', '/rs/sql/singleTable', {data: {
+          tablename:'t_order_center',
+          condition:condition
+        }}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        let OrderDaiBan = {}
+        res.data.forEach(item=>{
+          OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
+          OrderDaiBan[item.f_ordertype].push(item)
+        })
+        this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+        if (res.data.length> 0){
+          this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
+        }
+      })
+      let data = {
+        condition: '1 = 1',
+        data: {
+          orgid: this.$login.f.orgid,
+          id: this.$login.f.id
+        }
+      }
+      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        let AppDaiBan = {}
+        res.data.forEach(item=>{
+          AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
+          AppDaiBan[item.defname].push(item)
+        })
+        this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
+        if (res.data.length> 0){
+          this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
+        }
+      })
+
+    },
+    async getDaiBanA(){
+      // 是否全局开启待办通知
+      if (daibanJson.enable) {
+        console.log("当前获取到待办配置为" + JSON.stringify(daibanJson))
+        let http = new HttpResetClass()
+        let daibanArray = []
+        for (let daibanItem of daibanJson.daiban) {
+          console.log("开始处理待办任务：" + daibanItem.title + "当前任务状态：" + daibanItem.enable?"开启":"关闭" )
+          if (daibanItem.enable) { // 控制每一项通知是否开启
+            let postResult = ''; //提示信息为
+            await http.load("POST",daibanItem.url,{data:daibanItem.data},{ resolveMsg: null, rejectMsg: null})
+              .then((res)=>{
+                let responseData = res.data
+                for (let item of responseData) {
+                  postResult += eval(daibanItem.text) + "\n"
+                }
+                postResult += '\t'
+                daibanArray.push({text:postResult,oldData:daibanItem})
+              })
+          }
+        }
+        console.log("安检数据为："+JSON.stringify(daibanArray))
+        this.safecheckDaiBan = daibanArray
+      }else {
+        console.log("待办提醒全局关闭。")
+      }
+
+
+
+
+    },
+
+    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(){
+      // var  elementList = document.querySelectorAll('body');
+      //   console.log(elementList)
+      //   document.querySelectorAll('body')[0].className='themeTwo'
+      //   var  elementList = document.querySelectorAll('body');
+      //   console.log(elementList)
+    },
+    onReady () {
+      this.$emit('ready')
+    },
+    confirm (key) {
+      this.login_do=!this.login_do
+      // return
+      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(()=>{
+            this.login = false
+            $('form').fadeIn(500)
+            this.createCode()
+          })
+        }else if(this.picLyanzhengma.toUpperCase() != this.checkCode ) {
+          //若输入的验证码与产生的验证码不一致时
+          this.$showMessage("验证码不正确").then(()=>{
+            this.login = false
+            $('form').fadeIn(500)
+            this.createCode();//刷新验证码
+            this.picLyanzhengma = '';
+          })
+        }else {
+          this.login = true
+          let gen = saveGen(this)
+          return co(gen)
+        }
+      }else {
+        this.login = true
+        let gen = saveGen(this)
+        return co(gen)
+      }
+    },
+    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',
+        'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');//随机数
+      for (let i = 0; i < codeLength; i++) {
+        //循环操作
+        let index = Math.floor(Math.random() * 36);//取得随机数的索引（0~35）
+        code += random[index];//根据索引取得随机数加到code上
+      }
+      this.checkCode = code;//把code值赋给验证码
+    },
+
+    async depPromptConfirm () {
+      this.depPromptShow = false
+      return this.$goto('home-page', {functions: this.$login.f,config: this.config})
+    },
+
+    depPromptCancel () {
+      this.depPromptShow = false
+      this.createCode()
+      this.picLyanzhengma = ''
+      this.model.ename = ''
+      this.model.password = ''
+      this.login = false
+      $('form').fadeIn(500)
+    }
+  },
+  watch: {
+    'modifyPwShow' (val){
+      if (!val) {
+        window.location.reload()
+      }
+    }
+  }
+}
+</script>
+
+<style>
+</style>