system-clients 3.2.103-temp → 3.2.105-baoledp

package/package.json

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

package/src/components/server/Login.vue

@@ -135,7 +135,7 @@
     </modal>
 
     <!-- 修改密码组件 -->
-    <modify-pw :show.sync="modifyPwShow" v-if="modifyPwShow"></modify-pw>
+    <modify-pw :show.sync="modifyPwShow" v-if="modifyPwShow" :ename="model.ename"></modify-pw>
   </div>
 
 </template>

package/src/components/server/ModifyPw.vue

@@ -57,7 +57,7 @@
   import validator from '../../plugins/validation';
 
   let saveGen = function * (self) {
-    self.deliver.ename = self.functions.ename
+    self.deliver.ename = self.ename || self.functions.ename
     // let res = yield self.$post('rs/user/entity', {data: self.deliver})
     // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
     // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
@@ -101,7 +101,7 @@
         functions: this.$login.f
       }
     },
-    props: ['show'],
+    props: ['show','ename'],
     methods: {
       confirm () {
         let gen = saveGen(this)

package/src/components/server/ScreenLogin.vue

@@ -0,0 +1,549 @@
+<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:0">
+          <button class="my_button_search button_spacing" style="margin-right: 5px"  title="点击清除浏览器缓存" @click.stop="delCookie">
+            <img
+              src="../../assets/clear-cookie.png" style="height: 25px; width: 95px;margin-bottom: 3px;">
+          </button>
+          <span v-if="$login.versionTime">构建时间：{{ vTime }}</span>
+          <div v-if="titleShow">
+          <img src="../../../static/newStyle/login-info.png"/>
+          <span @click="showus=true">关于我们</span>
+          </div>
+          <!--          <img src="../../../static/newStyle/login-con.png"/>-->
+          <!--          <span>联系我们</span>-->
+        </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">
+
+        <p @click="theme()" style="white-space: nowrap">{{config.title}}</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"/>
+          </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 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;"
+                   type="button" @click="createCode" v-model="checkCode"/>
+          </div>
+          <div class="login-bt">
+            <button type="button" id="login-button" class="login-button" @click.prevent="confirm('click')">登录</button>
+          </div>
+          <!--                    <input type="password" placeholder="密码" v-model="model.password" class="psicon"-->
+          <!--                           @keyup.enter="confirm('key')">-->
+          <!--                    <input v-if="$login.Verification" styljiaoyane="width: 40%; display: inline" type="text" placeholder="请输入验证码"-->
+          <!--                           v-model="picLyanzhengma" @keyup.enter="confirm('key')">-->
+          <!--                    <input v-if="$login.Verification" style="width: 30%; display: inline;background-color: darkgray;"-->
+          <!--                           type="button" @click="createCode" v-model="checkCode"/><br>-->
+
+          <!-- <button type="button" id="login-button" @click.prevent="confirm()"><strong>注册</strong></button> -->
+          <!-- <span @click="register()">还没有注册，现在注册>>></span> -->
+        </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" :ename="model.ename"></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, self.$login.showYiDi)
+    }
+    // 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 && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{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('manage-main2', {functions: self.$login.f,config: self.config})
+      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
+    } else if (ret.status === 555) {
+      msg = ret.data
+    } else if(ret.status === 789) {
+      yield self.$showMessage(msg='您的密码已过期，请及时修改！！！', ['confirm']).then(() => {
+        self.modifyPwShow = true
+      })
+      return
+    }
+    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.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,
+        approve: false, // 是否获取审核提醒
+        approveTimes: 1 // 审核时间见间隔
+      },
+      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)
+    },
+    delCookie() {
+      let cookies = document.cookie.split(";");
+      console.log("点击触发了")
+      for (let i = 0; i < cookies.length; i++) {
+        let cookie = cookies[i];
+        let eqPos = cookie.indexOf("=");
+        let name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+        document.cookie =
+          name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/";
+      }
+      if (cookies.length > 0) {
+        for (let i = 0; i < cookies.length; i++) {
+          let cookie = cookies[i];
+          let eqPos = cookie.indexOf("=");
+          let name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+          let domain = location.host.substr(location.host.indexOf("."));
+          document.cookie =
+            name +
+            "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=" +
+            domain;
+        }
+      }
+      localStorage.clear()
+      sessionStorage.clear()
+      window.location.reload()
+    }
+
+  },
+  watch: {
+    'modifyPwShow' (val){
+      if (!val) {
+        window.location.reload()
+      }
+    }
+  }
+}
+</script>
+
+<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);}
+</style>

