system-clients 3.2.98 → 3.2.99-weinan

package/src/components/server/LeftTree.vue

@@ -1,111 +1,111 @@
-<template>
-  <div class='over'>
-    <tree :model='functions' :flagres="false" :is-click="false" v-ref:tree @toggle="toggled" >
-      <span partial class="row" :class="{ 'tree-img': isFolder(row), 'tree-span': !isFolder(row) }">
-        <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}}</div>
-      </span>
-    </tree>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-
-export default {
-  props: ['functions', 'userid','tabs'],
-  title: '左侧树菜单',
-  data () {
-    return {
-      index: -1,
-      name: null,
-      tbcg:[]
-    }
-  },
-  methods: {
-    open (row) {
-      if (row.data.name === '资源管理') {
-        this.$parent.changeMain(row.data.id)
-          return
-      }
-        console.log(row.data.navigate)
-        if (row.data.navigate) {
-
-            let isExist = false
-        this.tbcg.forEach((tab) => {
-            if(tab.comp.name == row.data.link) {
-            isExist = true
-          }
-        })
-        if (!isExist){
-          this.$goto('embbed-page', {domainName: row.data.navigate, title: row.data.name, compName: row.data.link, login: Vue.$login, param: Vue.$appdata}, 'main')
-        }else {
-            console.log(isExist,'aa')
-          this.$emit('isnodo',row.data.link)
-        }
-      } else if (row.data.link) {
-        let isExist = false
-        this.tbcg.forEach((tab) => {
-          if(tab.comp.name == row.data.link) {
-            isExist = true
-          }
-        })
-        if (!isExist){
-          this.$goto(row.data.link, {f: this.functions}, 'main')
-        }else {
-            console.log(isExist,'saaa')
-          this.$emit('isnodo',row.data.link)
-        }
-      }
-    },
-    changeSelect(name) {
-      if (!name) {
-        this.$refs.tree.selectStore.select(null)
-        return
-      }
-      this.name = name
-      let index = this.selfFindIndex(name)
-      this.index = index
-      // 当前激活页签有，index为-1，说明菜单收缩
-      this.changeSelected(index)
-    },
-    selfFindIndex (name) {
-
-      return this.$refs.tree.toNode.findIndex((item) => {
-        return item.data.link === name
-      })
-    },
-    changeSelected (index) {
-
-      if (index === -1) {
-        this.$refs.tree.selectStore.select(null)
-      }else {
-        this.$refs.tree.selectStore.select(this.$refs.tree.toNode[index])
-      }
-
-    },
-    toggled () {
-
-      if (this.name && this.index === -1) {
-        let index = this.selfFindIndex(this.name)
-        if (index !== -1) {
-          this.changeSelected(index)
-        }
-      }
-    }
-  },
-  events: {
-    'select-changed': function (data) {
-
-      // 事件回调内的 `this` 自动绑定到注册它的实例上
-      this.open(data.val)
-    }
-  },
-  watch:{
-    'tabs'(val){
-      this.tbcg = val
-    }
-  }
-}
-</script>
+<template>
+  <div class='over'>
+    <tree :model='functions' :flagres="false" :is-click="false" v-ref:tree @toggle="toggled" >
+      <span partial class="row" :class="{ 'tree-img': isFolder(row), 'tree-span': !isFolder(row) }">
+        <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}}</div>
+      </span>
+    </tree>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+
+export default {
+  props: ['functions', 'userid','tabs'],
+  title: '左侧树菜单',
+  data () {
+    return {
+      index: -1,
+      name: null,
+      tbcg:[]
+    }
+  },
+  methods: {
+    open (row) {
+      if (row.data.name === '资源管理') {
+        this.$parent.changeMain(row.data.id)
+          return
+      }
+        console.log(row.data.navigate)
+        if (row.data.navigate) {
+
+            let isExist = false
+        this.tbcg.forEach((tab) => {
+            if(tab.comp.name == row.data.link) {
+            isExist = true
+          }
+        })
+        if (!isExist){
+          this.$goto('embbed-page', {domainName: row.data.navigate, title: row.data.name, compName: row.data.link, login: Vue.$login, param: Vue.$appdata}, 'main')
+        }else {
+            console.log(isExist,'aa')
+          this.$emit('isnodo',row.data.link)
+        }
+      } else if (row.data.link) {
+        let isExist = false
+        this.tbcg.forEach((tab) => {
+          if(tab.comp.name == row.data.link) {
+            isExist = true
+          }
+        })
+        if (!isExist){
+          this.$goto(row.data.link, {f: this.functions}, 'main')
+        }else {
+            console.log(isExist,'saaa')
+          this.$emit('isnodo',row.data.link)
+        }
+      }
+    },
+    changeSelect(name) {
+      if (!name) {
+        this.$refs.tree.selectStore.select(null)
+        return
+      }
+      this.name = name
+      let index = this.selfFindIndex(name)
+      this.index = index
+      // 当前激活页签有，index为-1，说明菜单收缩
+      this.changeSelected(index)
+    },
+    selfFindIndex (name) {
+
+      return this.$refs.tree.toNode.findIndex((item) => {
+        return item.data.link === name
+      })
+    },
+    changeSelected (index) {
+
+      if (index === -1) {
+        this.$refs.tree.selectStore.select(null)
+      }else {
+        this.$refs.tree.selectStore.select(this.$refs.tree.toNode[index])
+      }
+
+    },
+    toggled () {
+
+      if (this.name && this.index === -1) {
+        let index = this.selfFindIndex(this.name)
+        if (index !== -1) {
+          this.changeSelected(index)
+        }
+      }
+    }
+  },
+  events: {
+    'select-changed': function (data) {
+
+      // 事件回调内的 `this` 自动绑定到注册它的实例上
+      this.open(data.val)
+    }
+  },
+  watch:{
+    'tabs'(val){
+      this.tbcg = val
+    }
+  }
+}
+</script>

