manage-client 1.22.8-ca → 1.22.12-ca

package/build/dev-server.js

@@ -1,102 +1,93 @@
-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 bendi = 'http://192.168.2.84:7003/', changan = 'http://192.168.2.84:7003/'
-var proxyTable = {
-  // 查找资源服务数据
-  '/rs/sql/manageSingleTable': {
-    target:changan
-  },
-  '/rs/search': {
-    target: changan
-  },
-  '/rs/logic/getLogin': {
-    target: changan
-  },
-  '/rs/logic/getInitData': {
-    target: changan
-  },
-  '/rs/logic/getSaleInitData': {
-    target: changan
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: changan
-  },
-  '/rs/data': {
-    target: changan
-  },
-  '/rs/license': {
-    target: changan
-  },
-  '/rs/sql/nosaleQuery': {
-    target: 'http://127.0.0.1:8081/'
-  },
-  '/rs/sql': {
-    target: bendi
-  },
-  '/rs/logic': {
-    target: bendi
-  },
-  '/xyhf/rs/xyhf': {
-    target: changan
-  },
-  '/rs': {
-    //target: changan
-    target: changan
-  }
-}
-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'))
-
-
-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()
+
+var bendi = 'http://127.0.0.1:5001/ldap/', changan = 'http://192.168.2.79:7003/'
+var proxyTable = {
+  // 查找资源服务数据
+  '/rs/sql/manageSingleTable': {
+    target:changan
+  },
+  '/rs/search': {
+    target: changan
+  },
+  '/rs/logic/getLogin': {
+    target: changan
+  },
+  '/rs/logic/getInitData': {
+    target: changan
+  },
+  '/rs/logic/getSaleInitData': {
+    target: changan
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: changan
+  },
+  '/rs/data': {
+    target: changan
+  },
+  '/rs/license': {
+    target: changan
+  },
+  '/xyhf/rs/xyhf': {
+    target: changan
+  },
+  '/rs': {
+    //target: changan
+    target: changan
+  }
+}
+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'))
+
+
+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.22.8-ca",
+  "version": "1.22.12-ca",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/MeterManage/ChargeQuery.vue

@@ -179,7 +179,9 @@
         args:{}
       },
     ready () {
+
       this.$refs.paged.$refs.criteria.model.f_state = ['有效']
+      // this.search()
       this.$refs.paged.$refs.criteria.search()
     },
     methods: {