package/src/filiale/gongyi/EquipmentManage.vue

@@ -0,0 +1,65 @@
+<template>
+  <div class="flex">
+    <div class="auto">
+      <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
+        <div class="row">
+          <div class="col-sm-2 form-group">
+            <label class="font_normal_body" title="参数管理：终端类型">终端类型</label>
+            <v-select id="f_charge_type"
+                      v-model="model.f_equipment_type"
+                      placeholder='终端类型'
+                      :value.sync="model.f_equipment_type"
+                      :options='equipmentType'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'PC'">
+      <pc-manage></pc-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'POS'">
+      <pos-manage></pos-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'PHONE'">
+      <phone-manage></phone-manage>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  title: '终端控制',
+  data () {
+    return {
+      filialeNameStr: this.$login.f.f_fengongsi,
+      filialeCodeStr: this.$login.f.orgid,
+      userid:this.$login.f.id,
+      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+      equipmentType: this.$appdata.getParam('终端类型'),
+      model: {
+        f_equipment_type: []
+      }
+    }
+  },
+  ready () {
+    console.log('看看终端类型',  this.equipmentType)
+    this.model.f_equipment_type = [this.equipmentType[0].value]
+  },
+  methods: {
+    del (row) {
+      console.log('要删除了', row)
+    },
+
+    getRes (obj) {
+      this.filialeNameStr = obj.res
+      this.filialeCodeStr = obj.resids
+    },
+  },
+  computed: {
+
+  }
+}
+</script>

package/src/filiale/gongyi/PcAdd.vue

@@ -0,0 +1,105 @@
+<template>
+  <div class="row select-overspread">
+    <validator name='v'>
+      <ul class="nav nav-tabs" >
+        <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
+      </ul>
+      <form class="form-horizontal">
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body">使用人员</label>
+          <input type="text"  style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
+        </div>
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body">所属地址</label>
+          <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_outlets" placeholder="所属地址" >
+        </div>
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body">mac地址</label>
+          <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_number" placeholder="mac地址" >
+        </div>
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body">使用公司</label>
+
+          <res-select restype='organization'
+                      is-mul="false"
+                      @res-select="getorg"
+                      :initresid="curorgid">
+          </res-select>
+
+        </div>
+      </form>
+      <div style="text-align:right;height:auto;">
+        <button class="btn button_search" @click="confirm()"  >确认</button>
+        <button class="btn button_clear " @click="cancel()" >取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+
+
+export default {
+  data () {
+    return {
+      model: {
+        f_username: '',
+        f_mac_outlets: '',
+        f_mac_number: '',
+        f_equipment_type: 'PC',
+        f_state: '正常'
+      },
+      curorgid: this.$login.f.orgid,
+      f_orgid: ''
+    }
+  },
+  props: ['data'],
+  watch: {
+    'data' (val) {
+      if (val) {
+        this.edit(val)
+      } else {
+        this.initModel()
+      }
+    }
+  },
+  ready () {
+    console.log('mac信息：', this.data)
+    if (this.data) {
+      this.edit(this.data)
+    }
+  },
+  methods: {
+    confirm () {
+      this.model.f_operator = this.$login.f.name
+      this.model.f_operatorid = this.$login.f.id
+      this.model.f_orgid = this.f_orgid
+      console.log('保存', this.model)
+      this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+        this.$dispatch('refresh')
+      }).catch((error) => {
+        this.$dispatch('refresh')
+      })
+    },
+    edit (row) {
+      console.log('修改，，。。', row)
+      this.model.f_username = row.f_username
+      this.model.f_mac_outlets = row.f_mac_outlets
+      this.model.f_mac_number = row.f_mac_number
+      this.model.id = row.id
+      this.f_orgid = row.f_orgid
+    },
+    initModel () {
+      delete this.model.id
+      this.model.f_username = ''
+      this.model.f_mac_outlets = ''
+      this.model.f_mac_number = ''
+    },
+    cancel () {
+      this.$dispatch('close')
+    },
+    getorg (val) {
+      this.f_orgid = val[0]
+    }
+  }
+}
+</script>

