system-clients 3.2.68-jinbin → 3.2.68-wuhai

package/package.json

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

package/src/components/Main.vue

@@ -202,217 +202,197 @@ 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,
-        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
+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)
       }
     },
-    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
+    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)
         })
-      }
-      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()
-      }
-      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)
+        if (res.data.length> 0){
+          this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+          this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
         }
-      },
-      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(', ')}`
-          }
-        })
-        let data = {
-          condition: '1 = 1',
-          data: {
-            orgid: this.$login.f.orgid,
-            id: this.$login.f.id
-          }
+      })
+      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)
+      }
+      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.AppDaiBan || this.OrderDaiBan){
-          this.newTipShow = true
+        if (res.data.length> 0){
+          this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
+          this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
         }
-      },
-      // 提醒框被点击
-      tipClick(){
-        this.newTipShow = false
-        this.newTipContextShow = true
-      },
-      gotoWorkOrderSite(){
-        const isRemind =this.$appdata.getSingleValue("站点工单提醒")
-        console.log('站点工单是否提醒',isRemind)
-        if(isRemind && isRemind !== '是'){
-          return
+      }).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
         }
-        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+'个工单待处理，请尽快前往站点工单页面进行处理')
           }
-          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'
-        }
+        })
+      }
+    },
+    openUrl() {
+      var url = `http://aote-office.8866.org: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/components/server/Login.vue

@@ -85,7 +85,7 @@
       技术支持：西安奥枫软件有限公司
     </div>
     <div class="login-foot" v-show="$login.BAinformation">
-      {{{ $login.BAinformation }}}
+      {{ $login.BAinformation }}
     </div>
 
     <modal v-if="depPromptShow" :show.sync="depPromptShow" :backdrop="false" v-ref:modal >
@@ -149,142 +149,111 @@ import {HttpResetClass} from 'vue-client'
 let daibanJson = require('../../util/Daiban.json')
 
 
-let saveGen = function* (self) {
+let saveGen = function *(self) {
   try {
-    if (self.$login) {
+    if(self.$login){
       // 账号ename，密码password，是否显示异地登陆
-      yield self.$login.login(self.model.ename, self.model.password, self.$login.showYiDi);
+      yield self.$login.login(self.model.ename, self.model.password, self.$login.showYiDi)
     }
-    if (self.$appdata) {
-      yield self.$appdata.load();
+    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.$loginHeat){
+          yield self.$loginHeat.login(self.model.ename, self.model.password)
         }
-        if (self.$appdataHeat) {
-          yield self.$appdataHeat.load();
+        if(self.$appdataHeat){
+          yield self.$appdataHeat.load()
         }
       } catch (e) {
-        console.log("热力系统登陆失败!");
+        console.log('热力系统登陆失败!')
       }
     }
-    yield self.$getConfig(self, "Login");
-    console.log("登录配置", self.config);
-
+    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);
-
+      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", {
+      let getLocalMac = yield self.$resetget('http://127.0.0.1:8003/loadmac', {
         resolveMsg: null,
-        rejectMsg: null,
+        rejectMsg: null
       }).catch(() => {
-        throw new Error("获取本地mac配置失败");
-      });
-      console.log("本地MAC地址信息", getLocalMac);
-
+        throw new Error('获取本地mac配置失败')
+      })
+      console.log('本地MAC地址信息', getLocalMac)
       // 对Mac地址进行匹配
-      let macValidate = false;
+      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;
+            macValidate = true
           }
         }
       }
       if (!macValidate) {
-        throw new Error("Mac地址验证失败, 请联系管理员！！");
+        throw new Error('Mac地址验证失败, 请联系管理员！！')
       }
     }
