apply-clients 3.4.89-9 → 3.4.91

package/build/dev-server.js

@@ -1,141 +1,133 @@
-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://121.36.79.201:8400'
-// var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'https://qnjtkf.cn:7401'
-var applyinstall = 'https://qnjtkf.cn:7401'
-
-var proxyTable = {
-  '/webapps/applyinstall/excel': {
-    target: ldap,
-    changeOrigin: true
-  },
-  '/apply/rs/entity': {
-    target: ldap,
-    changeOrigin: true
-  },
-  '/rs/logic/getSaleInitData': {
-    target: ldap,
-    changeOrigin: true
-  },
-  '/rs/workflow': {
-    target: applyinstall,
-    changeOrigin: true
-  },
-  '/rs/vue': {
-    target: ldap,
-    changeOrigin: true
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: ldap,
-    changeOrigin: true
-  },
-  // 街道查询
-  '/rs/sql/address_getstreetlist': {
-    target: ldap,
-    changeOrigin: true
-  },
-  // 创建街道
-  '/rs/logic/address_updatestreet': {
-    target: ldap,
-    changeOrigin: true
-  },
-  // 创建小区
-  '/rs/logic/address_updatearea': {
-    target: ldap,
-    changeOrigin: true
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: ldap,
-    changeOrigin: true
-  },
-  '/rs/logic/getInitData': {
-    target: ldap?ldap:applyinstall,
-    changeOrigin: true
-  },
-  '/rs/logic/getLogin': {
-    target: ldap,
-    changeOrigin: true
-  },
-  '/rs/file': {    // 文件上传
-    target: applyinstall,
-    changeOrigin: true
-  },
-  '/project': {    // 文件回显
-    target: applyinstall,
-    changeOrigin: true
-  },
-  '/rs': {
-    target: applyinstall,
-    changeOrigin: true
-  },
-  '/ws': {
-    target: applyinstall,
-    changeOrigin: true,
-    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(8300, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8300')
-})
+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://121.36.79.201:8400'
+// var applyinstall = 'http://121.36.79.201:8400'
+var ldap = 'https://qnjtkf.cn:7401'
+var applyinstall = 'https://qnjtkf.cn:7401'
+
+var proxyTable = {
+  '/rs/logic/getSaleInitData': {
+    target: ldap,
+    changeOrigin: true
+  },
+  '/rs/workflow': {
+    target: applyinstall,
+    changeOrigin: true
+  },
+  '/rs/vue': {
+    target: ldap,
+    changeOrigin: true
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: ldap,
+    changeOrigin: true
+  },
+  // 街道查询
+  '/rs/sql/address_getstreetlist': {
+    target: ldap,
+    changeOrigin: true
+  },
+  // 创建街道
+  '/rs/logic/address_updatestreet': {
+    target: ldap,
+    changeOrigin: true
+  },
+  // 创建小区
+  '/rs/logic/address_updatearea': {
+    target: ldap,
+    changeOrigin: true
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: ldap,
+    changeOrigin: true
+  },
+  '/rs/logic/getInitData': {
+    target: ldap?ldap:applyinstall,
+    changeOrigin: true
+  },
+  '/rs/logic/getLogin': {
+    target: ldap,
+    changeOrigin: true
+  },
+  '/rs/file': {    // 文件上传
+    target: applyinstall,
+    changeOrigin: true
+  },
+  '/project': {    // 文件回显
+    target: applyinstall,
+    changeOrigin: true
+  },
+  '/rs': {
+    target: applyinstall,
+    changeOrigin: true
+  },
+  '/ws': {
+    target: applyinstall,
+    changeOrigin: true,
+    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(8300, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8300')
+})

package/package.json

@@ -1,116 +1,117 @@
-{
-  "name": "apply-clients",
-  "version": "3.4.89-9",
-  "description": "报建前端模块",
-  "main": "src/index.js",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js",
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh",
-    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/ApplyInstall.git"
-  },
-  "keywords": [
-    "ApplyInstall"
-  ],
-  "author": "zx <939981212@qq.com>",
-  "license": "ISC",
-  "dependencies": {
-    "@logicflow/core": "^0.4.3",
-    "co": "4.6.0",
-    "dingtalk-jsapi": "^2.13.68",
-    "jsencrypt": "^3.0.0-rc.1",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "lib-flexible": "^0.3.2",
-    "px2rem-loader": "^0.1.9",
-    "qrcodejs2": "0.0.2",
-    "vue": "^1.0.17",
-    "vue-bubble": "^1.0.3"
-  },
-  "devDependencies": {
-    "crypto-js": "^4.1.1",
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.17.0",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "form-create": "^1.6.6",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.48",
-    "material-client": "^1.1.2",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "rimraf": "^2.5.0",
-    "sale-client": "^1.4.33",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.2.74",
-    "system-phone": "1.2.80-49",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.113",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "^2.1.7",
-    "vux": "^2.9.4",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0"
-  }
-}
+{
+  "name": "apply-clients",
+  "version": "3.4.91",
+  "description": "报建前端模块",
+  "main": "src/index.js",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js",
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh",
+    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/ApplyInstall.git"
+  },
+  "keywords": [
+    "ApplyInstall"
+  ],
+  "author": "zx <939981212@qq.com>",
+  "license": "ISC",
+  "dependencies": {
+    "@logicflow/core": "^0.4.3",
+    "co": "4.6.0",
+    "dingtalk-jsapi": "^2.13.68",
+    "jsencrypt": "^3.0.0-rc.1",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "lib-flexible": "^0.3.2",
+    "px2rem-loader": "^0.1.9",
+    "qrcodejs2": "0.0.2",
+    "vue": "^1.0.17",
+    "vue-bubble": "^1.0.3",
+    "sm-crypto": "^0.3.13"
+  },
+  "devDependencies": {
+    "crypto-js": "^4.1.1",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.17.0",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "form-create": "^1.6.6",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "3.0.48",
+    "material-client": "^1.1.2",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "rimraf": "^2.5.0",
+    "sale-client": "^1.4.33",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.2.74",
+    "system-phone": "1.2.80-49",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.113",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "^2.1.7",
+    "vux": "^2.9.4",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "weixin-js-sdk": "^1.2.0"
+  }
+}

