safecheck-client 3.0.35-gongyi-10 → 3.0.35-gongyi-11

package/src/utils/GerJsonObjectConfig.js

@@ -1,51 +1,51 @@
-/**
- * 把配置文件 Object形式 转成 数组形式
- * @param res: 对象格式得安检隐患项配置文件
- */
-
-let ObjConfig = {
-  getObjConfig (obj) {
-    var getconfig = []
-    // 获取对象中得所有key值
-    // 每一个key值和value 放到数组中
-   for(var key in obj){
-      // 组装每一个数组中得值
-      var fig = {
-        checkname:key
-      }
-      // items对象时，把object对象转成arr数组
-      var items =  obj[key]['items']
-       // 删除原有object中得items,把items转换成数组后再添加回来
-      delete  obj[key].items
-      obj[key].items =  this.getChangeObject(items)
-     var config  = Object.assign({},fig,obj[key])
-     getconfig.push(config)
-   }
-
-    return getconfig
-  },
-  // 将object转成数组
-  getChangeObject(obj){
-    console.log('1111===>' +JSON.stringify(obj))
-    var getconfig = []
-    for(var key in obj){
-      var fig = {
-        lname:key
-      }
-      var config  = Object.assign({},fig,obj[key])
-      getconfig.push(config)
-    }
-    return getconfig
-  },
-
-
-}
-/*
-     * @description    根据某个字段实现对json数组的排序
-     * @param   array  要排序的json数组对象
-     * @param   field  排序字段（此参数必须为字符串）
-     * @param   reverse 是否倒序（默认为false）
-     * @return  array  返回排序后的json数组
-    */
-
-export default ObjConfig
+/**
+ * 把配置文件 Object形式 转成 数组形式
+ * @param res: 对象格式得安检隐患项配置文件
+ */
+
+let ObjConfig = {
+  getObjConfig (obj) {
+    var getconfig = []
+    // 获取对象中得所有key值
+    // 每一个key值和value 放到数组中
+   for(var key in obj){
+      // 组装每一个数组中得值
+      var fig = {
+        checkname:key
+      }
+      // items对象时，把object对象转成arr数组
+      var items =  obj[key]['items']
+       // 删除原有object中得items,把items转换成数组后再添加回来
+      delete  obj[key].items
+      obj[key].items =  this.getChangeObject(items)
+     var config  = Object.assign({},fig,obj[key])
+     getconfig.push(config)
+   }
+
+    return getconfig
+  },
+  // 将object转成数组
+  getChangeObject(obj){
+    console.log('1111===>' +JSON.stringify(obj))
+    var getconfig = []
+    for(var key in obj){
+      var fig = {
+        lname:key
+      }
+      var config  = Object.assign({},fig,obj[key])
+      getconfig.push(config)
+    }
+    return getconfig
+  },
+
+
+}
+/*
+     * @description    根据某个字段实现对json数组的排序
+     * @param   array  要排序的json数组对象
+     * @param   field  排序字段（此参数必须为字符串）
+     * @param   reverse 是否倒序（默认为false）
+     * @return  array  返回排序后的json数组
+    */
+
+export default ObjConfig

package/src/utils/LdapHelper.js