package/src/filiale/gongyi/PcList.vue

@@ -0,0 +1,119 @@
+<template>
+  <div class="flex" >
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">使用公司</label>
+              <res-select restype='organization'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getorg"
+                          :initresid="$parent.$parent.curorgid">
+              </res-select>
+            </div>
+
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body">使用人员</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
+                      condition="f_username like '%{}%'" placeholder="使用人员">
+            </div>
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body">所属地址</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_outlets"
+                      condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
+            </div>
+            <div class="span" style="float:right;">
+              <button class="button_search" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
+              <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                   @click="$parent.$parent.hidden()"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body">MAC地址</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_number"
+                      condition="f_mac_number like '%{}%'" placeholder="MAC地址">
+            </div>
+
+
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' class="list_area table_sy"  v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th>序号</th>
+            <th>使用人员</th>
+            <th>所属地址</th>
+            <th>MAC地址</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body':model="model">
+          <tr>
+            <td style="text-align:center">{{$index+1}}</td>
+            <td style="text-align:center">{{row.f_username}}</td>
+            <td style="text-align:center">{{row.f_mac_outlets}}</td>
+            <td style="text-align:center">{{row.f_mac_number}}</td>
+            <td style="text-align:center">
+              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+
+export default {
+  title: 'PC',
+  components: {},
+  data () {
+    return {
+      criteriaShow: false,
+      model: new PagedList('rs/sql/equipmentQuery', 20),
+      curorgid: [this.$login.f.orgid],
+      f_orgid: ''
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    hidden(){
+      this.criteriaShow = !this.criteriaShow
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+
+    selfSearch (args) {
+      args.condition =  `${args.condition} and f_equipment_type = 'PC' and f_state = '正常' and f_orgid like '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
+      this.model.search(args.condition, this.model)
+    },
+    add () {
+      this.$dispatch('add')
+    },
+    del (row) {
+      console.log('要删除了', row)
+      row.f_state = '已删除'
+      this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch('refresh')
+      }).catch((error) => {
+        this.$dispatch('refresh')
+      })
+    },
+    getorg (val) {
+      this.f_orgid = val[0]
+    }
+  },
+  computed: {
+
+  }
+}
+</script>

package/src/filiale/gongyi/PcManage.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+      <pc-list :row="row" @select-changed="selected"  style="width:auto;" v-ref:list ></pc-list>
+    </div>
+    <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
+      <pc-add :data="row" v-ref:addbox></pc-add>
+    </div>
+  </div>
+</template>
+<script>
+
+import PcList from './PcList'
+import PcAdd from './PcAdd'
+
+export default {
+  title: 'PC终端管理',
+  components: {
+    PcList, PcAdd
+  },
+  data () {
+    return {
+      isChange: false,
+      row: null
+    }
+  },
+  methods: {
+    selected (obj) {
+      this.isChange = true
+      this.row = obj.val
+    }
+  },
+  events: {
+    'search' () {
+      this.isChange = false
+      this.row = null
+      this.$refs.list.$refs.paged.$refs.cri.search()
+    },
+    'refresh' () {
+      this.isChange = false
+      this.row = null
+      this.$refs.list.search()
+    },
+    'error' (name, row, res) {
+      this.isChange = false
+      this.row = null
+    },
+    'close' () {
+      this.isChange = false
+      this.row = null
+      this.$refs.list.search()
+    },
+    'add' () {
+      this.row = null
+      this.isChange = true
+      this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
+    }
+  }
+}
+</script>

package/src/filiale/gongyi/PhoneAdd.vue

@@ -0,0 +1,107 @@
+<template>
+  <div class="row select-overspread">
+    <validator name='v'>
+      <ul class="nav nav-tabs" >
+        <li role="presentation" class="active"><a href="#">Phone端设备号</a></li>
+      </ul>
+      <form class="form-horizontal">
+
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body">使用人员</label>
+          <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
+        </div>
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body">设备号</label>
+          <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
+        </div>
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body">使用公司</label>
+          <!--<right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>-->
+          <res-select restype='organization'
+                      is-mul="false"
+                      @res-select="getorg"
+                      :initresid="curorgid">
+          </res-select>
+        </div>
+
+      </form>
+      <div style="text-align:right;height:auto;">
+        <button class="btn button_search " @click="confirm()"  >确认</button>
+        <button class="btn button_clear " @click="cancel()" >取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+
+
+export default {
+  data () {
+    return {
+      model: {
+        f_username: '',
+        f_terminal_number: '',
+        f_equipment_type: 'PHONE',
+        f_state: '正常'
+      },
+      filialeCodeStr: this.$login.f.f_orgids,
+      userid: this.$login.f.id,
+      source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+      curorgid: this.$login.f.orgid,
+      f_orgid: ''
+    }
+  },
+  props: ['data'],
+  watch: {
+    'data' (val) {
+      if (val) {
+        this.edit(val)
+      } else {
+        this.initModel()
+      }
+    }
+  },
+  ready () {
+    console.log('mac信息：', this.data)
+    if (this.data) {
+      this.edit(this.data)
+    }
+  },
+  methods: {
+    confirm () {
+      this.model.f_operator = this.$login.f.name
+      this.model.f_filialeids = this.filialeCodeStr
+      this.model.f_orgid = this.f_orgid
+      console.log('保存', this.model)
+      this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+        this.$dispatch('refresh')
+      }).catch(() => {
+        this.$dispatch('refresh')
+      })
+    },
+    edit (row) {
+      console.log('修改，，。。', row)
+      this.model.f_username = row.f_username
+      this.model.f_terminal_number = row.f_terminal_number
+      this.model.id = row.id
+      this.filialeCodeStr = row.f_filialeids
+      this.f_orgid = row.f_orgid
+      this.curorgid= [row.f_orgid]
+    },
+    initModel () {
+      delete this.model.id
+      this.model.f_username = ''
+      this.model.f_terminal_number = ''
+    },
+    cancel () {
+      this.$dispatch('close')
+    },
+    getRes(obj) {
+      this.filialeCodeStr = obj.resids
+    },
+    getorg (val) {
+      this.f_orgid = val[0]
+    }
+  }
+}
+</script>

package/src/filiale/gongyi/PhoneList.vue

@@ -0,0 +1,112 @@
+<template>
+  <div class="flex" style="flex:1; ">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">使用公司</label>
+              <!--<right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes" > </right-tree>-->
+              <res-select restype='organization'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getorg"
+                          :initresid="$parent.$parent.curorgid">
+              </res-select>
+            </div>
+
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body">使用人员</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
+                      condition="f_username like '%{}%'" placeholder="使用人员">
+            </div>
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body">设备号</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
+                      condition="f_terminal_number like '%{}%'" placeholder="设备号">
+            </div>
+            <div class="span" style="float:right;">
+              <button class="button_search" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' class="list_area table_sy"  v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th>序号</th>
+            <th>使用人员</th>
+            <th>设备号</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body':model="model">
+          <tr>
+            <td style="text-align:center">{{$index+1}}</td>
+            <td style="text-align:center">{{row.f_username}}</td>
+            <td style="text-align:center">{{row.f_terminal_number}}</td>
+            <td style="text-align:center">
+              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+
+export default {
+  title: 'PC',
+  components: {},
+  data () {
+    return {
+      model: new PagedList('rs/sql/equipmentQuery', 20),
+      filialeNameStr: this.$login.f.f_fengongsi,
+      filialeCodeStr: this.$login.f.f_orgids,
+      userid:this.$login.f.id,
+      curorgid: [this.$login.f.orgid],
+      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+      f_orgid:''
+    }
+  },
+  ready () {
+    console.log('看看终端类型',  this.equipmentType)
+    this.search()
+  },
+  methods: {
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+
+    selfSearch (args) {
+      args.condition =  `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_orgid = '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
+      this.model.search(args.condition, this.model)
+    },
+    add () {
+      this.$dispatch('add')
+    },
+    del (row) {
+      console.log('要删除了', row)
+      row.f_state = '已删除'
+      this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch('refresh')
+      }).catch((error) => {
+        this.$dispatch('refresh')
+      })
+    },
+    getRes (obj) {
+      this.filialeNameStr = obj.res
+      this.filialeCodeStr = obj.resids
+    },
+    getorg (val) {
+      this.f_orgid = val[0]
+    }
+  },
+  computed: {
+
+  }
+}
+</script>

