apply-clients 7.1.36-yuchuan-5 → 7.1.36-yuchuan-7

package/build/dev-server.js

@@ -1,172 +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://121.36.79.201:8400'
-// var applyinstall = 'http://121.36.79.201:8400'
-// var ldap = 'http://193.168.1.64:8082'
-var ldap = 'http://193.168.1.6:8082'
-var applyinstall = 'http://127.0.0.1:8080'
-// var applyinstall = 'http://193.168.1.44:8600'
-// var fadada = 'http://127.0.0.1:8181'
-var fadada = 'http://193.168.1.44:8600'
-
-var proxyTable = {
-  // ---------------------------
-  '/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(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://193.168.1.44:8400/'
+// var applyinstall = 'http://121.36.79.201:8400'
+// var ldap = 'http://193.168.1.64:8082'
+// var ldap = 'http://61.134.61.238:8555'
+// var applyinstall = 'http://61.134.61.238:8555'
+var applyinstall = 'http://193.168.1.44:8400/'
+var fadada = 'http://193.168.1.44:8400/'
+// var fadada = 'http://61.134.61.238:8555'
+// var fadada = 'http://127.0.0.1:8080/'
+var proxyTable = {
+  '/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/index.html

@@ -1,39 +1,39 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <META HTTP-EQUIV="pragma" CONTENT="no-cache">
-  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
-  <META HTTP-EQUIV="expires" CONTENT="0">
-  <title>报建系统</title>
-  <script type="text/javascript">
-    window._AMapSecurityConfig = {
-      serviceHost: 'http://193.168.1.44:8400/_AMapService'
-      // 例如 ：serviceHost:'http://1.1.1.1:80/_AMapService',
-    }
-  </script>
-  <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=aa8b7c6a524337cb733152217fc1e52b"></script>
-  <!--引入UI组件库（1.1版本） -->
-  <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
-  <style media="screen">
-    /*url(./static/newmainbg.jpg)*/
-
-    body {
-      font-size:16px !important;
-      width: 100%;
-      background: #7f8eaf no-repeat center bottom;
-      background-size: cover;
-    }
-
-    body .loginbg {
-      width: 100%;
-      height: 100%;
-      background: url(./static/loginbg.jpg) no-repeat center top;
-    }
-  </style>
-</head>
-<body id="bodymain" class="themeOne">
-<app></app>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <META HTTP-EQUIV="pragma" CONTENT="no-cache">
+  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
+  <META HTTP-EQUIV="expires" CONTENT="0">
+  <title>报建系统</title>
+  <script type="text/javascript">
+    window._AMapSecurityConfig = {
+      serviceHost: 'http://193.168.1.44:8400/_AMapService'
+      // 例如 ：serviceHost:'http://1.1.1.1:80/_AMapService',
+    }
+  </script>
+  <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=aa8b7c6a524337cb733152217fc1e52b"></script>
+  <!--引入UI组件库（1.1版本） -->
+  <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
+  <style media="screen">
+    /*url(./static/newmainbg.jpg)*/
+
+    body {
+      font-size:16px !important;
+      width: 100%;
+      background: #7f8eaf no-repeat center bottom;
+      background-size: cover;
+    }
+
+    body .loginbg {
+      width: 100%;
+      height: 100%;
+      background: url(./static/loginbg.jpg) no-repeat center top;
+    }
+  </style>
+</head>
+<body id="bodymain" class="themeOne">
+<app></app>
+</body>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.36-yuchuan-5",
+  "version": "7.1.36-yuchuan-7",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -30,6 +30,7 @@
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@logicflow/core": "^0.4.3",
     "co": "4.6.0",
+    "crypto-js": "^4.2.0",
     "happypack": "^5.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "less": "^2.7.1",

package/src/apply.js

@@ -49,6 +49,13 @@ export default function () {
   // 报建菜单页面控制层
   Vue.component('function-service-control', (resolve) => { require(['./components/product/Function/Service/FunctionServiceControl'], resolve) })
 
+  // 公建数据推送业务
+  Vue.component('gongjian-apply-manage', (resolve) => { require(['./components/product/GongJianPush/ApplyPushManage'], resolve) })
+  // 报建数据列表
+  Vue.component('gongjian-apply-list', (resolve) => { require(['./components/product/GongJianPush/ApplyPushList'], resolve) })
+  // 报建数据详情
+  Vue.component('gongjian-apply-dispose', (resolve) => { require(['./components/product/GongJianPush/ApplyPushDispose'], resolve) })
+
   // 终止报建页面入口
   Vue.component('stop-apply', (resolve) => { require(['./components/product/Stop/StopApply'], resolve) })
   Vue.component('stop-apply-list', (resolve) => { require(['./components/product/Stop/StopApplyList'], resolve) })