sale-client 3.5.93 → 3.5.94

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/build/dev-server.js +2 -2
  2. package/package.json +1 -1
  3. package/src/components/webMeter/paramSaveNew/ParamHistory.vue +31 -12
package/build/dev-server.js CHANGED
@@ -12,7 +12,7 @@ var compiler = webpack(config)
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  var bendi = 'http://127.0.0.1:8080', bendi1 = 'http://121.36.106.17:8400/'
14
14
  // 公司测试服务
15
- var fuwu = 'http://192.168.50.4:8400'
15
+ var fuwu = 'http://39.108.82.124:8400/'
16
16
  // var fuwu = 'http://121.36.106.17:8400/'
17
17
  // 铜川正式
18
18
  // var fuwu = 'http://61.134.55.234:9999/'
@@ -101,7 +101,7 @@ var proxyTable = {
101
101
  target: fuwu
102
102
  },
103
103
  '/webmeter': {
104
- target: 'http://192.168.50.4:8450'
104
+ target: 'http://39.108.82.124:8400/'
105
105
  },
106
106
  '/rs': {
107
107
  // target: 'http://192.168.30.63:8081/'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.93",
3
+ "version": "3.5.94",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/webMeter/paramSaveNew/ParamHistory.vue CHANGED
@@ -6,10 +6,23 @@
6
6
  <li class="active"><a>{{data.name}}</a></li>
7
7
  </ul>
8
8
  <div class="col-sm-12" style="height: auto" v-for="param in data.params">
9
- {{param.name}}：{{row[param.title].bak_val}}
9
+ {{param.name}}：{{row[param.name+param.title].bak_val}}
10
10
  </div>
11
11
  </div>
12
12
  <div style="height: auto">
13
+ <ul class="nav nav-tabs col-sm-12" >
14
+ <li class="active"><a>区间用气量报警参数</a></li>
15
+ </ul>
16
+ <div class="col-sm-12" style="height: auto">时间区间1：{{row['readperiodusegasAlarmparam'].bak_val.timesection1||'暂无数据'}}</div>
17
+ <div class="col-sm-12" style="height: auto">区间1用气量：{{row['readperiodusegasAlarmparam'].bak_val.usegas1||'暂无数据'}}</div>
18
+ <div class="col-sm-12" style="height: auto">时间区间2：{{row['readperiodusegasAlarmparam'].bak_val.timesection2||'暂无数据'}}</div>
19
+ <div class="col-sm-12" style="height: auto">区间2用气量：{{row['readperiodusegasAlarmparam'].bak_val.usegas2||'暂无数据'}}</div>
20
+ <div class="col-sm-12" style="height: auto">时间区间3：{{row['readperiodusegasAlarmparam'].bak_val.timesection3||'暂无数据'}}</div>
21
+ <div class="col-sm-12" style="height: auto">区间3用气量：{{row['readperiodusegasAlarmparam'].bak_val.timesection3||'暂无数据'}}</div>
22
+ <div class="col-sm-12" style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas1||'暂无数据'}}</div>
23
+ <div class="col-sm-12" style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas2||'暂无数据'}}</div>
24
+ <div class="col-sm-12" style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas3||'暂无数据'}}</div>
25
+ <!-- [{"yjbbhlength":28,"softversionNo":"n0100081","mzbbhlength":15,"mzversion":"BC25PAR01A04_BT","version":"2022-07-28","yjversion":"YIMS-M-T1-3-1-H-2-13-17_V1.1"}]-->
13
26
  <ul class="nav nav-tabs col-sm-12" >
14
27
  <li class="active"><a>软件版本号</a></li>
15
28
  </ul>
@@ -69,7 +82,7 @@ export default {
69
82
  handler: async function (val) {
70
83
  this.history = []
71
84
  if (val.length === 1) {
72
- await this.$resetpost('rs/sql/getIotParams', {data: {t_userfiles_id: val[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
85
+ await this.$resetpost('rs/sql/getIotParams?pageNo=1&pageSize=9999999', {data: {t_userfiles_id: val[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
73
86
  this.row = {}
74
87
  console.log('=============', rat.data)
75
88
  this.row.forceSafeCheckUsedDayCount = 0
@@ -78,18 +91,24 @@ export default {
78
91
  this.row.isForceSrape = '1'
79
92
  if (rat.data.length > 0) {
80
93
  rat.data.forEach((item) => {
81
- if (item.f_param_value === '1') {
82
- item.f_param_value = '开'
94
+ if (item.f_back_content === '1') {
95
+ item.f_back_content = '开'
83
96
  }
84
- if (item.f_param_value === '0') {
85
- item.f_param_value = '关'
97
+ if (item.f_back_content === '0') {
98
+ item.f_back_content = '关'
86
99
  }
87
100
  if (item.f_param_name === '读表功能') {
88
- if (item.f_param_value && item.f_param_value === 'getMeterVersion') {
89
- item.f_back_content = JSON.parse(item.f_back_content.replace('[', '').replace(']', ''))['softversionNo']
101
+ if (item.f_param_content === '读区间用气量报警参数' && item.f_back_content) {
102
+ let str = item.f_back_content.substring(0, item.f_back_content.indexOf(']'))
103
+ item.f_back_content = JSON.parse(str.replace('[', '').replace(']', ''))
104
+ }
105
+ if (item.f_param_value && item.f_back_content && item.f_param_value === 'getMeterVersion') {
106
+ let str = item.f_back_content.substring(0, item.f_back_content.indexOf(']'))
107
+ item.f_back_content = JSON.parse(str.replace('[', '').replace(']', ''))['softversionNo']
90
108
  }
91
- if (item.f_param_value && item.f_param_value === 'readNextreportTime') {
92
- let str = JSON.parse(item.f_back_content.replace('[', '').replace(']', ''))['datetime']
109
+ if (item.f_param_value && item.f_back_content && item.f_param_value === 'readNextreportTime') {
110
+ let str = item.f_back_content.substring(0, item.f_back_content.indexOf(']'))
111
+ str = JSON.parse(str.replace('[', '').replace(']', ''))['datetime']
93
112
  item.f_back_content = '20' + str.substr(0, 2) + '-' + str.substr(2, 2) + '-' + str.substr(4, 2) + ' ' +
94
113
  str.substr(6, 2) + ':' + str.substr(8, 2) + ':' + str.substr(10, 2)
95
114
  }
@@ -98,7 +117,7 @@ export default {
98
117
  }
99
118
  this.row[item.f_param_value] = {set_val: item.f_param_value, bak_val: item.f_back_content}
100
119
  } else {
101
- this.row[item.f_param_lname] = {set_val: item.f_param_value, bak_val: item.f_back_content}
120
+ this.row[item.f_param_name + item.f_param_lname] = {set_val: item.f_param_value, bak_val: item.f_back_content}
102
121
  }
103
122
  })
104
123
  // let param = JSON.parse(rat.data[0].f_data)
@@ -126,7 +145,7 @@ export default {
126
145
  this.newmeterinfo = [{}]
127
146
  try {
128
147
  let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: null, rejectMsg: null})
129
- this.newmeterinfo = res.data.filter(item => { return (item.name !== '读表功能' && item.name !== '读记录数据') })
148
+ this.newmeterinfo = res.data.filter(item => { return (item.name !== '读表功能' && item.name !== '读记录数据' && item.name !== '设置区间用气量报警参数') })
130
149
  } catch (error) {
131
150
  this.$showAlert('该气表品牌不支持参数设置', 'warning', 1500)
132
151
  }