system-clients 4.1.1 → 4.1.2

package/package.json

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

package/src/components/Util.js

@@ -1,343 +1,343 @@
-import Vue from 'vue'
-// 登录后获取的所有数据，需要自行获取
-export var f
-
-export function getAttendanceState (item, timeToWork, timeToGo) {
-  item.f_state = ''
-  if (!item.f_signin_time || !item.f_knockoff_time) {
-    item.f_state = '缺勤'
-  } else {
-    let signin_time = item.f_signin_time.substring(11, 16)
-    let knockoff_time = item.f_knockoff_time.substring(11, 16)
-    if (signin_time > timeToWork) {
-      item.f_state = '迟到'
-    }
-    if (knockoff_time < timeToGo) {
-      item.f_state = item.f_state + '早退'
-    }
-  }
-  if (!item.f_state) {
-    item.f_state = '正常'
-  }
-}
-
-export function toStandardYearMonth () {
-  let dt = new Date()
-  let month = dt.getMonth() + 1
-  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month)
-}
-export function toStandardYearMonth1 () {
-  let dt = new Date()
-  let month = dt.getMonth() + 1
-  return dt.getFullYear() + (month < 10 ? '0' + month : month)
-}
-
-export function toStandardDateString () {
-  let dt = new Date()
-  let month = dt.getMonth() + 1
-  let date = dt.getDate()
-  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
-}
-
-export function toStartAndEndDateString () {
-  let dt = new Date()
-  let month = dt.getMonth() + 1
-  // let date = dt.getDate()
-  return [dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-01',
-  dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (new Date(dt.getFullYear(), month, 0).getDate())]
-  // return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
-}
-
-export function toStandardTimeString () {
-  let dt = new Date()
-  let month = dt.getMonth() + 1
-  let date = dt.getDate()
-  let hour = dt.getHours()
-  let min = dt.getMinutes()
-  let sec = dt.getSeconds()
-  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) +
-  ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
-}
-
-export function to3339TimeString () {
-  let dt = new Date()
-  let month = dt.getMonth() + 1
-  let date = dt.getDate()
-  let hour = dt.getHours()
-  let min = dt.getMinutes()
-  let sec = dt.getSeconds()
-  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) +
-   'T' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
-}
-
-export function parse3339String (strDate) {
-  return new Date(
-    strDate.substr(0, 4), strDate.substr(5, 2) - 1, strDate.substr(8, 2),
-    strDate.substr(11, 2), strDate.substr(14, 2), strDate.substr(17, 2)
-  )
-}
-
-export function format3339TimeString (dt) {
-  let month = dt.getMonth() + 1
-  let date = dt.getDate()
-  let hour = dt.getHours()
-  let min = dt.getMinutes()
-  let sec = dt.getSeconds()
-  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
-    + 'T' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
-}
-
-export function guid () {
-  let buf = new Uint16Array(8)
-  window.crypto.getRandomValues(buf)
-  let S4 = function (num) {
-    let ret = num.toString(16)
-    while (ret.length < 4) {
-      ret = '0' + ret
-    }
-    return ret
-  }
-  return (S4(buf[0]) + S4(buf[1]) + S4(buf[2]) + S4(buf[3]) + S4(buf[4]) + S4(buf[5]) + S4(buf[6]) + S4(buf[7]))
-}
-
-export function choices (role, param, hasBlank = false, blankHint = '请选择') {
-  if (role == 'view') {
-    Vue.getParams(param, [null])
-  } else {
-    let result = []
-    if (hasBlank)
-      result.push({label: blankHint, value: null})
-    if (!Vue.param || !Vue.param[param])
-      result.push({label: '请在系统设置里更新参数', value: '请在系统设置里更新参数'})
-    else {
-      let p = Vue.param[param]
-      p.forEach(function (item) {
-        result.push({label: item.name, value: item.name})
-      })
-    }
-    return result
-  }
-}
-
-export function required (param) {
-  if (typeof param === 'number' && param == 0)
-    return false
-  if (!param)
-    return true
-  param = param + ''
-  param = param.trim()
-  if (!param)
-    return true
-  return false
-}
-
-export function isInt (n) {
-  return !window.isNaN(n) && n % 1 === 0
-}
-
-export function isFloat (n) {
-  return !window.isNaN(n)
-}
-
-// this will convert all true/false to boolean
-export function booleanFilter (paper) {
-  for (let key in paper) {
-    if (!paper.hasOwnProperty(key))
-      continue
-    if (typeof paper[key] == 'object' && paper[key] != null) {
-      booleanFilter(paper[key])
-    } else {
-      if (paper[key] === 'true' || paper[key] == 'false')
-        paper[key] = (paper[key] === 'true')
-    }
-  }
-}
-// recursively traverse through each path
-export function ratifyPics (paper) {
-  for (let key in paper) {
-    if (key.endsWith('_path')) {
-      if (!paper[key]) {
-        paper[key] = 'rs/db/file/nopic.png'
-      } else {
-        paper[key] = 'rs/db/file/' + paper[key]
-      }
-    } else if (paper[key] !== null && typeof (paper[key]) == 'object') {
-      ratifyPics(paper[key])
-    }
-  }
-}
-
-// load script and other stuff
-export function loadscript (type, fileName) {
-  return new Promise((resolve, reject) => {
-    let element
-    if (type == 'css') {
-      element = document.createElement('link')
-      element.setAttribute('rel', 'stylesheet')
-      element.setAttribute('type', 'text/css')
-      element.setAttribute('href', fileName)
-    } else if (type == 'js') {
-      element = document.createElement('script')
-      element.setAttribute('type', 'text/javascript')
-      element.setAttribute('src', fileName)
-    }
-    if (element) {
-      element.setAttribute('async', '')
-      element.setAttribute('defer', '')
-      element.addEventListener('load', function () {
-        resolve(element)
-      }, false)
-      element.addEventListener('error', function () {
-        reject(element)
-      }, false)
-      document.body.appendChild(element)
-    }
-  })
-}
-// 不能选择器中截取掉多余的字符
-export function orgName (name) {
-  return name.substring(10)
-}
-
-export function getNowDate (name) {
-  // 求取当前时间的工具
-  let myweekday = ''
-  let year = ''
-  let mydate = new Date()
-  myweekday = mydate.getDay()
-  let mymonth = mydate.getMonth() + 1
-  let myday = mydate.getDate()
-  let myyear = mydate.getYear()
-  year = (myyear > 200) ? myyear : 1900 + myyear
-  let week = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期日', '星期六']
-  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
-  return year + '年' + mymonth + '月' + myday + '日  ' + week[myweekday]
-}
-
-export function addDate (date, days) {
-  // 求取当前时间的工具
-  let endDate = new Date(date)
-  endDate = endDate.valueOf()
-  endDate = endDate + days * 24 * 60 * 60 * 1000
-  endDate = new Date(endDate)
-  let month = endDate.getMonth() + 1
-  let day = endDate.getDate()
-  let hour = endDate.getHours()
-  let min = endDate.getMinutes()
-  let sec = endDate.getSeconds()
-  return endDate.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day) +
-  ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
-  // return a
-}
-
-// 通过地址栏的参数获取参数内容
-export function getUrlParames (param) {
-  var query = window.location.search
-  var iLen = param.length
-  var iStart = query.indexOf(param)
-  if (iStart === -1) {
-    return ''
-  }
-  iStart += iLen + 1
-  var iEnd = query.indexOf('&', iStart)
-  if (iEnd === -1) {
-    return query.substring(iStart)
-  }
-  return query.substring(iStart, iEnd)
-}
-
-// 从地址栏获取加密的参数
-export function getUrlCompileParames (param) {
-  var query = uncompileStr(window.location.search.slice(1, window.location.search.length))
-  var iLen = param.length
-  var iStart = query.indexOf(param)
-  if (iStart === -1) {
-    return ''
-  }
-  iStart += iLen + 1
-  var iEnd = query.indexOf('&', iStart)
-  if (iEnd === -1) {
-    return query.substring(iStart)
-  }
-  return query.substring(iStart, iEnd)
-}
-
-// 对字符串进行加密
-export function compileStr (code) {
-  let c = String.fromCharCode(code.charCodeAt(0) + code.length)
-  for (let i = 1; i < code.length; i++) {
-    c += String.fromCharCode(code.charCodeAt(i) + code.charCodeAt(i - 1))
-  }
-  return escape(c)
-}
-// 字符串进行解密
-export function uncompileStr (code) {
-  code = unescape(code)
-  let c = String.fromCharCode(code.charCodeAt(0) - code.length)
-  for (var i = 1; i < code.length; i++) {
-    c += String.fromCharCode(code.charCodeAt(i) - c.charCodeAt(i - 1))
-  }
-  return c
-}
-
-export function dateDescripte (date) {
-  let nowTime = new Date().getTime()
-  let oldTime = new Date(date).getTime()
-  let timeDiff = nowTime - oldTime
-  // 规则说明
-  // 小于等于2分钟为刚刚
-  // 大于2分钟小于等于1小时为取整的分钟前（例如：35分钟前）
-  // 大于1小时小于等于24小时为取整的小时前（例如：15小时前）
-  // 大于24小时小于等于30天为取整的天前（例如：12天前）
-  // 大于30天小于等于12月为取整的月前，月份统一为30天一月，不做额外处理（例如：3个月前）
-  // 大于365取整的年前，（例如：2年前）
-  let minute = 1000 * 60
-  let hour = minute * 60
-  let day = hour * 24
-  let month = day * 30
-  let year = month * 12
-  let des = ''
-  if (timeDiff <= minute * 2) {
-    des = '刚刚'
-  } else if (minute * 2 < timeDiff && timeDiff < hour) {
-    des = `${Math.floor(timeDiff / minute)}分钟前`
-  } else if (hour < timeDiff && timeDiff <= day) {
-    des = `${Math.floor(timeDiff / hour)}小时前`
-  } else if (day < timeDiff && timeDiff <= month) {
-    des = `${Math.floor(timeDiff / day)}天前`
-  } else if (month < timeDiff && timeDiff <= year) {
-    des = `${Math.floor(timeDiff / month)}个月前`
-  } else if (year < timeDiff) {
-    des = `${Math.floor(timeDiff / year)}年前`
-  }
-  return des
-}
-
-export function nextMonth20 (date) {
-  let ds = date.split('-')
-  let nextMonth = ds[1] - 0 + 1
-  return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
-}
-
-// export function getNowDate () {
-//   // 求取当前时间的工具
-//   let myweekday = ''
-//   let year = ''
-//   let mydate = new Date()
-//   myweekday = mydate.getDay()
-//   let mymonth = mydate.getMonth() + 1
-//   let myday = mydate.getDate()
-//   let myyear = mydate.getYear()
-//   year = (myyear > 200) ? myyear : 1900 + myyear
-//   let week = ['星期日','星期一','星期二','星期三','星期四','星期五','星期日','星期六']
-//   let weekday = week[myweekday]
-//
-//   // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
-//   return  year + '年' + mymonth + '月' + myday + '日 ' + weekday
-// }
-//
-// export function getImgsrc (name) {
-//   return "http://127.0.0.1:8081/images/"+name+".gif"
-// }
-//
-// export var f;
+import Vue from 'vue'
+// 登录后获取的所有数据，需要自行获取
+export var f
+
+export function getAttendanceState (item, timeToWork, timeToGo) {
+  item.f_state = ''
+  if (!item.f_signin_time || !item.f_knockoff_time) {
+    item.f_state = '缺勤'
+  } else {
+    let signin_time = item.f_signin_time.substring(11, 16)
+    let knockoff_time = item.f_knockoff_time.substring(11, 16)
+    if (signin_time > timeToWork) {
+      item.f_state = '迟到'
+    }
+    if (knockoff_time < timeToGo) {
+      item.f_state = item.f_state + '早退'
+    }
+  }
+  if (!item.f_state) {
+    item.f_state = '正常'
+  }
+}
+
+export function toStandardYearMonth () {
+  let dt = new Date()
+  let month = dt.getMonth() + 1
+  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month)
+}
+export function toStandardYearMonth1 () {
+  let dt = new Date()
+  let month = dt.getMonth() + 1
+  return dt.getFullYear() + (month < 10 ? '0' + month : month)
+}
+
+export function toStandardDateString () {
+  let dt = new Date()
+  let month = dt.getMonth() + 1
+  let date = dt.getDate()
+  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
+}
+
+export function toStartAndEndDateString () {
+  let dt = new Date()
+  let month = dt.getMonth() + 1
+  // let date = dt.getDate()
+  return [dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-01',
+  dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (new Date(dt.getFullYear(), month, 0).getDate())]
+  // return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
+}
+
+export function toStandardTimeString () {
+  let dt = new Date()
+  let month = dt.getMonth() + 1
+  let date = dt.getDate()
+  let hour = dt.getHours()
+  let min = dt.getMinutes()
+  let sec = dt.getSeconds()
+  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) +
+  ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+}
+
+export function to3339TimeString () {
+  let dt = new Date()
+  let month = dt.getMonth() + 1
+  let date = dt.getDate()
+  let hour = dt.getHours()
+  let min = dt.getMinutes()
+  let sec = dt.getSeconds()
+  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) +
+   'T' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+}
+
+export function parse3339String (strDate) {
+  return new Date(
+    strDate.substr(0, 4), strDate.substr(5, 2) - 1, strDate.substr(8, 2),
+    strDate.substr(11, 2), strDate.substr(14, 2), strDate.substr(17, 2)
+  )
+}
+
+export function format3339TimeString (dt) {
+  let month = dt.getMonth() + 1
+  let date = dt.getDate()
+  let hour = dt.getHours()
+  let min = dt.getMinutes()
+  let sec = dt.getSeconds()
+  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
+    + 'T' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+}
+
+export function guid () {
+  let buf = new Uint16Array(8)
+  window.crypto.getRandomValues(buf)
+  let S4 = function (num) {
+    let ret = num.toString(16)
+    while (ret.length < 4) {
+      ret = '0' + ret
+    }
+    return ret
+  }
+  return (S4(buf[0]) + S4(buf[1]) + S4(buf[2]) + S4(buf[3]) + S4(buf[4]) + S4(buf[5]) + S4(buf[6]) + S4(buf[7]))
+}
+
+export function choices (role, param, hasBlank = false, blankHint = '请选择') {
+  if (role == 'view') {
+    Vue.getParams(param, [null])
+  } else {
+    let result = []
+    if (hasBlank)
+      result.push({label: blankHint, value: null})
+    if (!Vue.param || !Vue.param[param])
+      result.push({label: '请在系统设置里更新参数', value: '请在系统设置里更新参数'})
+    else {
+      let p = Vue.param[param]
+      p.forEach(function (item) {
+        result.push({label: item.name, value: item.name})
+      })
+    }
+    return result
+  }
+}
+
+export function required (param) {
+  if (typeof param === 'number' && param == 0)
+    return false
+  if (!param)
+    return true
+  param = param + ''
+  param = param.trim()
+  if (!param)
+    return true
+  return false
+}
+
+export function isInt (n) {
+  return !window.isNaN(n) && n % 1 === 0
+}
+
+export function isFloat (n) {
+  return !window.isNaN(n)
+}
+
+// this will convert all true/false to boolean
+export function booleanFilter (paper) {
+  for (let key in paper) {
+    if (!paper.hasOwnProperty(key))
+      continue
+    if (typeof paper[key] == 'object' && paper[key] != null) {
+      booleanFilter(paper[key])
+    } else {
+      if (paper[key] === 'true' || paper[key] == 'false')
+        paper[key] = (paper[key] === 'true')
+    }
+  }
+}
+// recursively traverse through each path
+export function ratifyPics (paper) {
+  for (let key in paper) {
+    if (key.endsWith('_path')) {
+      if (!paper[key]) {
+        paper[key] = 'rs/db/file/nopic.png'
+      } else {
+        paper[key] = 'rs/db/file/' + paper[key]
+      }
+    } else if (paper[key] !== null && typeof (paper[key]) == 'object') {
+      ratifyPics(paper[key])
+    }
+  }
+}
+
+// load script and other stuff
+export function loadscript (type, fileName) {
+  return new Promise((resolve, reject) => {
+    let element
+    if (type == 'css') {
+      element = document.createElement('link')
+      element.setAttribute('rel', 'stylesheet')
+      element.setAttribute('type', 'text/css')
+      element.setAttribute('href', fileName)
+    } else if (type == 'js') {
+      element = document.createElement('script')
+      element.setAttribute('type', 'text/javascript')
+      element.setAttribute('src', fileName)
+    }
+    if (element) {
+      element.setAttribute('async', '')
+      element.setAttribute('defer', '')
+      element.addEventListener('load', function () {
+        resolve(element)
+      }, false)
+      element.addEventListener('error', function () {
+        reject(element)
+      }, false)
+      document.body.appendChild(element)
+    }
+  })
+}
+// 不能选择器中截取掉多余的字符
+export function orgName (name) {
+  return name.substring(10)
+}
+
+export function getNowDate (name) {
+  // 求取当前时间的工具
+  let myweekday = ''
+  let year = ''
+  let mydate = new Date()
+  myweekday = mydate.getDay()
+  let mymonth = mydate.getMonth() + 1
+  let myday = mydate.getDate()
+  let myyear = mydate.getYear()
+  year = (myyear > 200) ? myyear : 1900 + myyear
+  let week = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期日', '星期六']
+  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
+  return year + '年' + mymonth + '月' + myday + '日  ' + week[myweekday]
+}
+
+export function addDate (date, days) {
+  // 求取当前时间的工具
+  let endDate = new Date(date)
+  endDate = endDate.valueOf()
+  endDate = endDate + days * 24 * 60 * 60 * 1000
+  endDate = new Date(endDate)
+  let month = endDate.getMonth() + 1
+  let day = endDate.getDate()
+  let hour = endDate.getHours()
+  let min = endDate.getMinutes()
+  let sec = endDate.getSeconds()
+  return endDate.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day) +
+  ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+  // return a
+}
+
+// 通过地址栏的参数获取参数内容
+export function getUrlParames (param) {
+  var query = window.location.search
+  var iLen = param.length
+  var iStart = query.indexOf(param)
+  if (iStart === -1) {
+    return ''
+  }
+  iStart += iLen + 1
+  var iEnd = query.indexOf('&', iStart)
+  if (iEnd === -1) {
+    return query.substring(iStart)
+  }
+  return query.substring(iStart, iEnd)
+}
+
+// 从地址栏获取加密的参数
+export function getUrlCompileParames (param) {
+  var query = uncompileStr(window.location.search.slice(1, window.location.search.length))
+  var iLen = param.length
+  var iStart = query.indexOf(param)
+  if (iStart === -1) {
+    return ''
+  }
+  iStart += iLen + 1
+  var iEnd = query.indexOf('&', iStart)
+  if (iEnd === -1) {
+    return query.substring(iStart)
+  }
+  return query.substring(iStart, iEnd)
+}
+
+// 对字符串进行加密
+export function compileStr (code) {
+  let c = String.fromCharCode(code.charCodeAt(0) + code.length)
+  for (let i = 1; i < code.length; i++) {
+    c += String.fromCharCode(code.charCodeAt(i) + code.charCodeAt(i - 1))
+  }
+  return escape(c)
+}
+// 字符串进行解密
+export function uncompileStr (code) {
+  code = unescape(code)
+  let c = String.fromCharCode(code.charCodeAt(0) - code.length)
+  for (var i = 1; i < code.length; i++) {
+    c += String.fromCharCode(code.charCodeAt(i) - c.charCodeAt(i - 1))
+  }
+  return c
+}
+
+export function dateDescripte (date) {
+  let nowTime = new Date().getTime()
+  let oldTime = new Date(date).getTime()
+  let timeDiff = nowTime - oldTime
+  // 规则说明
+  // 小于等于2分钟为刚刚
+  // 大于2分钟小于等于1小时为取整的分钟前（例如：35分钟前）
+  // 大于1小时小于等于24小时为取整的小时前（例如：15小时前）
+  // 大于24小时小于等于30天为取整的天前（例如：12天前）
+  // 大于30天小于等于12月为取整的月前，月份统一为30天一月，不做额外处理（例如：3个月前）
+  // 大于365取整的年前，（例如：2年前）
+  let minute = 1000 * 60
+  let hour = minute * 60
+  let day = hour * 24
+  let month = day * 30
+  let year = month * 12
+  let des = ''
+  if (timeDiff <= minute * 2) {
+    des = '刚刚'
+  } else if (minute * 2 < timeDiff && timeDiff < hour) {
+    des = `${Math.floor(timeDiff / minute)}分钟前`
+  } else if (hour < timeDiff && timeDiff <= day) {
+    des = `${Math.floor(timeDiff / hour)}小时前`
+  } else if (day < timeDiff && timeDiff <= month) {
+    des = `${Math.floor(timeDiff / day)}天前`
+  } else if (month < timeDiff && timeDiff <= year) {
+    des = `${Math.floor(timeDiff / month)}个月前`
+  } else if (year < timeDiff) {
+    des = `${Math.floor(timeDiff / year)}年前`
+  }
+  return des
+}
+
+export function nextMonth20 (date) {
+  let ds = date.split('-')
+  let nextMonth = ds[1] - 0 + 1
+  return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
+}
+
+// export function getNowDate () {
+//   // 求取当前时间的工具
+//   let myweekday = ''
+//   let year = ''
+//   let mydate = new Date()
+//   myweekday = mydate.getDay()
+//   let mymonth = mydate.getMonth() + 1
+//   let myday = mydate.getDate()
+//   let myyear = mydate.getYear()
+//   year = (myyear > 200) ? myyear : 1900 + myyear
+//   let week = ['星期日','星期一','星期二','星期三','星期四','星期五','星期日','星期六']
+//   let weekday = week[myweekday]
+//
+//   // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
+//   return  year + '年' + mymonth + '月' + myday + '日 ' + weekday
+// }
+//
+// export function getImgsrc (name) {
+//   return "http://127.0.0.1:8081/images/"+name+".gif"
+// }
+//
+// export var f;

