manage-client-xy 3.2.15 → 3.2.17

package/build/dev-server.js

@@ -1,41 +1,32 @@
-const express = require('express')
-const webpack = require('webpack')
-const config = require('./webpack.dev.conf')
-const proxyMiddleware = require('http-proxy-middleware')
-// const httpProxy = require('http-proxy')
+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 app = express()
-const compiler = webpack(config)
-// const proxy = httpProxy.createProxyServer()
+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
-// const bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-const bendi = 'http://127.0.0.1:8888/'
-const fuwu = 'http://192.168.153.129:8300'
-// ,fuwu = 'http://172.16.16.163:8300/'
-const proxyTable = {
+// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
+var bendi = 'http://172.16.16.162:8300/'
+  , fuwu = 'http://172.16.16.162:8300/'
+// ,fuwu = 'http://172.16.16.162:8300/'
+var proxyTable = {
   '/resource': {
     target: 'http://192.168.13.135:31577/'
   },
 
   '/rs/logic/exportfile': {
-    target: fuwu
-  },
-  '/rs/logic/saleExport': {
-    target: fuwu
-  },
-  '/rs/sql/qc_statistics_manage': {
-    target: fuwu
+    target: bendi
   },
   '/files': {
     target: fuwu
   },
-  '/webapps': {
-    target: fuwu
-  },
   '/rs/sql': {
-    target: fuwu
+    target: bendi
   },
   // 查找资源服务数据
   '/rs/search': {
@@ -78,7 +69,7 @@ const proxyTable = {
     target: fuwu
   },
   '/rs/report': {
-    target: fuwu
+    target: bendi
   },
   '/rs/vue': {
     target: fuwu
@@ -87,14 +78,14 @@ const proxyTable = {
     target: fuwu
   },
   '/rs/logic/SumSettleFileImport': {
-    target: fuwu
+    target: 'http://127.0.0.1:8087'
   },
   '/rs': {
     target: fuwu
   }
 }
 
-const devMiddleware = require('webpack-dev-middleware')(compiler, {
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
   publicPath: config.output.publicPath,
   stats: {
     colors: true,
@@ -102,7 +93,7 @@ const devMiddleware = require('webpack-dev-middleware')(compiler, {
   }
 })
 
-const hotMiddleware = require('webpack-hot-middleware')(compiler)
+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) {
@@ -113,7 +104,7 @@ compiler.plugin('compilation', function (compilation) {
 
 // proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
-  let options = proxyTable[context]
+  var options = proxyTable[context]
   if (typeof options === 'string') {
     options = {target: options}
   }

package/package.json

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

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

@@ -150,7 +150,7 @@
                 <th rowspan="2">
                   <nobr>小区名称</nobr>
                 </th>
-                <th colspan="4">
+                <th colspan="6">
                   <nobr>用户数(档案户数)</nobr>
                 </th>
                 <th colspan="4">
@@ -173,12 +173,19 @@
                 <th>
                   <nobr>停用</nobr>
                 </th>
+                <th>
+                  <nobr>销户</nobr>
+                </th>
                 <th>
                   <nobr>未开户</nobr>
                 </th>
                 <th>
-                  <nobr>销户</nobr>
+                  <nobr>壁挂锅炉</nobr>
                 </th>
+                <th>
+                  <nobr>楼栋</nobr>
+                </th>
+
                 <th>
                   <nobr>户数</nobr>
                 </th>
@@ -230,11 +237,17 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_tingyong }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_xiaohu }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_weikaihu }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{ row.f_xiaohu }}</nobr>
+                <nobr>{{ row.bgl }}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_building }}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_jibiao }}</nobr>
@@ -303,6 +316,14 @@
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               销户合计:&emsp;{{ sumsmodel.f_xiaohu }}
             </td>
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              壁挂炉合计:&emsp;{{ sumsmodel.bgl }}
+            </td>
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              楼栋合计:&emsp;{{ sumsmodel.f_building }}
+            </td>
             <td
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               机表抄表户数合计:&emsp;{{ sumsmodel.f_jibiao }}
@@ -405,6 +426,8 @@ export default {
         endDate: 'this.model.endDate'
       }, {
         f_zhengchang: 0,
+        bgl:0,
+        f_building:0,
         f_tingyong: 0,
         f_weikaihu: 0,
         f_xiaohu: 0,

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

@@ -208,6 +208,12 @@
                 <th>
                   <nobr>旧表识别码</nobr>
                 </th>
+                <th>
+                  <nobr>旧表累购气量</nobr>
+                </th>
+                <th>
+                  <nobr>旧表累购金额</nobr>
+                </th>
                 <th>
                   <nobr>旧表底数</nobr>
                 </th>
@@ -291,6 +297,12 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_old_imei }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_old_total_gas }}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_old_total_fee }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_using_base_old }}</nobr>
               </td>

package/src/main.js

@@ -2,12 +2,12 @@ import Vue from 'vue'
 import App from './App'
 import { all } from 'vue-client'
 import { system } from 'system-clients'
-// import { sale } from 'sale-client'
+import { sale } from 'sale-client'
 import saleManage from './saleManage'
-// import webmeterManage from './webmeterManage'
-// import reportManage from './reportManage'
-// import newmanage from './newmanage'
-// import ManageHome from './ManageHome'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
 import echarts from 'echarts'
 import AMap from 'vue-amap';
 
@@ -38,13 +38,13 @@ AMap.initAMapApiLoader({
 
 Vue.prototype.$echarts = echarts
 all()
-// sale()
+sale()
 system(false)
 saleManage()
-// webmeterManage()
-// ManageHome()
-// newmanage()
-// reportManage()
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
 require('./bootstrap/less/bootstrap.less')
 require('./bootstrap/less/manageStyle/manageStyle.less')
 require('./bootstrap/less/manageStyle/manageChile.less')