readmeter-changan 1.0.46 → 1.0.48

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 (5) hide show
  1. package/.idea/workspace.xml +5 -2
  2. package/package.json +2 -2
  3. package/src/components/readingmeter/CheckInfo.vue +6 -6
  4. package/src/components/readingmeter/PhoneHandplanInfo.vue +6 -6
  5. package/src/components/server/ReadMeterHome.vue +215 -214
package/.idea/workspace.xml CHANGED
@@ -5,8 +5,8 @@
5
5
  </component>
6
6
  <component name="ChangeListManager">
7
7
  <list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡">
8
- <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
9
8
  <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9
+ <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
10
10
  </list>
11
11
  <option name="SHOW_DIALOG" value="false" />
12
12
  <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -435,7 +435,10 @@
435
435
  <workItem from="1778290423528" duration="240000" />
436
436
  <workItem from="1778657678952" duration="4775000" />
437
437
  <workItem from="1778721613582" duration="2000" />
438
- <workItem from="1778722375031" duration="1276000" />
438
+ <workItem from="1778722375031" duration="2067000" />
439
+ <workItem from="1778730839001" duration="6870000" />
440
+ <workItem from="1778832982051" duration="11000" />
441
+ <workItem from="1779947060363" duration="3373000" />
439
442
  </task>
440
443
  <task id="LOCAL-00001" summary="新增卡表抄表气量核算">
441
444
  <created>1553677761707</created>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "readmeter-changan",
3
- "version": "1.0.46",
3
+ "version": "1.0.48",
4
4
  "description": "手机抄表客户端",
5
5
  "author": "15529257852@163.com",
6
6
  "private": false,
@@ -68,7 +68,7 @@
68
68
  "selenium-server": "2.52.0",
69
69
  "style-loader": "^0.21.0",
70
70
  "url-loader": "^0.5.7",
71
- "vue-client": "^1.20.30",
71
+ "vue-client": "1.22.23-changan-phone",
72
72
  "vue-hot-reload-api": "^1.2.0",
73
73
  "vue-html-loader": "^1.0.0",
74
74
  "vue-loader": "^8.2.1",
package/src/components/readingmeter/CheckInfo.vue CHANGED
@@ -116,12 +116,12 @@
116
116
  <input type="text" id="" class="form-control font " v-model="model.f_checkic1" @blur="checkbyic1()">
117
117
  </div>
118
118
  </div>
119
- <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">
120
- <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">本期IC卡底数</p>
121
- <div class="col-xs-8 col-sm-8 col-md-8 ">
122
- <input type="text" id="" class="form-control font " v-model="model.f_checkicbase" >
123
- </div>
124
- </div>
119
+ <!-- <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">-->
120
+ <!-- <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">本期IC卡底数</p>-->
121
+ <!-- <div class="col-xs-8 col-sm-8 col-md-8 ">-->
122
+ <!-- <input type="text" id="" class="form-control font " v-model="model.f_checkicbase" >-->
123
+ <!-- </div>-->
124
+ <!-- </div>-->
125
125
  </div>
126
126
  <div class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
127
127
  <label for="f_insflow" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">瞬时流量</label>
package/src/components/readingmeter/PhoneHandplanInfo.vue CHANGED
@@ -116,12 +116,12 @@
116
116
  <input type="text" id="" class="form-control font " v-model="model.f_checkic1" @blur="checkbyic1()">
117
117
  </div>
118
118
  </div>
119
- <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">
120
- <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">本期IC卡底数</p>
121
- <div class="col-xs-8 col-sm-8 col-md-8 ">
122
- <input type="text" id="" class="form-control font " v-model="model.f_checkicbase" >
123
- </div>
124
- </div>
119
+ <!-- <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">-->
120
+ <!-- <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">本期IC卡底数</p>-->
121
+ <!-- <div class="col-xs-8 col-sm-8 col-md-8 ">-->
122
+ <!-- <input type="text" id="" class="form-control font " v-model="model.f_checkicbase" >-->
123
+ <!-- </div>-->
124
+ <!-- </div>-->
125
125
  </div>
