sale-client 3.5.90 → 3.5.91

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 (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/webMeter/paramSaveNew/ParamHistory.vue +93 -63
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.90",
3
+ "version": "3.5.91",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/webMeter/paramSaveNew/ParamHistory.vue CHANGED
@@ -6,24 +6,39 @@
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]}}
9
+ {{param.name}}：{{row[param.title].bak_val}}
10
10
  </div>
11
11
  </div>
12
+ <div style="height: auto">
13
+ <ul class="nav nav-tabs col-sm-12" >
14
+ <li class="active"><a>软件版本号</a></li>
15
+ </ul>
16
+ {{row['getMeterVersion'].bak_val||'暂无数据'}}
17
+ <!-- [{"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"}]-->
18
+ </div>
19
+ <div style="height: auto">
20
+ <ul class="nav nav-tabs col-sm-12" >
21
+ <li class="active"><a>下次上报日期</a></li>
22
+ </ul>
23
+ {{row['readNextreportTime'].bak_val||'暂无数据'}}
24
+ </div>
12
25
  </div>
13
26
  </div>
14
27
  <div class="binary-right" style="width:74%;overflow-y: auto;max-height:1000px;">
15
28
  <div class="row list_area table_sy">
16
29
  <table class="table table-bordered table-striped table-hover" id="table1" >
17
30
  <thead>
18
- <th style="text-align:center"><nobr>操作</nobr></th>
19
- <th style="text-align:center"><nobr>指令发送状态</nobr></th>
31
+ <tr>
32
+ <th style="text-align:center"><nobr>指令发送状态</nobr></th>
33
+ <th style="text-align:center"><nobr>操作</nobr></th>
34
+ </tr>
20
35
  <!-- <th style="text-align:center"><nobr>客户类型</nobr></th>-->
21
36
  <!-- <th style="text-align:center"><nobr>气表品牌</nobr></th>-->
22
37
  </thead>
23
38
  <tbody>
24
39
  <tr v-for="row in history">
25
- <td><nobr>{{row.msg}}</nobr></td>
26
40
  <td><nobr>{{row.f_instruct_state}}</nobr></td>
41
+ <td><nobr>{{row.msg}}</nobr></td>
27
42
  <!-- <td><nobr>{{row.f_user_type}}</nobr></td>-->
28
43
  <!-- <td><nobr>{{row.f_meter_brand}}</nobr></td>-->
29
44
  </tr>
@@ -35,77 +50,92 @@
35
50
 
36
51
 
37
52
  <script>
