safecheck-client 3.0.39-8 → 3.0.39-80

package/src/filiale/yangchunboneng/android/AndiroidSecurityAudit.vue

@@ -174,7 +174,7 @@ export default {
     },
     Nochange(row){
       new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/NoSecurityPass`, {
-        f_plan_id: row.f_plan_id,
+        id: row.itemid,
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
         this.search()
       })
@@ -183,6 +183,7 @@ export default {
       new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/SecurityPass`, {
         f_newplan_id: row.f_newplan_id,
         f_plan_id: row.f_plan_id,
+        id:row.itemid
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
         this.search()
       })

package/src/filiale/yangchunboneng/pc/CheckPlanAreaList.vue

@@ -518,13 +518,13 @@
           }
         }
         if(this.f_safe_start && this.f_safe_end){
-          args.condition += `and ch.f_offsite_time >= '${this.f_safe_start}' and ch.f_offsite_time <= '${this.f_safe_end}' `
+          args.condition += `and f_offsite_time >= '${this.f_safe_start}' and f_offsite_time <= '${this.f_safe_end}' `
         } else {
           if(this.f_safe_start){
-            args.condition += ` and ch.f_offsite_time >='${this.f_safe_start}'`
+            args.condition += ` and f_offsite_time >='${this.f_safe_start}'`
           }
           if(this.f_safe_end){
-            args.condition += ` and ch.f_offsite_time <='${this.f_safe_end}'`
+            args.condition += ` and f_offsite_time <='${this.f_safe_end}'`
           }
         }
         this.$refs.paged.$refs.grid.$el.scrollTop = 0

package/src/plugins/LoadData.js

@@ -1,10 +1,10 @@
-import Vue from 'vue'
-// import AppData from '../stores/AppData'
-
-let getSafeCheckParams = {
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.getSafeCheckParams = Vue.prototype.$getSafeCheckParams = getSafeCheckParams
-  }
-}
-export default getSafeCheckParams
+import Vue from 'vue'
+// import AppData from '../stores/AppData'
+
+let getSafeCheckParams = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.getSafeCheckParams = Vue.prototype.$getSafeCheckParams = getSafeCheckParams
+  }
+}
+export default getSafeCheckParams

package/src/plugins/LoadParams.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-// import AppData from '../stores/AppData'
-
-let LoadParams = {
-    // 开启卡监听
-  load () {
-    return Vue.resetpost('rs/path/getParams', {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      res.data.forEach((item) => {
-        let value = []
-        item.f_paramvalues.forEach((item, index) => {
-          value[index] = {}
-          value[index].label = item.name
-          value[index].value = item.name
-        })
-        AppData.params[item.name] = value
-      })
-    }).catch((res) => {
-      this.msg = res.data
-      this.show = true
-    })
-  }
-}
-
-export default LoadParams
+import Vue from 'vue'
+// import AppData from '../stores/AppData'
+
+let LoadParams = {
+    // 开启卡监听
+  load () {
+    return Vue.resetpost('rs/path/getParams', {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      res.data.forEach((item) => {
+        let value = []
+        item.f_paramvalues.forEach((item, index) => {
+          value[index] = {}
+          value[index].label = item.name
+          value[index].value = item.name
+        })
+        AppData.params[item.name] = value
+      })
+    }).catch((res) => {
+      this.msg = res.data
+      this.show = true
+    })
+  }
+}
+
+export default LoadParams

package/src/safecheck-android.js

