system-clients 3.2.79 → 3.2.80

package/src/styles/less/wells.less

@@ -1,29 +1,29 @@
-//
-// Wells
-// --------------------------------------------------
-
-
-// Base class
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: @well-bg;
-  border: 1px solid @well-border;
-  border-radius: @border-radius-base;
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
-  blockquote {
-    border-color: #ddd;
-    border-color: rgba(0,0,0,.15);
-  }
-}
-
-// Sizes
-.well-lg {
-  padding: 24px;
-  border-radius: @border-radius-large;
-}
-.well-sm {
-  padding: 9px;
-  border-radius: @border-radius-small;
-}
+//
+// Wells
+// --------------------------------------------------
+
+
+// Base class
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: @well-bg;
+  border: 1px solid @well-border;
+  border-radius: @border-radius-base;
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  blockquote {
+    border-color: #ddd;
+    border-color: rgba(0,0,0,.15);
+  }
+}
+
+// Sizes
+.well-lg {
+  padding: 24px;
+  border-radius: @border-radius-large;
+}
+.well-sm {
+  padding: 9px;
+  border-radius: @border-radius-small;
+}

package/src/system.js

@@ -1,121 +1,121 @@
-import Vue from 'vue'
-import GetLoginInfoService from './plugins/GetLoginInfoService'
-import GetAppDataService from './stores/AppData'
-// 热力
-import HeatGetLoginInfoService from './plugins/HeatGetLoginInfoService'
-import HeatGetAppDataService from './stores/HeatAppData'
-// 热力登陆控制
-Vue.$heatCompatibility  = Vue.prototype.$heatCompatibility = false
-
-// /** **************************登录与主界面相关******************************/
-
-import login from './components/server/Login'
-import changeDeclare from './components/server/ChangeDeclare'
-import addChangemsg from './components/server/AddChangeMsg'
-import homePage from './components/Main'
-import leftTree from './components/server/LeftTree'
-import iconTree from './components/server/IconTree'
-import modifyPw from './components/server/ModifyPw'
-import LoadData from './components/server/LoadData'
-import RightTree from './components/server/RightTree'
-import TestRightTree from './components/server/TestRightTree'
-//资源选择
-import ResSelect from './components/server/ResSelect'
-import ResSelectGroup from './components/server/ResSelectGroup'
-
-//资源选择测试
-import TestResSelect from './components/server/TestResSelect'
-import RoleSelector from "./components/server/RoleSelector";
-
-// BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
-export default function (val,filiale, {showLogin = false, show_daiBan = false, show_yiDi= false, BAinformation = null,showVersionTime=true} = {}) {
-  console.log(val,filiale,showLogin)
-  //验证码开关赋值
-  if(val!=null){
-    GetLoginInfoService.Verification=val
-  }
-  //构建时间开关赋值
-  if(val!=null){
-    GetLoginInfoService.versionTime=showVersionTime
-  }
-  //登录提示赋值
-  GetLoginInfoService.depPrompt=showLogin
-  //展示待办赋值
-  GetLoginInfoService.showDaiBan=show_daiBan
-  //展示异地登录
-  GetLoginInfoService.showYiDi=show_yiDi
-  // 备案信息复制
-  GetLoginInfoService.BAinformation = BAinformation
-  Vue.use(GetLoginInfoService)
-  Vue.use(GetAppDataService)
-  Vue.use(HeatGetLoginInfoService)
-  Vue.use(HeatGetAppDataService)
-
-  Vue.component('login', login)
-  Vue.component('change-declare', changeDeclare)
-  Vue.component('add-changemsg', addChangemsg)
-  Vue.component('home-page', homePage)
-  Vue.component('left-tree', leftTree)
-  Vue.component('icon-tree', iconTree)
-  Vue.component('modify-pw', modifyPw)
-  Vue.component('load-data', LoadData)
-  Vue.component('right-tree', RightTree)
-  Vue.component('test-right-tree', TestRightTree)
-  Vue.component('role-selector', RoleSelector)
-  //资源选择
-  Vue.component('res-select', ResSelect)
-  Vue.component('res-select-group', ResSelectGroup)
- //资源选择测试
-  Vue.component('test-res-select', TestResSelect)
-
-  // 参数管理(新)
-  Vue.component('param-manage', (resolve) => { require(['./components/parammanage/ParamManage'], resolve) })
-  // 参数管理
-  Vue.component('param-page', (resolve) => { require(['./components/parammanage/ParamPage'], resolve) })
-  // 参数管理
-  Vue.component('single-page', (resolve) => { require(['./components/parammanage/SinglePage'], resolve) })
-  //进度条插件
-  Vue.component('progress-base', (resolve) => { require(['./components/common/ProgressBase'], resolve) })
-
-  // 参数管理(旧)
-  Vue.component('param-manages', (resolve) => { require(['./components/parammanage/ParamManages'], resolve) })
-  // 参数管理
-  Vue.component('param-pages', (resolve) => { require(['./components/parammanage/ParamPages'], resolve) })
-  // 参数管理
-  Vue.component('single-pages', (resolve) => { require(['./components/parammanage/SinglePages'], resolve) })
-
-  // 终端管理
-  Vue.component('equipment-manage', (resolve) => { require(['./components/equipment/EquipmentManage'], resolve) })
-  // pc端控制
-  Vue.component('pc-manage', (resolve) => { require(['./components/equipment/PcManage'], resolve) })
-  // phone端控制
-  Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
-  // pos端控制
-  Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
-  // pos管理
-  Vue.component('pos-manage-both', (resolve) => { require(['./components/equipment/PosManageBoth'], resolve) })
-  // pos参数管理
-  Vue.component('pos-param-manage', (resolve) => { require(['./components/equipment/PosParamManage'], resolve) })
-
-  // 材料字典
-  Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], resolve) })
-  Vue.component('material-data-list', (resolve) => { require(['./components/materialManage/materialList.vue'], resolve) })
-  // 图片查看器
-  Vue.component('image-viewer', (resolve) => { require(['./components/server/ImageViewer'], resolve) })
-  // 测试图片查看器
-  Vue.component('image-viewer-test', (resolve) => { require(['./components/server/ImageVieweTest'], resolve) })
-
-  //省市区、街道、小区、楼栋级联查询
-  Vue.component('pcd-building-select', (resolve) => { require(['./components/server/PcdBuildingSelect'], resolve) })
-
-
-  // 大屏
-  Vue.component('login-page', (resolve) => { require(['./components/server/LoginPage'], resolve) })
-  Vue.component('login-view', (resolve) => { require(['./components/server/LoginView'], resolve) })
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/system`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
-}
+import Vue from 'vue'
+import GetLoginInfoService from './plugins/GetLoginInfoService'
+import GetAppDataService from './stores/AppData'
+// 热力
+import HeatGetLoginInfoService from './plugins/HeatGetLoginInfoService'
+import HeatGetAppDataService from './stores/HeatAppData'
+// 热力登陆控制
+Vue.$heatCompatibility  = Vue.prototype.$heatCompatibility = false
+
+// /** **************************登录与主界面相关******************************/
+
+import login from './components/server/Login'
+import changeDeclare from './components/server/ChangeDeclare'
+import addChangemsg from './components/server/AddChangeMsg'
+import homePage from './components/Main'
+import leftTree from './components/server/LeftTree'
+import iconTree from './components/server/IconTree'
+import modifyPw from './components/server/ModifyPw'
+import LoadData from './components/server/LoadData'
+import RightTree from './components/server/RightTree'
+import TestRightTree from './components/server/TestRightTree'
+//资源选择
+import ResSelect from './components/server/ResSelect'
+import ResSelectGroup from './components/server/ResSelectGroup'
+
+//资源选择测试
+import TestResSelect from './components/server/TestResSelect'
+import RoleSelector from "./components/server/RoleSelector";
+
+// BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
+export default function (val,filiale, {showLogin = false, show_daiBan = false, show_yiDi= false, BAinformation = null,showVersionTime=true} = {}) {
+  console.log(val,filiale,showLogin)
+  //验证码开关赋值
+  if(val!=null){
+    GetLoginInfoService.Verification=val
+  }
+  //构建时间开关赋值
+  if(val!=null){
+    GetLoginInfoService.versionTime=showVersionTime
+  }
+  //登录提示赋值
+  GetLoginInfoService.depPrompt=showLogin
+  //展示待办赋值
+  GetLoginInfoService.showDaiBan=show_daiBan
+  //展示异地登录
+  GetLoginInfoService.showYiDi=show_yiDi
+  // 备案信息复制
+  GetLoginInfoService.BAinformation = BAinformation
+  Vue.use(GetLoginInfoService)
+  Vue.use(GetAppDataService)
+  Vue.use(HeatGetLoginInfoService)
+  Vue.use(HeatGetAppDataService)
+
+  Vue.component('login', login)
+  Vue.component('change-declare', changeDeclare)
+  Vue.component('add-changemsg', addChangemsg)
+  Vue.component('home-page', homePage)
+  Vue.component('left-tree', leftTree)
+  Vue.component('icon-tree', iconTree)
+  Vue.component('modify-pw', modifyPw)
+  Vue.component('load-data', LoadData)
+  Vue.component('right-tree', RightTree)
+  Vue.component('test-right-tree', TestRightTree)
+  Vue.component('role-selector', RoleSelector)
+  //资源选择
+  Vue.component('res-select', ResSelect)
+  Vue.component('res-select-group', ResSelectGroup)
+ //资源选择测试
+  Vue.component('test-res-select', TestResSelect)
+
+  // 参数管理(新)
+  Vue.component('param-manage', (resolve) => { require(['./components/parammanage/ParamManage'], resolve) })
+  // 参数管理
+  Vue.component('param-page', (resolve) => { require(['./components/parammanage/ParamPage'], resolve) })
+  // 参数管理
+  Vue.component('single-page', (resolve) => { require(['./components/parammanage/SinglePage'], resolve) })
+  //进度条插件
+  Vue.component('progress-base', (resolve) => { require(['./components/common/ProgressBase'], resolve) })
+
+  // 参数管理(旧)
+  Vue.component('param-manages', (resolve) => { require(['./components/parammanage/ParamManages'], resolve) })
+  // 参数管理
+  Vue.component('param-pages', (resolve) => { require(['./components/parammanage/ParamPages'], resolve) })
+  // 参数管理
+  Vue.component('single-pages', (resolve) => { require(['./components/parammanage/SinglePages'], resolve) })
+
+  // 终端管理
+  Vue.component('equipment-manage', (resolve) => { require(['./components/equipment/EquipmentManage'], resolve) })
+  // pc端控制
+  Vue.component('pc-manage', (resolve) => { require(['./components/equipment/PcManage'], resolve) })
+  // phone端控制
+  Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
+  // pos端控制
+  Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
+  // pos管理
+  Vue.component('pos-manage-both', (resolve) => { require(['./components/equipment/PosManageBoth'], resolve) })
+  // pos参数管理
+  Vue.component('pos-param-manage', (resolve) => { require(['./components/equipment/PosParamManage'], resolve) })
+
+  // 材料字典
+  Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], resolve) })
+  Vue.component('material-data-list', (resolve) => { require(['./components/materialManage/materialList.vue'], resolve) })
+  // 图片查看器
+  Vue.component('image-viewer', (resolve) => { require(['./components/server/ImageViewer'], resolve) })
+  // 测试图片查看器
+  Vue.component('image-viewer-test', (resolve) => { require(['./components/server/ImageVieweTest'], resolve) })
+
+  //省市区、街道、小区、楼栋级联查询
+  Vue.component('pcd-building-select', (resolve) => { require(['./components/server/PcdBuildingSelect'], resolve) })
+
+
+  // 大屏
+  Vue.component('login-page', (resolve) => { require(['./components/server/LoginPage'], resolve) })
+  Vue.component('login-view', (resolve) => { require(['./components/server/LoginView'], resolve) })
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/system`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}