38
- import {PagedList} from 'vue-client'
39
-
40
53
  export default {
41
- title: '表计信息修改',
42
- props: ['user', 'checked1', 'gasbrandid'],
43
-
44
- data () {
45
- return {
46
- newmeterinfo: [{}],
47
- history: [],
48
- row: {},
49
- gasbrand: null
50
- }
51
- },
52
- ready () {
54
+ title: '表计信息修改',
55
+ props: ['user', 'checked1', 'gasbrandid'],
56
+ data () {
57
+ return {
58
+ newmeterinfo: [{}],
59
+ history: [],
60
+ row: {},
61
+ gasbrand: null
62
+ }
63
+ },
64
+ ready () {
53
65
 
54
- },
55
- watch: {
56
- 'user': {
57
- handler: async function (val) {
58
- this.history = []
59
- if (val.length === 1) {
60
- await this.$resetpost('rs/sql/getIotParams', {data: {t_userfiles_id: val[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
61
- this.row = {}
62
- console.log('=============', rat.data)
63
- this.row.forceSafeCheckUsedDayCount = 0
64
- this.row.currStairUsedGasCount = 0
65
- this.row.forceScrapUsedDayCount = 0
66
- this.row.isForceSrape = '1'
67
- if (rat.data.length > 0) {
68
- rat.data.forEach((item) => {
69
- if(item.f_param_value === '1'){
70
- item.f_param_value = '开'
66
+ },
67
+ watch: {
68
+ 'user': {
69
+ handler: async function (val) {
70
+ this.history = []
71
+ 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) => {
73
+ this.row = {}
74
+ console.log('=============', rat.data)
75
+ this.row.forceSafeCheckUsedDayCount = 0
76
+ this.row.currStairUsedGasCount = 0
77
+ this.row.forceScrapUsedDayCount = 0
78
+ this.row.isForceSrape = '1'
79
+ if (rat.data.length > 0) {
80
+ rat.data.forEach((item) => {
81
+ if (item.f_param_value === '1') {
82
+ item.f_param_value = '开'
83
+ }
84
+ if (item.f_param_value === '0') {
85
+ item.f_param_value = '关'
86
+ }
87
+ 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']
71
90
  }
72
- if(item.f_param_value === '0'){
73
- item.f_param_value = '关'
91
+ if (item.f_param_value && item.f_param_value === 'readNextreportTime') {
92
+ let str = JSON.parse(item.f_back_content.replace('[', '').replace(']', ''))['datetime']
93
+ item.f_back_content = '20' + str.substr(0, 2) + '-' + str.substr(2, 2) + '-' + str.substr(4, 2) + ' ' +
94
+ str.substr(6, 2) + ':' + str.substr(8, 2) + ':' + str.substr(10, 2)
74
95
  }
75
- this.row[item.f_param_lname] = item.f_param_value
76
- })
96
+ if (!item.f_param_value) {
97
+ item.f_param_value = '暂无数据'
98
+ }
99
+ this.row[item.f_param_value] = {set_val: item.f_param_value, bak_val: item.f_back_content}
100
+ } else {
101
+ this.row[item.f_param_lname] = {set_val: item.f_param_value, bak_val: item.f_back_content}
102
+ }
103
+ })
77
104
  // let param = JSON.parse(rat.data[0].f_data)
78
105
  // console.log(param)
79
106
  // this.row= param
80
- }
81
- })
82
- await this.$resetpost('rs/sql/getParamInstruct', {data: {condition: `i.f_userfiles_id='${val[0].f_userfiles_id}'` }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
83
- this.history = res.data
84
- })
85
- }
86
- if (this.gasbrandid[0]) {
87
- await this.refreshParam(this.gasbrandid[0])
88
- }
89
- },
90
- deep: true
107
+ }
108
+ })
109
+ await this.$resetpost('rs/sql/getParamInstruct', {data: {condition: `i.f_userfiles_id='${val[0].f_userfiles_id}'` }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
110
+ this.history = res.data
111
+ })
112
+ }
113
+ if (this.gasbrandid[0]) {
114
+ await this.refreshParam(this.gasbrandid[0])
115
+ }
116
+ },
117
+ deep: true
91
118
 
92
- }
119
+ }
120
+ },
121
+ methods: {
122
+ close () {
123
+ this.$dispatch('close')
93
124
  },
94
- methods: {
95
- close () {
96
- this.$dispatch('close')
97
- },
98
- async refreshParam (val) {
99
- this.newmeterinfo = [{}]
100
- try {
101
- let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: null, rejectMsg: null})
102
- this.newmeterinfo = res.data
103
- } catch (error) {
104
- this.$showAlert('该气表品牌不支持参数设置', 'warning', 1500)
105
- }
125
+ async refreshParam (val) {
126
+ this.newmeterinfo = [{}]
127
+ try {
128
+ 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 !== '读记录数据') })
130
+ } catch (error) {
131
+ this.$showAlert('该气表品牌不支持参数设置', 'warning', 1500)
106
132
  }
133
+ },
134
+ readNextReportTime_parse () {
135
+ let str = JSON.parse(row['readNextreportTime'].bak_val)[0].datetime
107
136
  }
108
137
  }
138
+ }
109
139
  </script>
110
140
  <style>
111
141
  .btn-border {