manage-client 3.3.188 → 3.3.189

package/build/dev-server.js

@@ -1,190 +1,190 @@
-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 bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan = 'http://119.146.1.106:8300/'
-var qtx= 'http://36.103.222.144:6300/'
-// 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:8400/'
-// var bendi = 'http://121.36.106.17:8400/'
-// var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400/'
-// var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.4:8400/'
-// 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
-  },
-  '/api': {
-    target: 'http://192.168.50.4:8400'
-
-  },
-  '/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: bendi
-  },
-  // 查找资源服务数据
-  '/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: bendi
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/sql/singleTable': {
-    target: bendi
-  },
-  '/rs': {
-    target: wode
-  }
-}
-
-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'))
-
-// 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)
-    return
-  }
-  console.log('Listening at http://localhost:8015')
-})
+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 bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
+var shaoguan = 'http://119.146.1.106:8300/'
+var qtx= 'http://36.103.222.144:6300/'
+// 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:8400/'
+// var bendi = 'http://121.36.106.17:8400/'
+// var fuwu = 'http://203.57.101.233:9001'
+var bendi = 'http://192.168.50.4:8400/'
+// var bendi = 'http://119.187.112.234:8400/'
+var wode = 'http://192.168.50.4:8400/'
+// 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
+  },
+  '/api': {
+    target: 'http://192.168.50.4:8400'
+
+  },
+  '/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: bendi
+  },
+  // 查找资源服务数据
+  '/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: bendi
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/sql/singleTable': {
+    target: bendi
+  },
+  '/rs': {
+    target: wode
+  }
+}
+
+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'))
+
+// 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)
+    return
+  }
+  console.log('Listening at http://localhost:8015')
+})

package/package.json

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

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

@@ -294,7 +294,7 @@
     </div>
     <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
       <article slot="modal-body">
-        <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false"  fusetype="补气" :isremark="false" style="width:auto" ></upload>
+        <upload :businessid="selected.id" v-ref:upload isupload="false" takeimg="false"  fusetype="补气" :isremark="false" style="width:auto" ></upload>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>

package/src/filiale/shanxian/EchartsBox.vue

@@ -32,7 +32,7 @@
                       @res-select="getRes"
                       :initresid="model.id">
           </res-select>
-          <button class="button_search button_spacing" @click="changePage()">下一页</button>
+         <button class="button_search button_spacing" @click="changePage()">下一页</button>
         </div>
       </div>
     </div>
@@ -67,7 +67,7 @@
       </div>
     </div>
     <div style="height: 97%;" v-if="showPage === 2">
-      <iframe src="http://119.187.112.234:9528/#/delink?link=Y8I%2FK%2FiIq6HlCQCQx8xG%2FeAj2GQ%2Fg1nl7jXauckQJhZrEPV%2BRkyF3HthpF4LVC8pS6MDn5%2BLiEM7mYEgROEQtQ&user=qDn45GDQ0K0EVNcpZy2VoQxHult9RhbeRPXLrq%2BCQz152dmng0uyBYBWn7EjcF2YwD44XdF0gda5h6oFHwJqkg"
+      <iframe src="http://119.187.112.234:9528/#/delink?link=Xun1W4ColEjaBrsR7uQqq%2FlLRaqpur8ZLnbuwSovQJxkK%2F%2Bqs7bEbonCchQM%2BGwmojs%2BbvtBuc9zdBl3miXOZQ&user=yrh0a7xtbSypdtka86RCIhSxZUjIWE688Z%2BWgADSW%2BqCmrEPVvMXYtymOZkdto39pSXjNdw%2BOe25pTYGZkNuMw"
               width="100%" height="100%" style="border: none;" ></iframe>
       <!--      <div class="flex-row" style="flex: 1;height: 96%">-->
       <!--        <div style="flex: 1">-->

package/src/filiale/tongchuan/GasInspection.vue

@@ -261,6 +261,12 @@
             <th><nobr>最后抄表日期</nobr></th>
             <th><nobr>用气量</nobr></th>
             <th><nobr>用气金额</nobr></th>
+            <th><nobr>一阶气量</nobr></th>
+            <th><nobr>一阶金额</nobr></th>
+            <th><nobr>二阶气量</nobr></th>
+            <th><nobr>二阶金额</nobr></th>
+            <th><nobr>三阶气量</nobr></th>
+            <th><nobr>三阶金额</nobr></th>
             <th><nobr>欠费月数</nobr></th>
             <th><nobr>欠费条数</nobr></th>
             <th><nobr>欠费月平均气量</nobr></th>
@@ -291,6 +297,14 @@
           <th style="text-align: center;"><nobr>{{row.end_time}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_oughtamount}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_oughtfee}}</nobr></th>
+
+          <th style="text-align: center;"><nobr>{{row.f_stair_gas1}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_money1}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_gas2}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_money2}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_gas3}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_stair_money3}}</nobr></th>
+
           <th style="text-align: center;"><nobr>{{row.qianfei_month_num}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.qianfei_num}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.qianfei_avg_gas}}</nobr></th>
@@ -304,6 +318,14 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">总用气量:&emsp;&emsp;{{sumsmodel.f_oughtamount}}</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总用气金额:&emsp;&emsp;{{sumsmodel.f_oughtfee}}</td>
+
+            <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">一阶气量:&emsp;&emsp;{{sumsmodel.f_stair_gas1}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">一阶金额:&emsp;&emsp;{{sumsmodel.f_stair_money1}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">二阶气量:&emsp;&emsp;{{sumsmodel.f_stair_gas2}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">二阶金额:&emsp;&emsp;{{sumsmodel.f_stair_money2}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">三阶气量:&emsp;&emsp;{{sumsmodel.f_stair_gas3}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">三阶金额:&emsp;&emsp;{{sumsmodel.f_stair_money3}}</td>
+
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费条数:&emsp;&emsp;{{sumsmodel.qianfei_num}}</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费气量:&emsp;{{sumsmodel.f_totalowe_gas}}</td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费金额:&emsp;{{sumsmodel.f_totalowe_fee}}</td>
@@ -348,6 +370,12 @@
         model: new PagedList('api/af-revenue/sql/getGasInspection', 50,{mycondition:'this.model.model.mycondition'},{
           f_oughtamount:0,
           f_oughtfee:0,
+          f_stair_gas1:0,
+          f_stair_money1:0,
+          f_stair_gas2:0,
+          f_stair_money2:0,
+          f_stair_gas3:0,
+          f_stair_money3:0,
           qianfei_num:0,
           f_totalowe_gas:0,
           f_totalowe_fee:0
@@ -622,6 +650,12 @@
           'f_meter_base': '表底数',
           'f_oughtamount': '用气量',
           'f_oughtfee': '用气金额',
+          'f_stair_gas1': '一阶气量',
+          'f_stair_money1': '一阶金额',
+          'f_stair_gas2': '二阶气量',
+          'f_stair_money2': '二阶金额',
+          'f_stair_gas3': '三阶气量',
+          'f_stair_money3': '三阶金额',
           'qianfei_month_num': '欠费月数',
           'qianfei_num': '欠费条数',
           'qianfei_avg_gas': '欠费月平均气量',

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Apr 17 11:12:27 CST 2024
-gradle.version=7.4