@@ -1,99 +1,99 @@
-/**
- * 获得给定资源的名称全路径
- * @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
-}
-/*
-     * @description    根据某个字段实现对json数组的排序
-     * @param   array  要排序的json数组对象
-     * @param   field  排序字段（此参数必须为字符串）
-     * @param   reverse 是否倒序（默认为false）
-     * @return  array  返回排序后的json数组
-    */
-export function jsonSort(array, field, reverse) {
-  console.log('传进来的数据==》',array)
-  //数组长度小于2 或 没有指定排序字段 或 不是json格式数据
-  if(array.length < 2 || !field || typeof array[0] !== "object") return array;
-  //数字类型排序
-  if(typeof array[0][field] === "number") {
-    array.sort(function(x, y) { return x[field] - y[field]});
-  }
-  //字符串类型排序
-  if(typeof array[0][field] === "string") {
-    array.sort(function(x, y) { return parseInt(x[field]) -  parseInt(y[field])});
-  }
-  //倒序
-  if(reverse) {
-    array.reverse();
-  }
-  return array;
-}
-/**
- * 给拿到的资源添加父关系
- * @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
+}
+/*
+     * @description    根据某个字段实现对json数组的排序
+     * @param   array  要排序的json数组对象
+     * @param   field  排序字段（此参数必须为字符串）
+     * @param   reverse 是否倒序（默认为false）
+     * @return  array  返回排序后的json数组
+    */
+export function jsonSort(array, field, reverse) {
+  console.log('传进来的数据==》',array)
+  //数组长度小于2 或 没有指定排序字段 或 不是json格式数据
+  if(array.length < 2 || !field || typeof array[0] !== "object") return array;
+  //数字类型排序
+  if(typeof array[0][field] === "number") {
+    array.sort(function(x, y) { return x[field] - y[field]});
+  }
+  //字符串类型排序
+  if(typeof array[0][field] === "string") {
+    array.sort(function(x, y) { return parseInt(x[field]) -  parseInt(y[field])});
+  }
+  //倒序
+  if(reverse) {
+    array.reverse();
+  }
+  return array;
+}
+/**
+ * 给拿到的资源添加父关系
+ * @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/src/utils/getNowDate.js

@@ -1,33 +1,33 @@
-export default () => {
-  // 求取当前时间的工具
-  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 weekday = ''
-  if (myweekday === 0) {
-    weekday = '星期日'
-  } else if (myweekday === 1) {
-    weekday = '星期一'
-  } else if (myweekday === 2) {
-    weekday = '星期二'
-  } else if (myweekday === 3) {
-    weekday = '星期三'
-  } else if (myweekday === 4) {
-    weekday = '星期四'
-  } else if (myweekday === 5) {
-    weekday = '星期五'
-  } else if (myweekday === 6) {
-    weekday = '星期日'
-  } else if (myweekday === 7) {
-    weekday = '星期六'
-  }
-
-
-  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
-  return  year + '年' + mymonth + '月' + myday + '日 ' + weekday
-}
+export default () => {
+  // 求取当前时间的工具
+  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 weekday = ''
+  if (myweekday === 0) {
+    weekday = '星期日'
+  } else if (myweekday === 1) {
+    weekday = '星期一'
+  } else if (myweekday === 2) {
+    weekday = '星期二'
+  } else if (myweekday === 3) {
+    weekday = '星期三'
+  } else if (myweekday === 4) {
+    weekday = '星期四'
+  } else if (myweekday === 5) {
+    weekday = '星期五'
+  } else if (myweekday === 6) {
+    weekday = '星期日'
+  } else if (myweekday === 7) {
+    weekday = '星期六'
+  }
+
+
+  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
+  return  year + '年' + mymonth + '月' + myday + '日 ' + weekday
+}

package/test/SearchList.test.js

@@ -1,14 +1,14 @@
-import assert from "assert"
-import Comp from '../examples/SafePlan/comp'
-describe('model/List.js: 对象变量测试', () => {
-  it('设置对象变量', async()=> {
-    console.log("11111111111111111111111111111111")
-    let c=new Comp();
-    await c.delPlanItem()
-    console.log(c.user.check.checkAll)
-    c.loadCheckPlan()
-    c.changeCheckAll("user")
-    console.log(c.user.check.checkAll)
-    assert.equal(10, 10)
-  })
-})
+import assert from "assert"
+import Comp from '../examples/SafePlan/comp'
+describe('model/List.js: 对象变量测试', () => {
+  it('设置对象变量', async()=> {
+    console.log("11111111111111111111111111111111")
+    let c=new Comp();
+    await c.delPlanItem()
+    console.log(c.user.check.checkAll)
+    c.loadCheckPlan()
+    c.changeCheckAll("user")
+    console.log(c.user.check.checkAll)
+    assert.equal(10, 10)
+  })
+})

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
+      }
+    }
+  }
+}

package/test/e2e/runner.js

@@ -1,30 +1,30 @@
-// 1. start the dev server
-var server = require('../../build/dev-server.js')
-
-// 2. run the nightwatch test suite against it
-// to run in additional browsers:
-//    1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
-//    2. add it to the --env flag below
-// For more information on Nightwatch's config file, see
-// http://nightwatchjs.org/guide#settings-file
-var spawn = require('cross-spawn')
-var runner = spawn(
-  './node_modules/.bin/nightwatch',
-  [
-    '--config', 'test/e2e/nightwatch.conf.js',
-    '--env', 'chrome'
-  ],
-  {
-    stdio: 'inherit'
-  }
-)
-
-runner.on('exit', function (code) {
-  server.close()
-  process.exit(code)
-})
-
-runner.on('error', function (err) {
-  server.close()
-  throw err
-})
+// 1. start the dev server
+var server = require('../../build/dev-server.js')
+
+// 2. run the nightwatch test suite against it
+// to run in additional browsers:
+//    1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
+//    2. add it to the --env flag below
+// For more information on Nightwatch's config file, see
+// http://nightwatchjs.org/guide#settings-file
+var spawn = require('cross-spawn')
+var runner = spawn(
+  './node_modules/.bin/nightwatch',
+  [
+    '--config', 'test/e2e/nightwatch.conf.js',
+    '--env', 'chrome'
+  ],
+  {
+    stdio: 'inherit'
+  }
+)
+
+runner.on('exit', function (code) {
+  server.close()
+  process.exit(code)
+})
+
+runner.on('error', function (err) {
+  server.close()
+  throw err
+})

package/test/e2e/specs/test.js

@@ -1,13 +1,13 @@
-// For authoring Nightwatch tests, see
-// http://nightwatchjs.org/guide#usage
-
-module.exports = {
-  'default e2e tests': function (browser) {
-    browser
-    .url('http://localhost:8080')
-      .waitForElementVisible('#app', 5000)
-      .assert.elementPresent('.logo')
-      .assert.containsText('h1', 'Hello World!')
-      .end()
-  }
-}
+// For authoring Nightwatch tests, see
+// http://nightwatchjs.org/guide#usage
+
+module.exports = {
+  'default e2e tests': function (browser) {
+    browser
+    .url('http://localhost:8080')
+      .waitForElementVisible('#app', 5000)
+      .assert.elementPresent('.logo')
+      .assert.containsText('h1', 'Hello World!')
+      .end()
+  }
+}

package/test/unit/.eslintrc

@@ -1,5 +1,5 @@
-{
-  "env": {
-    "jasmine": true
-  }
-}
+{
+  "env": {
+    "jasmine": true
+  }
+}