system-phone 3.1.87 → 3.1.89

package/src/components/SystemSetUp.vue

@@ -134,6 +134,10 @@
         } else if (name == '导出数据') {
           this.outdata()
         } else if (name == '退出系统') {
+		  if(Vue.$login && Vue.$login.s){
+              Vue.$login.s = null
+              Vue.$login['v3-session-key'] = null
+            }
           HostApp.back_home()
         } else if (name == '删除照片') {
           const result = HostApp.deletePic()
@@ -145,6 +149,10 @@
         } else if (name == '退出登录') {
           this.$showMessage('即将返回登陆界面！', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
+			  if(Vue.$login && Vue.$login.s){
+				Vue.$login.s = null
+				Vue.$login['v3-session-key'] = null
+			  }
               this.$androidUtil.setPreference('f_repairman_id', 'x')
               this.$androidUtil.setPreference('f_repairman_name', 'x')
               this.$androidUtil.setPreference('f_orgid', '')

package/src/components/Test.vue

@@ -1,14 +1,14 @@
-<template>
-  <div>
-    <h1>Hello Test {{msg}}</h1>
-  </div>
-</template>
-<script>
-  export default {
-    title: "test",
-    props: ['msg'],
-    data () {
-      return {}
-    }
-  }
-</script>
+<template>
+  <div>
+    <h1>Hello Test {{msg}}</h1>
+  </div>
+</template>
+<script>
+  export default {
+    title: "test",
+    props: ['msg'],
+    data () {
+      return {}
+    }
+  }
+</script>

package/src/plugins/GetStringData.js

@@ -1,18 +1,18 @@
-
-let GetStringdatas = {
-
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.$getString = Vue.prototype.$getString = GetStringdatas
-  },
-  getSubStr (String) {
-    if(String.endsWith('phone')){
-      let oldStr = String
-      let index = oldStr.lastIndexOf("/")
-      return oldStr.substring(0, index)
-    }
-    return String
-  }
-}
-
-export default GetStringdatas
+
+let GetStringdatas = {
+
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.$getString = Vue.prototype.$getString = GetStringdatas
+  },
+  getSubStr (String) {
+    if(String.endsWith('phone')){
+      let oldStr = String
+      let index = oldStr.lastIndexOf("/")
+      return oldStr.substring(0, index)
+    }
+    return String
+  }
+}
+
+export default GetStringdatas