package/src/systemphone.js

@@ -1,11 +1,11 @@
-import Vue from 'vue'
-
-
-// /** **************************登录与主界面相关******************************/
-import RightTree from './components/server/RightTree'
-
-export default function (val) {
-
-  Vue.component('right-tree', RightTree)
-
-}
+import Vue from 'vue'
+
+
+// /** **************************登录与主界面相关******************************/
+import RightTree from './components/server/RightTree'
+
+export default function (val) {
+
+  Vue.component('right-tree', RightTree)
+
+}

package/src/util/Daiban.json

@@ -1,12 +1,12 @@
-{
-  "enable" : true,
-  "daiban": [
-      {
-        "title":"超期未安检通知",
-        "url": "/rs/sql/UpcomingSafecheckdata",
-        "data": {},
-        "text": "\t `到期未下发小区为：${item.f_residential_area},未检户数为:${item.user_count}` \t",
-        "enable": true
-      }
-  ]
-}
+{
+  "enable" : true,
+  "daiban": [
+      {
+        "title":"超期未安检通知",
+        "url": "/rs/sql/UpcomingSafecheckdata",
+        "data": {},
+        "text": "\t `到期未下发小区为：${item.f_residential_area},未检户数为:${item.user_count}` \t",
+        "enable": true
+      }
+  ]
+}

