manage-client 4.1.42 → 4.1.43-qjls

package/build/dev-server.js

@@ -11,17 +11,17 @@ var 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://61.163.123.47:30785/'
-var qtx = 'http://61.163.123.47:30785/'
+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:9001/'
+// var bendi = 'http://123.57.3.66:31467/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://61.163.123.47:30785/'
+var bendi = 'http://123.57.3.66:31467/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://61.163.123.47:30785/'
+var wode = 'http://123.57.3.66:31467/'
 // 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'
@@ -29,42 +29,20 @@ var proxyTable = {
   '/rs/logic/exportfile': {
     target: bendi
   },
-  '/dataManage': {
-    target: 'http://203.57.101.233:9001/'
-
-  },
-  '/api/af-revenue/sql/WeChatPaydetail': {
+  '/api/af-revenue/logic': {
     pathRewrite: {
-      '^/api/af-revenue': '/rs'
+      '^/api/af-revenue/logic': '/rs/logic'
     },
-    target: 'http://127.0.0.1:8080/'
+    target: 'http://123.57.3.66:31467/'
   },
-  '/api/af-revenue/sql/WeChatPayment': {
+  '/api/af-revenue/sql': {
     pathRewrite: {
-      '^/api/af-revenue': '/rs'
+      '^/api/af-revenue/sql': '/rs/sql'
     },
-    target: 'http://127.0.0.1:8080/'
-  },
-  '/api/af-revenue/sql/getGasInspection': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
-  },
-  '/api/af-revenue/sql/inspectList_sellinggas': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
-  },
-  '/api/af-revenue/sql/inspectList': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
+    target: 'http://123.57.3.66:31467/'
   },
   '/api': {
-    target: 'http://61.163.123.47:30785/'
+    target: 'http://123.57.3.66:31467/'
 
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
@@ -78,7 +56,7 @@ var proxyTable = {
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: 'http://61.163.123.47:30785/'
+    target: bendi
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
@@ -120,7 +98,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/vue': {
-    target: 'http://61.163.123.47:30785/'
+    target: bendi
   },
   '/rs/file': {
     target: bendi

package/package.json

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

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

@@ -153,6 +153,7 @@ export default {
     'value': '气价详情',
     'f_meter_brand': '气表品牌',
     'f_meter_style': '气表型号',
+    'f_xc_meter_style': '现场表具型号',
     'f_inputtor': '户管员',
     'f_gas_person': '通气人',
     'f_gas_date': '通气时间',
@@ -643,6 +644,7 @@ export default {
     'f_is_mgq': '是否煤改气',
     'f_send_usegas_card': '是否发放天然气使用证',
     'f_meter_style': '型号',
+    'f_xc_meter_style': '现场表具型号',
     'f_table_state': '表具状态',
     'f_initial_base': '初始气表底数',
     'f_total_usegas_amount': '累计用气金额',

package/src/filiale/WEINAN/config/exportConfig.js

@@ -480,7 +480,8 @@ export default{
     'f_hand_date': '上报日期', 'f_jval': '表内剩余金额', 'f_tablebase': '本次抄表底数', 'f_valvestate': '阀门状态',
     'f_upload_type': '上报类型', 'f_insert_date': '系统接收时间', 'f_meterDebitAmt': '表内累计充值金额',
     'f_signal': '噪音强度', 'f_snr': '信噪比', 'f_batterylevel': '电压', 'f_lowlithiumbattery': '电压状态', 'f_networkshutvalve': '阀门强制状态',
-    'f_wmprepaytype': '计量类型', 'f_moneystate': '金额状态', 'f_magneticInterference': '磁干扰异常', 'f_compensateState': '补偿状态'
+    'f_wmprepaytype': '计量类型', 'f_moneystate': '金额状态', 'f_magneticInterference': '磁干扰异常', 'f_compensateState': '补偿状态',
+    'flowmetertemperature': '温度', 'flowmeterpressure': '压力'
   },
   ReportDataQueryConfig: {
     'f_userinfo_code': '客户编号', 'f_tablebase': '本次抄表底数', 'f_last_tablebase': '上次抄表底数', 'f_jval': '表计剩余余额', 'f_hand_date': '抄表日期',

package/src/filiale/WEINAN/webmeter/ReportList.vue

@@ -175,6 +175,8 @@
 
                 <th><nobr>表状态</nobr></th>
                 <th><nobr>金额状态</nobr></th>
+                <th><nobr>温度</nobr></th>
+                <th><nobr>压力</nobr></th>
                 <!--<th><nobr>每小时上报量</nobr></th>-->
               </tr>
             </template>
@@ -202,6 +204,8 @@
 
                 <th style="text-align:center"><nobr>{{row.f_table_msg}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.flowmetertemperature}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.flowmeterpressure}}</nobr></th>
                 <!--              <th style="text-align:center"><nobr>{{row.f_nsturalgas_data}}</nobr></th>-->
 <!--                <th style="text-align:center"><nobr><span @click="$parent.$parent.$parent.showdetail(row.f_nsturalgas_data)"><a>查看</a></span></nobr></th>-->
                 <!--<th style="text-align:center">-->