126
126
  <div class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
127
127
  <label for="f_insflow" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">瞬时流量</label>
package/src/components/server/ReadMeterHome.vue CHANGED
@@ -1,214 +1,215 @@
1
- <template>
2
- <div class="bg-white "style="overflow: hidden;">
3
- <div class="top" style="height: 0%">
4
- <readmeter-top v-if='showTop' :toptext='pageName'></readmeter-top>
5
- </div>
6
- <div class="row "style="height: 100%;" >
7
- <route v-ref:route :reuse="reuse" name="handplanlist"></route>
8
- </div>
9
- </div>
10
- </template>
11
- <script>
12
- import Vue from 'vue'
13
-
14
- export default {
15
- title: 'home',
16
- data () {
17
- return {
18
- model: {
19
- selectstreet:{
20
- f_userinfo_code: '',
21
- f_userinfo_id: '',
22
- f_user_name: '',
23
- f_address: '',
24
- f_meternumber: '',
25
- startDate: '',
26
- endDate: '',
27
- name:'',
28
- returnData: [],
29
- gasArr: [],
30
- streetArr:[],
31
- pointArr: [],
32
- handinfo: [],
33
- show: false,
34
- f_street: '',
35
- f_gas_area: '',
36
- f_point_name: '',
37
- gasArr: [],
38
- pointArr: [],
39
- handcount: 0,
40
- f_point_name: ''
41
- },
42
- selectuser:{},
43
- f_userinfo_code: '',
44
- f_userinfo_id: '',
45
- f_user_name: '',
46
- f_address: '',
47
- f_meternumber: '',
48
- startDate: '',
49
- endDate: ''
50
- },
51
- reuse:true,
52
- pageName: '',
53
- name:'',
54
- showback: 'false',
55
- nowPage: 'home-page',
56
- showTop: false
57
- }
58
- },
59
- events: {
60
- 'menu' (param) {
61
- this.showTop = true
62
- this.pageName = param
63
- if (param === '计划下载') {
64
- this.name = 'plan-down'
65
- this.reuse = true
66
- this.$refs.route.init(this.name)
67
- }else if (param === '临时周检') {
68
- this.name = 'check-online'
69
- this.reuse = true
70
- this.$refs.route.init(this.name)
71
- } else if (param === '表单上传') {
72
- this.reuse = true
73
- this.name = 'plan-update'
74
- this.$refs.route.init(this.name)
75
- } else if (param === '抄表管理') {
76
- this.reuse = true
77
- this.name = 'read-meter'
78
- this.$refs.route.init('read-meter',{data:this.model.selectstreet})
79
- } else if (param === '抄表记录') {
80
- this.reuse = true
81
- this.name = 'read-meter-info'
82
- this.$refs.route.init('read-meter-info')
83
- } else {
84
- this.reuse = true
85
- this.showTop = false
86
- this.name = 'home'
87
- this.$refs.route.init('home')
88
- }
89
- },
90
- 'changepage' (val, param) {
91
- console.log(val)
92
- if (param === 'save') {
93
- window.currentPage = '抄表录入'
94
- this.name = 'phone-hand-home'
95
- this.$refs.route.init('phone-hand-home', {data: val, type: param})
96
- }else if (param === 'onlinecheck') {
97
- //选择用气点
98
- window.currentPage = '临时周检'
99
- this.name = 'phone-hand-home'
100
- this.$refs.route.init('phone-hand-home', {param: val, type: param})
101
- } else if (param === 'selectpoint') {
102
- //选择用气点
103
- window.currentPage = '选择用气点'
104
- this.name = 'read-meter-changan'
105
- this.$refs.route.init('read-meter-changan', {param: val, type: param})
106
- } else if (param === 'selectuser') {
107
- //选择用户
108
- // window.alert('选择用户')
109
- window.currentPage = '选择用户'
110
-
111
- console.log('传入的信息'+ JSON.stringify(val))
112
- this.name = 'phone-hand-home'
113
- this.$refs.route.init('phone-hand-home', {param: val, type: param,show:true})
114
- }else if (param === 'hadupload') {
115
- //选择用户
116
- // console.log('查看用户')
117
- window.currentPage = '已上传'
118
- this.name = 'phone-hand-home'
119
- this.$refs.route.init('phone-hand-home', {param: val, type: param,show:false})
120
- }
121
- else if (param === 'waitupload') {
122
- //选择用户
123
- // console.log('查看用户')
124
- window.currentPage = '待上传'
125
- this.name = 'phone-hand-home'
126
- this.$refs.route.init('phone-hand-home', {param: val, type: param,show:false})
127
- }
128
- else {
129
- window.currentPage = undefined
130
- this.name = 'phone-hand-home'
131
- this.$refs.route.init('phone-hand-home', {param: val, type: param})
132
- }
133
- },
134
- 'returnPage' () {
135
- console.log('当前页面' + window.currentPage)
136
- if (window.currentPage && window.currentPage === '抄表录入') {
137
- this.showTop = true
138
- this.pageName = '抄表管理'
139
- window.currentPage = undefined
140
- this.$refs.route.init('read-meter')
141
- return
142
- }
143
- if (window.currentPage && window.currentPage === '临时周检') {
144
- this.showTop = true
145
- this.pageName = '临时周检'
146
- window.currentPage = undefined
147
- this.$refs.route.init('check-online')
148
- return
149
- }
150
- if (window.currentPage && window.currentPage === '选择用气点') {
151
- this.showTop = true
152
- this.pageName = '选择用气点'
153
- window.currentPage = undefined
154
- this.$refs.route.init('read-meter',{data:this.model.selectstreet})
155
-
156
- return
157
- }
158
- if (window.currentPage && window.currentPage === '选择用户') {
159
- this.showTop = true
160
- this.pageName = '选择用户'
161
- window.currentPage = '选择用气点'
162
- this.$refs.route.init('read-meter-changan',{param:this.model.selectstreet})
163
- this.$refs.route.remove('phone-hand-home')
164
- return
165
- }
166
- if (window.currentPage && window.currentPage === '已上传') {
167
- this.showTop = true
168
- this.pageName = '抄表记录查看'
169
- window.currentPage = ''
170
- this.$refs.route.init('read-meter-info',{f_meter_state:'已抄表'})
171
- this.$refs.route.remove('phone-hand-home')
172
- return
173
- }
174
- if (window.currentPage && window.currentPage === '待上传') {
175
- this.showTop = true
176
- this.pageName = '抄表记录查看'
177
- window.currentPage = ''
178
- this.name = 'read-meter-info'
179
- this.$refs.route.init('read-meter-info',{f_meter_state:'待上传'})
180
- this.$refs.route.remove('phone-hand-home')
181
- return
182
- }
183
- // this.$dispatch('hideFullPage')
184
- this.showTop = false
185
- this.name = 'readmeter-homepage'
186
- this.$refs.route.init('readmeter-homepage')
187
- },
188
- 'hand-success' (type) {
189
- // this.$dispatch('showFullPage')
190
- HostApp.alert('抄表成功')
191
- if (type === 'save') {
192
- this.name = 'read-meter'
193
- this.$refs.route.init('read-meter',null)
194
- } else {
195
- this.name = 'read-meter-info'
196
- this.$refs.route.init('read-meter-info',null)
197
- }
198
- }
199
- },
200
- ready () {
201
- this.name = 'readmeter-homepage'
202
- this.$refs.route.init('readmeter-homepage',null)
203
- this.showTop = false
204
- }
205
- }
206
- </script>
207
- <style>
208
- .have_top {
209
- padding-top: 60px;
210
- }
211
- /*.content{*/
212
-
213
- /*}*/
214
- </style>
1
+ <template>
2
+ <div class="bg-white "style="overflow: hidden;">
3
+ <div class="top" style="height: 0%">
4
+ <readmeter-top v-if='showTop' :toptext='pageName'></readmeter-top>
5
+ </div>
6
+ <div class="row "style="height: 100%;" >
7
+ <route v-ref:route :reuse="reuse" name="handplanlist"></route>
8
+ </div>
9
+ </div>
10
+ </template>
11
+ <script>
12
+ import Vue from 'vue'
13
+
14
+ export default {
15
+ title: 'home',
16
+ data () {
17
+ return {
18
+ model: {
19
+ selectstreet:{
20
+ f_userinfo_code: '',
21
+ f_userinfo_id: '',
22
+ f_user_name: '',
23
+ f_address: '',
24
+ f_meternumber: '',
25
+ startDate: '',
26
+ endDate: '',
27
+ name:'',
28
+ returnData: [],
29
+ gasArr: [],
30
+ streetArr:[],
31
+ pointArr: [],
32
+ handinfo: [],
33
+ show: false,
34
+ f_street: '',
35
+ f_gas_area: '',
36
+ f_point_name: '',
37
+ gasArr: [],
38
+ pointArr: [],
39
+ handcount: 0,
40
+ f_point_name: ''
41
+ },
42
+ selectuser:{},
43
+ f_userinfo_code: '',
44
+ f_userinfo_id: '',
45
+ f_user_name: '',
46
+ f_address: '',
47
+ f_meternumber: '',
48
+ startDate: '',
49
+ endDate: ''
50
+ },
51
+ reuse:true,
52
+ pageName: '',
53
+ name:'',
54
+ showback: 'false',
55
+ nowPage: 'home-page',
56
+ showTop: false
57
+ }
58
+ },
59
+ events: {
60
+ 'menu' (param) {
61
+ this.showTop = true
62
+ this.pageName = param
63
+ if (param === '计划下载') {
64
+ this.name = 'plan-down'
65
+ this.reuse = true
66
+ this.$refs.route.init(this.name)
67
+ }else if (param === '临时周检') {
68
+ this.name = 'check-online'
69
+ this.reuse = true
70
+ this.$refs.route.init(this.name)
71
+ } else if (param === '表单上传') {
72
+ this.reuse = true
73
+ this.name = 'plan-update'
74
+ this.$refs.route.init(this.name)
75
+ } else if (param === '抄表管理') {
76
+ this.reuse = true
77
+ this.name = 'read-meter'
78
+ this.$refs.route.init('read-meter',{data:this.model.selectstreet})
79
+ } else if (param === '抄表记录') {
80
+ this.reuse = true
81
+ this.name = 'read-meter-info'
82
+ this.$refs.route.init('read-meter-info')
83
+ } else {
84
+ this.reuse = true
85
+ this.showTop = false
86
+ this.name = 'home'
87
+ this.$refs.route.init('home')
88
+ }
89
+ },
90
+ 'changepage' (val, param) {
91
+ console.log(val)
92
+ if (param === 'save') {
93
+ window.currentPage = '抄表录入'
94
+ this.name = 'phone-hand-home'
95
+ this.$refs.route.init('phone-hand-home', {data: val, type: param})
96
+ }else if (param === 'onlinecheck') {
97
+ //选择用气点
98
+ window.currentPage = '临时周检'
99
+ this.name = 'phone-hand-home'
100
+ this.$refs.route.init('phone-hand-home', {param: val, type: param})
101
+ } else if (param === 'selectpoint') {
102
+ //选择用气点
103
+ window.currentPage = '选择用气点'
104
+ this.name = 'read-meter-changan'
105
+ this.$refs.route.init('read-meter-changan', {param: val, type: param})
106
+ } else if (param === 'selectuser') {
107
+ //选择用户
108
+ // window.alert('选择用户')
109
+ window.currentPage = '选择用户'
110
+
111
+ console.log('传入的信息'+ JSON.stringify(val))
112
+ this.name = 'phone-hand-home'
113
+ this.$refs.route.init('phone-hand-home', {param: val, type: param,show:true})
114
+ }else if (param === 'hadupload') {
115
+ //选择用户
116
+ // console.log('查看用户')
117
+ window.currentPage = '已上传'
118
+ this.name = 'phone-hand-home'
119
+ this.$refs.route.init('phone-hand-home', {param: val, type: param,show:false})
120
+ }
121
+ else if (param === 'waitupload') {
122
+ //选择用户
123
+ // console.log('查看用户')
124
+ window.currentPage = '待上传'
125
+ this.name = 'phone-hand-home'
126
+ this.$refs.route.init('phone-hand-home', {param: val, type: param,show:false})
127
+ }
128
+ else {
129
+ window.currentPage = undefined
130
+ this.name = 'phone-hand-home'
131
+ this.$refs.route.init('phone-hand-home', {param: val, type: param})
132
+ }
133
+ },
134
+ 'returnPage' () {
135
+ console.log('当前页面' + window.currentPage)
136
+ if (window.currentPage && window.currentPage === '抄表录入') {
137
+ this.showTop = true
138
+ this.pageName = '抄表管理'
139
+ window.currentPage = undefined
140
+ this.$refs.route.init('read-meter')
141
+ return
142
+ }
143
+ if (window.currentPage && window.currentPage === '临时周检') {
144
+ this.showTop = true
145
+ this.pageName = '临时周检'
146
+ window.currentPage = undefined
147
+ this.$refs.route.remove('phone-hand-home')
148
+ this.$refs.route.init('check-online')
149
+ return
150
+ }
151
+ if (window.currentPage && window.currentPage === '选择用气点') {
152
+ this.showTop = true
153
+ this.pageName = '选择用气点'
154
+ window.currentPage = undefined
155
+ this.$refs.route.init('read-meter',{data:this.model.selectstreet})
156
+
157
+ return
158
+ }
159
+ if (window.currentPage && window.currentPage === '选择用户') {
160
+ this.showTop = true
161
+ this.pageName = '选择用户'
162
+ window.currentPage = '选择用气点'
163
+ this.$refs.route.init('read-meter-changan',{param:this.model.selectstreet})
164
+ this.$refs.route.remove('phone-hand-home')
165
+ return
166
+ }
167
+ if (window.currentPage && window.currentPage === '已上传') {
168
+ this.showTop = true
169
+ this.pageName = '抄表记录查看'
170
+ window.currentPage = ''
171
+ this.$refs.route.init('read-meter-info',{f_meter_state:'已抄表'})
172
+ this.$refs.route.remove('phone-hand-home')
173
+ return
174
+ }
175
+ if (window.currentPage && window.currentPage === '待上传') {
176
+ this.showTop = true
177
+ this.pageName = '抄表记录查看'
178
+ window.currentPage = ''
179
+ this.name = 'read-meter-info'
180
+ this.$refs.route.init('read-meter-info',{f_meter_state:'待上传'})
181
+ this.$refs.route.remove('phone-hand-home')
182
+ return
183
+ }
184
+ // this.$dispatch('hideFullPage')
185
+ this.showTop = false
186
+ this.name = 'readmeter-homepage'
187
+ this.$refs.route.init('readmeter-homepage')
188
+ },
189
+ 'hand-success' (type) {
190
+ // this.$dispatch('showFullPage')
191
+ HostApp.alert('抄表成功')
192
+ if (type === 'save') {
193
+ this.name = 'read-meter'
194
+ this.$refs.route.init('read-meter',null)
195
+ } else {
196
+ this.name = 'read-meter-info'
197
+ this.$refs.route.init('read-meter-info',null)
198
+ }
199
+ }
200
+ },
201
+ ready () {
202
+ this.name = 'readmeter-homepage'
203
+ this.$refs.route.init('readmeter-homepage',null)
204
+ this.showTop = false
205
+ }
206
+ }
207
+ </script>
208
+ <style>
209
+ .have_top {
210
+ padding-top: 60px;
211
+ }
212
+ /*.content{*/
213
+
214
+ /*}*/
215
+ </style>