safecheck-client 3.0.33-73 → 3.0.33-74

package/src/filiale/yangchunboneng/android.js

@@ -14,6 +14,7 @@ let specialComp = {
   'DailyworkloadQueryNew': (resolve) => { require(['./android/DailyworkloadQueryNew'], resolve) },
   'new-check-paper-android': (resolve) => { require(['./android/NewCheckpaperAndroid'], resolve) },
   'safe-history-look': (resolve) => { require(['./android/safeHistoryLook'], resolve) },
+  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
 }
 
 exports.specialComp = specialComp

package/src/main.js

@@ -1,33 +1,32 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('fugou')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('fugou');
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/plugins/GerJsonConfig.js

@@ -1,59 +1,59 @@
-import LoadParams from "./LoadParams";
-
-/**
- * 把配置文件 数组形式 转成 Object形式
- * @param res: 数组格式得安检隐患项配置文件
- * @param number: 燃气表配置项 index 开始
- */
-export var arr =
-  [
-    {
-      "checkname": "燃气表",
-      "checkmust":false,
-      "items":[
-        {"lname": "表具状态","multiple":false,"type":"selector","options":[{"data":"正常","isdefect":false,"isdefault": true},{"data":"包裹","isdefect":true,"level":"C2","isdefault": false,"tooltip":"1.整改时限1日，2，禁止使用，及时联系公司客服"},{"data":"漏气","isdefect":true,"level":"A1","isdefault": false,"tooltip":"1.整改时限1日，2，禁止使用，及时联系公司客服"}]},
-        {"lname": "表故障","multiple":true,"type":"selector","options":[{"data":"正常","isdefect":false,"isdefault": true},{"data":"破损变形","isdefect":true,"level":"B2","isdefault": false,"tooltip":"1.整改时限1日，2，禁止使用，及时联系公司客服"},{"data":"失效","isdefect":true,"level":"B2","isdefault": false},{"data":"不走字","isdefect":true,"level":"B2","isdefault": false},{"data":"铅封损坏","isdefect":true,"level":"B2","isdefault": false},{"data":"气表到期(使用年限超过八年)","isdefect":true,"level":"B2","isdefault": false}]},
-        {"lname": "腐蚀","multiple":false,"type":"selector","options":[{"data":"正常","isdefect":false,"isdefault": true},{"data":"轻微","isdefect":false,"isdefault": false},{"data":"中度","isdefect":false,"isdefault": false},{"data":"严重","isdefect":true,"level":"A2","isdefault": false,"tooltip":"1.整改时限1日，2，禁止使用，及时联系公司客服"}]},
-        {"lname": "使用年限","type":"string", "data": 8,"isshow": false}
-      ]
-    },
-    {
-      "checkname": "阀门",
-      "checkmust":true,
-      "items":[
-        {"lname": "阀门","multiple":true,"type":"selector","options":[{"data":"无阀门","isdefect":true,"level":"A2"},{"data":"无阀柄","isdefect":true,"level":"A2"},{"data":"失效","isdefect":true,"level":"A2"}]},
-        {"lname": "表前阀","multiple":false,"type":"selector","options":[{"data":"正常","isdefect":false,"isdefault": true},{"data":"异常","isdefect":true,"level":"A1","isdefault": false}]},
-        {"lname": "灶前阀","multiple":false,"type":"selector","options":[{"data":"正常","isdefect":false,"isdefault": true},{"data":"异常","isdefect":true,"level":"A1","isdefault": false}]},
-        {"lname":"使用年限","type":"string", "data": 8,"isshow": false}
-      ]
-    }
-]
-
-let ObjConfig = {
-  getObjConfig (arr,index) {
-    var obj = {}
-    var start = false
-    for(var i = 0;i<arr.length;i++){
-      var name = arr[i].checkname
-      delete arr[i].checkname
-      obj[name] = arr[i]
-      if(start){
-        obj[name]['index'] = index + i
-      }else{
-        obj[name]['index'] = i+1
-      }
-      if(arr[i].isstart){
-        obj[name]['index'] = index
-        start = true
-      }
-      if(arr[i].items){
-        obj[name].items = this.getObjConfig(arr[i].items,index)
-      }
-    }
-    return obj
-  }
-
-
-}
-
-export default ObjConfig
+import LoadParams from "./LoadParams";
+
+/**
+ * 把配置文件 数组形式 转成 Object形式
+ * @param res: 数组格式得安检隐患项配置文件
+ * @param number: 燃气表配置项 index 开始
+ */
+export var arr =
+  [
+    {
+      "checkname": "燃气表",
+      "checkmust":false,
+      "items":[
+        {"lname": "表具状态","multiple":false,"type":"selector","options":[{"data":"正常","isdefect":false,"isdefault": true},{"data":"包裹","isdefect":true,"level":"C2","isdefault": false,"tooltip":"1.整改时限1日，2，禁止使用，及时联系公司客服"},{"data":"漏气","isdefect":true,"level":"A1","isdefault": false,"tooltip":"1.整改时限1日，2，禁止使用，及时联系公司客服"}]},
+        {"lname": "表故障","multiple":true,"type":"selector","options":[{"data":"正常","isdefect":false,"isdefault": true},{"data":"破损变形","isdefect":true,"level":"B2","isdefault": false,"tooltip":"1.整改时限1日，2，禁止使用，及时联系公司客服"},{"data":"失效","isdefect":true,"level":"B2","isdefault": false},{"data":"不走字","isdefect":true,"level":"B2","isdefault": false},{"data":"铅封损坏","isdefect":true,"level":"B2","isdefault": false},{"data":"气表到期(使用年限超过八年)","isdefect":true,"level":"B2","isdefault": false}]},
+        {"lname": "腐蚀","multiple":false,"type":"selector","options":[{"data":"正常","isdefect":false,"isdefault": true},{"data":"轻微","isdefect":false,"isdefault": false},{"data":"中度","isdefect":false,"isdefault": false},{"data":"严重","isdefect":true,"level":"A2","isdefault": false,"tooltip":"1.整改时限1日，2，禁止使用，及时联系公司客服"}]},
+        {"lname": "使用年限","type":"string", "data": 8,"isshow": false}
+      ]
+    },
+    {
+      "checkname": "阀门",
+      "checkmust":true,
+      "items":[
+        {"lname": "阀门","multiple":true,"type":"selector","options":[{"data":"无阀门","isdefect":true,"level":"A2"},{"data":"无阀柄","isdefect":true,"level":"A2"},{"data":"失效","isdefect":true,"level":"A2"}]},
+        {"lname": "表前阀","multiple":false,"type":"selector","options":[{"data":"正常","isdefect":false,"isdefault": true},{"data":"异常","isdefect":true,"level":"A1","isdefault": false}]},
+        {"lname": "灶前阀","multiple":false,"type":"selector","options":[{"data":"正常","isdefect":false,"isdefault": true},{"data":"异常","isdefect":true,"level":"A1","isdefault": false}]},
+        {"lname":"使用年限","type":"string", "data": 8,"isshow": false}
+      ]
+    }
+]
+
+let ObjConfig = {
+  getObjConfig (arr,index) {
+    var obj = {}
+    var start = false
+    for(var i = 0;i<arr.length;i++){
+      var name = arr[i].checkname
+      delete arr[i].checkname
+      obj[name] = arr[i]
+      if(start){
+        obj[name]['index'] = index + i
+      }else{
+        obj[name]['index'] = i+1
+      }
+      if(arr[i].isstart){
+        obj[name]['index'] = index
+        start = true
+      }
+      if(arr[i].items){
+        obj[name].items = this.getObjConfig(arr[i].items,index)
+      }
+    }
+    return obj
+  }
+
+
+}
+
+export default ObjConfig

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/stores/AppData.js

