manage-client 1.60.12-2 → 1.60.12-20

package/build/dev-server.js

@@ -1,139 +1,167 @@
-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()
-let server = 'http://192.168.1.212:8300/'
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var proxyTable = {
-  '/images': {
-    target : server
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target : server
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target : server
-  },
-  '/rs/path/getParams': {
-    target : server
-  },
-  '/rs/logic/getInitData': {
-    target : server
-  },
-  '/rs/sql/saleSingleTable': {
-    target : server
-  },
-  '/rs/sql/singleTable_OrderBy': {
-    target : server
-  },
-  '/rs/logic/getLogin': {
-    target : server
-  },
-  '/rs/db': {
-    target : server
-  },
-  '/excel': {
-    target : server
-  },
-  '/rs/file': {
-    target : server
-  },
-  '/rs/logic/getSaleInitData':{
-    target : server
-  },
-  '/rs/vue': {
-    target : server
-  },
-  '/rs': {
-    target : server
-  }
-}
-
-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')())
-
-// 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'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+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 = {
+  '/images': {
+    // target: 'http://localhost:8086'
+    target: 'http://192.168.1.212:8300/ldap'
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    // target: 'http://192.168.50.202:8099'
+    // target: 'http://192.168.20.2:8081'
+    target: 'http://192.168.1.212:8300/ldap'
+    // target: 'http://192.168.20.191:8011'
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    // target: 'http://192.168.50.202:8099'
+    // target: 'http://192.168.2.77:8081'
+    target: 'http://192.168.1.212:8300/'
+    // target: 'http://192.168.20.191:8011'
+  },
+  '/rs/path/getParams': {
+    // target: 'http://192.168.50.202:8099'
+    //target: 'http://127.0.0.1:8888/product'
+    target: 'http://192.168.50.220:8200/system'
+    // target: 'http://192.168.20.191:8011'
+  },
+  '/rs/logic/getInitData': {
+    // target: 'http://192.168.50.202:8099'
+    //target: 'http://127.0.0.1:8888/product'
+    target: 'http://192.168.1.212:8300/system'
+    // target: 'http://192.168.20.191:8011'
+  },
+  '/rs/sql/saleSingleTable': {
+    // target: 'http://192.168.50.202:8099'
+    //target: 'http://127.0.0.1:8888/product'
+    target: 'http://192.168.50.220:8300'
+    // target: 'http://192.168.20.191:8011'
+  },
+  '/rs/sql/singleTable_OrderBy': {
+    // target: 'http://192.168.50.202:8099'
+    //target: 'http://127.0.0.1:8888/product'
+    target: 'http://192.168.1.212:8300/system'
+    // target: 'http://192.168.20.191:8011'
+  },
+  '/rs/logic/getLogin': {
+    // target: 'http://192.168.50.202:8099'
+    //target: 'http://127.0.0.1:8888/product'
+    target: 'http://192.168.1.212:8300/system'
+    // target: 'http://192.168.20.191:8011'
+  },
+  '/rs/db': {
+    target: 'http://192.168.1.212:8300/ldap'
+    // target: 'http://127.0.0.1:8012'
+    // target: 'http://192.168.20.191:s8011'
+  },
+  '/excel': {
+    target: 'http://192.168.1.212:8300/'
+    // target: 'http://127.0.0.1:8080/manager'
+    // target: 'http://192.168.50.220:8300'
+  },
+  '/rs/file': {
+    target: 'http://192.168.1.212:8300/'
+  },
+  '/rs/logic/getSaleInitData':{
+    target: 'http://192.168.1.212:8300/'
+  },
+  '/rs/vue': {
+    target: 'http://192.168.1.212:8300/system'
+  },
+  '/rs': {//rs/sql/newsellQuery
+    // target: 'http://127.0.0.1:8088/mamage'
+    target: 'http://192.168.1.212:8300/'
+    // target: 'http://192.168.50.220:8300'
+  }
+}
+
+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')())
+
+// 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'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "1.60.12-2",
+  "version": "1.60.12-20",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/ManageBusiness/ArchivesQuery.vue

@@ -9,6 +9,9 @@
     <tabs header="设备查询">
       <equipment-query v-if="show[2]"></equipment-query>
     </tabs>
+    <tabs header="档案变更记录">
+      <changeuser-query v-if="show[3]" @deal-msg="dealMsg"></changeuser-query>
+    </tabs>
   </tab-button>
 
 </template>