-    console.log(self.$login.depPrompt);
-
-    // 强口令验证
-    // 跳转过来的不进行验证
-    console.log("self===============");
-    console.log(self.$login);
-
-    if (
-      !self.otherLogin &&
-      self.config.weakPassword &&
-      !/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?])[a-zA-Z\d!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]{8,16}$/.test(
-        self.model.password
-      )
-    ) {
-      self.$showMessage("登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！", ["confirm"]).then((res) => {
-        self.modifyPwShow = true;
-      });
-    } else {
-      // **新增：密码修改时间检查逻辑**
-      const lastModTime = self.$login.f.f_last_modification_time;
-      if (lastModTime) {
-        const lastModDate = new Date(lastModTime);
-        if (isNaN(lastModDate)) {
-          throw new Error("密码修改时间格式无效，请联系管理员！");
-        }
-        const currentDate = new Date();
-        const daysSinceLastMod = Math.floor((currentDate - lastModDate) / (1000 * 60 * 60 * 24));
-        if (daysSinceLastMod >= 90) {
-          self.modifyPwShow = true; // 弹出修改密码的提示框
-          throw new Error("您的密码已超过90天未更改，请修改后重新登录！");
-        }
-      } else {
-        console.warn("未找到密码修改时间字段，跳过密码过期检查。");
+    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.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.$login) {
-          console.log("登录信息", self.$login.f);
-          global.login = self.$login.f;
-          console.log("登录信息", global.login);
-        }
+      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.$login) {
+        console.log('登录信息', self.$login.f)
+        global.login=self.$login.f
+        console.log('登录信息', global.login)
       }
     }
   } catch (ret) {
-    console.error("登录失败", ret);
-    let msg;
+    console.error('登录失败', ret)
+    let msg
     if (ret instanceof Error) {
-      msg = ret;
+      msg = ret
     }
     if (ret.status === 0) {
-      msg = "服务连接错误，请确认服务状态";
+      msg = '服务连接错误，请确认服务状态'
     } else if (ret.status === 401) {
-      msg = ret.data;
+      msg = ret.data
     } else if (ret.status === 710) {
-      msg = ret.data;
+      msg = ret.data
     } else if (ret.status === 555) {
-      msg = ret.data;
+      msg = ret.data
+    }else if(ret.status === 789){
+      yield self.$showMessage(msg=ret.data, ['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);
+    self.createCode()
+    self.picLyanzhengma = ''
+    yield self.$showMessage(msg)
+    self.model.ename = ''
+    self.model.password = ''
+    self.login = false
+    $('form').fadeIn(500)
   }
 }
 export default {

package/src/components/server/ModifyPw.vue

@@ -22,10 +22,10 @@
           '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: 8,chinesePassword: true}'>
+              <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.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
               <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
             </div>
           </div>

package/src/filiale/dongguan/Main.vue

@@ -313,7 +313,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
+      var url = `http://aote-office.8866.org:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/furuike/Main.vue

@@ -425,7 +425,7 @@ export default {
       }
     },
     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}`
+      var url = `http://aote-office.8866.org:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/gehua/Main.vue

@@ -363,7 +363,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
+      var url = `http://aote-office.8866.org:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/qianneng/Main.vue

@@ -372,7 +372,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
+      var url = `http://aote-office.8866.org:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/rizhao/Main.vue

@@ -216,7 +216,7 @@ export default {
       }
     },
     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}`
+      var url = `http://aote-office.8866.org:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/wenxi/Main.vue

@@ -383,7 +383,7 @@ export default {
       }
     },
     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}`
+      var url = `http://aote-office.8866.org:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/wuhai/LeftTree.vue

@@ -5,9 +5,10 @@
         <div class="col-sm-2" >
           <img v-if="isFolder(row)" :src="row.data.icon" alt="">
         </div>
-        <div class="col-sm-8" style="padding-left:6%;text-align: left" title="{{row.data.name}}">{{row.data.name}}
-        <span class="unreadResumeWarning11" v-show="row.data.name === '微信管理' && $parent.$parent.wechatnub"></span>
+        <div class="col-sm-10" style="padding-left:6%;text-align: left" title="{{row.data.name}}">{{row.data.name}}
+        <span class="unreadResumeWarning11" v-show="row.data.name === '微信管理' && $parent.$parent.todo"></span>
         <span class="unreadResumeWarning" v-show="row.data.name === '投诉咨询' && $parent.$parent.wechatnub">{{$parent.$parent.wechatnub}}</span>
+        <span class="unreadResumeWarning" v-show="row.data.name === '预约中心' && $parent.$parent.ordernum">{{$parent.$parent.ordernum}}</span>
         </div>
       </span>
     </tree>
@@ -21,16 +22,23 @@ export default {
   title: '左侧树菜单',
   data () {
     return {
+      todo: false,
       index: -1,
       wechatnub: 0,
+      ordernum: 0,
       name: null,
       tbcg:[]
     }
   },
   methods: {
-    setNum(val){
+    setNum(type,val){
+      this.todo = true
       console.log("=====",val)
-      this.wechatnub = val
+      if (type === '投诉咨询') {
+        this.wechatnub = val
+      } else if (type === '预约中心') {
+        this.ordernum = val
+      }
     },
     open (row) {
       if (row.data.name === '资源管理') {
@@ -128,14 +136,17 @@ export default {
   position: absolute;
   left: 70px;
   top: 0px;
+  margin-left: 10px;
 }
 .unreadResumeWarning {
-  width: 20px;
+  text-align: center;
+  min-width: 20px;
   height: 20px;
-  border-radius: 7px;
+  border-radius: 10px;
   background-color: #FF3B30;
   position: absolute;
   left: 60px;
   top: 0px;
+  margin-left: 10px;
 }
 </style>

package/src/filiale/wuhai/Main.vue

@@ -72,7 +72,7 @@
           <div class="span system-left-tree " style="height:85%">
             <h3>{{ systemname }}</h3>
             <!--            <div class="span" style="margin-bottom:10px;padding-bottom:5px;padding-top:5px;flex: 1;border-top: 1px solid #e5e5e5;border-bottom: 1px solid #e5e5e5;">-->
-            <left-tree :functions='functions.functions' :wechatnub='WeChatNub' :userid='userid' @isnodo="isnodo" v-show="treeOrIcon"
+            <left-tree :functions='functions.functions' :wechatnub='WeChatNub' :ordernum='OrderNum' :userid='userid' @isnodo="isnodo" v-show="treeOrIcon"
                        :tabs="tabs" v-ref:tree></left-tree>
             <!--&lt;!&ndash;              <icon-tree :functions='functions.functions' :userid='userid' v-show="!treeOrIcon"></icon-tree>&ndash;&gt;-->
           </div>
@@ -242,6 +242,8 @@ export default {
       showwatermakeflag: false,
       //获取微信投诉和咨询条数
       WeChatNub: undefined,
+      // 咨询条数
+      OrderNum: undefined,
       // headerHint: true, // 右侧顶部提示信息
       // value: 25645.26,
       // AddChangeMsgShow: false,
@@ -299,6 +301,7 @@ export default {
   },
   created () {
     this.WechatOfComplaintAndConsult()
+    this.orderCount()
   },
   methods: {
     getOrderList(){
@@ -388,7 +391,7 @@ export default {
       }
     },
     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}`
+      var url = `http://aote-office.8866.org:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
       window.open(url, '_blank')
     },
     hindsetting() {
@@ -479,15 +482,29 @@ export default {
         data:{
           items: 'f_isreply',
           tablename: 't_comment',
-          condition: 'f_isreply = 0',
+          condition: " 1=1  and f_isreply = '0' and f_orgid = '37710' and f_pid = '0'",
           orderitem: 'f_isreply'
         }
       },{resolveMsg: null, rejectMsg: null});
       if (WeChatData.data.length > 0){
         this.WeChatNub = WeChatData.data.length
+        console.log('获取数值为：'+ this.WeChatNub)
+        this.$refs.tree.setNum('投诉咨询', this.WeChatNub)
+      }
+    },
+    async orderCount() {
+      let orderData = await new HttpResetClass().load('POST','rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'id',
+          tablename: 't_order_center',
+          condition: ` f_orgstr ='${this.$login.f.orgid}' and f_orderstate is null `,
+          orderitem: 'f_orderdate'
+        }
+      }, {resolveMsg: null, rejectMsg: null});
+      if (orderData.data.length > 0) {
+        this.OrderNum = orderData.data.length
+        this.$refs.tree.setNum('预约中心', this.OrderNum)
       }
-      console.log('获取数值为：'+ this.WeChatNub)
-      this.$refs.tree.setNum(this.WeChatNub)
     }
   },
   computed: {

package/src/filiale/yuchuan/Main.vue

@@ -235,9 +235,6 @@ export default {
     }
   },
   ready() {
-    //使用socket发送代办消息提醒
-    vue.prototype.$connectNumber = this.connectNumber
-    this.initWebSocket()
     getwartermakr(this);
     let component = this.$login.getUrlCompileParames('component')
     if (component) {
@@ -287,94 +284,6 @@ 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)
@@ -462,7 +371,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
+      var url = `http://aote-office.8866.org:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/zhoukou/Main.vue

@@ -363,7 +363,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
+      var url = `http://aote-office.8866.org:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/plugins/GetLoginInfoService.js

@@ -205,9 +205,13 @@ let loginGen = async function (name, password, cue) {
     }
 
   } else {
-    let error = {status: 401, data: getLogin.data.states}
-    // 抛出错误
-    throw error
+    if(getLogin.data.states.includes('您的密码已经使用超过')){
+      throw {status: 789, data: getLogin.data.states}
+    }else{
+      let error = {status: 401, data: getLogin.data.states}
+      // 抛出错误
+      throw error
+    }
   }
 }
 

package/src/plugins/validation.js

@@ -11,5 +11,5 @@ Vue.validator('chinesePassword', function (val) {
 });
 // 潜能要求8~16位数字字母组合；
 Vue.validator('numbersAndLetter8to16', function (val) {
-  return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?])[a-zA-Z\d!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]{8,16}$/.test(val)
+  return /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(val)
 });