@@ -303,6 +303,7 @@ export default function (filiale) {
   // 铅封绑定
   Vue.component('seal-bind', (resolve) => { require(['./components/android/SealBind'], resolve) })
   Vue.component('stop-enabling', (resolve) => { require(['./components/android/Stopenabling'], resolve) })
+  Vue.component('reject-inspec-check', (resolve) => { require(['./components/android/rejectInspecCheck'], resolve) })
   //特殊目录给这里加
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/android`).specialComp

package/src/stores/wxconfig.js

@@ -1,10 +1,10 @@
-export default {
-  // 一下为长安呼叫使用云电话地址
-  // tcUrl: 'http://192.169.1.2:9876/Dual'
- /* voiceUrl: 'http://127.0.0.1:9876/Dual',
-  texttUrl: 'http://192.168.2.77:9876/Dual'*/
-  // 一下为咸阳呼叫使用地址
-  // tcUrl: 'http://192.168.2.77:9876/Dual'
-  // tcUrl: 'http://127.0.0.1:9876/Dual'
-  // tcUrl: 'http://192.168.30.28:9876/Dual'
-}
+export default {
+  // 一下为长安呼叫使用云电话地址
+  // tcUrl: 'http://192.169.1.2:9876/Dual'
+ /* voiceUrl: 'http://127.0.0.1:9876/Dual',
+  texttUrl: 'http://192.168.2.77:9876/Dual'*/
+  // 一下为咸阳呼叫使用地址
+  // tcUrl: 'http://192.168.2.77:9876/Dual'
+  // tcUrl: 'http://127.0.0.1:9876/Dual'
+  // tcUrl: 'http://192.168.30.28:9876/Dual'
+}

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

package/test/unit/TestUtil.js

@@ -1,62 +1,62 @@
-import Vue from 'vue'
-
-let id = 0;
-
-const createElm = function() {
-  const elm = document.createElement('div');
-
-  elm.id = 'app' + ++id;
-  document.body.appendChild(elm);
-
-  return elm;
-};
-
-export default {
-  // 创建一个测试组件
-  createTest: function (name, props) {
-    const template = '<div>' + '<' + name + ' v-ref:child></' + name + '></div>'
-    const elm = createElm();
-    const comp = new Vue({
-      template: template
-    })
-    comp.$mount(elm)
-    const vm = comp.$refs.child
-    Object.assign(vm, props)
-    return vm
-  },
-
-  // 删除一个组件
-  destroyVM: function (vm) {
-    vm.$destroy && vm.$destroy();
-    vm.$el &&
-    vm.$el.parentNode &&
-    vm.$el.parentNode.removeChild(vm.$el);
-  },
-
-  /**
-   * 触发一个事件
-   * mouseenter, mouseleave, mouseover, keyup, change, click 等
-   * @param  {Element} elm
-   * @param  {String} name
-   * @param  {*} opts
-   */
-  triggerEvent: function (elm, name, ...opts) {
-    let eventName
-
-    if (/^mouse|click/.test(name)) {
-      eventName = 'MouseEvents'
-    } else if (/^key/.test(name)) {
-      eventName = 'KeyboardEvent'
-    } else {
-      eventName = 'HTMLEvents'
-    }
-    const evt = document.createEvent(eventName)
-
-    evt.initEvent(name, ...opts)
-    elm.dispatchEvent
-      ? elm.dispatchEvent(evt)
-      : elm.fireEvent('on' + name, evt)
-
-    return elm
-  }
-}
+import Vue from 'vue'
+
+let id = 0;
+
+const createElm = function() {
+  const elm = document.createElement('div');
+
+  elm.id = 'app' + ++id;
+  document.body.appendChild(elm);
+
+  return elm;
+};
+
+export default {
+  // 创建一个测试组件
+  createTest: function (name, props) {
+    const template = '<div>' + '<' + name + ' v-ref:child></' + name + '></div>'
+    const elm = createElm();
+    const comp = new Vue({
+      template: template
+    })
+    comp.$mount(elm)
+    const vm = comp.$refs.child
+    Object.assign(vm, props)
+    return vm
+  },
+
+  // 删除一个组件
+  destroyVM: function (vm) {
+    vm.$destroy && vm.$destroy();
+    vm.$el &&
+    vm.$el.parentNode &&
+    vm.$el.parentNode.removeChild(vm.$el);
+  },
+
+  /**
+   * 触发一个事件
+   * mouseenter, mouseleave, mouseover, keyup, change, click 等
+   * @param  {Element} elm
+   * @param  {String} name
+   * @param  {*} opts
+   */
+  triggerEvent: function (elm, name, ...opts) {
+    let eventName
+
+    if (/^mouse|click/.test(name)) {
+      eventName = 'MouseEvents'
+    } else if (/^key/.test(name)) {
+      eventName = 'KeyboardEvent'
+    } else {
+      eventName = 'HTMLEvents'
+    }
+    const evt = document.createEvent(eventName)
+
+    evt.initEvent(name, ...opts)
+    elm.dispatchEvent
+      ? elm.dispatchEvent(evt)
+      : elm.fireEvent('on' + name, evt)
+
+    return elm
+  }
+}

package/test/unit/context.html

@@ -1,20 +1,20 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <meta name="referrer" content="never">
-    <title>呼叫系统</title>
-    <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>
-    <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.3&key=4889f1e58df01cb40415536c8907bf64&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
-    <script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
-    <style media="screen">
-    /*url(./static/newmainbg.jpg)*/
-      body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}
-      body .loginbg{ width:100%; height:100%; background:url(./static/loginbg.jpg) no-repeat center top;}
-    </style>
-  </head>
-  <body>
-  测试2
-  </body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <meta name="referrer" content="never">
+    <title>呼叫系统</title>
+    <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>
+    <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.3&key=4889f1e58df01cb40415536c8907bf64&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
+    <script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
+    <style media="screen">
+    /*url(./static/newmainbg.jpg)*/
+      body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}
+      body .loginbg{ width:100%; height:100%; background:url(./static/loginbg.jpg) no-repeat center top;}
+    </style>
+  </head>
+  <body>
+  测试2
+  </body>
+</html>

package/test/unit/index.js

@@ -1,13 +1,13 @@
-// Polyfill fn.bind() for PhantomJS
-/* eslint-disable no-extend-native */
-Function.prototype.bind = require('function-bind')
-
-// require all test files (files that ends with .spec.js)
-var testsContext = require.context('./specs', true, /\.spec$/)
-testsContext.keys().forEach(testsContext)
-
-// require all src files except main.js for coverage.
-// you can also change this to match only the subset of files that
-// you want coverage for.
-// var srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/)
-// srcContext.keys().forEach(srcContext)
+// Polyfill fn.bind() for PhantomJS
+/* eslint-disable no-extend-native */
+Function.prototype.bind = require('function-bind')
+
+// require all test files (files that ends with .spec.js)
+var testsContext = require.context('./specs', true, /\.spec$/)
+testsContext.keys().forEach(testsContext)
+
+// require all src files except main.js for coverage.
+// you can also change this to match only the subset of files that
+// you want coverage for.
+// var srcContext = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/)
+// srcContext.keys().forEach(srcContext)