package/src/plugins/LoadParams.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-import AppData from '../stores/AppData'
-
-let LoadParams = {
-    // 开启卡监听
-  load () {
-    return Vue.resetpost(`${Vue.androidUtil.getProxyUrl()}/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(`${Vue.androidUtil.getProxyUrl()}/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/services/ConfigService.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-import AppData from '../stores/AppData'
-
-let LoadParams = {
-    // 开启卡监听
-  load () {
-    return Vue.resetpost(`${Vue.androidUtil.getProxyUrl()}/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(`${Vue.androidUtil.getProxyUrl()}/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/static/app.json

@@ -1,5 +1,5 @@
-{
-	"hybrid_version":"2018-01-01 00:00:01",
-	"appVer":"1"
-
+{
+	"hybrid_version":"2018-01-01 00:00:01",
+	"appVer":"1"
+
 }

package/static/globals.txt

@@ -1,74 +1,74 @@
-{
-    "lastNewFormDate": "1980-01-01 00:00:00",
-    "f_repairman_id": "x",
-    "f_user_id": "aaa",
-    "cc_base_url": "http://aotesoft.f3322.net:8300",
-    "REMOTE_WWW_PREFIX": "",
-    "LOCAL_PATH_PREFIX": "/data/data/com.aofeng.hybridwork/files/",
-    "REMOTE_BZ_PREFIX": "thiswillremove",
-    "ProjectNativeMethod": "com.aofeng.hybridwork.android.ProjectNativeMethod",
-    "SCREEN_ORIENTATION":"0",
-    "startService": "true",
-    "full_screen":"true",
-    "pos":"false",
-    "device":"com.aofeng.hybrid.pos.device.ZTDevice",
-    "reader":"com.aofeng.hybrid.pos.reader.ZTChangAnReader",
-    "printer":"com.aofeng.hybrid.pos.printer.ZTPrinter",
-    "cloud_url":"http://113.140.20.122:4004/",
-    "version": "0",
-    "txtServiceStopped": "false",
-    "msgCount": "0",
-    "f_subcompany": "changan",
-    "entities": [
-	      "t_serviceworkorder",
-        "t_oppointment",
-        "t_service",
-        "t_complaint",
-        "t_consult",
-      	"t_service_acitivity",
-        "t_servicework",
-       	"t_notwork",
-       	"t_delayapply",
-       	"t_delayreply",
-        "t_reminder",
-        "t_site_back",
-       	"t_servicesend",
-        "t_recall",
-        "t_servicedelete",
-      	"t_servicerepair",
-       	"t_details",
-       	"t_doorrepair",
-       	"t_accidenttreatment",
-      	"t_gaiconduit",
-       	"t_liconduit",
-       	 "t_firstgascheck",
-       	"t_failure",
-       	"t_failurecase",
-       	"t_material",
-       	"t_baseuserinfo",
-       	"t_repairimg",
-       	"t_retail",
-         "t_notice",
-         "t_check_paper_alarm",
-         "t_check_paper",
-         "t_check_plan_item",
-         "t_check_plan",
-         "t_check_paper_cooker",
-         "t_check_paper_counter",
-         "t_check_paper_defect",
-         "t_check_paper_furnace",
-         "t_check_paper_heater",
-         "t_check_paper_innerplumb",
-         "t_check_paper_meter",
-         "t_phone_state",
-         "t_check_paper_plumb",
-         "t_check_paper_valve",
-         "t_blob",
-         "t_plan_item_meter",
-         "t_plan_item_device",
-         "t_device_info",
-         "t_defect_info",
-         "t_devices_items",
-         "t_paper_devices"
-    ]
-}
+{
+    "lastNewFormDate": "1980-01-01 00:00:00",
+    "f_repairman_id": "x",
+    "f_user_id": "aaa",
+    "cc_base_url": "http://aotesoft.f3322.net:8300",
+    "REMOTE_WWW_PREFIX": "",
+    "LOCAL_PATH_PREFIX": "/data/data/com.aofeng.hybridwork/files/",
+    "REMOTE_BZ_PREFIX": "thiswillremove",
+    "ProjectNativeMethod": "com.aofeng.hybridwork.android.ProjectNativeMethod",
+    "SCREEN_ORIENTATION":"0",
+    "startService": "true",
+    "full_screen":"true",
+    "pos":"false",
+    "device":"com.aofeng.hybrid.pos.device.ZTDevice",
+    "reader":"com.aofeng.hybrid.pos.reader.ZTChangAnReader",
+    "printer":"com.aofeng.hybrid.pos.printer.ZTPrinter",
+    "cloud_url":"http://113.140.20.122:4004/",
+    "version": "0",
+    "txtServiceStopped": "false",
+    "msgCount": "0",
+    "f_subcompany": "changan",
+    "entities": [
+	      "t_serviceworkorder",
+        "t_oppointment",
+        "t_service",
+        "t_complaint",
+        "t_consult",
+      	"t_service_acitivity",
+        "t_servicework",
+       	"t_notwork",
+       	"t_delayapply",
+       	"t_delayreply",
+        "t_reminder",
+        "t_site_back",
+       	"t_servicesend",
+        "t_recall",
+        "t_servicedelete",
+      	"t_servicerepair",
+       	"t_details",
+       	"t_doorrepair",
+       	"t_accidenttreatment",
+      	"t_gaiconduit",
+       	"t_liconduit",
+       	 "t_firstgascheck",
+       	"t_failure",
+       	"t_failurecase",
+       	"t_material",
+       	"t_baseuserinfo",
+       	"t_repairimg",
+       	"t_retail",
+         "t_notice",
+         "t_check_paper_alarm",
+         "t_check_paper",
+         "t_check_plan_item",
+         "t_check_plan",
+         "t_check_paper_cooker",
+         "t_check_paper_counter",
+         "t_check_paper_defect",
+         "t_check_paper_furnace",
+         "t_check_paper_heater",
+         "t_check_paper_innerplumb",
+         "t_check_paper_meter",
+         "t_phone_state",
+         "t_check_paper_plumb",
+         "t_check_paper_valve",
+         "t_blob",
+         "t_plan_item_meter",
+         "t_plan_item_device",
+         "t_device_info",
+         "t_defect_info",
+         "t_devices_items",
+         "t_paper_devices"
+    ]
+}

package/test/unit/.eslintrc

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

package/test/unit/TestUtil.js

@@ -1,35 +1,35 @@
-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)
-  }
-}
+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)
+  }
+}

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)

package/test/unit/init.js