package/src/filiale/gongyi/PhoneManage.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+      <phone-list :row="row" @select-changed="selected"  style="width:auto;" v-ref:list ></phone-list>
+    </div>
+    <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
+      <phone-add :data="row" v-ref:addbox></phone-add>
+    </div>
+  </div>
+</template>
+<script>
+
+import PhoneList from './PhoneList'
+import PhoneAdd from './PhoneAdd'
+
+export default {
+  title: 'PC终端管理',
+  components: {
+    PhoneList, PhoneAdd
+  },
+  data () {
+    return {
+      isChange: false,
+      row: null
+    }
+  },
+  methods: {
+    selected (obj) {
+      this.isChange = true
+      this.row = obj.val
+    }
+  },
+  events: {
+    'search' () {
+      this.isChange = false
+      this.row = null
+      this.$refs.list.$refs.paged.$refs.cri.search()
+    },
+    'refresh' () {
+      this.isChange = false
+      this.row = null
+      this.$refs.list.search()
+    },
+    'error' (name, row, res) {
+      this.isChange = false
+      this.row = null
+    },
+    'close' () {
+      this.isChange = false
+      this.row = null
+      this.$refs.list.search()
+    },
+    'add' () {
+      this.row = null
+      this.isChange = true
+      this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
+    }
+  }
+}
+</script>

