system-phone 1.2.84 → 1.2.85-test2
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.
- package/.npmignore +9 -0
- package/SystemPhone.iml +9 -0
- package/build/dev-server.js +20 -4
- package/build/webpack.base.conf.js +82 -78
- package/package-lock.json +10055 -0
- package/package.json +99 -99
- package/src/App.vue +25 -26
- package/src/assets/biaohao.png +0 -0
- package/src/assets/bieming.png +0 -0
- package/src/assets/caozuo.png +0 -0
- package/src/assets/guige.png +0 -0
- package/src/assets/leixing.png +0 -0
- package/src/assets/pinpai.png +0 -0
- package/src/assets/qiliang.png +0 -0
- package/src/assets/xinghao.png +0 -0
- package/src/assets/yue.png +0 -0
- package/src/assets//345/257/271/345/217/267.png +0 -0
- package/src/assets//350/241/250/345/217/267 (7).png +0 -0
- package/src/assets//350/241/250/345/217/267.png +0 -0
- package/src/assets//351/224/231/345/217/267.png +0 -0
- package/src/components/NavBottomVVV.vue +2 -2
- package/src/components/iot/InstructMessage.vue +313 -0
- package/src/components/iot/IotBaseInfo.vue +97 -0
- package/src/components/iot/IotMeterInfo.vue +77 -0
- package/src/components/iot/iotMonitoringMain.vue +109 -78
- package/src/main.js +37 -37
- package/src/systemphone.js +11 -7
- package/src/systemphonegrid.js +148 -132
- package/yarn.lock +6399 -0
- package/src/components/iot/iotMonitoringFun.vue +0 -24
- package/src/components/iot/iotMonitoringQuery.vue +0 -24
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="flex">
|
|
3
|
+
<div class="cols-sm-12 col-md-12 col-xs-12 " >
|
|
4
|
+
<div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
|
|
5
|
+
<div class="flex" style="padding: 0.5rem">
|
|
6
|
+
<img src="../../assets/pinpai.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
|
|
7
|
+
<span class="font-content">表具品牌</span>
|
|
8
|
+
<span class="font-head">{{row.f_meter_brand}}</span>
|
|
9
|
+
</div>
|
|
10
|
+
|
|
11
|
+
</div>
|
|
12
|
+
<div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
|
|
13
|
+
<div class="flex" style="padding: 0.5rem">
|
|
14
|
+
<img src="../../assets/leixing.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
|
|
15
|
+
<span class="font-content">表具类型</span>
|
|
16
|
+
<span class="font-head">{{row.f_meter_type}}</span>
|
|
17
|
+
</div>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
|
|
20
|
+
<div class="flex" style="padding: 0.5rem">
|
|
21
|
+
<img src="../../assets/biaohao.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
|
|
22
|
+
<span class="font-content">表号</span>
|
|
23
|
+
<span class="font-head">{{row.f_meternumber}}</span>
|
|
24
|
+
</div>
|
|
25
|
+
</div>
|
|
26
|
+
<div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
|
|
27
|
+
<div class="flex" style="padding: 0.5rem">
|
|
28
|
+
<img src="../../assets/guige.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
|
|
29
|
+
<span class="font-content">表具规格</span>
|
|
30
|
+
<span class="font-head">{{row.f_meter_style}}</span>
|
|
31
|
+
</div>
|
|
32
|
+
</div>
|
|
33
|
+
<div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
|
|
34
|
+
<div class="flex" style="padding: 0.5rem">
|
|
35
|
+
<img src="../../assets/xinghao.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
|
|
36
|
+
<span class="font-content">表具型号</span>
|
|
37
|
+
<span class="font-head">{{row.f_type}}</span>
|
|
38
|
+
</div>
|
|
39
|
+
</div>
|
|
40
|
+
<div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
|
|
41
|
+
<div class="flex" style="padding: 0.5rem">
|
|
42
|
+
<img src="../../assets/bieming.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
|
|
43
|
+
<span class="font-content">表具别名</span>
|
|
44
|
+
<span class="font-head">{{row.f_alias}}</span>
|
|
45
|
+
</div>
|
|
46
|
+
</div>
|
|
47
|
+
<div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
|
|
48
|
+
<div class="flex" style="padding: 0.5rem">
|
|
49
|
+
<img src="../../assets/yue.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
|
|
50
|
+
<span class="font-content">剩余金额</span>
|
|
51
|
+
<span class="font-head">{{row.f_balance_amount}}</span>
|
|
52
|
+
</div>
|
|
53
|
+
</div>
|
|
54
|
+
<div class="col-sm-3 col-md-3 col-xs-4 meterinfo">
|
|
55
|
+
<div class="flex" style="padding: 0.5rem">
|
|
56
|
+
<img src="../../assets/qiliang.png" style="height:32px;width:32px;margin-bottom: 5px" alt="" >
|
|
57
|
+
<span class="font-content">累计用气量</span>
|
|
58
|
+
<span class="font-head">{{row.f_balance_gas}}</span>
|
|
59
|
+
</div>
|
|
60
|
+
</div>
|
|
61
|
+
</div>
|
|
62
|
+
</div>
|
|
63
|
+
</template>
|
|
64
|
+
|
|
65
|
+
<script>
|
|
66
|
+
export default {
|
|
67
|
+
title: '基础信息',
|
|
68
|
+
data () {
|
|
69
|
+
return {
|
|
70
|
+
msg: '',
|
|
71
|
+
show: false
|
|
72
|
+
}
|
|
73
|
+
},
|
|
74
|
+
props:['row'],
|
|
75
|
+
ready () {
|
|
76
|
+
// this.$appdata.load().then(() => {
|
|
77
|
+
// this.$emit('ready')
|
|
78
|
+
// })
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
</script>
|
|
82
|
+
<style media="screen" scoped>
|
|
83
|
+
.font-head{
|
|
84
|
+
font-size: 14px;
|
|
85
|
+
font-weight: bold;
|
|
86
|
+
color: #333;
|
|
87
|
+
}
|
|
88
|
+
.font-content{
|
|
89
|
+
font-size: 12px;
|
|
90
|
+
font-weight: normal;
|
|
91
|
+
color: #666666;
|
|
92
|
+
}
|
|
93
|
+
.meterinfo{
|
|
94
|
+
border:1px solid #eeeeee;
|
|
95
|
+
/*border-right: 2px solid #eeeeee;*/
|
|
96
|
+
}
|
|
97
|
+
</style>
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div>
|
|
3
|
+
<div class="cols-sm-12 col-md-12 col-xs-12 " >
|
|
4
|
+
<div class="col-sm-12 col-md-12 col-xs-12 ">
|
|
5
|
+
<label class="font-content lb-left" style="padding-left: 0.5rem">表具信息:{{row.f_meternumber}}</label>
|
|
6
|
+
</div>
|
|
7
|
+
</div>
|
|
8
|
+
<div class="row" >
|
|
9
|
+
|
|
10
|
+
<div class="cols-sm-12 col-md-12 col-xs-12 font-content" style="">
|
|
11
|
+
|
|
12
|
+
<p class="col-sm-6 col-md-6 col-xs-6 flex-row">
|
|
13
|
+
<span>表编号:</span>
|
|
14
|
+
<span style="padding-left: 0.5rem">{{row.f_user_id}}</span>
|
|
15
|
+
</p>
|
|
16
|
+
<p class="col-sm-6 col-md-6 col-xs-6 flex-row">
|
|
17
|
+
<span>用户编号:</span>
|
|
18
|
+
<span style="padding-left: 0.5rem">{{row.f_userinfo_code}}</span>
|
|
19
|
+
</p>
|
|
20
|
+
<p class="col-sm-6 col-md-6 col-xs-6 flex-row">
|
|
21
|
+
<span>余额:</span>
|
|
22
|
+
<span style="padding-left: 0.5rem">{{row.f_jval}}</span>
|
|
23
|
+
</p>
|
|
24
|
+
<p class="col-sm-6 col-md-6 col-xs-6 flex-row">
|
|
25
|
+
<span>网络购气次数:</span>
|
|
26
|
+
<span style="padding-left: 0.5rem">{{row.f_iot_times}}</span>
|
|
27
|
+
</p>
|
|
28
|
+
<p class="col-sm-6 col-md-6 col-xs-6 flex-row">
|
|
29
|
+
<span>总购金量:</span>
|
|
30
|
+
<span style="padding-left: 0.5rem">{{row.f_total_gas}}</span>
|
|
31
|
+
</p>
|
|
32
|
+
<p class="col-sm-6 col-md-6 col-xs-6 flex-row">
|
|
33
|
+
<span>总购气量:</span>
|
|
34
|
+
<span style="padding-left: 0.5rem">{{row.f_total_fee}}</span>
|
|
35
|
+
</p>
|
|
36
|
+
<p class="col-sm-12 col-md-12 col-xs-12">
|
|
37
|
+
<span>气表品牌别名:</span>
|
|
38
|
+
<span style="padding-left: 0.5rem">{{row.f_alias}}</span>
|
|
39
|
+
|
|
40
|
+
</p>
|
|
41
|
+
</div>
|
|
42
|
+
</div>
|
|
43
|
+
</div>
|
|
44
|
+
</template>
|
|
45
|
+
|
|
46
|
+
<script>
|
|
47
|
+
export default {
|
|
48
|
+
title: '表具信息',
|
|
49
|
+
data () {
|
|
50
|
+
return {
|
|
51
|
+
msg: '',
|
|
52
|
+
show: false
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
props:['row'],
|
|
56
|
+
ready () {
|
|
57
|
+
// this.$appdata.load().then(() => {
|
|
58
|
+
// this.$emit('ready')
|
|
59
|
+
// })
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
</script>
|
|
63
|
+
<style media="screen" scoped>
|
|
64
|
+
.font-head{
|
|
65
|
+
font-size: 16px;
|
|
66
|
+
font-weight: bold;
|
|
67
|
+
color: #666;
|
|
68
|
+
}
|
|
69
|
+
.font-content{
|
|
70
|
+
font-size: 14px;
|
|
71
|
+
font-weight: normal;
|
|
72
|
+
color: #666666;
|
|
73
|
+
}
|
|
74
|
+
p span{
|
|
75
|
+
flex:1
|
|
76
|
+
}
|
|
77
|
+
</style>
|
|
@@ -1,57 +1,67 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="auto">
|
|
3
|
-
<div partial>
|
|
4
|
-
<div class="row app-row" style="margin-top: 10px">
|
|
2
|
+
<div class="auto" style="background: #f8f8f8">
|
|
3
|
+
<div partial class="bg-white">
|
|
4
|
+
<div class="row app-row " style="margin-top: 10px">
|
|
5
5
|
<div class="col-xs-4">
|
|
6
|
-
<img src="../../assets
|
|
7
|
-
<label class="font
|
|
6
|
+
<img src="../../assets/表号.png" style="width: 20px;margin-bottom: 5px" alt="">
|
|
7
|
+
<label class="font ">表号：</label>
|
|
8
8
|
</div>
|
|
9
9
|
<div class="col-xs-8" >
|
|
10
|
-
<input class="search_input input-font" v-model="f_meternumber" />
|
|
10
|
+
<input class="search_input input-font" placeholder="请输入您要查询的表号" v-model="f_meternumber" />
|
|
11
11
|
</div>
|
|
12
12
|
</div>
|
|
13
|
-
<div class="row text-center" style="
|
|
14
|
-
<button type="button" class="btn
|
|
13
|
+
<div class="row text-center" style="padding-top: 10px;padding-bottom:10px;text-align: center">
|
|
14
|
+
<button type="button" class="btn btn-font" style="width: 25%;
|
|
15
15
|
margin-right: 3%; background-color: #499edf;color:#FFFFFF;border-radius: 10px ;" @click="query(querytitle)">查询</button>
|
|
16
|
-
<button type="button" class="btn
|
|
17
|
-
<button type="button" class="btn
|
|
16
|
+
<button type="button" class="btn btn-font btn-color1" style="width: 25%;margin-right: 3%" @click="empty">清空</button>
|
|
17
|
+
<button type="button" class="btn btn-font btn-color1" style="width: 25%;margin-right: 3%" @click="Scanningtable">扫表号</button>
|
|
18
18
|
</div>
|
|
19
|
-
|
|
19
|
+
</div>
|
|
20
|
+
<div class="meterinfo auto bg-white">
|
|
21
|
+
<iot-meter-info :row="row"></iot-meter-info>
|
|
20
22
|
</div>
|
|
21
23
|
<div>
|
|
22
|
-
<div class="row" style="margin-
|
|
23
|
-
<
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
<button type="button" class="btn-color" style="width:
|
|
28
|
-
<button type="button" class="btn-color" style="width: 25
|
|
29
|
-
<button type="button" class="btn-color" style="width: 25%;margin-right: 20px" @click="againOpening">重新开户</button>
|
|
24
|
+
<div class="row bg-white" style="padding: 10px;margin-bottom: 5px">
|
|
25
|
+
<div class="col-sm-12 " >
|
|
26
|
+
<img src="../../assets/caozuo.png" style="width: 20px;margin-bottom: 5px" alt="">
|
|
27
|
+
<label class="font ">操作</label>
|
|
28
|
+
<button type="button" class="btn btn-font btn-color" style="width: 20%" @click="OpenValve('1')">开阀</button>
|
|
29
|
+
<button type="button" class="btn btn-font btn-color" style="width: 20%" @click="valveShutoff('0')">关阀</button>
|
|
30
|
+
<button type="button" class="btn btn-font btn-color" style="width: 25%" @click="againOpening">重新开户</button>
|
|
30
31
|
</div>
|
|
31
|
-
<!--<div class="col-sm-12 text-center" style="height: 54px;">
|
|
32
|
-
<button type="button" class="btn-color" style="width: 25%;margin-right: 20px" @click="upgas">修改累计</button>
|
|
33
|
-
<button type="button" class="btn-color" style="width: 25%;margin-right: 20px" @click="querytotal">用气明细</button>
|
|
34
|
-
<button type="button" class="btn-color" style="width: 25%;margin-right: 20px" @click="upoverdraft3">透支清零</button>
|
|
35
|
-
</div>-->
|
|
36
32
|
</div>
|
|
37
33
|
|
|
38
34
|
</div>
|
|
39
|
-
<div class="">
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
<div class="row" style="">
|
|
44
|
-
<div @click="setquery('
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
<div @click="setquery('
|
|
35
|
+
<div class="bg-white">
|
|
36
|
+
<!--<div class="row" style="padding-left: 10px">-->
|
|
37
|
+
<!--<label class="font_normal_body">信息查询</label>-->
|
|
38
|
+
<!--</div>-->
|
|
39
|
+
<div class="row flex-row" style="justify-content: space-between">
|
|
40
|
+
<div @click="setquery('基础')" >
|
|
41
|
+
<label :class="querytitle == '基础' ? 'text-center div_ul2' : 'text-center div_ul'">基础</label>
|
|
42
|
+
</div>
|
|
43
|
+
<div @click="setquery('指令查询')" >
|
|
44
|
+
<label :class="querytitle == '指令查询' ? 'text-center div_ul2' : 'text-center div_ul'">指令</label>
|
|
45
|
+
</div>
|
|
46
|
+
<div @click="setquery('抄表查询')" >
|
|
47
|
+
<label :class="querytitle == '抄表查询' ? 'text-center div_ul2' : 'text-center div_ul'">抄表</label>
|
|
48
|
+
</div>
|
|
49
|
+
<div @click="setquery('售气查询')" >
|
|
50
|
+
<label :class="querytitle == '售气查询' ? 'text-center div_ul2' : 'text-center div_ul'">售气</label>
|
|
51
|
+
</div>
|
|
52
|
+
<div @click="setquery('上报查询')" >
|
|
53
|
+
<label :class="querytitle == '上报查询' ? ' text-center div_ul2' : 'text-center div_ul'">上报</label>
|
|
54
|
+
</div>
|
|
48
55
|
</div>
|
|
49
|
-
<div v-if="model.rows.length == 0" style="margin-top: 20px">
|
|
56
|
+
<div v-if="model.rows.length == 0 && querytitle !== '基础'" style="margin-top: 20px">
|
|
50
57
|
<label class="font_normal_body"><b> 暂无记录... </b></label>
|
|
51
58
|
</div>
|
|
59
|
+
<div class="iotbaseinfo" v-if="querytitle == '基础'">
|
|
60
|
+
<iot-base-info :row="row"></iot-base-info>
|
|
61
|
+
</div>
|
|
52
62
|
<list :model="model" partial='list' v-if="querytitle == '指令查询'">
|
|
53
63
|
<div partial>
|
|
54
|
-
<div class="auto app-text" style="margin-top: 5px; ">
|
|
64
|
+
<div class="auto app-text" style="margin-top: 5px; " @click="$parent.$parent.goto(row)">
|
|
55
65
|
<div class="panel" style="padding: 10px 10px 5px 10px;">
|
|
56
66
|
<div class="panel-body panel-self " style="border: 2px solid #499EDF; border-radius: 10px">
|
|
57
67
|
<div class="col-xs-12">
|
|
@@ -191,20 +201,17 @@
|
|
|
191
201
|
<script>
|
|
192
202
|
import Vue from 'vue'
|
|
193
203
|
import {HttpResetClass} from 'vue-client'
|
|
204
|
+
import IotMeterInfo from "./IotMeterInfo";
|
|
194
205
|
export default {
|
|
206
|
+
components: {IotMeterInfo},
|
|
195
207
|
title: '物联网监控',
|
|
196
208
|
data () {
|
|
197
209
|
return {
|
|
198
210
|
f_meternumber: '',
|
|
199
|
-
querytitle: '
|
|
211
|
+
querytitle: '基础',
|
|
212
|
+
row:{},
|
|
200
213
|
model: {
|
|
201
|
-
|
|
202
|
-
f_userinfo_code: '00000000',
|
|
203
|
-
f_user_name: '55555',
|
|
204
|
-
f_user_type: '55555',
|
|
205
|
-
f_user_phone: '55555',
|
|
206
|
-
f_meternumber: '55555'
|
|
207
|
-
}]*/
|
|
214
|
+
rows: [{}]
|
|
208
215
|
}
|
|
209
216
|
|
|
210
217
|
}
|
|
@@ -213,6 +220,17 @@
|
|
|
213
220
|
console.log('物联网监控')
|
|
214
221
|
},
|
|
215
222
|
methods: {
|
|
223
|
+
goto(row){
|
|
224
|
+
console.log(row)
|
|
225
|
+
let _this=this
|
|
226
|
+
var pardate = {
|
|
227
|
+
_this:_this,
|
|
228
|
+
title:'指令信息',
|
|
229
|
+
safe:false
|
|
230
|
+
}
|
|
231
|
+
this.$dispatch('gotoson',pardate)
|
|
232
|
+
this.$goto('instruct-message',{row:row}, 'self')
|
|
233
|
+
},
|
|
216
234
|
empty () {
|
|
217
235
|
console.log('清空')
|
|
218
236
|
this.f_meternumber = ''
|
|
@@ -226,77 +244,76 @@
|
|
|
226
244
|
orderitem: 'gb.id desc',
|
|
227
245
|
condition: ` f_meternumber = '${this.f_meternumber}'`
|
|
228
246
|
}
|
|
229
|
-
console.log('查询条件'+ JSON.stringify(data))
|
|
230
|
-
this.$resetpost(`/rs/sql/
|
|
231
|
-
|
|
232
|
-
console.log('查询返回'+JSON.stringify(row))
|
|
247
|
+
// console.log('查询条件'+ JSON.stringify(data))
|
|
248
|
+
// this.$resetpost(`/rs/sql/iot_singleTable_OrderBy`, {data: data}).then((row) => {
|
|
249
|
+
this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/iot_singleTable_OrderBy`, {data: data}).then((row) => {
|
|
250
|
+
// console.log('查询返回'+JSON.stringify(row))
|
|
233
251
|
return row.data[0]
|
|
234
252
|
}).catch((e) => {
|
|
235
253
|
this.$showMessage('表别名获取失败！')
|
|
236
|
-
console.log('错误信息+++++++'+JSON.stringify(e))
|
|
254
|
+
// console.log('错误信息+++++++'+JSON.stringify(e))
|
|
237
255
|
})
|
|
238
256
|
|
|
239
257
|
},
|
|
240
258
|
async OpenValve(type) {
|
|
241
|
-
console.log('开阀')
|
|
259
|
+
// console.log('开阀')
|
|
242
260
|
if (!this.f_meternumber) {
|
|
243
261
|
this.$showMessage('请输入/扫描用户表号！')
|
|
244
262
|
return
|
|
245
263
|
}
|
|
246
264
|
this.$showMessage(`您确认要生成开阀指令吗？`, ['confirm', 'cancel']).then(async (res) => {
|
|
247
265
|
if (res === 'confirm') {
|
|
248
|
-
let alias = await this.queryAlias()
|
|
266
|
+
// let alias = await this.queryAlias()
|
|
249
267
|
let data = {
|
|
250
|
-
|
|
268
|
+
userId: this.row.f_user_id,
|
|
251
269
|
content: {isOpen: type},
|
|
252
|
-
alias:
|
|
270
|
+
alias: this.row.f_alias,
|
|
253
271
|
inputtor: Vue.user.name,
|
|
254
|
-
moduleName:
|
|
272
|
+
moduleName: this.row.f_alias
|
|
255
273
|
}
|
|
256
|
-
console.log('请求参数'+JSON.stringify(data))
|
|
274
|
+
// console.log('请求参数'+JSON.stringify(data))
|
|
257
275
|
// http://ip:port/webmeter/rs/logic/syncSaveValveControlTemplate
|
|
258
276
|
let http = new HttpResetClass()
|
|
259
|
-
http.load('POST',`${this.$androidUtil.getProxyUrl()}/
|
|
277
|
+
http.load('POST',`${this.$androidUtil.getProxyUrl()}/webmeter/rs/logic/syncSaveValveControlTemplate`, {data: data}).then((row) => {
|
|
260
278
|
// http.load('POST',`${this.$androidUtil.getProxyUrl()}/SJwebmeter`, {data: data}).then((row) => {
|
|
261
|
-
console.log('执行结果'+JSON.stringify(row))
|
|
279
|
+
// console.log('执行结果'+JSON.stringify(row))
|
|
262
280
|
this.$showMessage('发送成功！')
|
|
263
281
|
}).catch((e) => {
|
|
264
282
|
this.$showMessage('发送失败！')
|
|
265
|
-
console.log('错误信息+++++++'+JSON.stringify(e))
|
|
283
|
+
// console.log('错误信息+++++++'+JSON.stringify(e))
|
|
266
284
|
})
|
|
267
285
|
}
|
|
268
286
|
})
|
|
269
287
|
},
|
|
270
288
|
valveShutoff (type) {
|
|
271
|
-
console.log('关阀')
|
|
289
|
+
// console.log('关阀')
|
|
272
290
|
if (!this.f_meternumber) {
|
|
273
291
|
this.$showMessage('请输入/扫描用户表号！')
|
|
274
292
|
return
|
|
275
293
|
}
|
|
276
294
|
this.$showMessage(`您确认要生成关阀指令吗？`, ['confirm', 'cancel']).then(async (res) => {
|
|
277
295
|
if (res === 'confirm') {
|
|
278
|
-
let alias = await this.queryAlias()
|
|
296
|
+
// let alias = await this.queryAlias()
|
|
279
297
|
let data = {
|
|
280
|
-
|
|
298
|
+
userId: this.row.f_user_id,
|
|
281
299
|
content: {isOpen: type},
|
|
282
|
-
alias:
|
|
300
|
+
alias: this.row.f_alias,
|
|
283
301
|
inputtor: Vue.user.name,
|
|
284
|
-
moduleName:
|
|
302
|
+
moduleName: this.row.f_alias
|
|
285
303
|
}
|
|
286
|
-
console.log('请求参数'+JSON.stringify(data))
|
|
304
|
+
// console.log('请求参数'+JSON.stringify(data))
|
|
287
305
|
// http://ip:port/webmeter/rs/logic/syncSaveValveControlTemplate
|
|
288
306
|
let http = new HttpResetClass()
|
|
289
|
-
http.load('POST',`${this.$androidUtil.getProxyUrl()}/
|
|
307
|
+
http.load('POST',`${this.$androidUtil.getProxyUrl()}/webmeter/rs/logic/syncSaveValveControlTemplate`, {data: data}).then((row) => {
|
|
290
308
|
// http.load('POST',`${this.$androidUtil.getProxyUrl()}/SJwebmeter`, {data: data}).then((row) => {
|
|
291
|
-
console.log('执行结果'+JSON.stringify(row))
|
|
309
|
+
// console.log('执行结果'+JSON.stringify(row))
|
|
292
310
|
this.$showMessage('发送成功！')
|
|
293
311
|
}).catch((e) => {
|
|
294
312
|
this.$showMessage('发送失败！')
|
|
295
|
-
console.log('错误信息+++++++'+JSON.stringify(e))
|
|
313
|
+
// console.log('错误信息+++++++'+JSON.stringify(e))
|
|
296
314
|
})
|
|
297
315
|
}
|
|
298
316
|
})
|
|
299
|
-
|
|
300
317
|
},
|
|
301
318
|
againOpening () {
|
|
302
319
|
console.log('重新开户')
|
|
@@ -307,10 +324,10 @@
|
|
|
307
324
|
this.$showMessage(`您确认要重新开户吗？`, ['confirm', 'cancel']).then(async (res) => {
|
|
308
325
|
if (res === 'confirm') {
|
|
309
326
|
let http = new HttpResetClass()
|
|
310
|
-
let
|
|
311
|
-
console.log('修改条件===' + JSON.stringify(
|
|
312
|
-
http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/
|
|
313
|
-
console.log('修改返回' + JSON.stringify(row))
|
|
327
|
+
let condition = `f_meternumber = '${this.f_meternumber}'`
|
|
328
|
+
console.log('修改条件===' + JSON.stringify(condition))
|
|
329
|
+
http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/againOpenAccount`, {data: {condition: condition}},{resolveMsg: null, rejectMsg: null}).then((row) => {
|
|
330
|
+
// console.log('修改返回' + JSON.stringify(row))
|
|
314
331
|
this.$showMessage('操作成功！将会在一段时间内重新生成开户指令！')
|
|
315
332
|
}).catch((e) => {
|
|
316
333
|
this.$showMessage('操作失败！请稍后重试！')
|
|
@@ -331,8 +348,17 @@
|
|
|
331
348
|
items: '*',
|
|
332
349
|
tablename: 't_instruct',
|
|
333
350
|
orderitem: 'f_instruct_date desc',
|
|
334
|
-
|
|
351
|
+
f_meternumber: this.meternumber
|
|
335
352
|
}
|
|
353
|
+
if(title==='基础'){
|
|
354
|
+
let condition = `f_meternumber = '${this.f_meternumber}'`
|
|
355
|
+
this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/getUserByMeter`, {data: {condition:condition}}).then((row) => {
|
|
356
|
+
// console.log('查询返回'+JSON.stringify(row))
|
|
357
|
+
this.row = row.data[0]
|
|
358
|
+
}).catch((e) => {
|
|
359
|
+
console.log('错误信息+++++++'+JSON.stringify(e))
|
|
360
|
+
})
|
|
361
|
+
} else {
|
|
336
362
|
if (title == '指令查询') {
|
|
337
363
|
data = {
|
|
338
364
|
items: '*',
|
|
@@ -363,15 +389,15 @@
|
|
|
363
389
|
}
|
|
364
390
|
}
|
|
365
391
|
console.log('查询条件'+ JSON.stringify(data))
|
|
366
|
-
this.$resetpost(`/rs/sql/
|
|
367
|
-
|
|
392
|
+
// this.$resetpost(`/rs/sql/iot_singleTable_OrderBy`, {data: data}).then((row) => {
|
|
393
|
+
this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/iot_singleTable_OrderBy`, {data: data}).then((row) => {
|
|
368
394
|
console.log('查询返回'+JSON.stringify(row))
|
|
369
395
|
this.model.rows = row.data
|
|
370
396
|
}).catch((e) => {
|
|
371
397
|
console.log('正在维护！')
|
|
372
398
|
console.log('错误信息+++++++'+JSON.stringify(e))
|
|
373
399
|
})
|
|
374
|
-
|
|
400
|
+
}
|
|
375
401
|
},
|
|
376
402
|
setquery (msg) {
|
|
377
403
|
console.log(msg)
|
|
@@ -402,7 +428,6 @@
|
|
|
402
428
|
border: 1px solid #499EDF;
|
|
403
429
|
font:600 16px PingFang-SC-Bold;
|
|
404
430
|
color: #FFFFFF;
|
|
405
|
-
height: 44px;
|
|
406
431
|
|
|
407
432
|
}
|
|
408
433
|
.btn-color1{
|
|
@@ -431,6 +456,7 @@
|
|
|
431
456
|
}
|
|
432
457
|
.div_ul {
|
|
433
458
|
height: 36px;
|
|
459
|
+
color:rgb(153,153,153);
|
|
434
460
|
/*border-right: 1px solid royalblue;*/
|
|
435
461
|
line-height: 36px;
|
|
436
462
|
}
|
|
@@ -438,7 +464,12 @@
|
|
|
438
464
|
height: 36px;
|
|
439
465
|
/*border-right: 1px solid royalblue;*/
|
|
440
466
|
line-height: 36px;
|
|
441
|
-
|
|
467
|
+
color:#6eb0e3;
|
|
468
|
+
border-bottom: 2px solid #6eb0e3;
|
|
442
469
|
}
|
|
443
|
-
|
|
470
|
+
.meterinfo{
|
|
471
|
+
padding: 10px;
|
|
472
|
+
margin-top: 5px;
|
|
473
|
+
margin-bottom: 5px;
|
|
474
|
+
}
|
|
444
475
|
</style>
|
package/src/main.js
CHANGED
|
@@ -1,37 +1,37 @@
|
|
|
1
|
-
import Vue from 'vue'
|
|
2
|
-
import App from './App'
|
|
3
|
-
import { all } from 'vue-client'
|
|
4
|
-
import systemphonegrid from './systemphonegrid'
|
|
5
|
-
// import { telephoneAndroid } from 'telephone-clients'
|
|
6
|
-
import systemphone from './systemphone'
|
|
7
|
-
|
|
8
|
-
all()
|
|
9
|
-
systemphonegrid()
|
|
10
|
-
// telephoneAndroid()
|
|
11
|
-
systemphone()
|
|
12
|
-
require('./android-bootstrap/less/bootstrap.less')
|
|
13
|
-
require('./expandcssAndroid.less')
|
|
14
|
-
// require('./assets/fonttype/fontAndroid.less')
|
|
15
|
-
|
|
16
|
-
Vue.config.silent = true
|
|
17
|
-
Vue.android = false
|
|
18
|
-
|
|
19
|
-
if (Vue.android) {
|
|
20
|
-
// 取数据的url android
|
|
21
|
-
// Vue.dataUrl = 'http://192.168.50.220:8300/'
|
|
22
|
-
Vue.dataUrl = 'http://aotesoft.f3322.net:8300/'
|
|
23
|
-
// pc上使用
|
|
24
|
-
} else {
|
|
25
|
-
// Vue.dataUrl = ''
|
|
26
|
-
// 设置android测试内容
|
|
27
|
-
Object.assign(Vue.androidUtil, {
|
|
28
|
-
isAndroid:false,
|
|
29
|
-
// 设置为pc端测试方式
|
|
30
|
-
isTest: false
|
|
31
|
-
})
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
new Vue({
|
|
35
|
-
el: 'body',
|
|
36
|
-
components: { App }
|
|
37
|
-
})
|
|
1
|
+
import Vue from 'vue'
|
|
2
|
+
import App from './App'
|
|
3
|
+
import { all } from 'vue-client'
|
|
4
|
+
import systemphonegrid from './systemphonegrid'
|
|
5
|
+
// import { telephoneAndroid } from 'telephone-clients'
|
|
6
|
+
import systemphone from './systemphone'
|
|
7
|
+
|
|
8
|
+
all()
|
|
9
|
+
systemphonegrid()
|
|
10
|
+
// telephoneAndroid()
|
|
11
|
+
systemphone()
|
|
12
|
+
require('./android-bootstrap/less/bootstrap.less')
|
|
13
|
+
require('./expandcssAndroid.less')
|
|
14
|
+
// require('./assets/fonttype/fontAndroid.less')
|
|
15
|
+
|
|
16
|
+
Vue.config.silent = true
|
|
17
|
+
Vue.android = false
|
|
18
|
+
|
|
19
|
+
if (Vue.android) {
|
|
20
|
+
// 取数据的url android
|
|
21
|
+
// Vue.dataUrl = 'http://192.168.50.220:8300/'
|
|
22
|
+
Vue.dataUrl = 'http://aotesoft.f3322.net:8300/'
|
|
23
|
+
// pc上使用
|
|
24
|
+
} else {
|
|
25
|
+
// Vue.dataUrl = ''
|
|
26
|
+
// 设置android测试内容
|
|
27
|
+
Object.assign(Vue.androidUtil, {
|
|
28
|
+
isAndroid:false,
|
|
29
|
+
// 设置为pc端测试方式
|
|
30
|
+
isTest: false
|
|
31
|
+
})
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
new Vue({
|
|
35
|
+
el: 'body',
|
|
36
|
+
components: { App }
|
|
37
|
+
})
|
package/src/systemphone.js
CHANGED
|
@@ -37,17 +37,21 @@ export default function () {
|
|
|
37
37
|
Vue.component('modify-pass-word', (resolve) => {
|
|
38
38
|
require(['./components/ModifyPassWord'], resolve)
|
|
39
39
|
})
|
|
40
|
-
//
|
|
40
|
+
// 物联网监控
|
|
41
41
|
Vue.component('iot-monitoring-main', (resolve) => {
|
|
42
42
|
require(['./components/iot/iotMonitoringMain'], resolve)
|
|
43
43
|
})
|
|
44
|
-
//
|
|
45
|
-
Vue.component('iot-
|
|
46
|
-
require(['./components/iot/
|
|
44
|
+
// 物联网监控表具信息
|
|
45
|
+
Vue.component('iot-meter-info', (resolve) => {
|
|
46
|
+
require(['./components/iot/IotMeterInfo'], resolve)
|
|
47
47
|
})
|
|
48
|
-
//
|
|
49
|
-
Vue.component('iot-
|
|
50
|
-
require(['./components/iot/
|
|
48
|
+
// 物联网监控基础信息
|
|
49
|
+
Vue.component('iot-base-info', (resolve) => {
|
|
50
|
+
require(['./components/iot/IotBaseInfo'], resolve)
|
|
51
|
+
})
|
|
52
|
+
// 物联网监控指令信息
|
|
53
|
+
Vue.component('instruct-message', (resolve) => {
|
|
54
|
+
require(['./components/iot/InstructMessage'], resolve)
|
|
51
55
|
})
|
|
52
56
|
// // 只加载参数（只有下拉框所需参数）
|
|
53
57
|
// Vue.component('alone-load-params', (resolve) => { require(['./components/AloneLoadParams'], resolve) })
|