@@ -1,13 +1,13 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-import { safecheckAndroid } from 'safecheck-client'
-import { telephoneAndroid } from 'telephone-clients'
-
-export default function () {
-  Vue.config.silent = false
-
-  all()
-  safecheckAndroid()
-  telephoneAndroid()
-  require('../../src/bootstrap/less/bootstrap.less')
-}
+import Vue from 'vue'
+import { all } from 'vue-client'
+import { safecheckAndroid } from 'safecheck-client'
+import { telephoneAndroid } from 'telephone-clients'
+
+export default function () {
+  Vue.config.silent = false
+
+  all()
+  safecheckAndroid()
+  telephoneAndroid()
+  require('../../src/bootstrap/less/bootstrap.less')
+}

package/test/unit/karma.conf.js

@@ -1,50 +1,50 @@
-// This is a karma config file. For more details see
-//   http://karma-runner.github.io/0.13/config/configuration-file.html
-// we are also using it with karma-webpack
-//   https://github.com/webpack/karma-webpack
-
-var webpackConfig = require('../../build/webpack.test.conf')
-
-module.exports = function (config) {
-  config.set({
-    // to run in additional browsers:
-    // 1. install corresponding karma launcher
-    //    http://karma-runner.github.io/0.13/config/browsers.html
-    // 2. add it to the `browsers` array below.
-    browsers: ['Chrome_without_security'],
-    customLaunchers: {
-      Chrome_without_security: {
-        base: 'Chrome',
-        flags: ['--disable-web-security']
-      }
-    },
-    proxies: {
-      '/rs': 'http://192.168.50.220:8300/rs',
-      '/phone/rs/vue': 'http://192.168.50.220:8500/phone/rs/vue',
-      //'/phone/rs/db': 'http://192.168.50.220:9300/manage/rs/db'
-      // '/phone/rs': 'http://192.168.50.220:9000/telephone/rs'
-      // '/phone/rs': 'http://192.168.50.220:9200/safecheck/rs'
-      '/rs/db': 'http://192.168.50.220:8300/phone/rs/db',
-      '/rs/dir': 'http://127.0.0.1:8080/rs/dir',
-    },
-
-    autoWatch: true,
-    frameworks: ['mocha', 'sinon-chai'],
-    reporters: ['spec', 'coverage'],
-    files: ['./index.js'],
-    preprocessors: {
-      './index.js': ['webpack', 'sourcemap']
-    },
-    webpack: webpackConfig,
-    webpackMiddleware: {
-      noInfo: true
-    },
-    coverageReporter: {
-      dir: './coverage',
-      reporters: [
-        { type: 'lcov', subdir: '.' },
-        { type: 'text-summary' }
-      ]
-    }
-  })
-}
+// This is a karma config file. For more details see
+//   http://karma-runner.github.io/0.13/config/configuration-file.html
+// we are also using it with karma-webpack
+//   https://github.com/webpack/karma-webpack
+
+var webpackConfig = require('../../build/webpack.test.conf')
+
+module.exports = function (config) {
+  config.set({
+    // to run in additional browsers:
+    // 1. install corresponding karma launcher
+    //    http://karma-runner.github.io/0.13/config/browsers.html
+    // 2. add it to the `browsers` array below.
+    browsers: ['Chrome_without_security'],
+    customLaunchers: {
+      Chrome_without_security: {
+        base: 'Chrome',
+        flags: ['--disable-web-security']
+      }
+    },
+    proxies: {
+      '/rs': 'http://192.168.50.220:8300/rs',
+      '/phone/rs/vue': 'http://192.168.50.220:8500/phone/rs/vue',
+      //'/phone/rs/db': 'http://192.168.50.220:9300/manage/rs/db'
+      // '/phone/rs': 'http://192.168.50.220:9000/telephone/rs'
+      // '/phone/rs': 'http://192.168.50.220:9200/safecheck/rs'
+      '/rs/db': 'http://192.168.50.220:8300/phone/rs/db',
+      '/rs/dir': 'http://127.0.0.1:8080/rs/dir',
+    },
+
+    autoWatch: true,
+    frameworks: ['mocha', 'sinon-chai'],
+    reporters: ['spec', 'coverage'],
+    files: ['./index.js'],
+    preprocessors: {
+      './index.js': ['webpack', 'sourcemap']
+    },
+    webpack: webpackConfig,
+    webpackMiddleware: {
+      noInfo: true
+    },
+    coverageReporter: {
+      dir: './coverage',
+      reporters: [
+        { type: 'lcov', subdir: '.' },
+        { type: 'text-summary' }
+      ]
+    }
+  })
+}