system-clients 3.2.63 → 3.2.65-1

package/package.json

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

package/src/App.vue

@@ -1,24 +1,24 @@
-<template>
-  <app-base class="bg">
-    <div class='flex'>
-      <article>
-        <!--<route :comp="{name: 'check-model'}"></route>-->
-        <!--<route :comp="{name: 'vender-management'}"></route>-->
-        <route :comp="{name: 'login'}"></route>
-        <!-- <route :comp="{name: 'load-data'}"></route> -->
-        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
-        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-      </article>
-    </div>
-  </app-base>
-</template>
-
-<script>
-// import cardListen from './plugins/CardListen'
-
-export default {
-  // ready () {
-  //   cardListen.startListen()
-  // }
-}
-</script>
+<template>
+  <app-base class="bg">
+    <div class='flex'>
+      <article>
+        <!--<route :comp="{name: 'check-model'}"></route>-->
+        <!--<route :comp="{name: 'vender-management'}"></route>-->
+        <route :comp="{name: 'login'}"></route>
+        <!-- <route :comp="{name: 'load-data'}"></route> -->
+        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
+        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+      </article>
+    </div>
+  </app-base>
+</template>
+
+<script>
+// import cardListen from './plugins/CardListen'
+
+export default {
+  // ready () {
+  //   cardListen.startListen()
+  // }
+}
+</script>

package/src/components/Main.vue

@@ -202,197 +202,217 @@ let createWaterMark = function (userName) {
   (document.head.append || document.head.appendChild).apply(document.head, [style]);
 }
 
