manage-client 4.1.86-tcls → 4.1.87-ycls

package/build/dev-server.js

@@ -1,142 +1,131 @@
-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')
+const express = require('express')
+const webpack = require('webpack')
+const config = require('./webpack.dev.conf')
+const proxyMiddleware = require('http-proxy-middleware')
 
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
+const app = express()
+const compiler = webpack(config)
 
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan = 'http://123.57.3.66:31467/'
-var qtx = 'http://123.57.3.66:31467/'
-// var bendi = 'http://220.194.141.253:8600/'
-// var bendi = 'http://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001/'
-// var bendi = 'http://203.57.101.233:9001/'
-// var bendi = 'http://121.36.106.17:8400/'
-// var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://10.218.0.52:8600/'
-// var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://10.218.0.52:8600/'
-// 192.168.
-//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
-// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
-var proxyTable = {
-  // '/rs/logic/exportfile': {
-  //   target: bendi
-  // },
-  // '/dataManage': {
-  //   target: 'http://203.57.101.233:9001/'
-  //
-  // },
-  // '/api/af-revenue/sql/WeChatPaydetail': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/rs'
-  //   },
-  //   target: 'http://127.0.0.1:8080/'
-  // },
-  // '/api/af-revenue/sql/WeChatPayment': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/rs'
-  //   },
-  //   target: 'http://127.0.0.1:8080/'
-  // },
-  // '/api/af-revenue/sql/getGasInspection': {
+const server = 'https://yc.aofengcloud.com:31467/'
+const local = 'https://yc.aofengcloud.com:31467/'
+const proxyTable = {
+  '/rs/logic/exportfile': {
+    target: server,
+    secure: false
+  },
+  '/dataManage': {
+    target: server,
+    secure: false
+  },
+  // '/api/af-revenue/sql/': {
   //   pathRewrite: {
-  //     '^/api/af-revenue': '/rs'
+  //     '^/api/af-revenue': '/'
   //   },
-  //   target: 'http://127.0.0.1:8080/'
+  //   target: local
   // },
-  // '/api/af-revenue/sql/inspectList_sellinggas': {
+  // '/api/af-revenue/report/': {
   //   pathRewrite: {
-  //     '^/api/af-revenue': '/rs'
+  //     '^/api/af-revenue': '/'
   //   },
-  //   target: 'http://127.0.0.1:8080/'
+  //   target: local
   // },
-  // '/api/af-revenue/sql/inspectList': {
+  // '/api/af-revenue/logic': {
   //   pathRewrite: {
-  //     '^/api/af-revenue': '/rs'
+  //     '^/api/af-revenue': '/'
   //   },
-  //   target: 'http://127.0.0.1:8080/'
-  // },
-  // '/api': {
-  //   target: 'http://123.57.3.66:31467/'
-  //
-  // },
-  // '/rs/sql/chargeQuery_by_gasproperties': {
-  //   target: 'http://localhost:8084/'
-  // },
-  // '/rs/logic/chargeQuery_by_gasproperties_line': {
-  //   target: 'http://localhost:8084/'
-  // },
-  // '/files': {
-  //   target: bendi
-  // },
-  // // 查找资源服务数据
-  // '/rs/search': {
-  //   target: 'http://123.57.3.66:31467/'
-  // },
-  // // 查找资源服务数据
-  // '/rs/logic/getLogin': {
-  //   target: bendi
-  // },
-  // // 查找资源服务数据
-  // '/rs/logic/getInitData': {
-  //   target: bendi
-  // },
-  // '/rs/logic/getSaleInitData': {
-  //   target: bendi
-  // },
-  // // 用户登录服务地址
-  // '/rs/user': {
-  //   target: bendi
-  // },
-  // '/rs/path/getParams': {
-  //   target: bendi
-  // },
-  // '/rs/data': {
-  //   target: bendi
-  // },
-  // '/rs/license': {
-  //   target: bendi
-  // },
-  // '/rs/db': {
-  //   target: bendi
-  // },
-  // '/excel': {
-  //   target: bendi
-  // },
-  // '/rs/config': {
-  //   target: bendi
-  // },
-  // '/rs/sql/getLicenseById': {
-  //   target: bendi
-  // },
-  // '/rs/report': {
-  //   target: bendi
-  // },
-  // '/rs/vue': {
-  //   target: 'http://123.57.3.66:31467/'
-  // },
-  // '/rs/file': {
-  //   target: bendi
-  // },
-  // '/rs/sql/singleTable': {
-  //   target: bendi
+  //   target: local
   // },
   '/api': {
-    target: wode
+    target: server,
+    secure: false
+  },
+  '/rs/sql/chargeQuery_by_gasproperties': {
+    target: server,
+    secure: false
+  },
+  '/rs/logic/chargeQuery_by_gasproperties_line': {
+    target: server,
+    secure: false
+  },
+  '/files': {
+    target: server,
+    secure: false
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: server,
+    secure: false
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: server,
+    secure: false
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: server,
+    secure: false
+  },
+  '/rs/logic/getSaleInitData': {
+    target: server,
+    secure: false
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: server,
+    secure: false
+  },
+  '/rs/path/getParams': {
+    target: server,
+    secure: false
+  },
+  '/rs/data': {
+    target: server,
+    secure: false
+  },
+  '/rs/license': {
+    target: server,
+    secure: false
+  },
+  '/rs/db': {
+    target: server,
+    secure: false
+  },
+  '/excel': {
+    target: server,
+    secure: false
+  },
+  '/rs/config': {
+    target: server,
+    secure: false
+  },
+  '/rs/sql/getLicenseById': {
+    target: server,
+    secure: false
+  },
+  '/rs/report': {
+    target: server,
+    secure: false
+  },
+  '/rs/vue': {
+    target: server,
+    secure: false
+  },
+  '/rs/file': {
+    target: server,
+    secure: false
+  },
+  '/rs/sql/singleTable': {
+    target: server,
+    secure: false
   },
   '/rs': {
-    target: wode
+    target: server,
+    secure: false
   }
 }
 
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
   publicPath: config.output.publicPath,
   stats: {
     colors: true,
@@ -144,7 +133,7 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
   }
 })
 
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
+const 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) {
@@ -155,69 +144,21 @@ compiler.plugin('compilation', function (compilation) {
 
 // proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
+  let 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'))
 
-// 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(8015, function (err) {
   if (err) {
     console.log(err)

package/package.json

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

package/src/components/sale/businessquery/ChangeMeterQuery.vue

@@ -195,6 +195,9 @@
                   <data-order field="f_userinfo_code" name="客户编号"
                               :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
+                <th>
+                  <nobr>换表编号</nobr>
+                </th>
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
@@ -287,6 +290,9 @@
               <td style="text-align: center;"><nobr>
                 <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
               </nobr> </td>
+              <td style="text-align: center;">
+                <nobr>{{row.id}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>

package/src/components/sale/config/exportConfig.js

@@ -747,6 +747,7 @@ export default {
   },
 
   changemeterConfig: {
+    'id': '换表编号',
     'f_userinfo_code': '客户编号',
     'f_olduserinfo_code': '档案编号',
     'f_user_name': '客户名称',

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -469,9 +469,9 @@
                 let load = new HttpResetClass()
                 load.load('POST', 'api/af-revenue/sql/singleTableParam', {
                     data: {
-                        items:' f_type',
+                        items:'name',
                         tablename:'t_paramvalue',
-                        condition:'processid in (select id from t_parameter where f_name='+ this.$refs.paged.$refs.cri.model.f_error_level[0] + ')'
+                        condition:'processid in (select id from t_parameter where name='+ `'${this.$refs.paged.$refs.cri.model.f_error_level[0]}'` + ')'
                     }
                 },{warnMsg:null,resolveMsg:null}).then((res) => {
                     let i = 0
@@ -481,8 +481,8 @@
                     console.log("rows========",rows)
                     for (i = 0; i < rows.length; i++) {
                         let dr = {label: '全部', value: ''}
-                        dr.label=rows[i].f_type
-                        dr.value=rows[i].f_type
+                        dr.label=rows[i].name
+                        dr.value=rows[i].name
                         array1.push(dr)
                         console.log("rows[i]========",rows[i],dr)
                     }