safecheck-client 3.1.1-gaomi-5 → 4.0.1

package/build/dev-server.js

@@ -9,111 +9,140 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var csurl = 'http://192.168.50.4:8400'
-// var csurl = 'http://223.150.9.117:8400'
+var strulr = 'http://192.168.11.160:31567'
+// var strulr = 'http://192.168.10.14:8300'
+var strurlMain = 'http://192.168.11.160:31567'
+// var strurlMain = 'http://192.168.10.14:8300'
+// var strurlMain = 'http://192.168.10.233:8300'
 var proxyTable = {
   // 取图片的地址
   '/webapps': {
-    target: csurl
+    target: strulr
     //  target: 'http://192.168.50.220:7000/ldap'
   },
+  '/api': {
+    target: strurlMain
+    //  target: 'http://192.168.50.220:7000/ldap'
+  },
+  '/resource': {
+    target: strurlMain
+    //  target: 'http://192.168.50.220:7000/ldap'
+  },
+
   '/images': {
-    target: csurl
+    target: strulr
     //  target: 'http://192.168.50.220:7000/ldap'
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: csurl
+    target: strulr
     //   target: 'http://192.168.50.220:7000/ldap'
   },
   '/phone/rs/vue': {
-    target: csurl
-    //   target: 'http://192.168.50.220:8300'
-  },
-  '/safecheck/rs/vue': {
-    target: csurl
+    target: strulr
     //   target: 'http://192.168.50.220:8300'
   },
   '/rs/vue': {
-    target: csurl
+    target: strulr
     //   target: 'http://192.168.50.220:8300'
   },
   '/rs/user/userLogin': {
-    target: csurl
+    target: strulr
     //   target: 'http://192.168.50.220:8300'
   },
   // 用户登录服务地址
   '/rs/user': {
-    target: csurl
+    target: strulr
     //   target: 'http://192.168.50.220:7000/ldap'
   },
   '/rs/image/file':{
-    target: csurl
+    target: strulr
     // target: 'http://192.168.50.220:9000/telephone'
   },
+  '/rs/report/getDefectReport':{
+    //target: strulr
+     target: strurlMain
+  },
+  '/rs/report/getDefectReportTS':{
+    //target: strulr
+     target: strurlMain
+  },
   '/rs/path/getParams': {
-    target: csurl
+    target: strulr
     //  target: 'http://192.168.50.220:8300'
   },
   '/rs/sql/singleTable':{
-    target: csurl
+    target: strulr
     //  target: 'http://192.168.50.220:8300'
   },
-
-  'rs/sql/tel_singleTable_OrderBy':{
-    target: csurl
+  // 安检隐患转维修
+  '/rs/logic/UploadRectification':{
+    target: strulr
     //  target: 'http://192.168.50.220:8300'
   },
   'rs/sql/PhoneChangeMeter':{
-    target: csurl
+    target: strulr
     //  target: 'http://192.168.50.220:8300'
   },
-  '/rs/logic/getSaleInitData':{
-    target: csurl
+  // '/rs/sql/GetCheckPaperByDefect':{
+  //   target: 'http://localhost:8081/'
+  //   //  target: 'http://192.168.50.220:8300'
+  // },
+  // '/rs/logic/SafeExportExcel':{
+  //   target: 'http://localhost:8081/'
+  //   //  target: 'http://192.168.50.220:8300'
+  // },
+  '/rs/path/getService':{
+    target: strulr
     //  target: 'http://192.168.50.220:8300'
   },
   '/rs/logic/getInitData': {
-    target: csurl
+    target: strulr
     //  target: 'http://192.168.50.220:8300'
   },
   '/rs/logic/callerSend': {
-    target: csurl
+    target: strulr
     //  target: 'http://192.168.50.220:8300'
   },
   '/rs/db': {
-    target: csurl
+    target: strulr
     //  target: 'http://192.168.50.220:7000/ldap'
   },
   // 图片上传存放地址
   '/rs/file': {
-    target: csurl
+    target: strulr
   },
   '/rs/logic/getLogin': {
-    target: csurl
+    target: strulr
     //  target: 'http://192.168.50.220:8300'
   },
   '/rs/sql/tel_singleTable_OrderBy': {
-    target: csurl
+    target: strulr
+    //  target: 'http://192.168.50.220:8300'
+  },
+  '/safecheck': {
+    target: strulr
     //  target: 'http://192.168.50.220:8300'
   },
   '/rs/logic/GenCallInAllPlan': {
-    target: csurl
+    target: strulr
+    //  target: 'http://127.0.0.1:8081'
   },
   // 安检系统主数据服务
   '/rs': {
-    //target: 'http://127.0.0.1:8081'
+     target: strulr
+    // target: strulr
     // target: 'http://127.0.0.1:8012/AndroidRest'
-    target: csurl
-  },
+    // target: strulr
+  }
 
   // 安卓测试转发地址
-  '/AndroidRest/rs': {
-    pathRewrite:{
-      '^/AndroidRest/rs':'/rs'
-    },
-    // target: 'http://127.0.0.1:9001/safecheck'
-    target: csurl
-  }
+  // '/AndroidRest/rs': {
+  //   pathRewrite:{
+  //     '^/AndroidRest/rs':'/rs'
+  //   },
+  //   target: 'http://127.0.0.1:9001/safecheck'
+  // }
 }
 
 var devMiddleware = require('webpack-dev-middleware')(compiler, {
@@ -172,10 +201,10 @@ app.use(hotMiddleware)
 // serve pure static assets
 app.use('/static', express.static('./static'))
 
-module.exports = app.listen(8333, function (err) {
+module.exports = app.listen(8789, function (err) {
   if (err) {
     console.log(err)
     return
   }
-  console.log('Listening at http://127.0.0.1:8333')
+  console.log('Listening at http://127.0.0.1:8789')
 })

package/build/example-server.js

@@ -10,14 +10,14 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var strulr = 'http://222.135.79.12:8300'
+var strulr = 'http://192.168.10.14:8300'
 var proxyTable = {
   '/test.wasm': {
-    target: 'http://127.0.0.1:8089'
+    target: strulr
     //target: 'http://127.0.0.1:8089'
   },
   '/go_static': {
-    target: 'http://127.0.0.1:8089'
+    target: strulr
     //target: 'http://127.0.0.1:8089'
   },
   // 取图片的地址
@@ -101,7 +101,7 @@ var proxyTable = {
   },
   // 安检系统主数据服务
   '/rs': {
-    // target: 'http://127.0.0.1:8081/Safecheck'
+     //target: 'http://127.0.0.1:8081'
     // target: 'http://127.0.0.1:8012/AndroidRest'
     target: strulr
   }

package/build/webpack.base.conf.js

@@ -5,7 +5,7 @@ var projectRoot = path.resolve(__dirname, '../')
 module.exports = {
   entry: {
     app: './src/main.js',
-    'android-app': './src/androidTest.js'
+    'android-app': './src/android.js'
   },
   output: {
     path: path.resolve(__dirname, '../dist/safecheck'),
@@ -42,7 +42,9 @@ module.exports = {
           `${projectRoot}\\test`,
           `${projectRoot}\\node_modules\\vue-client\\src`,
           `${projectRoot}\\node_modules\\vue-strap\\src`,
+          `${projectRoot}\\node_modules\\telephone-clients\\src`,
           `${projectRoot}\\node_modules\\system-clients\\src`,
+          `${projectRoot}\\node_modules\\system-phone\\src`,
           `${projectRoot}\\node_modules\\ol`
         ]
       },

package/docs/FormPrint.md

@@ -7,7 +7,7 @@
 把打印组件直接当做按钮使用，如下：
 
 ```html
-<form-print :model='$parent.model' url='rs/report/test'></form-print>
+<form-print :model='$parent.model' url='api/af-safecheck/report/test'></form-print>
 ```
 其中：
 - model: 列表对应的model

package/docs/GridTree.md

@@ -7,7 +7,7 @@
 用model参数传递数据，partial='head'指明表头，partial='body'指明表体，默认partial指明树节点显示内容，加载子节点的服务路径通过url参数传递给组件。
 
 ```html
-<grid-tree :model='model' url='rs/sql/subproject.sql'>
+<grid-tree :model='model' url='api/af-safecheck/sql/subproject.sql'>
   <template partial='head'>
     <tr>
       <th>姓名</th>
@@ -32,14 +32,14 @@ data () {
       {name: '根节点', size: 1, children: [
         {name: '子节点', size: 0}
       ]}
-    ]  
+    ]
   }
 }
 ```
 
-* children：  
+* children：
 数组类型，每个节点的children属性指明子节点。
-* size：  
+* size：
 整形，代表子节点个数。对异步数据，在没有加载所有子节点前，需要把子节点个数先加载过来，以便确定该节点是否叶子节点。
 
 ## 选择

package/docs/PrintFile.md

@@ -7,8 +7,8 @@
 把打印组件直接当做按钮使用，如下：
 
 ```html
-<print-file url='/rs/sql/getPrintcontent'
-            logicurl='/rs/logic/printfile'
+<print-file url='/api/af-safecheck/sql/getPrintcontent'
+            logicurl='/api/af-safecheck/logic/printfile'
             userid='1120002568'
             :top='100'
             :left='100'

package/docs/tree.md

@@ -8,7 +8,7 @@
 ```html
 <template>
   <div>
-    <tree :model='model' url='rs/sql/subproject.sql'>
+    <tree :model='model' url='api/af-safecheck/sql/subproject.sql'>
       <div partial>{{row.data.name}}</div>
     </tree>
   </div>
@@ -31,7 +31,7 @@ data () {
       {name: '根节点', size: 1, children: [
         {name: '子节点', size: 0}
       ]}
-    ]  
+    ]
   }
 }
 ```

package/examples/ChangeConfig/comp.js

@@ -83,7 +83,7 @@ export default class Comp {
 
   async writeConfig (obj) {
     let http = new HttpResetClass()
-    let response = await http.load('POST', `rs/logic/saveJson_logic`, {
+    let response = await http.load('POST', `api/af-safecheck/logic/saveJson_logic`, {
       'data': {
         'jsonStr': JSON.stringify(obj),
         'vueName': '' + this.config_name

package/examples/PhoneSafePlan/comp.js

@@ -20,7 +20,7 @@ export default class Comp {
     if(Vue.android){
       this.all.$androidUtil.bzLogic(('FetchCheckPaper', {id: "this.item.id"}))
     }else{
-      let response=await this.http.load("POST", "/rs/sql/androidGetuserinfo", {
+      let response=await this.http.load("POST", "/api/af-safecheck/sql/androidGetuserinfo", {
         data:{
           condition:"1=1"
         }