apply-clients 7.1.36-yuchuan-61 → 7.1.36-yuchuan-63

package/build/dev-server.js

@@ -1,187 +1,187 @@
-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()
-var ldap = 'http://193.168.1.5:8765'
-var applyinstall = 'http://193.168.1.5:8765'
-var fadada = 'http://193.168.1.5:8765'
-var proxyTable = {
-  '/baojianFile': {
-    target: fadada
-  },
-  '/testfiles': {
-    target: fadada
-  },
-  '/api/af-auth/login': {
-    target: fadada
-  },
-  '/rs/logic/getAllNode': {
-    target: fadada
-  },
-  '/android.html/rs': {
-    target: fadada,
-    pathRewrite: {
-      '^/android.html': ''
-    }
-  },
-  '/webapps/applyinstall/excel': {
-    target: fadada
-  },
-
-  '/rs/logic/pushShortUrlSms': {
-    target: fadada
-  },
-  '/rs/logic/generateContract': {
-    target: fadada
-  },
-  '/rs/logic/getAuthSubject': {
-    target: fadada
-  },
-  '/rs/sql/getAuthSubjectList': {
-    target: fadada
-  },
-  '/rs/logic/keyExtSign': {
-    target: fadada
-  },
-  '/rs/logic/keyExtSignAuto': {
-    target: fadada
-  },
-  // 重新发送实名认证短信
-  '/rs/logic/anotherAuthSubject': {
-    target: fadada
-  },
-  // ---------------------------
-  '/rs/logic/getSaleInitData': {
-    target: ldap
-  },
-  '/rs/logic/saveInstruct': {
-    target: 'http://193.168.1.64:8082'
-  },
-  '/rs/logic/updateNetWorkValve': {
-    target: 'http://193.168.1.64:8082'
-  },
-  '/rs/logic/uploadSave': {
-    target: 'http://193.168.1.16:8003'
-  },
-  '/rs/workflow': {
-    target: applyinstall
-  },
-  '/apply': {
-    target: applyinstall
-  },
-  '/rs/vue': {
-    target: ldap
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: ldap
-  },
-  // 发票组织数据
-  '/rs/logic/bjEticketCharge': {
-    target: 'http://193.168.1.6:8082'
-  },
-  // 开发票
-  '/rs/logic/bjOpenEticket': {
-    target: 'http://193.168.1.6:8082'
-  },
-  // 获取发票明细
-  '/rs/logic/queryEticket': {
-    target: 'http://193.168.1.44:8400'
-  },
-  // 创建小区
-  '/rs/logic/address_updatearea': {
-    target: ldap
-  },
-  '/rs/phone/send': {
-    target: 'http://193.168.1.21:80'
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: ldap
-  },
-  '/rs/logic/getInitData': {
-    target: ldap?ldap:applyinstall
-  },
-  '/rs/logic/getLogin': {
-    target: ldap
-  },
-  '/rs/file': {    // 文件上传
-    target: applyinstall
-  },
-  '/project': {    // 文件回显
-    target: applyinstall
-  },
-  '/rs/apply': {
-    target: applyinstall,
-    pathRewrite: {
-      '^/rs/apply': '/rs'
-    }
-  },
-  '/rs': {
-    target: applyinstall
-  },
-  // '/ws': {
-  //   target: applyinstall,
-  //   ws: true // 代理webSocket
-  // }
-}
-
-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(8400, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8400')
-})
+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()
+var ldap = 'http://61.134.61.238:8655'
+var applyinstall = 'http://61.134.61.238:8655'
+var fadada = 'http://61.134.61.238:8655'
+var proxyTable = {
+  '/baojianFile': {
+    target: fadada
+  },
+  '/testfiles': {
+    target: fadada
+  },
+  '/api/af-auth/login': {
+    target: fadada
+  },
+  '/rs/logic/getAllNode': {
+    target: fadada
+  },
+  '/android.html/rs': {
+    target: fadada,
+    pathRewrite: {
+      '^/android.html': ''
+    }
+  },
+  '/webapps/applyinstall/excel': {
+    target: fadada
+  },
+
+  '/rs/logic/pushShortUrlSms': {
+    target: fadada
+  },
+  '/rs/logic/generateContract': {
+    target: fadada
+  },
+  '/rs/logic/getAuthSubject': {
+    target: fadada
+  },
+  '/rs/sql/getAuthSubjectList': {
+    target: fadada
+  },
+  '/rs/logic/keyExtSign': {
+    target: fadada
+  },
+  '/rs/logic/keyExtSignAuto': {
+    target: fadada
+  },
+  // 重新发送实名认证短信
+  '/rs/logic/anotherAuthSubject': {
+    target: fadada
+  },
+  // ---------------------------
+  '/rs/logic/getSaleInitData': {
+    target: ldap
+  },
+  '/rs/logic/saveInstruct': {
+    target: 'http://193.168.1.64:8082'
+  },
+  '/rs/logic/updateNetWorkValve': {
+    target: 'http://193.168.1.64:8082'
+  },
+  '/rs/logic/uploadSave': {
+    target: 'http://193.168.1.16:8003'
+  },
+  '/rs/workflow': {
+    target: applyinstall
+  },
+  '/apply': {
+    target: applyinstall
+  },
+  '/rs/vue': {
+    target: ldap
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: ldap
+  },
+  // 发票组织数据
+  '/rs/logic/bjEticketCharge': {
+    target: 'http://193.168.1.6:8082'
+  },
+  // 开发票
+  '/rs/logic/bjOpenEticket': {
+    target: 'http://193.168.1.6:8082'
+  },
+  // 获取发票明细
+  '/rs/logic/queryEticket': {
+    target: 'http://193.168.1.44:8400'
+  },
+  // 创建小区
+  '/rs/logic/address_updatearea': {
+    target: ldap
+  },
+  '/rs/phone/send': {
+    target: 'http://193.168.1.21:80'
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: ldap
+  },
+  '/rs/logic/getInitData': {
+    target: ldap?ldap:applyinstall
+  },
+  '/rs/logic/getLogin': {
+    target: ldap
+  },
+  '/rs/file': {    // 文件上传
+    target: applyinstall
+  },
+  '/project': {    // 文件回显
+    target: applyinstall
+  },
+  '/rs/apply': {
+    target: applyinstall,
+    pathRewrite: {
+      '^/rs/apply': '/rs'
+    }
+  },
+  '/rs': {
+    target: applyinstall
+  },
+  // '/ws': {
+  //   target: applyinstall,
+  //   ws: true // 代理webSocket
+  // }
+}
+
+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(8400, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8400')
+})

