apply-clients 3.3.94 → 3.3.95

package/build/dev-server-app.js

@@ -1,76 +1,76 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var proxyTable = {
-  '/rs': {
-    target: 'http://192.168.20.27:8555'
-    // target: 'http://192.168.30.86:8077'
-  },
-  '/AndroidRest/rs': {
-    target: 'http://192.168.20.27:8555'
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var proxyTable = {
+  '/rs': {
+    target: 'http://192.168.20.27:8555'
+    // target: 'http://192.168.30.86:8077'
+  },
+  '/AndroidRest/rs': {
+    target: 'http://192.168.20.27:8555'
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/build/dev-server.js

@@ -9,30 +9,20 @@ var compiler = webpack(config)
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
 var ldap = 'http://192.168.20.28:8400'
-var applyinstall = 'http://127.0.0.1:8080'
-// var ldap = 'http://192.168.20.28:8556'
-// var applyinstall = 'http://192.168.20.28:8556'
+// var applyinstall = 'http://192.168.20.28:8400'
+var applyinstall = 'http://127.0.0.1:8081'
 var proxyTable = {
   '/wx': {
     target: ldap
   },
-  '/ncc': {
-    target: 'http://192.168.20.27:7890'
-  },
   '/rs/sql/filemanage_getUserfies/n': {
     target: ldap
   },
   '/rs/sql/filemanage_getUserfies': {
     target: ldap
   },
-  '/rs/entity/t_apply': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs/logic/ApplyProductService': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs/sql/checkuser': {
-    target: 'http://127.0.0.1:8080'
+  '/rs/logic/saveInsInfo': {
+    target: ldap
   },
   '/rs/logic/exportfile': {
     target: ldap
@@ -40,36 +30,9 @@ var proxyTable = {
   '/rs/logic/getBatchOperaPro': {
     target: ldap
   },
-  '/rs/sql/getApplyCharge': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs/sql/getChargeAll': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs/sql/supervisory': {
-    target: 'http://127.0.0.1:8080'
-  },
   '/rs/logic/updateApplyOrder': {
     target: ldap
   },
-  // '/rs/sql/getAddresAndUserinfoAndUserfilesAmount': {
-  //   target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/singleTable': {
-  //   target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/countApplyUserinfo': {
-  //   target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/getStockMaterial': {
-  //   target: 'http://127.0.0.1:8080'
-  // },
-  '/rs/logic/resAreaSelect': {
-    target: 'http://127.0.0.1:8080'
-  },
-  // '/rs/logic/bjqCheck': {
-  //   target: 'http://127.0.0.1:8080'
-  // },
   '/rs/logic/getSaleInitData': {
     target: ldap
   },
@@ -156,10 +119,10 @@ app.use(hotMiddleware)
 // serve pure static assets
 app.use('/static', express.static('./static'))
 
-module.exports = app.listen(8300, function (err) {
+module.exports = app.listen(8600, function (err) {
   if (err) {
     console.log(err)
     return
   }
-  console.log('Listening at http://localhost:8300')
+  console.log('Listening at http://localhost:8600')
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.94",
+  "version": "3.3.95",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/App.vue

@@ -1,22 +1,20 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <route :comp="{name: 'login'}"></route>
-<!--          <route :comp="{name: 'login-app'}"></route>-->
-
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-
-  export default {
-
-
-  }
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <route :comp="{name: 'login'}"></route>
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+
+
+  export default {
+
+
+  }
+</script>

package/src/components/android/AppSign.vue

@@ -37,17 +37,10 @@ export default {
       this.$emit('sign-clean')
     },
     sign () {
-      console.log('==============签字开始============')
-      console.log(this.f_sign_path)
-      console.log(guid() )
       this.delAudioFile(this.f_sign_path)
-      console.log(this.signCallback)
       this.fileName = guid() + '.jpg'
-      console.log(this.fileName)
       HostApp.__callback__ = this.signCallback
       HostApp.__this__ = this
-
-
       HostApp.getSignature({
         file: this.fileName,
         requestCode: 111,
@@ -69,6 +62,7 @@ export default {
     uploadFile () {
       console.log('===================签字文件上传==============')
       let data = {
+        blodid: HostApp.__this__.blobid,
         username: Vue.user.name,
         fremarks: '报装手机签字文件',
         fileName: HostApp.__this__.fileName,
@@ -78,8 +72,8 @@ export default {
       console.log('-----------bzLogic-----------------')
       console.log(JSON.stringify(data))
       let res = HostApp.bzLogic({
-        'logic': 'appFileUpload',
-        'data': data
+          'logic': 'appFileUpload',
+         'data': data
       })
       console.log('===============上传回调=================')
       console.log(JSON.stringify(res))
@@ -108,8 +102,6 @@ export default {
       this.$emit('sign-success', fileUrl)
     },
     delAudioFile (signPath) {
-      console.log('=========回调===============')
-      console.log(signPath)
       if (!signPath) {
         return
       }

package/src/components/android/AppTakePic.vue

@@ -1,144 +1,143 @@
-<template>
-  <div class="panel">
-    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
-      <div class="row form-group" style="height: 240px;overflow: scroll;">
-        <div class="col-xs-4 col-sm-3 col-md-2 col-xs-offset-1 col-sm-offset-1 col-md-offset-1" v-for="(index,file) in fileList">
-          <img-self :src="file.f_downloadURL" :width="120" :height="170"></img-self>
-          <img v-if="isdelete" src="../../../src/assets/删除.png" style="width: 15px;margin-top: -80px" @click.prevent="delfile(file, index)">
-        </div>
-      </div>
-      <div class="row text-right form-group" v-if="istakepic">
-        <v-select
-          class="fileType"
-          placeholder="请选择使用类型"
-          v-if="istype"
-          :search="false"
-          close-on-select
-          value-single
-          :options="typeList"
-          v-model="type"
-          :value.sync="type"
-        ></v-select>
-        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic(type)">拍照</button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-import {guid, toStandardTimeString} from '../Util'
-import Vue from 'vue'
-export default {
-  title: '附件',
-  props: ['blobid', 'type', 'defname', 'istype', 'typelabel', 'isdelete', 'istakepic'],
-  data () {
-    return {
-      fileList: []
-    }
-  },
-  ready () {
-    this.getFiles()
-  },
-  methods: {
-    async getFiles () {
-      console.log('----------------开始查询图片----------------')
-      this.fileList = []
-
-      let http = new HttpResetClass()
-
-      let data = {
-        tablename: 't_files',
-        condition: `f_blobid = '${this.blobid}' and fremarks = '手机拍照' order by f_uploaddate desc `
-      }
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
-      // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
-        warnMsg: null,
-        resolveMsg: null
-      })
-
-      for (var i = 0; i < res.data.length; i++) {
-        console.log('-----------地址----------------')
-        console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
-        res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
-      }
-
-      this.fileList = res.data
-    },
-    delfile (file, index) {
-      console.log('-----------文件----------------')
-      this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_files`, {id: file.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-        this.$dispatch("delResid", file.id)
-        this.getFiles()
-      })
-    },
-    takePic (title) {
-      // 拍照成功回调
-      HostApp.__callback__ = this.cameraCallBack
-      HostApp.__this__ = this
-      let fileName = guid() + '.jpg'
-      // 打开相机
-      HostApp._open_a_page({
-        type: 'boomerang',
-        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
-        param: {
-          file: fileName,
-          requestCode: 200,
-          callback: 'javascript:HostApp.__callback__("' + fileName + '", "%s");',
-          watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name  // 水印
-        }
-      })
-    },
-    cameraCallBack (fileName, fileUrl) {
-      console.log('-----------cameraCallBack-----------------')
-
-      let data = {
-        blodid: HostApp.__this__.blobid,
-        type: HostApp.__this__.type,
-        defname: HostApp.__this__.defname,
-        username: Vue.user.name,
-        fremarks: '手机拍照',
-        fileName: fileName,
-        fileUrl: fileUrl
-      }
-
-      console.log('-----------bzLogic-----------------')
-      HostApp.bzLogic({
-        'logic': 'appFileUpload',
-        'data': data
-      })
-
-      console.log('----------------开始回调查询-------------------')
-      HostApp.__this__.getFiles()
-      console.log('----------------查询回调结束-------------------')
-
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
-    }
-  },
-  computed: {
-    typeList () {
-      if (this.typelabel) {
-        return this.$appdata.getParam(this.typelabel)
-      }
-      return this.$appdata.getParam('使用类型')
-    }
-  },
-  events: {
-  }
-}
-</script>
-
-<style lang="less">
-  .fileType {
-    float: left;
-    .select-style {
-      background: #f8f8f8;
-      border: 0px;
-    }
-    input {
-      border-left: none;
-      width: 100%;
-    }
-  }
-</style>
+<template>
+  <div class="panel">
+    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
+      <div class="row form-group" style="height: 240px;overflow: scroll;">
+        <div class="col-xs-4 col-sm-3 col-md-2 col-xs-offset-1 col-sm-offset-1 col-md-offset-1" v-for="(index,file) in fileList">
+          <img-self :src="file.f_downloadURL" :width="120" :height="170"></img-self>
+          <img v-if="isdelete" src="../../../src/assets/删除.png" style="width: 15px;margin-top: -80px" @click.prevent="delfile(file, index)">
+        </div>
+      </div>
+      <div class="row text-right form-group" v-if="istakepic">
+        <v-select
+          class="fileType"
+          placeholder="请选择使用类型"
+          v-if="istype"
+          :search="false"
+          close-on-select
+          value-single
+          :options="typeList"
+          v-model="type"
+          :value.sync="type"
+        ></v-select>
+        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic(type)">拍照</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import {guid, toStandardTimeString} from '../Util'
+import Vue from 'vue'
+export default {
+  title: '附件',
+  props: ['blobid', 'type', 'defname', 'istype', 'typelabel', 'isdelete', 'istakepic'],
+  data () {
+    return {
+      fileList: []
+    }
+  },
+  ready () {
+    this.getFiles()
+  },
+  methods: {
+    async getFiles () {
+      console.log('----------------开始查询图片----------------')
+      this.fileList = []
+
+      let http = new HttpResetClass()
+
+      let data = {
+        tablename: 't_files',
+        condition: `f_blobid = '${this.blobid}' and fremarks = '手机拍照' order by f_uploaddate desc `
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
+      // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+
+      for (var i = 0; i < res.data.length; i++) {
+        console.log('-----------地址----------------')
+        console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
+        res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
+      }
+
+      this.fileList = res.data
+    },
+    delfile (file, index) {
+      this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_files`, {id: file.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch("delResid", file.id)
+        this.getFiles()
+      })
+    },
+    takePic (title) {
+      // 拍照成功回调
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      let fileName = guid() + '.jpg'
+      // 打开相机
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
+        param: {
+          file: fileName,
+          requestCode: 200,
+          callback: 'javascript:HostApp.__callback__("' + fileName + '", "%s");',
+          watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name  // 水印
+        }
+      })
+    },
+    cameraCallBack (fileName, fileUrl) {
+      console.log('-----------cameraCallBack-----------------')
+
+      let data = {
+        blodid: HostApp.__this__.blobid,
+        type: HostApp.__this__.type,
+        defname: HostApp.__this__.defname,
+        username: Vue.user.name,
+        fremarks: '手机拍照',
+        fileName: fileName,
+        fileUrl: fileUrl
+      }
+
+      console.log('-----------bzLogic-----------------')
+      HostApp.bzLogic({
+        'logic': 'appFileUpload',
+        'data': data
+      })
+
+      console.log('----------------开始回调查询-------------------')
+      HostApp.__this__.getFiles()
+      console.log('----------------查询回调结束-------------------')
+
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    }
+  },
+  computed: {
+    typeList () {
+      if (this.typelabel) {
+        return this.$appdata.getParam(this.typelabel)
+      }
+      return this.$appdata.getParam('使用类型')
+    }
+  },
+  events: {
+  }
+}
+</script>
+
+<style lang="less">
+  .fileType {
+    float: left;
+    .select-style {
+      background: #f8f8f8;
+      border: 0px;
+    }
+    input {
+      border-left: none;
+      width: 100%;
+    }
+  }
+</style>