-window.onunload = () => {
-  vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
-}
-window.onbeforeunload = () => {
-  vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
-}
-export default {
-  title: '主界面',
-  props: ['functions', 'userid', 'config'],
-  data() {
-    return {
-      // 页面提示信息定时器
-      interval: null,
-      newTipShow: false,
-      newTipContextShow: false,
-      AppDaiBan: '',
-      OrderDaiBan: '',
-      // 左侧树下部三个小图标
-      imgs: {
-        open: '/images/lefticon/菜单伸缩.png',
-        set: '/images/lefticon/系统设置.png',
-        out: '/images/lefticon/退出系统.png',
-        img1: '/images/newStyle/login-user.png',
-        logoimg: '/static/newStyle/fife.png'
-        // img2: '/images/lefticon/退出系统.png',
-      },
-      treeOrIcon: false,
-      qrCode:false,
-      isManger: false,
-      show: false,
-      orgpathnames: `${this.$login.f.orgs}-${this.$login.f.deps}-${this.$login.f.name}`,
-      systemname: '客服系统',
-      date: this.$login.toStandardDateString(),
-      tabs: [],       //已初始化页签数组
-      selecttab: '',
-      setting: true,
-      srcsetting: '../../static/newStyle/setting.png',
-      showwatermakeflag: false,
-      // headerHint: true, // 右侧顶部提示信息
-      // value: 25645.26,
-      // AddChangeMsgShow: false,
-      // showsum: false
-    }
-  },
-  ready() {
-    getwartermakr(this);
-    let component = this.$login.getUrlCompileParames('component')
-    if (component) {
-      this.isManger = true
-      this.$refs.route.init(component, {data: this.functions.functions})
-    }
-    if (this.$login.f.password == '1') {
-      this.$showMessage('本地登录系统为此账户的初始密码，请确认修改密码！！！', ['confirm', 'cancel']).then((res) => {
-        if (res == 'confirm')
-          this.show = true
-      })
-    }
-    console.log("系统名称", this.$appdata.getSingleValue("系统名称"))
-    this.systemname = this.$appdata.getSingleValue("系统名称") ? this.$appdata.getSingleValue("系统名称") : '客服系统'
-    //   let oBox = this.getElement("box")
-    // 	let	oTop = this.getElement("top")
-    // 	let	oBottom = this.getElement("bottom")
-    // 	let oLine = this.getElement("line")
-    //   let that = this
-    // 			oLine.onmousedown = function(e) {
-    // 				let disX = (e || event).clientX
-    // 				oLine.left = oLine.offsetLeft
-    // 				document.onmousemove = function(e) {
-    // 					let iT = oLine.left + ((e || event).clientX - disX)
-    //           var e = e || window.event
-    // 					let tarnameb = e.target || e.srcElement
-    // 					let maxT = oBox.clientWight - oLine.offsetWidth
-    // 					oLine.style.margin = 0
-    // 					iT < 0 && (iT = 0)
-    // 					iT > maxT && (iT = maxT)
-    // 					oLine.style.left = oTop.style.width = iT + "px"
-    // 					oBottom.style.width = oBox.clientWidth - iT + "px"
-    //           that.$set('treeWidth', iT)
-    // 					return false
-    // 				}
-    // 				document.onmouseup = function() {
-    // 					document.onmousemove = null
-    // 					document.onmouseup = null
-    // 					oLine.releaseCapture && oLine.releaseCapture()
-    // 				}
-    // 				oLine.setCapture && oLine.setCapture()
-    // 				return false
-    // 			}
-    this.changeShow()
-    this.gotoWorkOrderSite()
-    // 获取预约列表
-    this.functions.f_role_name && this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
-  },
-  methods: {
-    getOrderList(){
-      let times = this.config.times * 60 * 1000
-      console.log("=定时提示间隔=", times)
-      try {
-        this.interval = setInterval(() => {
-          this.getDaiBan()
-        }, times)
-      } catch (error) {
-        console.log('捕获到异常', error)
+  window.onunload = () => {
+    vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
+  }
+  window.onbeforeunload = () => {
+    vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
+  }
+  export default {
+    title: '主界面',
+    props: ['functions', 'userid', 'config'],
+    data() {
+      return {
+        // 页面提示信息定时器
+        interval: null,
+        intervaltx: null,
+        newTipShow: false,
+        newTipContextShow: false,
+        AppDaiBan: '',
+        OrderDaiBan: '',
+        // 左侧树下部三个小图标
+        imgs: {
+          open: '/images/lefticon/菜单伸缩.png',
+          set: '/images/lefticon/系统设置.png',
+          out: '/images/lefticon/退出系统.png',
+          img1: '/images/newStyle/login-user.png',
+          logoimg: '/static/newStyle/fife.png'
+          // img2: '/images/lefticon/退出系统.png',
+        },
+        treeOrIcon: false,
+        qrCode:false,
+        isManger: false,
+        show: false,
+        orgpathnames: `${this.$login.f.orgs}-${this.$login.f.deps}-${this.$login.f.name}`,
+        systemname: '客服系统',
+        date: this.$login.toStandardDateString(),
+        tabs: [],       //已初始化页签数组
+        selecttab: '',
+        setting: true,
+        srcsetting: '../../static/newStyle/setting.png',
+        showwatermakeflag: false,
+        // headerHint: true, // 右侧顶部提示信息
+        // value: 25645.26,
+        // AddChangeMsgShow: false,
+        // showsum: false
       }
     },
-    async getDaiBan(){
-      this.OrderDaiBan  = ''
-      this.AppDaiBan  = ''
-      let http = new HttpResetClass()
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
-        }}, {
-        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)
-        })
-        if (res.data.length> 0){
-          this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
-          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
-        }
+    ready() {
+      getwartermakr(this);
+      let component = this.$login.getUrlCompileParames('component')
+      if (component) {
+        this.isManger = true
+        this.$refs.route.init(component, {data: this.functions.functions})
       }
-      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)
+      if (this.$login.f.password == '1') {
+        this.$showMessage('本地登录系统为此账户的初始密码，请确认修改密码！！！', ['confirm', 'cancel']).then((res) => {
+          if (res == 'confirm')
+            this.show = true
         })
-        if (res.data.length> 0){
-          this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
-          this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
-        }
-      }).catch((e)=>{
-        console.error(e)
-      })
-      if(this.AppDaiBan || this.OrderDaiBan){
-        this.newTipShow = true
       }
-    },
-    // 提醒框被点击
-    tipClick(){
-      this.newTipShow = false
-      this.newTipContextShow = true
-    },
-    gotoWorkOrderSite(){
-      const isRemind =this.$appdata.getSingleValue("站点工单提醒")
-      console.log('站点工单是否提醒',isRemind)
-      if(isRemind && isRemind !== '是'){
-        return
+      console.log("系统名称", this.$appdata.getSingleValue("系统名称"))
+      this.systemname = this.$appdata.getSingleValue("系统名称") ? this.$appdata.getSingleValue("系统名称") : '客服系统'
+      //   let oBox = this.getElement("box")
+      // 	let	oTop = this.getElement("top")
+      // 	let	oBottom = this.getElement("bottom")
+      // 	let oLine = this.getElement("line")
+      //   let that = this
+      // 			oLine.onmousedown = function(e) {
+      // 				let disX = (e || event).clientX
+      // 				oLine.left = oLine.offsetLeft
+      // 				document.onmousemove = function(e) {
+      // 					let iT = oLine.left + ((e || event).clientX - disX)
+      //           var e = e || window.event
+      // 					let tarnameb = e.target || e.srcElement
+      // 					let maxT = oBox.clientWight - oLine.offsetWidth
+      // 					oLine.style.margin = 0
+      // 					iT < 0 && (iT = 0)
+      // 					iT > maxT && (iT = maxT)
+      // 					oLine.style.left = oTop.style.width = iT + "px"
+      // 					oBottom.style.width = oBox.clientWidth - iT + "px"
+      //           that.$set('treeWidth', iT)
+      // 					return false
+      // 				}
+      // 				document.onmouseup = function() {
+      // 					document.onmousemove = null
+      // 					document.onmouseup = null
+      // 					oLine.releaseCapture && oLine.releaseCapture()
+      // 				}
+      // 				oLine.setCapture && oLine.setCapture()
+      // 				return false
+      // 			}
+      this.changeShow()
+      const istelRemindTimes =this.$appdata.getSingleValue("是否开启工单提醒定时器")
+      if(istelRemindTimes=='是'){
+        this.getTimesgotoWorkOrderSite()
       }
-      if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('派单员') !== -1){
-        const data = {
-          "condition":
-            {
-              "condition":" 1=1  and processins.activities[ state='开始活动' and (defname in('站点接单'))].count(*) > 0 ",
-              "sign":"1=1"
-            },
-          "userid":this.functions.name
+      const isapplyRemind =this.$appdata.getSingleValue("是否开启提醒")
+      const times =this.$appdata.getSingleValue("提示间隔分钟")
+      if(isapplyRemind=='是'){
+        this.config.isTip = true
+        this.config.times = times
+      }
+      // 获取预约列表
+      this.functions.f_role_name && this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
+    },
+    methods: {
+      getOrderList(){
+        let times = this.config.times * 60 * 1000
+        console.log("=定时提示间隔=", times)
+        try {
+          this.interval = setInterval(() => {
+            this.getDaiBan()
+          }, times)
+        } catch (error) {
+          console.log('捕获到异常', error)
         }
-        new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
-          if(res.data && res.data.n !== 0){
-             this.$showMessage('你有'+res.data.n+'个工单待处理，请尽快前往站点工单页面进行处理')
+      },
+      getTimesgotoWorkOrderSite(){
+        let teltimes = 2*60*1000 // 两分钟
+        try {
+          this.intervaltx =setInterval(()=>{
+            this.gotoWorkOrderSite()
+          },teltimes)
+        }catch (e) {
+          console.log('捕获到异常', e)
+        }
+      },
+      async getDaiBan(){
+        this.OrderDaiBan  = ''
+        this.AppDaiBan  = ''
+        let http = new HttpResetClass()
+        await http.load('POST', '/rs/sql/singleTable', {data: {
+            tablename:'t_order_center',
+            condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
+          }}, {
+          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)
+          })
+          if (res.data.length> 0){
+            this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+            this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
           }
         })
-      }
-    },
-    openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
-      window.open(url, '_blank')
-    },
-    hindsetting() {
-      this.setting = !this.setting
-      if (this.setting) {
-        this.srcsetting = '../../static/newStyle/setting.png'
-      } else {
-        this.srcsetting = '../../static/newStyle/setting1.png'
-      }
+        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)
+          })
+          if (res.data.length> 0){
+            this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
+            this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
+          }
+        }).catch((e)=>{
+          console.error(e)
+        })
+        if(this.AppDaiBan || this.OrderDaiBan){
+          this.newTipShow = true
+        }
+      },
+      // 提醒框被点击
+      tipClick(){
+        this.newTipShow = false
+        this.newTipContextShow = true
+      },
+      gotoWorkOrderSite(){
+        const isRemind =this.$appdata.getSingleValue("站点工单提醒")
+        console.log('站点工单是否提醒',isRemind)
+        if(isRemind && isRemind !== '是'){
+          return
+        }
+        if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('派单员') !== -1){
+          const data = {
+            "condition":
+              {
+                "condition":" 1=1  and processins.activities[ state='开始活动' and (defname in('站点接单'))].count(*) > 0 ",
+                "sign":"1=1"
+              },
+            "userid":this.functions.name
+          }
+          new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+            if(res.data && res.data.n !== 0){
+              this.$showMessage('你有'+res.data.n+'个工单待处理，请尽快前往站点工单页面进行处理')
+            }
+          })
+        }
+      },
+      openUrl() {
+        var url = `http://123.60.214.109:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
+        window.open(url, '_blank')
+      },
+      hindsetting() {
+        this.setting = !this.setting
+        if (this.setting) {
+          this.srcsetting = '../../static/newStyle/setting.png'
+        } else {
+          this.srcsetting = '../../static/newStyle/setting1.png'
+        }
 
     },
     hindsetting1() {

package/src/filiale/qianneng/ModifyPw.vue

@@ -1,107 +1,107 @@
-<template>
-  <div>
-    <validator name="v">
-      <modal :show.sync="show" v-ref:modal  backdrop="false">
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="rest"><span>&times;</span></button>
-          <h4 class="modal-title">修改密码</h4>
-        </header>
-        <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
-          'has-success':!$v.password.required}">
-            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
-              <span v-if="$v.password.required">不能为空</span>
-            </div>
-          </div>
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
-          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
-            <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
-              <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
-              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
-            </div>
-          </div>
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
-          'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
-            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
-              <span v-if="$v.affirmpassword.required">不能为空</span>
-              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
-            </div>
-          </div>
-        </article>
-
-        <footer slot="modal-footer" class="modal-footer">
-          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
-          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
-        </footer>
-      </modal>
-    </validator>
-  </div>
-
-
-</template>
-<script>
-  import co from 'co'
-  import validator from '../../plugins/validation';
-
-  let saveGen = function * (self) {
-    self.deliver.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})
-    //  Util.f.password = self.deliver.newpassword
-    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
-    self.$login.f.password = self.deliver.newpassword
-    if (res.data) {
-      self.deliver.password = ''
-      self.deliver.newpassword = ''
-      self.deliver.affirmpassword = ''
-      self.show = false
-    }
-  }
-  export default {
-    title: '系统管理-密码修改',
-    data () {
-      return {
-        deliver: {
-          password: '',
-          newpassword: '',
-          affirmpassword: ''
-        },
-        functions: this.$login.f
-      }
-    },
-    props: ['show'],
-    methods: {
-      confirm () {
-        let gen = saveGen(this)
-        co(gen)
-      },
-      rest () {
-        this.show = false
-        this.deliver = {password: '', newpassword: '', affirmpassword: ''}
-      }
-    }
-  }
-</script>
-<style>
-  /*修改密码body界面样式*/
-  .modifystyle {
-    background: #FCFEEE;
-  }
-  .modifystyle span{
-    color: red;
-  }
-</style>
+<template>
+  <div>
+    <validator name="v">
+      <modal :show.sync="show" v-ref:modal  backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="rest"><span>&times;</span></button>
+          <h4 class="modal-title">修改密码</h4>
+        </header>
+        <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
+          'has-success':!$v.password.required}">
+            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
+              <span v-if="$v.password.required">不能为空</span>
+            </div>
+          </div>
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
+          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
+            <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
+              <span v-if="$v.newpassword.required">不能为空</span>
+              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
+              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
+            </div>
+          </div>
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
+          'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
+            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
+              <span v-if="$v.affirmpassword.required">不能为空</span>
+              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
+            </div>
+          </div>
+        </article>
+
+        <footer slot="modal-footer" class="modal-footer">
+          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
+          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
+        </footer>
+      </modal>
+    </validator>
+  </div>
+
+
+</template>
+<script>
+  import co from 'co'
+  import validator from '../../plugins/validation';
+
+  let saveGen = function * (self) {
+    self.deliver.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})
+    //  Util.f.password = self.deliver.newpassword
+    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
+    self.$login.f.password = self.deliver.newpassword
+    if (res.data) {
+      self.deliver.password = ''
+      self.deliver.newpassword = ''
+      self.deliver.affirmpassword = ''
+      self.show = false
+    }
+  }
+  export default {
+    title: '系统管理-密码修改',
+    data () {
+      return {
+        deliver: {
+          password: '',
+          newpassword: '',
+          affirmpassword: ''
+        },
+        functions: this.$login.f
+      }
+    },
+    props: ['show'],
+    methods: {
+      confirm () {
+        let gen = saveGen(this)
+        co(gen)
+      },
+      rest () {
+        this.show = false
+        this.deliver = {password: '', newpassword: '', affirmpassword: ''}
+      }
+    }
+  }
+</script>
+<style>
+  /*修改密码body界面样式*/
+  .modifystyle {
+    background: #FCFEEE;
+  }
+  .modifystyle span{
+    color: red;
+  }
+</style>

package/src/filiale/qianneng/system.js

@@ -1,8 +1,8 @@
-// 分公司特殊组件页面注册
-
-let specialComp = {
-  // 潜能密码改下
-  'modify-pw': (resolve) => { require(['./ModifyPw.vue'], resolve) },
-  'home-page': (resolve) => require(['./Main'], resolve)
-}
-exports.specialComp = specialComp
+// 分公司特殊组件页面注册
+
+let specialComp = {
+  // 潜能密码改下
+  // 'modify-pw': (resolve) => { require(['./ModifyPw.vue'], resolve) },
+  'home-page': (resolve) => require(['./Main'], resolve)
+}
+exports.specialComp = specialComp

package/src/filiale/yuchuan/Main.vue

@@ -235,6 +235,9 @@ export default {
     }
   },
   ready() {
+    //使用socket发送代办消息提醒
+    vue.prototype.$connectNumber = this.connectNumber
+    this.initWebSocket()
     getwartermakr(this);
     let component = this.$login.getUrlCompileParames('component')
     if (component) {
@@ -284,6 +287,94 @@ export default {
     this.functions.f_role_name && this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
   },
   methods: {
+    // 清除
+    reset () {
+      clearTimeout(this.timeoutObj)
+      clearTimeout(this.serverTimeoutObj)
+    },
+    //每隔几分钟发送一个固定信息给服务端，服务端收到后回复一个固定信息
+    //如果服务端在一定时间内没有收到信息，就认为客户端断开了，服务端就会断开连接
+    // 发送心跳--确保连接有效
+    start () {
+      // 重置
+      vue.prototype.$connectNumber = this.connectNumber  // 重置重连次数
+      this.timeoutObj = setTimeout(() => {
+        this.$socket.send('ping')
+        console.log('ping!')
+        this.serverTimeoutObj = setTimeout(() => {
+          this.$socket.close()
+        }, this.timeout)
+      }, this.timeout)
+    },
+    // 重连
+    reconnect () {
+      if (this.lockReconnect) return
+      // if (this.$connectNumber <= 0) {
+      //   vue.showMessage('连接已断开，将无法接收消息，请重新登录', ['confirm']).then((res) => {
+      //     if (res === 'confirm') {
+      //       location.reload()
+      //     }
+      //   })
+      //   return
+      // }
+      // this.$connectNumber--
+      setTimeout(() => {
+        console.log('连接异常，尝试重新连接。。。。')
+        this.initWebSocket()
+        this.lockReconnect = false
+      }, 1000 * 60)
+    },
+    // 初始化
+    initWebSocket () {
+      let path = `ws://${location.host}/ws?token=${this.$login.f.id}`
+      try {
+        if ('WebSocket' in window) {
+          // 创建对象
+          vue.prototype.$socket = new WebSocket(path)
+        } else {
+          this.$showMessage('您的浏览器不支持websocket的协议，建议使用新版谷歌浏览器，请勿使用IE浏览器，360浏览器请使用极速模式，不要使用兼容模式!"')
+        }
+      } catch (e) {
+        this.reconnect()
+      }
+
+      this.$socket.onopen = this.onOpen  // 连接成功
+      this.$socket.onmessage = this.onMessage  // 收到消息时回调
+      this.$socket.onclose = this.onClose  // 连接关闭时回调
+      this.$socket.onerror = this.onError  // 通讯异常
+    },
+    // 通讯异常
+    onError () {
+      console.log('通讯异常')
+      this.reconnect()
+    },
+    // 连接成功
+    onOpen () {
+      console.log('webSocket连接成功')
+      this.start()//每十秒发送心跳包，确保连接状态有效
+    },
+    // 收到消息时回调函数
+    onMessage (event) {
+      if (event.data === 'pong') { //建立心跳机制发送ping，返回pong
+        this.reset()  // 重置心跳
+        this.start() // 重新开始心跳
+        return
+      }
+      //不是pong消息，就是服务器返回的消息（提示消息）
+
+      let data = JSON.parse(event.data)
+      console.log('收到消息', data)
+      //向所有子组件广播一个名为'onMessage'的事件，并传递一个数据参数'data'。
+      this.$broadcast('onMessage', data)
+      //作用是显示一个消息。
+      this.$showMessage(data.message)
+    },
+    // 关闭连接时回调函数
+    onClose () {
+      console.log('webSocket连接断开')
+      this.reset()
+      this.reconnect()  // 重连
+    },
     getOrderList(){
       let times = this.config.times * 60 * 1000
       console.log("=定时提示间隔=", times)

package/src/plugins/validation.js

@@ -1,15 +1,15 @@
-import Vue from 'vue'
-import Validator from 'vue-validator'
-Vue.use(Validator)
-//密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
-Vue.validator('strongpassword', function (val) {
-  return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
-});
-Vue.validator('chinesePassword', function (val) {
-  var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
-  return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
-});
-// 潜能要求8~16位数字字母组合；
-Vue.validator('numbersAndLetter8to16', function (val) {
-  return /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(val)
-});
+import Vue from 'vue'
+import Validator from 'vue-validator'
+Vue.use(Validator)
+//密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
+Vue.validator('strongpassword', function (val) {
+  return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
+});
+Vue.validator('chinesePassword', function (val) {
+  var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
+  return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
+});
+// 潜能要求8~16位数字字母组合；
+Vue.validator('numbersAndLetter8to16', function (val) {
+  return /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(val)
+});