package/src/components/equipment/PosAdd.vue

@@ -218,30 +218,39 @@ import {HttpResetClass, PagedList} from 'vue-client'
       },
       getEditState () {
         if (this.model.f_state === '正常') {
-          this.$showMessage(`当前设备号： ${this.model.f_terminal_number} ,确认停用该设备？`, ['confirm', 'cancel']).then((res) => {
+          this.$showMessage(`当前设备号： ${this.model.f_terminal_number} ,确认停用该设备？`, ['confirm', 'cancel']).then(async (res) => {
             if (res === 'confirm') {
               this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送停用指令，请稍后查看执行结果！`, 'success', 2500)
               this.model.f_state = '停用'
               try {
-                this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
+                await this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [{... this.data, sn: this.data.f_terminal_number, taskState: '0'}], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
+                await this.$resetpost('api/af-revenue/logic/saveEquipmentLogicV3', {f_state: '停用', id: this.model.id, type: 'one'}, {
+                  rejectMsg: null,
+                  resolveMsg: null
+                })
               } catch (error) {
                 this.search()
               }
             }
           })
         } else if (this.model.f_state === '停用'){
-          this.$showMessage(`当前设备号： ${this.model.f_terminal_number} ,确认启用该设备？`, ['confirm', 'cancel']).then((res) => {
+          this.$showMessage(`当前设备号： ${this.model.f_terminal_number} ,确认启用该设备？`, ['confirm', 'cancel']).then(async (res) => {
             if (res === 'confirm') {
               this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送启用指令，请稍后查看执行结果！`, 'success', 2500)
               this.model.f_state = '正常'
               try {
-                this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
+                await this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [{... this.data, sn: this.data.f_terminal_number, taskState: '1'}], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
+                await this.$resetpost('api/af-revenue/logic/saveEquipmentLogicV3', {f_state: '正常', id: this.model.id, type: 'one'}, {
+                  rejectMsg: null,
+                  resolveMsg: null
+                })
               } catch (error) {
                 this.search()
               }
             }
           })
         }
+
       },
       editBeizhu  (val) {
         this.editshow = true

package/src/components/equipment/PosList.vue

@@ -233,31 +233,45 @@
       // 批量操作
       async batchRoot(val) {
         let arrs = []
+        let entityArr = []
         let alertMessage = ''
         let selPos = this.selPos
         if (val === '0') {
           alertMessage = '停用'
           for (const tmp of selPos) {
-            if (tmp.f_state === '正常') arrs.push(tmp)
+            if (tmp.f_state === '正常') {
+              arrs.push({... tmp, sn: tmp.f_terminal_number, taskState: val})
+              entityArr.push({id: tmp.id, version: tmp.version, f_state: '停用'})
+            }
           }
         } else if (val === '1') {
           alertMessage = '启用'
           for (const tmp of selPos) {
-            if (tmp.f_state === '停用') arrs.push(tmp)
+            if (tmp.f_state === '停用') {
+              arrs.push({... tmp, sn: tmp.f_terminal_number, taskState: val})
+              entityArr.push({id: tmp.id, version: tmp.version, f_state: '正常'})
+            }
           }
         } else if (val === '2') {
           alertMessage = '升级'
           for (const tmp of selPos) {
-            if (tmp.f_state === '正常') arrs.push(tmp)
+            if (tmp.f_state === '正常') arrs.push({... tmp, sn: tmp.f_terminal_number, taskState: val})
           }
         } else {
           this.showAlert('出现异常，请重新进操作')
           return
         }
+        console.log('arrs', arrs)
+        console.log('entityArr', entityArr)
         await this.$resetpost('api/af-system/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
           rejectMsg: null,
           resolveMsg: null
         })
+        await this.$resetpost('api/af-revenue/logic/saveEquipmentLogicV3', {arr: entityArr, type: 'batch'}, {
+          rejectMsg: null,
+          resolveMsg: null
+        })
+        this.search()
         // 需要提示
         this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`,'success', 2500)
         this.$dispatch('close')

package/src/components/equipment/PosManage.vue

@@ -124,7 +124,7 @@
         this.isChange = false
         this.row = null
 
-        // this.$refs.list.search()
+        this.$refs.list.search()
       },
       'add' (val) {
         this.f_filialeids = val

package/src/components/server/Menu.vue

@@ -1,188 +1,188 @@
-<template>
-  <div class="auto">
-    <div class="head">
-      <img src="../../../static/loginlogo.png" alt="图片加载未完成"
-      style="float:left;width: 100px; height: 80px; margin: 10px 20px 20px 20px;"/>
-      <div style="float:left;width:auto;height:130px;padding-top:10px;">
-        <h3 style="font-size: 22px;">欢迎使用陕西燃气管理系统</h3>
-        <h5 style="font-size: 15px;">Welcome to ShanXi GAS Manage System</h5>
-      </div>
-
-      <h5 style="float:right;margin-top:70px;margin-right:80px;">
-
-        <span class="glyphicon glyphicon-calendar"></span>
-        {{ date }}&nbsp;&nbsp;
-
-        <span class="glyphicon glyphicon-copyright-mark"></span>
-        系统版本：V1.0.0&nbsp;&nbsp;
-
-        <span class="glyphicon glyphicon-th-large"></span>
-        蓝色主题&nbsp;&nbsp;
-        <a href="#" style="color:#fff;text-decoration:none;" @click.stop.prevent="modify=true">
-          <span class="glyphicon glyphicon-cog"></span>
-          修改密码
-        </a>
-      </h5>
-    </div>
-    <div class="auto">
-      <!-- 白线div -->
-      <div class="whiteline">
-      </div>
-        <select-menu :model="functions.functions"></select-menu>
-    </div>
-    <modal v-ref:modal :show.sync="modify" :backdrop="false" class="auto">
-      <header slot="modal-header" class="modal-header">
-        <h4 class="modal-title">修改密码</h4>
-      </header>
-      <article slot="modal-body" class="modal-body modifystyle">
-        <validator name="v">
-
-          <div class="has-feedback"
-          :class="{'has-warning':$v.password.required,'has-error':$v.password.equalValid && !($v.password.required),
-          'has-success': !$v.password.required && !($v.password.equalValid && !($v.password.required))}">
-            <label for="password" class="control-label">原始密码:&nbsp;&nbsp;</label>
-            <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true, equalValid: functions.password }">
-            <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required && !($v.password.equalValid && !($v.password.required))"></span>
-            <!-- <span class="glyphicon form-control-feedback"
-            :class="{'glyphicon-warning-sign':$v.password.required,'glyphicon-remove'$v.password.equalValid && !($v.password.required):,
-            'glyphicon-ok':!$v.password.required && !($v.password.equalValid && !($v.password.required))}"></span> -->
-            <span v-if="$v.password.required">不能为空</span>
-            <span v-if="$v.password.equalValid && !($v.password.required)">原始密码错误 !!</span>
-          </div>
-
-          <div class="has-feedback"
-          :class="{'has-warning':$v.newpassword.required, 'has-success': !$v.newpassword.required}">
-            <label for="newpassword" class="control-label">新的密码:&nbsp;&nbsp;</label>
-            <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{ required: true }'>
-            <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required"></span>
-            <!-- <span class="glyphicon form-control-feedback"
-            :class="{'glyphicon-warning-sign':$v.newpassword.required,'glyphicon-ok':!$v.newpassword.required }"></span> -->
-            <span v-if="$v.newpassword.required">不能为空</span>
-          </div>
-
-          <div class="has-feedback"
-          :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="control-label">确认密码:&nbsp;&nbsp;</label>
-            <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 class="glyphicon form-control-feedback"
-            :class="{'glyphicon-warning-sign':$v.affirmpassword.required,'glyphicon-remove'$v.affirmpassword.equalValid && !($v.affirmpassword.required):,
-            'glyphicon-ok':!$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>
-
-        </validator>
-      </article>
-      <footer slot="modal-footer" class="footerbtn">
-        <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
-        <button  type="button" class="btn btn-default" @click='close'>取消</button>
-      </footer>
-    <modal>
-      <!-- modifyPassword() -->
-    </modal>
-    </modal>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import * as Util from '../Util'
-
-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.$post('rs/db/modifypwd', {data: self.deliver})
-  if (res.status === 200 || res.status === 204) {
-    self.modify = false
-    self.deliver.password = ''
-    self.deliver.newpassword = ''
-    self.deliver.affirmpassword = ''
-  }
-}
-
-export default {
-  title: '菜单选择',
-  props: ['functions'],
-  data () {
-    return {
-      modify: false,
-      deliver: {
-        password: '',
-        newpassword: '',
-        affirmpassword: ''
-      }
-    }
-  },
-  computed: {
-    date () {
-      return Util.getNowDate()
-    }
-  },
-  methods: {
-    open (row) {
-      if (row.link) {
-        // this.$goto(row.link, {userid: this.functions, source: {isRead: 'modify'}}, 'home-page')
-        this.$goto(row.link, {f: this.functions}, 'home-page')
-      }
-    },
-    // 修改密码操作
-    close () {
-      this.modify = false
-    },
-    confirm () {
-      let gen = saveGen(this)
-      co(gen)
-    }
-  },
-  events: {
-    'select-changed': function (data) {
-      // 事件回调内的 `this` 自动绑定到注册它的实例上
-      this.open(data.val)
-    }
-  }
-}
-</script>
-<style>
-/* 头部样式，大部分使用放在标签内 */
-  .head {
-    color: #fff;
-    height: 110px;
-    width: 100%;
-  }
-  /* 菜单头部与内容区域的中间的白色线 */
-  .whiteline {
-    height: 1px;
-    background: #fff;
-    margin: 0px 30px;
-  }
-  /*修改密码body界面样式*/
-  .modifystyle {
-    background: #FCFEEE;
-  }
-   .modifystyle div{
-     height: auto;
-     margin-bottom: 15px;
-     /*text-align: center;*/
-     margin-left: 20%;
-   }
-   /*bootstrap字体图标要手动调整，所以使用字体图标的span必须紧跟在input后面，负责会错位*/
-   .modifystyle div input + span{
-     top: 0!important;
-     right: 32%;
-   }
-   .modifystyle span{
-     color: red;
-   }
-   /*修改密码底部按钮部分样式*/
-   .footerbtn {
-     text-align: center;
-     padding: 15px;
-   }
-   .footerbtn button {
-     width: 100px;
-     margin-left: 20px;
-   }
-</style>
+<template>
+  <div class="auto">
+    <div class="head">
+      <img src="../../../static/loginlogo.png" alt="图片加载未完成"
+      style="float:left;width: 100px; height: 80px; margin: 10px 20px 20px 20px;"/>
+      <div style="float:left;width:auto;height:130px;padding-top:10px;">
+        <h3 style="font-size: 22px;">欢迎使用陕西燃气管理系统</h3>
+        <h5 style="font-size: 15px;">Welcome to ShanXi GAS Manage System</h5>
+      </div>
+
+      <h5 style="float:right;margin-top:70px;margin-right:80px;">
+
+        <span class="glyphicon glyphicon-calendar"></span>
+        {{ date }}&nbsp;&nbsp;
+
+        <span class="glyphicon glyphicon-copyright-mark"></span>
+        系统版本：V1.0.0&nbsp;&nbsp;
+
+        <span class="glyphicon glyphicon-th-large"></span>
+        蓝色主题&nbsp;&nbsp;
+        <a href="#" style="color:#fff;text-decoration:none;" @click.stop.prevent="modify=true">
+          <span class="glyphicon glyphicon-cog"></span>
+          修改密码
+        </a>
+      </h5>
+    </div>
+    <div class="auto">
+      <!-- 白线div -->
+      <div class="whiteline">
+      </div>
+        <select-menu :model="functions.functions"></select-menu>
+    </div>
+    <modal v-ref:modal :show.sync="modify" :backdrop="false" class="auto">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">修改密码</h4>
+      </header>
+      <article slot="modal-body" class="modal-body modifystyle">
+        <validator name="v">
+
+          <div class="has-feedback"
+          :class="{'has-warning':$v.password.required,'has-error':$v.password.equalValid && !($v.password.required),
+          'has-success': !$v.password.required && !($v.password.equalValid && !($v.password.required))}">
+            <label for="password" class="control-label">原始密码:&nbsp;&nbsp;</label>
+            <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true, equalValid: functions.password }">
+            <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required && !($v.password.equalValid && !($v.password.required))"></span>
+            <!-- <span class="glyphicon form-control-feedback"
+            :class="{'glyphicon-warning-sign':$v.password.required,'glyphicon-remove'$v.password.equalValid && !($v.password.required):,
+            'glyphicon-ok':!$v.password.required && !($v.password.equalValid && !($v.password.required))}"></span> -->
+            <span v-if="$v.password.required">不能为空</span>
+            <span v-if="$v.password.equalValid && !($v.password.required)">原始密码错误 !!</span>
+          </div>
+
+          <div class="has-feedback"
+          :class="{'has-warning':$v.newpassword.required, 'has-success': !$v.newpassword.required}">
+            <label for="newpassword" class="control-label">新的密码:&nbsp;&nbsp;</label>
+            <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{ required: true }'>
+            <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required"></span>
+            <!-- <span class="glyphicon form-control-feedback"
+            :class="{'glyphicon-warning-sign':$v.newpassword.required,'glyphicon-ok':!$v.newpassword.required }"></span> -->
+            <span v-if="$v.newpassword.required">不能为空</span>
+          </div>
+
+          <div class="has-feedback"
+          :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="control-label">确认密码:&nbsp;&nbsp;</label>
+            <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 class="glyphicon form-control-feedback"
+            :class="{'glyphicon-warning-sign':$v.affirmpassword.required,'glyphicon-remove'$v.affirmpassword.equalValid && !($v.affirmpassword.required):,
+            'glyphicon-ok':!$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>
+
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="footerbtn">
+        <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
+        <button  type="button" class="btn btn-default" @click='close'>取消</button>
+      </footer>
+    <modal>
+      <!-- modifyPassword() -->
+    </modal>
+    </modal>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import * as Util from '../Util'
+
+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.$post('rs/db/modifypwd', {data: self.deliver})
+  if (res.status === 200 || res.status === 204) {
+    self.modify = false
+    self.deliver.password = ''
+    self.deliver.newpassword = ''
+    self.deliver.affirmpassword = ''
+  }
+}
+
+export default {
+  title: '菜单选择',
+  props: ['functions'],
+  data () {
+    return {
+      modify: false,
+      deliver: {
+        password: '',
+        newpassword: '',
+        affirmpassword: ''
+      }
+    }
+  },
+  computed: {
+    date () {
+      return Util.getNowDate()
+    }
+  },
+  methods: {
+    open (row) {
+      if (row.link) {
+        // this.$goto(row.link, {userid: this.functions, source: {isRead: 'modify'}}, 'home-page')
+        this.$goto(row.link, {f: this.functions}, 'home-page')
+      }
+    },
+    // 修改密码操作
+    close () {
+      this.modify = false
+    },
+    confirm () {
+      let gen = saveGen(this)
+      co(gen)
+    }
+  },
+  events: {
+    'select-changed': function (data) {
+      // 事件回调内的 `this` 自动绑定到注册它的实例上
+      this.open(data.val)
+    }
+  }
+}
+</script>
+<style>
+/* 头部样式，大部分使用放在标签内 */
+  .head {
+    color: #fff;
+    height: 110px;
+    width: 100%;
+  }
+  /* 菜单头部与内容区域的中间的白色线 */
+  .whiteline {
+    height: 1px;
+    background: #fff;
+    margin: 0px 30px;
+  }
+  /*修改密码body界面样式*/
+  .modifystyle {
+    background: #FCFEEE;
+  }
+   .modifystyle div{
+     height: auto;
+     margin-bottom: 15px;
+     /*text-align: center;*/
+     margin-left: 20%;
+   }
+   /*bootstrap字体图标要手动调整，所以使用字体图标的span必须紧跟在input后面，负责会错位*/
+   .modifystyle div input + span{
+     top: 0!important;
+     right: 32%;
+   }
+   .modifystyle span{
+     color: red;
+   }
+   /*修改密码底部按钮部分样式*/
+   .footerbtn {
+     text-align: center;
+     padding: 15px;
+   }
+   .footerbtn button {
+     width: 100px;
+     margin-left: 20px;
+   }
+</style>