package/src/App.vue

@@ -1,22 +1,21 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <route :comp="{name: 'login'}"></route>
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-  export default {
-    ready() {
-      // 潜能加密
-      Vue.mmType = 'nginx'
-      Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
-    }
-  }
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <route :comp="{name: 'login'}"></route>
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  export default {
+    ready() {
+      Vue.mmType = 'nginx'
+      Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
+    }
+  }
+</script>

package/src/apply.js

@@ -95,8 +95,8 @@ export default function (filiale) {
   Vue.component('print-gnition-bill', (resolve) => { require(['./components/product/Print/IgnitionBill/printIgnitionBill'], resolve) })
   Vue.component('ignition-bill-list', (resolve) => { require(['./components/product/Print/IgnitionBill/IgnitionBill'], resolve) })
   // 点火界面
-  Vue.component('ignition-list-manage', (resolve) => { require(['./components/product/ignition/IgnitionListManage'], resolve) })
-  Vue.component('ignition-record', (resolve) => { require(['./components/product/ignition/IgnitionRecord'], resolve) })
+  Vue.component('ignition-list-manage', (resolve) => { require(['./components/product/Ignition/IgnitionListManage'], resolve) })
+  Vue.component('ignition-record', (resolve) => { require(['./components/product/Ignition/IgnitionRecord'], resolve) })
   // 材料查看
   Vue.component('material-manger', (resolve) => { require(['./components/product/Material/Materialmanger'], resolve) })
   Vue.component('material-user', (resolve) => { require(['./components/product/Material/Materialuser'], resolve) })
@@ -110,7 +110,8 @@ export default function (filiale) {
   Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
   // 地图组件
   Vue.component('gaode-map', (resolve) => { require(['./components/product/GaoDeMapComponents/GaoDeMap'], resolve) })
-
+  // 预收组件
+  Vue.component('apply-contract-charge', (resolve) => { require(['./components/product/Install/ContractCharge'], resolve) })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
     for (let key in filialeComp) {

package/src/applyAndroid.js

@@ -43,8 +43,8 @@ export default function (filiale) {
   Vue.component('app-res-area-map-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaMapGroup'], resolve) })
   // 扫描二维码
   Vue.component('app-qrcode-reader', (resolve) => { require(['./components/android/AreaSelect/AppQrcodeReader'], resolve) })
-  Vue.component('app-ignition-ventilation', (resolve) => { require(['./components/android/ignition/VentilationIgnition'], resolve) })
-  Vue.component('app-ignition-handle', (resolve) => { require(['./components/android/ignition/VentilationIgnitionHandle'], resolve) })
+  Vue.component('app-ignition-ventilation', (resolve) => { require(['./components/android/Ignition/VentilationIgnition'], resolve) })
+  Vue.component('app-ignition-handle', (resolve) => { require(['./components/android/Ignition/VentilationIgnitionHandle'], resolve) })
   // 特殊目录给这里加
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/android`).specialComp