system-phone 3.1.74 → 3.1.76

package/src/bootstrap/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/components/AloneLoadParams.vue

@@ -1,26 +1,26 @@
-<template>
-  <div>
-     <p>获取参数中，请保持网络畅通</p>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-import LoadParams from '../plugins/LoadParams'
-
-export default {
-  title: '加载参数',
-  props: {
-    componentName: {
-      type: String
-    }
-  },
-  ready () {
-    LoadParams.load().then(() => {
-      // this.$resetpost(Vue.dataUrl + 'rs/logic/androidLog', {data: {name: 'path', msg: '加载参数成功'}}, {resolveMsg: null, rejectMsg: null})
-      this.$goto(this.componentName)
-    })
-  }
-}
-</script>
+<template>
+  <div>
+     <p>获取参数中，请保持网络畅通</p>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+import LoadParams from '../plugins/LoadParams'
+
+export default {
+  title: '加载参数',
+  props: {
+    componentName: {
+      type: String
+    }
+  },
+  ready () {
+    LoadParams.load().then(() => {
+      // this.$resetpost(Vue.dataUrl + 'rs/logic/androidLog', {data: {name: 'path', msg: '加载参数成功'}}, {resolveMsg: null, rejectMsg: null})
+      this.$goto(this.componentName)
+    })
+  }
+}
+</script>

package/src/components/LoadAppdata.vue

@@ -1,38 +1,38 @@
-<template>
-  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
-    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
-    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '加载参数',
-    data () {
-      return {
-        msg: '',
-        show: false
-      }
-    },
-    ready () {
-      this.$appdata.load().then(() => {
-        this.$emit('ready')
-      })
-    }
-  }
-</script>
-<style media="screen">
-  .loadingdata {
-    position: fixed;
-    background: #fff;
-    opacity: 0.6;
-    top: 0;
-    width: 100%;
-  }
-  .loaderror {
-    opacity: 1;
-  }
-  .loadsuccess {
-    display: none;
-  }
-</style>
+<template>
+  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
+    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
+    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '加载参数',
+    data () {
+      return {
+        msg: '',
+        show: false
+      }
+    },
+    ready () {
+      this.$appdata.load().then(() => {
+        this.$emit('ready')
+      })
+    }
+  }
+</script>
+<style media="screen">
+  .loadingdata {
+    position: fixed;
+    background: #fff;
+    opacity: 0.6;
+    top: 0;
+    width: 100%;
+  }
+  .loaderror {
+    opacity: 1;
+  }
+  .loadsuccess {
+    display: none;
+  }
+</style>

package/src/components/LoginApp.vue

@@ -283,6 +283,36 @@ export default {
           return
         }
       }
+      let jwt = ''
+      let access_token = ''
+      if(Vue.isafsystem){
+        jwt = loginData.id
+        access_token =  ret.data.access_token
+      }else{
+        console.log("ret", ret)
+        if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code === 200) {
+          jwt = ret.data.data.id
+        }else{
+          jwt = ret.data.id
+        }
+      }
+      Vue.$login = Vue.prototype.$login = {jwt: jwt,
+        jwtNew:access_token,
+        toStandardDateString () {
+          let dt = new Date()
+          let month = dt.getMonth() + 1
+          let date = dt.getDate()
+          return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
+        }, toStandardTimeString () {
+          let dt = new Date()
+          let month = dt.getMonth()+1
+          let date = dt.getDate()
+          let hour = dt.getHours()
+          let min = dt.getMinutes()
+          let sec = dt.getSeconds()
+          return dt.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
+            + ' ' + (hour<10? '0'+ hour : hour) + ':' + (min<10? '0'+ min : min) + ':' + (sec<10? '0'+ sec : sec)
+        }}
       // 对资源菜单进行排序
       let viewDetails = await Vue.resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, {
         source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
@@ -326,33 +356,6 @@ export default {
         console.log("自动登陆标识" + Util.f.f_role_name)
         this.$androidUtil.setPreference('auto_login', this.showauto)
       }
-      let jwt = ''
-      if(Vue.isafsystem){
-        jwt = loginData.id
-      }else{
-        console.log("ret", ret)
-        if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code === 200) {
-          jwt = ret.data.data.id
-        }else{
-          jwt = ret.data.id
-        }
-      }
-      Vue.$login = Vue.prototype.$login = {jwt: jwt,
-        toStandardDateString () {
-          let dt = new Date()
-          let month = dt.getMonth() + 1
-          let date = dt.getDate()
-          return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
-        }, toStandardTimeString () {
-          let dt = new Date()
-          let month = dt.getMonth()+1
-          let date = dt.getDate()
-          let hour = dt.getHours()
-          let min = dt.getMinutes()
-          let sec = dt.getSeconds()
-          return dt.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
-            + ' ' + (hour<10? '0'+ hour : hour) + ':' + (min<10? '0'+ min : min) + ':' + (sec<10? '0'+ sec : sec)
-        }}
       // 获取参数
       console.log('获取参数system以及安检参数')
       const flag = await asyncReady(this, this.$androidUtil.getProxyUrl())

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