apply-clients 3.3.69 → 3.3.71-3

package/build/dev-server-app.js

@@ -11,11 +11,11 @@ var compiler = webpack(config)
 // https://github.com/chimurai/http-proxy-middleware
 var proxyTable = {
   '/rs': {
-    target: 'http://192.168.30.94:8555'
+    target: 'http://192.168.20.27:8555'
     // target: 'http://192.168.30.86:8077'
   },
   '/AndroidRest/rs': {
-    target: 'http://192.168.30.94:8555'
+    target: 'http://192.168.20.27:8555'
   }
 }
 

package/build/dev-server.js

@@ -1,133 +1,127 @@
-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://192.168.50.4:8400'
-// var ldap = 'http://192.168.20.28:8400'
-var ldap = 'http://192.168.20.28:8400'
-// var ldap = 'http://61.163.127.69:8555'
-// var applyinstall = 'http://192.168.20.27:8400'
-var applyinstall = 'http://127.0.0.1:8080'
-// var applyinstall = 'http://61.163.127.69:8555'
-
-var proxyTable = {
-  '/wx': {
-    target: ldap
-  },
-  '/rs/sql/filemanage_getUserfies/n': {
-    target: ldap
-  },
-  '/rs/sql/filemanage_getUserfies': {
-    target: ldap
-  },
-  '/rs/logic/saveInsInfo': {
-    target: ldap
-  },
-  '/rs/logic/exportfile': {
-    target: ldap
-  },
-  '/rs/logic/getBatchOperaPro': {
-    target: ldap
-  },
-  '/rs/logic/updateApplyOrder': {
-    target: ldap
-  },
-  '/rs/logic/getSaleInitData': {
-    target: ldap
-  },
-  '/rs/workflow': {
-    target: applyinstall
-  },
-  '/rs/vue': {
-    target: ldap
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: ldap
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: ldap
-  },
-  '/rs/logic/getInitData': {
-    target: ldap?ldap:applyinstall
-  },
-  '/rs/logic/getLogin': {
-    target: ldap
-  },
-  '/rs/file': {    // 文件上传
-    target: applyinstall
-  },
-  '/project': {    // 文件回显
-    target: applyinstall
-  },
-  '/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://121.36.79.201:8400'
+// var applyinstall = 'http://121.36.79.201:8400'
+var ldap = 'http://192.168.20.27:8555'
+var applyinstall = 'http://192.168.20.27:8555'
+var proxyTable = {
+  '/wx': {
+    target: ldap
+  },
+  '/rs/sql/filemanage_getUserfies/n': {
+    target: ldap
+  },
+  '/rs/sql/filemanage_getUserfies': {
+    target: ldap
+  },
+  '/rs/logic/saveInsInfo': {
+    target: ldap
+  },
+  '/rs/logic/exportfile': {
+    target: ldap
+  },
+  '/rs/logic/getBatchOperaPro': {
+    target: ldap
+  },
+  '/rs/logic/updateApplyOrder': {
+    target: ldap
+  },
+  '/rs/logic/getSaleInitData': {
+    target: ldap
+  },
+  '/rs/workflow': {
+    target: applyinstall
+  },
+  '/rs/vue': {
+    target: ldap
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: ldap
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: ldap
+  },
+  '/rs/logic/getInitData': {
+    target: ldap
+  },
+  '/rs/logic/getLogin': {
+    target: ldap
+  },
+  '/rs/file': {    // 文件上传
+    target: applyinstall
+  },
+  '/project': {    // 文件回显
+    target: applyinstall
+  },
+  '/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')
+})

package/package.json

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

package/src/AndroidApp.vue

@@ -1,35 +1,35 @@
-<template>
-  <!-- <app-base> -->
-  <div id="android-app">
-    <article>
-<!--      <route :comp="{name: 'app-exploration-user'}" name="root"></route>-->
-<!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
-<!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
-<!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
-<!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
-      <route :comp="{name: 'login-app'}" name="root"></route>
-    </article>
-    <time-out></time-out>
-    <message-box></message-box>
-    <alert-box></alert-box>
-    <alert-box-batch></alert-box-batch>
-  </div>
-</template>
-
-<script>
-
-  import AlertBox from "vue-client/src/components/AlertBox";
-  import AlertBoxBatch from "vue-client/src/components/AlertBoxBatch";
-
-  export default {
-    ready () {
-      if(!window.onerror) {
-        window.onerror = function (message, file, line, col, error) {
-          // HostApp.alert("Error occured: " + error.message)
-          return false
-        }
-      }
-    },
-    components: { AlertBox, AlertBoxBatch }
-  }
-</script>
+<template>
+  <!-- <app-base> -->
+  <div id="android-app">
+    <article>
+<!--      <route :comp="{name: 'app-exploration-user'}" name="root"></route>-->
+<!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
+<!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
+<!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
+<!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
+      <route :comp="{name: 'login-app'}" name="root"></route>
+    </article>
+    <time-out></time-out>
+    <message-box></message-box>
+    <alert-box></alert-box>
+    <alert-box-batch></alert-box-batch>
+  </div>
+</template>
+
+<script>
+
+  import AlertBox from "vue-client/src/components/AlertBox";
+  import AlertBoxBatch from "vue-client/src/components/AlertBoxBatch";
+
+  export default {
+    ready () {
+      if(!window.onerror) {
+        window.onerror = function (message, file, line, col, error) {
+          // HostApp.alert("Error occured: " + error.message)
+          return false
+        }
+      }
+    },
+    components: { AlertBox, AlertBoxBatch }
+  }
+</script>

package/src/App.vue

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

package/src/applyAndroid.js

@@ -26,6 +26,9 @@ export default function () {
   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) })
 }