system-clients 3.2.93-temp → 3.2.93-tongchuan

package/package.json

@@ -1,105 +1,105 @@
-{
-  "name": "system-clients",
-  "version": "3.2.93-temp",
-  "description": "系统基础框架",
-  "main": "src/index.js",
-  "directories": {
-    "doc": "doc",
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
-    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
-  },
-  "dependencies": {
-    "base64-js": "^1.3.0",
-    "js-base64": "^2.4.9",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "nyc": "^15.1.0",
-    "src": "^1.1.2",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "^3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "manage-client": "^1.4.20",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.107-test",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aotu/System"
-  },
-  "keywords": [
-    "system_clients"
-  ],
-  "author": "杨文宇",
-  "license": "ISC"
-}
+{
+  "name": "system-clients",
+  "version": "3.2.93-tongchuan",
+  "description": "系统基础框架",
+  "main": "src/index.js",
+  "directories": {
+    "doc": "doc",
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
+    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
+  },
+  "dependencies": {
+    "base64-js": "^1.3.0",
+    "js-base64": "^2.4.9",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "nyc": "^15.1.0",
+    "src": "^1.1.2",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "^3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "manage-client": "^1.4.20",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.107-test",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aotu/System"
+  },
+  "keywords": [
+    "system_clients"
+  ],
+  "author": "杨文宇",
+  "license": "ISC"
+}

package/src/components/Main.vue

@@ -160,24 +160,6 @@
       </footer>
     </modal>
 
-    <modal v-show="notReportShow" :show.sync="notReportShow" :backdrop="false">
-      <header slot="modal-header" class="text-center">
-        <h3>未上报用户提醒</h3>
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <form class="form-horizontal">
-          <div class="row">
-            <div class="col-sm-12">
-              <span style="font-weight:normal">{{ notReportTitle }}</span>
-            </div>
-          </div>
-        </form>
-      </article>
-      <footer slot="modal-footer" style="height: 8vh" class="modal-footer">
-        <button class="button_search" @click="notReportShow = false">确认</button>
-      </footer>
-    </modal>
-
     <!-- 变更录入 模态框 -->
     <add-changemsg :show="AddChangeMsgShow" v-on:toggle="AddChangeMsgShow = false"></add-changemsg>
     <!-- 修改密码组件 -->
@@ -273,8 +255,6 @@ let createWaterMark = function (userName) {
           // img2: '/images/lefticon/退出系统.png',
         },
         treeOrIcon: false,
-        notReportTitle: '',
-        notReportShow: false,
         qrCode:false,
         isManger: false,
         show: false,
@@ -341,7 +321,9 @@ let createWaterMark = function (userName) {
       // 			}
       this.changeShow()
       const istelRemindTimes =this.$appdata.getSingleValue("是否开启工单提醒定时器")
+      this.getDaiBan()
       if(istelRemindTimes=='是'){
+        this.getOrderList()
         this.getTimesgotoWorkOrderSite()
       }
       const isapplyRemind =this.$appdata.getSingleValue("是否开启提醒")
@@ -355,28 +337,10 @@ let createWaterMark = function (userName) {
       if (this.config.approve) {
         this.getFlowList()
       }
-      if (this.config.isGetNotReport) {
-        this.getNotReport()
-      }
       // 获取卡表动态库到期时间
       this.getExpireDate()
     },
     methods: {
-      async getNotReport(){
-        this.notReportTitle = ''
-        let http = new HttpResetClass()
-        await http.load('POST', 'rs/sql/getNotReportUserCount', {}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
-          if (res.data.length > 0){
-            this.notReportTitle = `当前系统物联网表用户有${res.data[0].f_total_web_count}户，超过7天未上报有${res.data[0].f_greater_than_seven_days}户，7天及以内未上报有${res.data[0].f_less_than_orequalto_seven_days}户。如需查询详情，请到物联查询中“失联查询”获取详细信息！`
-          }
-        }).catch((e)=>{})
-        if(this.notReportTitle){
-          this.notReportShow = true
-        }
-      },
       getOrderList(){
         let times = this.config.times * 60 * 1000
         console.log("=定时提示间隔=", times)
@@ -559,7 +523,7 @@ let createWaterMark = function (userName) {
         }
       },
       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}`
+        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() {

package/src/components/Util.js

@@ -76,6 +76,20 @@ export function parse3339String (strDate) {
     strDate.substr(11, 2), strDate.substr(14, 2), strDate.substr(17, 2)
   )
 }
+// 判断密码最后修改时间是否超过两个半月（2个月零15天）
+export function isPasswordModificationExpired (lastModificationTime) {
+  if (!lastModificationTime) {
+    return true
+  }
+  const lastMod = parse3339String(lastModificationTime)
+  if (isNaN(lastMod.getTime())) {
+    return true
+  }
+  const expireDate = new Date(lastMod)
+  expireDate.setMonth(expireDate.getMonth() + 2)
+  expireDate.setDate(expireDate.getDate() + 15)
+  return new Date() > expireDate
+}
 
 export function format3339TimeString (dt) {
   let month = dt.getMonth() + 1

package/src/components/server/Login.vue

@@ -10,8 +10,8 @@
           </button>
           <span v-if="$login.versionTime">构建时间：{{ vTime }}</span>
           <div v-if="titleShow">
-          <img src="../../../static/newStyle/login-info.png"/>
-          <span @click="showus=true">关于我们</span>
+            <img src="../../../static/newStyle/login-info.png"/>
+            <span @click="showus=true">关于我们</span>
           </div>
           <!--          <img src="../../../static/newStyle/login-con.png"/>-->
           <!--          <span>联系我们</span>-->
@@ -99,12 +99,12 @@
               <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 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>
@@ -114,7 +114,7 @@
               </div> -->
             </div>
             <div class="col-sm-12 " v-if="AppDaiBan !==''">
-                <label class="col-sm-2">报装待办:</label>
+              <label class="col-sm-2">报装待办:</label>
               <span style="font-weight:normal">{{AppDaiBan}}</span>
             </div>
             <div class="col-sm-12 " v-if="OrderDaiBan !==''">
@@ -143,8 +143,8 @@
 <script>
 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,18 +158,6 @@ 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) {
@@ -203,12 +191,15 @@ 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 +220,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
@@ -257,19 +250,19 @@ 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){}
+    // 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) {
@@ -278,10 +271,8 @@ export default {
     })
     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{
@@ -370,14 +361,14 @@ export default {
       }).then((res) => {
         let OrderDaiBan = {}
         res.data.forEach(item=>{
-        OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
-        OrderDaiBan[item.f_ordertype].push(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(', ')}`
+        }
       })
-      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: {
@@ -391,14 +382,14 @@ export default {
       }).then((res) => {
         let AppDaiBan = {}
         res.data.forEach(item=>{
-        AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
-        AppDaiBan[item.defname].push(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(', ')}`
+        }
       })
-      this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
-      if (res.data.length> 0){
-        this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
-      }
-    })
 
     },
     async getDaiBanA(){
@@ -410,8 +401,8 @@ export default {
         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})
+            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) {

package/src/components/server/ResSelect.vue

@@ -161,9 +161,6 @@
       'parentresid'(){
         this.dealdata()
       },
-      'initresid'(){
-        this.dealdata()
-      }
     },
   }
 </script>