package/src/util/LdapHelper.js

@@ -1,75 +1,75 @@
-/**
- * 获得给定资源的名称全路径
- * @param res: 资源
- * @param name: 全路径字段
- */
-export function getFullName (res, name) {
-  let result = ''
-  while (res != null) {
-    if (result === '') {
-      result = res[name]
-    } else {
-      result = res[name] + '.' + result
-    }
-    res = res.parent
-  }
-  return result
-}
-
-/**
- * 给拿到的资源添加父关系
- * @param res
- */
-export function procParent (reses) {
-  for (let value of reses) {
-    procInnerParent(value)
-  }
-}
-
-// 给资源res的所有子，添加父关系
-function procInnerParent (res) {
-  for (let value of res.children) {
-    value.parent = res
-    procInnerParent(value)
-  }
-}
-
-/**
- * 从给定一批资源中，递归找到给定号码的资源
- * @param model：给定的一批资源
- * @param id：要查找的资源id串
- */
-export function find (model, id) {
-  // 返回最后一个id信息
-  let index = id.lastIndexOf('.')
-  if (index !== -1) {
-    id = id.substr(index + 1)
-  }
-
-  // 子中有，返回子里的
-  for (let value of model) {
-    let ret = getInnerResourceById(value, id)
-    if (ret) {
-      return ret
-    }
-  }
-
-  return null
-}
-
-// 根据id号取资源，自己不是，递归从子中找
-function getInnerResourceById (res, id) {
-  if (res.id === id) {
-    return res
-  }
-
-  // 子中有，返回子里的
-  for (let value of res.children) {
-    let ret = getInnerResourceById(value, id)
-    if (ret) {
-      return ret
-    }
-  }
-
-  return null
-}
+/**
+ * 获得给定资源的名称全路径
+ * @param res: 资源
+ * @param name: 全路径字段
+ */
+export function getFullName (res, name) {
+  let result = ''
+  while (res != null) {
+    if (result === '') {
+      result = res[name]
+    } else {
+      result = res[name] + '.' + result
+    }
+    res = res.parent
+  }
+  return result
+}
+
+/**
+ * 给拿到的资源添加父关系
+ * @param res
+ */
+export function procParent (reses) {
+  for (let value of reses) {
+    procInnerParent(value)
+  }
+}
+
+// 给资源res的所有子，添加父关系
+function procInnerParent (res) {
+  for (let value of res.children) {
+    value.parent = res
+    procInnerParent(value)
+  }
+}
+
+/**
+ * 从给定一批资源中，递归找到给定号码的资源
+ * @param model：给定的一批资源
+ * @param id：要查找的资源id串
+ */
+export function find (model, id) {
+  // 返回最后一个id信息
+  let index = id.lastIndexOf('.')
+  if (index !== -1) {
+    id = id.substr(index + 1)
+  }
+
+  // 子中有，返回子里的
+  for (let value of model) {
+    let ret = getInnerResourceById(value, id)
+    if (ret) {
+      return ret
+    }
+  }
+
+  return null
+}
+
+// 根据id号取资源，自己不是，递归从子中找
+function getInnerResourceById (res, id) {
+  if (res.id === id) {
+    return res
+  }
+
+  // 子中有，返回子里的
+  for (let value of res.children) {
+    let ret = getInnerResourceById(value, id)
+    if (ret) {
+      return ret
+    }
+  }
+
+  return null
+}

