system-phone 1.2.84 → 1.2.85-1

package/.eslintrc.js

@@ -1,16 +1,16 @@
-module.exports = {
-  root: true,
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-  extends: 'standard',
-  // required to lint *.vue files
-  plugins: [
-    'eslint-plugin-html'
-  ],
-  // add your custom rules here
-  'rules': {
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-  }
-}
+// module.exports = {
+//   root: true,
+//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+//   extends: 'standard',
+//   // required to lint *.vue files
+//   plugins: [
+//     'eslint-plugin-html'
+//   ],
+//   // add your custom rules here
+//   'rules': {
+//     // allow paren-less arrow functions
+//     'arrow-parens': 0,
+//     // allow debugger during development
+//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+//   }
+// }

package/SystemPhone.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="SystemPhone" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/build/dev-server.js

@@ -38,10 +38,26 @@ var proxyTable = {
   //   // target: 'http://127.0.0.1:8082'
   //   target: 'http://121.36.106.17:8400/'
   // },
-  // '/SaleRest/rs': {
-  //    // target: 'http://127.0.0.1:8081'
-  //   target: 'http://121.36.106.17:8400/'
-  // },
+  '/rs/sql/getUserByMeter': {
+     // target: 'http://127.0.0.1:8081'
+    target: 'http://localhost:8025'
+  },
+  '/rs/logic/againOpenAccount': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://localhost:8025'
+  },
+  '/rs/logic/againSendInstruct': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://localhost:8025'
+  },
+  '/rs/logic/cancelSendInstruct': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://localhost:8025'
+  },
+  '/rs/sql/iot_singleTable_OrderBy': {
+    // target: 'http://127.0.0.1:8081'
+    target: 'http://localhost:8025'
+  },
   // 呼叫系统主数据服务
   '/rs': {
     // target: 'http://127.0.0.1:8082'

package/build/webpack.base.conf.js

@@ -51,6 +51,10 @@ module.exports = {
         test: /\.html$/,
         loader: 'vue-html'
       },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
       {
         test: /\.less$/,
         loader: 'style!css!less'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-phone",
-  "version": "1.2.84",
+  "version": "1.2.85-1",
   "description": "手机模块 前端组件",
   "author": "何宁社 <524395609@qq.com>",
   "license": "ISC",

package/src/App.vue

@@ -1,26 +1,25 @@
-<template>
-  <!-- <app-base> -->
-  <div id="android-app">
-    <article>
-      <!--<route :comp="{name: 'login-app'}"></route>-->
-      <route :comp="{name: 'iot-monitoring-main'}"></route>
-    </article>
-    <time-out></time-out>
-    <message-box>
-    </message-box>
-  </div>
-  <!-- </app-base> -->
-</template>
-
-<script>
-  export default {
-    ready () {
-      if (!window.onerror) {
-        window.onerror = function (message, file, line, col, error) {
-          // HostApp.alert("网络故障，加载组件有误")
-          return false
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <!-- <app-base> -->
+  <div id="android-app">
+    <article>
+      <route :comp="{name: 'login-app'}"></route>
+    </article>
+    <time-out></time-out>
+    <message-box>
+    </message-box>
+  </div>
+  <!-- </app-base> -->
+</template>
+
+<script>
+  export default {
+    ready () {
+      if (!window.onerror) {
+        window.onerror = function (message, file, line, col, error) {
+          // HostApp.alert("网络故障，加载组件有误")
+          return false
+        }
+      }
+    }
+  }
+</script>

package/src/components/NavBottomVVV.vue

@@ -1,144 +1,144 @@
-<template>
-  <div style="height: 7%">
-    <tools-page :need-back="!isMenu" :title="titleName" @back="back('返回')" > </tools-page>
-  </div>
-  <div id="app" :class="{'auto':isMenu,'app-height':!isMenu}">
-    <div class="row" style="overflow-y: scroll;">
-      <route v-ref:route> </route>
-    </div>
-    <tab-bar @select-item="onClickTabBarItem" v-show="isMenu">
-    </tab-bar>
-  </div>
-</template>
-
-<script>
-
-export default {
-  title: 'app',
-  data: function () {
-    return {
-      item: 0,
-      isMenu:true,
-      beforeName:'主界面',
-      titleName:'待办工作',
-      backthis:'',
-      safe:false,
-      beforetabs:[],
-      iftabbar:''
-    }
-  },
-  ready(){
-  },
-  methods: {
-    back (flag){
-      if(this.safe && flag == '返回' ){
-        this.$showMessage('此返回所录入内容将无法找回！', ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            //this.safe = false 返回父页面后不能修改父级页面定义的 是否返回提示
-            this.delback()
-            this.backthis.$back()
-            this.closeAndDelAudio()
-          }
-        })
-      }else{
-        this.delback()
-        //this.safe = false 返回父页面后不能修改父级页面定义的 是否返回提示
-        this.backthis.$back()
-      }
-    },
-    delback(){
-      // 先确认出 前一个组件的名字
-      var title = this.beforeName
-      var beforetitle = '主界面'
-      var j = -1
-      for(var i = 0;i<this.beforetabs.length;i++){
-        if(this.beforetabs[i].titleName == title){
-          beforetitle = this.beforetabs[i].beforeName
-          this.backthis =this.beforetabs[i].backthis
-          this.safe  = this.beforetabs[i].safe
-          j = i
-          break;
-        }
-      }
-      this.beforetabs.splice(j + 1, 1)
-      this.beforeName = beforetitle
-      this.titleName = title
-      // 判断是否 显示底层导航
-      if(this.iftabbar ==  this.titleName){
-        this.isMenu = true
-      }
-    },
-    onClickTabBarItem(titlefg) {
-      var param = titlefg.link
-      if(titlefg.name == '退出系统'){
-        this.$showMessage('即将返回登陆界面！', ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            this.$androidUtil.setPreference('f_repairman_id', 'x')
-            this.$androidUtil.setPreference('f_repairman_name', 'x')
-            this.$back()
-          }
-        })
-      }else{
-        if(this.beforeName == titlefg.name){
-          return
-        }
-        this.titleName = titlefg.name
-        this.beforeName = titlefg.name
-        let data = {
-          sourcet: '竖屏'
-        }
-        // if(titlefg.name == '待办工单'){
-        //   param = param+'V'
-        // }
-        this.$refs.route.init(param,data)
-      }
-    },
-    closeAndDelAudio() {
-      console.log("停止无限制录音,并删除录音文件")
-      HostApp.startOrStopAudioClip("-----","停止并删除录音")
-    }
-  },
-  events: {
-    'gotoson': function (prpdata) {
-      // 事件回调内的 `this` 自动绑定到注册它的实例上
-      // safe 返回事件是否进行判断后再返回
-      // 每进入一次，beforetabs 数组添加  返回  删除
-      this.backthis = prpdata._this
-      this.safe = prpdata.safe
-      this.isMenu = false
-      // 记录本次跳转
-      var beforedata = {
-        beforeName: this.titleName,
-        titleName: prpdata.title,
-        backthis:prpdata._this,
-        safe:prpdata.safe
-      }
-      this.beforetabs.push(beforedata)
-      if( this.beforetabs.length == 1){
-        this.iftabbar = beforedata.beforeName
-      }
-      // 写入跳转后 前后组件名字
-      this.beforeName = this.titleName
-      this.titleName = prpdata.title
-
-      console.log('进入子组件，通知外层组件，我已经进入')
-    },
-    'confirm': function () {
-      // 提交处理返回事件
-      this.back('提交')
-    },
-    'backarrdel': function () {
-      this.delback()
-    },
-    'gologin': function () {
-      this.beforetabs = []
-      this.$back()
-    }
-  }
-}
-</script>
-<style scoped>
-.app-height{
-  height: 93%;
-}
-</style>
+<template>
+  <div style="height: 7%">
+    <tools-page :need-back="!isMenu" :title="titleName" @back="back('返回')" > </tools-page>
+  </div>
+  <div id="app" :class="{'auto':isMenu,'app-height':!isMenu}">
+    <div class="row" style="overflow-y: scroll;">
+      <route v-ref:route> </route>
+    </div>
+    <tab-bar @select-item="onClickTabBarItem" v-show="isMenu">
+    </tab-bar>
+  </div>
+</template>
+
+<script>
+
+export default {
+  title: 'app',
+  data: function () {
+    return {
+      item: 0,
+      isMenu:true,
+      beforeName:'主界面',
+      titleName:'待办工作',
+      backthis:'',
+      safe:false,
+      beforetabs:[],
+      iftabbar:''
+    }
+  },
+  ready(){
+  },
+  methods: {
+    back (flag){
+      if(this.safe && flag == '返回' ){
+        this.$showMessage('此返回所录入内容将无法找回！', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            //this.safe = false 返回父页面后不能修改父级页面定义的 是否返回提示
+            this.delback()
+            this.backthis.$back()
+            this.closeAndDelAudio()
+          }
+        })
+      }else{
+        this.delback()
+        //this.safe = false 返回父页面后不能修改父级页面定义的 是否返回提示
+        this.backthis.$back()
+      }
+    },
+    delback(){
+      // 先确认出 前一个组件的名字
+      var title = this.beforeName
+      var beforetitle = '主界面'
+      var j = -1
+      for(var i = 0;i<this.beforetabs.length;i++){
+        if(this.beforetabs[i].titleName == title){
+          beforetitle = this.beforetabs[i].beforeName
+          this.backthis =this.beforetabs[i].backthis
+          this.safe  = this.beforetabs[i].safe
+          j = i
+          break;
+        }
+      }
+      this.beforetabs.splice(j + 1, 1)
+      this.beforeName = beforetitle
+      this.titleName = title
+      // 判断是否 显示底层导航
+      if(this.iftabbar ==  this.titleName){
+        this.isMenu = true
+      }
+    },
+    onClickTabBarItem(titlefg) {
+      var param = titlefg.link
+      if(titlefg.name == '退出系统'){
+        this.$showMessage('即将返回登陆界面！', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            this.$androidUtil.setPreference('f_repairman_id', 'x')
+            this.$androidUtil.setPreference('f_repairman_name', 'x')
+            this.$back()
+          }
+        })
+      }else{
+        if(this.beforeName == titlefg.name){
+          return
+        }
+        this.titleName = titlefg.name
+        this.beforeName = titlefg.name
+        let data = {
+          sourcet: '竖屏'
+        }
+        // if(titlefg.name == '待办工单'){
+        //   param = param+'V'
+        // }
+        this.$refs.route.init(param,data)
+      }
+    },
+    closeAndDelAudio() {
+      console.log("停止无限制录音")
+      HostApp.startOrStopAudioClip("-----","停止录音")
+    }
+  },
+  events: {
+    'gotoson': function (prpdata) {
+      // 事件回调内的 `this` 自动绑定到注册它的实例上
+      // safe 返回事件是否进行判断后再返回
+      // 每进入一次，beforetabs 数组添加  返回  删除
+      this.backthis = prpdata._this
+      this.safe = prpdata.safe
+      this.isMenu = false
+      // 记录本次跳转
+      var beforedata = {
+        beforeName: this.titleName,
+        titleName: prpdata.title,
+        backthis:prpdata._this,
+        safe:prpdata.safe
+      }
+      this.beforetabs.push(beforedata)
+      if( this.beforetabs.length == 1){
+        this.iftabbar = beforedata.beforeName
+      }
+      // 写入跳转后 前后组件名字
+      this.beforeName = this.titleName
+      this.titleName = prpdata.title
+
+      console.log('进入子组件，通知外层组件，我已经进入')
+    },
+    'confirm': function () {
+      // 提交处理返回事件
+      this.back('提交')
+    },
+    'backarrdel': function () {
+      this.delback()
+    },
+    'gologin': function () {
+      this.beforetabs = []
+      this.$back()
+    }
+  }
+}
+</script>
+<style scoped>
+.app-height{
+  height: 93%;
+}
+</style>