package/src/filiale/gongyi/system.js

@@ -0,0 +1,9 @@
+// 分公司特殊组件页面注册
+exports.specialComp =  {
+  // pc端控制
+  'pc-manage': (resolve) => { require(['./PcManage'], resolve) },
+  // phone端控制
+  'phone-manage': (resolve) => { require(['./PhoneManage'], resolve) },
+  // 终端管理
+  'equipment-manage': (resolve) => { require(['./EquipmentManage'], resolve) }
+}

package/src/system.js

@@ -10,6 +10,7 @@ Vue.$heatCompatibility  = Vue.prototype.$heatCompatibility = false
 // /** **************************登录与主界面相关******************************/
 
 import login from './components/server/Login'
+import screenLogin from './components/server/ScreenLogin'
 import changeDeclare from './components/server/ChangeDeclare'
 import addChangemsg from './components/server/AddChangeMsg'
 import homePage from './components/Main'
@@ -54,7 +55,7 @@ export default function (val,filiale, {showLogin = false, show_daiBan = false, s
   Vue.use(GetAppDataService)
   Vue.use(HeatGetLoginInfoService)
   Vue.use(HeatGetAppDataService)
-
+  Vue.component('screen-login', screenLogin)
   Vue.component('login', login)
   Vue.component('change-declare', changeDeclare)
   Vue.component('add-changemsg', addChangemsg)