package/test/e2e/custom-assertions/elementCount.js

@@ -1,26 +1,26 @@
-// A custom Nightwatch assertion.
-// the name of the method is the filename.
-// can be used in tests like this:
-//
-//   browser.assert.elementCount(selector, count)
-//
-// for how to write custom assertions see
-// http://nightwatchjs.org/guide#writing-custom-assertions
-exports.assertion = function (selector, count) {
-  this.message = 'Testing if element <' + selector + '> has count: ' + count
-  this.expected = count
-  this.pass = function (val) {
-    return val === this.expected
-  }
-  this.value = function (res) {
-    return res.value
-  }
-  this.command = function (cb) {
-    var self = this
-    return this.api.execute(function (selector) {
-      return document.querySelectorAll(selector).length
-    }, [selector], function (res) {
-      cb.call(self, res)
-    })
-  }
-}
+// A custom Nightwatch assertion.
+// the name of the method is the filename.
+// can be used in tests like this:
+//
+//   browser.assert.elementCount(selector, count)
+//
+// for how to write custom assertions see
+// http://nightwatchjs.org/guide#writing-custom-assertions
+exports.assertion = function (selector, count) {
+  this.message = 'Testing if element <' + selector + '> has count: ' + count
+  this.expected = count
+  this.pass = function (val) {
+    return val === this.expected
+  }
+  this.value = function (res) {
+    return res.value
+  }
+  this.command = function (cb) {
+    var self = this
+    return this.api.execute(function (selector) {
+      return document.querySelectorAll(selector).length
+    }, [selector], function (res) {
+      cb.call(self, res)
+    })
+  }
+}