@@ -1,46 +1,46 @@
-let DataStore = {
-  params: {},
-  singleValues: {},
-  gasstyles: {},
-  gasbrands: [],
-  price: [],
-
-  getParam (key) {
-    return this.params[key]
-  },
-  getSingleValue (key) {
-    return this.singleValues[key]
-  },
-  getGasstyle (key) {
-    return this.gasbrands.key
-  },
-  getGasbrand () {
-    return this.gasbrands
-  },
-  getPrice (object) {
-    // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
-    if (!object.f_user_type || !object.f_gasproperties || !object.f_price_type) {
-      return
-    }
-    let result = []
-    // 做筛选
-    this.price.forEach((item) => {
-      if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type) {
-        let value = {
-          label: item.f_price_name,
-          value: item
-        }
-        result.push(value)
-      }
-    })
-    // 数组去重
-    let hash = {}
-    result = result.reduce((item, next) => {
-      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
-      return item
-    }, [])
-    return Array.from(new Set(result))
-  }
-}
-
-export default DataStore
+let DataStore = {
+  params: {},
+  singleValues: {},
+  gasstyles: {},
+  gasbrands: [],
+  price: [],
+
+  getParam (key) {
+    return this.params[key]
+  },
+  getSingleValue (key) {
+    return this.singleValues[key]
+  },
+  getGasstyle (key) {
+    return this.gasbrands.key
+  },
+  getGasbrand () {
+    return this.gasbrands
+  },
+  getPrice (object) {
+    // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
+    if (!object.f_user_type || !object.f_gasproperties || !object.f_price_type) {
+      return
+    }
+    let result = []
+    // 做筛选
+    this.price.forEach((item) => {
+      if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type) {
+        let value = {
+          label: item.f_price_name,
+          value: item
+        }
+        result.push(value)
+      }
+    })
+    // 数组去重
+    let hash = {}
+    result = result.reduce((item, next) => {
+      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+      return item
+    }, [])
+    return Array.from(new Set(result))
+  }
+}
+
+export default DataStore

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