apply-clients 3.3.110-2 → 3.3.112

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

@@ -6,33 +6,15 @@ var proxyMiddleware = require('http-proxy-middleware')
 var app = express()
 var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
+// 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://192.168.20.28:8400'
-// var ldap = 'http://192.168.20.28:8556'
-//
-// var applyinstall = 'http://127.0.0.1:8080'
+// var applyinstall = 'http://127.0.0.1:8081'
 var proxyTable = {
   '/wx': {
     target: ldap
   },
-  // '/ncc': {
-  //   target: 'http://192.168.20.28:7890'
-  // },
-  '/rs/logic/bjqadduser': {
-    target: 'http://127.0.0.1:8081'
-  },
-  '/rs/logic/bjqcheck': {
-    target: 'http://127.0.0.1:8081'
-  },
-  '/rs/logic/gdMapTransBMap': {
-    target: 'http://127.0.0.1:8081'
-  },
-  '/rs/logic/saveArea': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs/logic/applyBjqMap': {
-    target: 'http://127.0.0.1:8080'
-  },
   '/rs/sql/filemanage_getUserfies/n': {
     target: ldap
   },
@@ -137,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.110-2",
+  "version": "3.3.112",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/App.vue

@@ -1,21 +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/applyAndroid.js

@@ -1,42 +1,42 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-Vue.config.silent = true
-import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
-import ApplyLoadParams from './stores/ApplyLoadParams'
-/** ****************服务插件*********************/
-
-export default function () {
-  Vue.use(ApplyGetSaleParam)
-  Vue.use(ApplyLoadParams)
-  /** ***************************报建模块*********************************/
-  // 报建 总入口
-  Vue.component('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
-  Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
-  Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
-  Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
-  Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
-  Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
-
-  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
-  Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
-  Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
-  Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
-
-  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
-  Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
-  Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
-  Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
-  // 选择用户信息
-  Vue.component('select-userinfo', (resolve) => { require(['./components/android/Process/Processes/selectUserinfo'], resolve) })
-  // 选择报建项目
-  Vue.component('select-apply', (resolve) => { require(['./components/android/Process/Processes/selectApply'], resolve) })
-  Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
-
-  // 区域 地址下拉框联动组件
-  Vue.component('app-res-area-select', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelect'], resolve) })
-  Vue.component('app-res-area-select-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelectGroup'], resolve) })
-  Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
-  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
-  //地图组件
-  Vue.component('app-res-area-map-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaMapGroup'], resolve) })
-}
+import Vue from 'vue'
+import { all } from 'vue-client'
+Vue.config.silent = true
+import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
+import ApplyLoadParams from './stores/ApplyLoadParams'
+/** ****************服务插件*********************/
+
+export default function () {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+  /** ***************************报建模块*********************************/
+  // 报建 总入口
+  Vue.component('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
+  Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
+  Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
+  Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
+  Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
+  Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
+
+  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
+  Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
+  Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
+  Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
+
+  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
+  Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
+  Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
+  Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
+  // 选择用户信息
+  Vue.component('select-userinfo', (resolve) => { require(['./components/android/Process/Processes/selectUserinfo'], resolve) })
+  // 选择报建项目
+  Vue.component('select-apply', (resolve) => { require(['./components/android/Process/Processes/selectApply'], resolve) })
+  Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
+
+  // 区域 地址下拉框联动组件
+  Vue.component('app-res-area-select', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelect'], resolve) })
+  Vue.component('app-res-area-select-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelectGroup'], resolve) })
+  Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
+  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
+  //地图组件
+  Vue.component('app-res-area-map-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaMapGroup'], resolve) })
+}

package/src/components/android/AppSign.vue