package/test/e2e/nightwatch.conf.js

@@ -1,40 +1,40 @@
-// http://nightwatchjs.org/guide#settings-file
-module.exports = {
-  'src_folders': ['test/e2e/specs'],
-  'output_folder': 'test/e2e/reports',
-  'custom_assertions_path': ['test/e2e/custom-assertions'],
-
-  'selenium': {
-    'start_process': true,
-    'server_path': 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.52.0.jar',
-    'host': '127.0.0.1',
-    'port': 4444,
-    'cli_args': {
-      'webdriver.chrome.driver': require('chromedriver').path
-    }
-  },
-
-  'test_settings': {
-    'default': {
-      'selenium_port': 4444,
-      'selenium_host': 'localhost',
-      'silent': true
-    },
-
-    'chrome': {
-      'desiredCapabilities': {
-        'browserName': 'chrome',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      }
-    },
-
-    'firefox': {
-      'desiredCapabilities': {
-        'browserName': 'firefox',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      }
-    }
-  }
-}
+// http://nightwatchjs.org/guide#settings-file
+module.exports = {
+  'src_folders': ['test/e2e/specs'],
+  'output_folder': 'test/e2e/reports',
+  'custom_assertions_path': ['test/e2e/custom-assertions'],
+
+  'selenium': {
+    'start_process': true,
+    'server_path': 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.52.0.jar',
+    'host': '127.0.0.1',
+    'port': 4444,
+    'cli_args': {
+      'webdriver.chrome.driver': require('chromedriver').path
+    }
+  },
+
+  'test_settings': {
+    'default': {
+      'selenium_port': 4444,
+      'selenium_host': 'localhost',
+      'silent': true
+    },
+
+    'chrome': {
+      'desiredCapabilities': {
+        'browserName': 'chrome',
+        'javascriptEnabled': true,
+        'acceptSslCerts': true
+      }
+    },
+
+    'firefox': {
+      'desiredCapabilities': {
+        'browserName': 'firefox',
+        'javascriptEnabled': true,
+        'acceptSslCerts': true
+      }
+    }
+  }
+}