package/src/components/server/LoadData.vue

@@ -1,55 +1,55 @@
-<template>
-  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
-    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
-    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '加载参数',
-    data () {
-      return {
-        msg: '',
-        show: false
-      }
-    },
-    props: {
-      componentName: {}
-    },
-    async ready () {
-      this.$nextTick(() => {
-        window.addEventListener('message', messageEvent => {
-          try {
-            const data = messageEvent.data
-            console.log('接收到数据', data)
-            this.$login = Object.assign(this.$login, data.login)
-            this.$appdata = Object.assign(this.$appdata, data.appdata)
-            if (!data.page) {
-              this.$showMessage('没有功能连接, 请配置!')
-              return
-            }
-            this.$goto(data.page)
-          } catch (e) {
-            console.log('登陆异常', e)
-          }
-        })
-      })
-    }
-  }
-</script>
-<style media="screen">
-  .loadingdata {
-    position: fixed;
-    background: #fff;
-    opacity: 0.6;
-    top: 0;
-    width: 100%;
-  }
-  .loaderror {
-    opacity: 1;
-  }
-  .loadsuccess {
-    display: none;
-  }
-</style>
+<template>
+  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
+    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
+    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '加载参数',
+    data () {
+      return {
+        msg: '',
+        show: false
+      }
+    },
+    props: {
+      componentName: {}
+    },
+    async ready () {
+      this.$nextTick(() => {
+        window.addEventListener('message', messageEvent => {
+          try {
+            const data = messageEvent.data
+            console.log('接收到数据', data)
+            this.$login = Object.assign(this.$login, data.login)
+            this.$appdata = Object.assign(this.$appdata, data.appdata)
+            if (!data.page) {
+              this.$showMessage('没有功能连接, 请配置!')
+              return
+            }
+            this.$goto(data.page)
+          } catch (e) {
+            console.log('登陆异常', e)
+          }
+        })
+      })
+    }
+  }
+</script>
+<style media="screen">
+  .loadingdata {
+    position: fixed;
+    background: #fff;
+    opacity: 0.6;
+    top: 0;
+    width: 100%;
+  }
+  .loaderror {
+    opacity: 1;
+  }
+  .loadsuccess {
+    display: none;
+  }
+</style>

package/src/components/server/Login.vue

@@ -145,6 +145,7 @@ import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../Util'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -158,23 +159,11 @@ let saveGen = function *(self) {
     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('api/af-system/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
+      let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
       }).catch(() => {
@@ -205,10 +194,16 @@ let saveGen = function *(self) {
     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))) {
+    // 弱口令验证（默认开启，跳转过来的不进行验证）
+    if ((!self.otherLogin) && !(/^(?=.*[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) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
+      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('展示预约信息')){
@@ -229,6 +224,8 @@ let saveGen = function *(self) {
     }
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
+    self.$login['v3-session-key'] = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -239,7 +236,7 @@ let saveGen = function *(self) {
       msg = ret.data
     } else if (ret.status === 710) {
       msg = ret.data
-    } else {
+    } else if (ret.status === 555) {
       msg = ret.data
     }
     self.createCode()
@@ -257,16 +254,29 @@ export default {
     this.titleShow = this.$appdata.getSingleValue('关于我们')
     window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
     this.vTime = this.format(new Date(window.versionTime));
+    // try{
+    //   let http = new HttpResetClass()
+    //   let res = await http.load('POST', 'rs/sql/singleTable',
+    //     {data:{
+    //         tablename: 't_changedeclare',
+    //         condition: ` f_type ='变更通知' `
+    //       }
+    //     }, {resolveMsg: null, rejectMsg: null})
+    //   if(res.data.length>0){
+    //     console.log("---------------获取通知",res.data[0].f_change_message)
+    //     this.notice=res.data[0].f_change_message
+    //   }
+    // }catch(e){}
+
+    this.loginother();
     $('#login-button').click(function (event) {
       event.preventDefault()
       $('form').fadeOut(500)
     })
     if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
       const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
-      console.log(subUrl)
       this.model.ename = window.atob(subUrl[0])
       this.model.password = window.atob(subUrl[1])
-      console.log('this.model.ename',this.model.ename)
       this.otherLogin = true
       this.confirm()
     }else{
@@ -346,7 +356,7 @@ export default {
       } 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', '/api/af-system/sql/singleTable', {data: {
+      await http.load('POST', '/rs/sql/singleTable', {data: {
           tablename:'t_order_center',
           condition:condition
         }}, {
@@ -412,24 +422,27 @@ export default {
       }else {
         console.log("待办提醒全局关闭。")
       }
+
+
+
+
     },
 
     async loginother(){
-      // if (this.config.distanceLogin) {
-      //   if (this.$login && this.$login.getUrlParames('name') ) {
-      //     let ename = this.$login.getUrlParames('name');
-      //     // todo v4
-      //     let logininfo = await this.$resetpost('api/af-revenue/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
-      //     if(logininfo.data){
-      //       if(logininfo.data.ename && logininfo.data.password){
-      //         this.model.ename = logininfo.data.ename
-      //         this.model.password =logininfo.data.password
-      //         let gen = saveGen(this)
-      //         return co(gen)
-      //       }
-      //     }
-      //   }
-      // }
+      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');