package/package.json

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

package/src/components/android/Process/Processes/AppInstallationDetails.vue

@@ -523,20 +523,23 @@ export default {
       } else if (code.startsWith('02') || code.startsWith('22')) {
         var num2 = this.getMeterBrands('千嘉NB物联网表')
         this.userfile.f_gasbrand_id = num2
+      } else if (code.startsWith('03')) {
+        var num2 = this.getMeterBrands('先锋NB民用物联网表')
+        this.userfile.f_gasbrand_id = num2
       }
       //气表型号
-      if (code.substring(4, 5) == 7) {
+      if (code.substring(4, 5) == 7 || code.substring(4, 5) == 0) {
         await this.gasbrandValue('JGD1.6-NNB物联网表')
         const  value=this.modelCode
         this.userfile.f_gasmodel_id = value
-      } else if (code.substring(4, 5) == 8) {
+      } else if (code.substring(4, 5) == 8 ||code.substring(4, 5) == 1) {
 
        await this.gasbrandValue('JGD2.5-NNB物联网表')
         const  value1=this.modelCode
         this.userfile.f_gasmodel_id =value1
-      } else if (code.substring(4, 5) == 9) {
+      } else if (code.substring(4, 5) == 9 ||code.substring(4, 5) == 2) {
         await this.gasbrandValue('JGD4S-NNB物联网表')
-       const value2 =this.modelCode
+        const value2 =this.modelCode
         this.userfile.f_gasmodel_id = value2
       }
       // 表向

package/src/components/android/Process/Processes/newAppInstallationDetails.vue

@@ -469,11 +469,11 @@ export default {
     async gasbrandChange() {
       // 清空已保存的气表型号
       // this.newUserfile.f_new_gasbrand_id = null
-      if (isEmpty(newUserfile.f_new_gasbrand_id)) {
+      if (isEmpty(this.newUserfile.f_new_gasbrand_id)) {
         return
       }
       let data = {
-        f_gasbrand_id: newUserfile.f_new_gasbrand_id
+        f_gasbrand_id: this.newUserfile.f_new_gasbrand_id
       }
       let http = new HttpResetClass()
       let res = await http.load(

package/src/components/android/SealBind.vue

@@ -116,13 +116,23 @@ export default {
       longitude: '',
       latitude: '',
       f_qr_code: '',
-      causeOption: this.$appdata.getParam('施封原因')
+      causeOption: []
     }
   },
   ready () {
-    console.log('this.row=', JSON.stringify(this.row))
+    if (Vue.user.rolestr.includes('新安检员')) {
+      this.causeOption = [{label: '安检施封', value: '安检施封'}]
+      this.cause = '安检施封'
+    } else if (Vue.user.rolestr.includes('通气组安检')) {
+      this.causeOption = [{label: '通气施封', value: '通气施封'}]
+      this.cause = '通气施封'
+    } else if (Vue.user.rolestr.includes('新维修员')) {
+      this.causeOption = [{label: '换表施封', value: '换表施封'}, {label: '维修施封', value: '维修施封'}]
+    } else {
+      this.causeOption = this.$appdata.getParam('施封原因')
+    }
     this.getLocation()
-    if (this.longitude == 0){
+    if (this.longitude === 0) {
       this.timer = window.setInterval(this.getLocation, 3000)
     }
   },