@@ -1,143 +1,154 @@
-<template>
-  <div class="panel">
-    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
-      <div class="row form-group" style="height: 240px;overflow: scroll;">
-        <img :src="f_sign_path" width="100%" height="100%" />
-      </div>
-      <div class="row text-right form-group">
-        <button class="btn" style="background-color: #f1e404;border-radius: 5px;margin-right: 10px" @click="clean">清除</button>
-        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click="sign">签名</button>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import {getNowDate, guid, isEmpty} from '../Util'
-import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-import QRCode from 'qrcodejs2'
-import Vue from "vue";
-
-export default {
-  title: '签字',
-  props: ['filePath'],
-  data () {
-    return {
-      f_sign_path: null,
-      fileName: null
-    }
-  },
-  ready () {
-    this.f_sign_path = this.filePath
-  },
-  methods: {
-    clean () {
-      this.f_sign_path = null
-      this.fileName = null
-      this.$emit('sign-clean')
-    },
-    sign () {
-      this.delAudioFile(this.f_sign_path)
-      this.fileName = guid() + '.jpg'
-      HostApp.__callback__ = this.signCallback
-      HostApp.__this__ = this
-      HostApp.getSignature({
-        file: this.fileName,
-        requestCode: 111,
-        callback: 'javascript:HostApp.__callback__("f_sign_path", "%s");'
-      })
-    },
-    // 签名回调
-    signCallback (prop, signPath) {
-      console.log('==============签字回调============')
-      console.log(signPath)
-      HostApp.__this__.$set(prop, signPath)
-      console.log(HostApp.__this__.f_sign_path)
-
-      HostApp.__this__.uploadFile()
-
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
-    },
-    uploadFile () {
-      console.log('===================签字文件上传==============')
-      let data = {
-        blodid: HostApp.__this__.blobid,
-        username: Vue.user.name,
-        fremarks: '报装手机签字文件',
-        fileName: HostApp.__this__.fileName,
-        fileUrl: HostApp.__this__.f_sign_path
-      }
-
-      console.log('-----------bzLogic-----------------')
-      console.log(JSON.stringify(data))
-      let res = HostApp.bzLogic({
-          'logic': 'appFileUpload',
-         'data': data
-      })
-      console.log('===============上传回调=================')
-      console.log(JSON.stringify(res))
-      HostApp.__this__.getFiles(res.id)
-    },
-    async getFiles (fileid) {
-      let http = new HttpResetClass()
-
-      let data = {
-        tablename: 't_files',
-        condition: `id = '${fileid}'`
-      }
-      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
-      })
-
-      console.log('=========查询回调===============')
-      let fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
-      console.log(fileUrl)
-      // HostApp.__this__.$set('f_sign_path', fileUrl)
-      // HostApp.__this__.f_sign_path = fileUrl
-      this.f_sign_path = fileUrl
-
-      this.$emit('sign-success', fileUrl)
-    },
-    delAudioFile (signPath) {
-      if (!signPath) {
-        return
-      }
-      HostApp.delfile(signPath)
-      this.f_sign_path = null
-      this.fileName = null
-    }
-  },
-  events: {
-  },
-  computed: {
-  },
-  watch: {
-  }
-}
-</script>
-<style scoped lang="less">
-.qrcode {
-  display: inline-block !important;
-  margin: 10px 0px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.vertical-center {
-  display: flex;
-  align-items: center;
-  text-align: center;
-}
-/*清除model中的浮动*/
-.clearfix:after,.clearfix:before{
-  display: table;
-}
-.clearfix:after{
-  clear: both;
-}
-</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;">
+        <img :src="f_sign_path" width="100%" height="100%" />
+      </div>
+      <div class="row text-right form-group">
+        <button class="btn" style="background-color: #f1e404;border-radius: 5px;margin-right: 10px" @click="clean">清除</button>
+        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click="sign">签名</button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {getNowDate, guid, isEmpty} from '../Util'
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import QRCode from 'qrcodejs2'
+import Vue from "vue";
+
+export default {
+  title: '签字',
+  props: ['filePath','blobid','type', 'defname'],
+  data () {
+    return {
+      f_sign_path: null,
+      fileName: null
+    }
+  },
+  ready () {
+    console.log('在ready里打印一下this.filePath',this.filePath)
+    this.f_sign_path = this.filePath
+    console.log('在ready里打印一下this.f_sign_path',this.f_sign_path)
+    // this.getFiles()
+  },
+  methods: {
+    clean () {
+      this.f_sign_path = null
+      this.fileName = null
+      this.$emit('sign-clean')
+    },
+    sign () {
+      debugger
+      this.type='手机签字'
+      console.log('==============签字打印this============',this)
+      this.delAudioFile(this.f_sign_path)
+      this.fileName = guid() + '.jpg'
+      HostApp.__callback__ = this.signCallback
+      HostApp.__this__ = this
+      HostApp.getSignature({
+        file: this.fileName,
+        requestCode: 111,
+        callback: 'javascript:HostApp.__callback__("f_sign_path", "%s");'
+      })
+    },
+    // 签名回调
+    signCallback (prop, signPath) {
+      console.log('==============签字回调============')
+      console.log(signPath)
+      HostApp.__this__.$set(prop, signPath)
+      console.log(HostApp.__this__.f_sign_path)
+
+      HostApp.__this__.uploadFile()
+
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    },
+    uploadFile () {
+      console.log('===================签字文件上传==============')
+      console.log('===================打印id==============',HostApp.__this__.blobid)
+      let data = {
+        defname:HostApp.__this__.defname,
+        type:HostApp.__this__.type,
+        blodid: HostApp.__this__.blobid,
+        username: Vue.user.name,
+        fremarks: '报装手机签字文件',
+        fileName: HostApp.__this__.fileName,
+        fileUrl: HostApp.__this__.f_sign_path
+      }
+
+      console.log('-----------bzLogic-----------------')
+      console.log(JSON.stringify(data))
+      let res = HostApp.bzLogic({
+          'logic': 'appFileUpload',
+         'data': data
+      })
+      console.log('===============上传回调=================')
+      console.log(JSON.stringify(res))
+      HostApp.__this__.getFiles(res.id)
+    },
+    async getFiles (fileid) {
+      debugger
+      console.log('=========进来===============')
+      let http = new HttpResetClass()
+      console.log('=========进来===============')
+      let data = {
+        tablename: 't_files',
+        condition: `f_blobid = '${this.blobid}' `
+      }
+      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
+      })
+
+      console.log('=========查询回调===============')
+      let fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
+      console.log(fileUrl)
+      // HostApp.__this__.$set('f_sign_path', fileUrl)
+      // HostApp.__this__.f_sign_path = fileUrl
+      this.f_sign_path = fileUrl
+
+      this.$emit('sign-success', fileUrl)
+    },
+    delAudioFile (signPath) {
+      if (!signPath) {
+        return
+      }
+      HostApp.delfile(signPath)
+      this.f_sign_path = null
+      this.fileName = null
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped lang="less">
+.qrcode {
+  display: inline-block !important;
+  margin: 10px 0px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.vertical-center {
+  display: flex;
+  align-items: center;
+  text-align: center;
+}
+/*清除model中的浮动*/
+.clearfix:after,.clearfix:before{
+  display: table;
+}
+.clearfix:after{
+  clear: both;
+}
+</style>