manage-client 4.1.135 → 4.1.137
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/build/dev-server.js +27 -88
- package/index.html +22 -12
- package/package.json +1 -1
- package/src/App.vue +53 -22
- package/src/components/SellReport/ReportItems.vue +8 -2
- package/src/filiale/liaoyuan/HandplanRatioQuery.vue +42 -2
- package/src/filiale/liaoyuan/WebHandplanRatioQuery.vue +10 -0
- package/src/main.js +1 -1
- package/src/filiale/jinbin/exportConfig.js +0 -1110
- package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +0 -1372
- package/src/filiale/jinbin/sale.js +0 -7
package/build/dev-server.js
CHANGED
|
@@ -6,99 +6,38 @@ const proxyMiddleware = require('http-proxy-middleware')
|
|
|
6
6
|
const app = express()
|
|
7
7
|
const compiler = webpack(config)
|
|
8
8
|
|
|
9
|
-
const server = '
|
|
9
|
+
const server = 'https://ys.cqsyrq.com'
|
|
10
10
|
const local = 'http://127.0.0.1:9026/'
|
|
11
11
|
const proxyTable = {
|
|
12
|
-
'/
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
},
|
|
18
|
-
'/api/af-revenue/
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
},
|
|
24
|
-
'/api/af-revenue/
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
},
|
|
30
|
-
'/api/af-revenue/logic': {
|
|
31
|
-
pathRewrite: {
|
|
32
|
-
'^/api/af-revenue': '/'
|
|
33
|
-
},
|
|
34
|
-
target: local
|
|
35
|
-
},
|
|
12
|
+
// '/api/af-revenue/sql/': {
|
|
13
|
+
// pathRewrite: {
|
|
14
|
+
// '^/api/af-revenue': '/'
|
|
15
|
+
// },
|
|
16
|
+
// target: local
|
|
17
|
+
// },
|
|
18
|
+
// '/api/af-revenue/report/': {
|
|
19
|
+
// pathRewrite: {
|
|
20
|
+
// '^/api/af-revenue': '/'
|
|
21
|
+
// },
|
|
22
|
+
// target: local
|
|
23
|
+
// },
|
|
24
|
+
// '/api/af-revenue/logic': {
|
|
25
|
+
// pathRewrite: {
|
|
26
|
+
// '^/api/af-revenue': '/'
|
|
27
|
+
// },
|
|
28
|
+
// target: local
|
|
29
|
+
// },
|
|
36
30
|
'/api': {
|
|
37
|
-
target: server
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
},
|
|
42
|
-
'/rs/logic/chargeQuery_by_gasproperties_line': {
|
|
43
|
-
target: server
|
|
44
|
-
},
|
|
45
|
-
'/files': {
|
|
46
|
-
target: server
|
|
47
|
-
},
|
|
48
|
-
// 查找资源服务数据
|
|
49
|
-
'/rs/search': {
|
|
50
|
-
target: server
|
|
51
|
-
},
|
|
52
|
-
// 查找资源服务数据
|
|
53
|
-
'/rs/logic/getLogin': {
|
|
54
|
-
target: server
|
|
55
|
-
},
|
|
56
|
-
// 查找资源服务数据
|
|
57
|
-
'/rs/logic/getInitData': {
|
|
58
|
-
target: server
|
|
59
|
-
},
|
|
60
|
-
'/rs/logic/getSaleInitData': {
|
|
61
|
-
target: server
|
|
62
|
-
},
|
|
63
|
-
// 用户登录服务地址
|
|
64
|
-
'/rs/user': {
|
|
65
|
-
target: server
|
|
66
|
-
},
|
|
67
|
-
'/rs/path/getParams': {
|
|
68
|
-
target: server
|
|
69
|
-
},
|
|
70
|
-
'/rs/data': {
|
|
71
|
-
target: server
|
|
72
|
-
},
|
|
73
|
-
'/rs/license': {
|
|
74
|
-
target: server
|
|
75
|
-
},
|
|
76
|
-
'/rs/db': {
|
|
77
|
-
target: server
|
|
78
|
-
},
|
|
79
|
-
'/excel': {
|
|
80
|
-
target: server
|
|
81
|
-
},
|
|
82
|
-
'/rs/config': {
|
|
83
|
-
target: server
|
|
84
|
-
},
|
|
85
|
-
'/rs/sql/getLicenseById': {
|
|
86
|
-
target: server
|
|
87
|
-
},
|
|
88
|
-
'/rs/report': {
|
|
89
|
-
target: server
|
|
90
|
-
},
|
|
91
|
-
'/rs/vue': {
|
|
92
|
-
target: server
|
|
93
|
-
},
|
|
94
|
-
'/rs/file': {
|
|
95
|
-
target: server
|
|
96
|
-
},
|
|
97
|
-
'/rs/sql/singleTable': {
|
|
98
|
-
target: server
|
|
31
|
+
target: server,
|
|
32
|
+
ws: true,
|
|
33
|
+
secure: false,
|
|
34
|
+
changeOrigin: true
|
|
99
35
|
},
|
|
100
36
|
'/rs': {
|
|
101
|
-
target: server
|
|
37
|
+
target: server,
|
|
38
|
+
ws: true,
|
|
39
|
+
secure: false,
|
|
40
|
+
changeOrigin: true
|
|
102
41
|
}
|
|
103
42
|
}
|
|
104
43
|
|
package/index.html
CHANGED
|
@@ -6,23 +6,33 @@
|
|
|
6
6
|
<META HTTP-EQUIV="pragma" CONTENT="no-cache">
|
|
7
7
|
<META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
|
|
8
8
|
<META HTTP-EQUIV="expires" CONTENT="0">
|
|
9
|
-
<
|
|
9
|
+
<link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>
|
|
10
|
+
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.3&key=4889f1e58df01cb40415536c8907bf64&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
|
|
11
|
+
<script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
|
|
12
|
+
<title>智慧燃气</title>
|
|
13
|
+
<script src="./static/wasm_exec.js"></script>
|
|
14
|
+
<script src="./static/Functions.js"></script>
|
|
15
|
+
<script src="./static/init.js"></script>
|
|
16
|
+
<script src="./static/tools.js"></script>
|
|
17
|
+
<script src="./static/Jsons.js"></script>
|
|
18
|
+
<script src="./static/class.js"></script>
|
|
19
|
+
<script>
|
|
20
|
+
global.loadWasm().then(()=>{
|
|
21
|
+
global.run()
|
|
22
|
+
})
|
|
23
|
+
</script>
|
|
10
24
|
<style media="screen">
|
|
11
25
|
/*url(./static/newmainbg.jpg)*/
|
|
12
|
-
body
|
|
13
|
-
|
|
14
|
-
background: #7f8eaf no-repeat center bottom;
|
|
15
|
-
background-size: cover;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
body .loginbg {
|
|
19
|
-
width: 100%;
|
|
20
|
-
height: 100%;
|
|
21
|
-
background: url(./static/loginbg.jpg) no-repeat center top;
|
|
22
|
-
}
|
|
26
|
+
body{width: 100%;background:#7f8eaf no-repeat center bottom; background-size: cover;}
|
|
27
|
+
body .loginbg{ width:100%; height:100%; background:url(./static/loginbgmain.jpg) no-repeat center top;}
|
|
23
28
|
</style>
|
|
24
29
|
</head>
|
|
25
30
|
<body id="bodymain" class="themeOne">
|
|
26
31
|
<app></app>
|
|
27
32
|
</body>
|
|
28
33
|
</html>
|
|
34
|
+
<style>
|
|
35
|
+
* {
|
|
36
|
+
font-family: PingFangSC-Regular;
|
|
37
|
+
}
|
|
38
|
+
</style>
|
package/package.json
CHANGED
package/src/App.vue
CHANGED
|
@@ -1,29 +1,60 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<
|
|
3
|
-
<
|
|
4
|
-
<
|
|
5
|
-
<
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
<!--<route :comp="{name: 'vender-management'}"></route>-->
|
|
10
|
-
<!--<route :comp="{name: 'malfunction-home'}"></route>-->
|
|
11
|
-
<route :comp="{name: 'login'}"></route>
|
|
12
|
-
<!-- <route :comp="{name: 'call-report-main-page'}"></route>-->
|
|
13
|
-
<!-- <route :comp="{name: 'load-data'}"></route> -->
|
|
14
|
-
<!--<route :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
|
|
15
|
-
<!-- <route :comp="{name: 'load-params', props: {dataUrl: ['api/af-revenue/sql/getMeterBrand','api/af-revenue/sql/getPriceType','api/af-revenue/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
|
|
16
|
-
</article>
|
|
17
|
-
</div>
|
|
18
|
-
</app-base>
|
|
19
|
-
</div>
|
|
2
|
+
<app-base class="bg" @click="isTimeOut">
|
|
3
|
+
<div class='flex'>
|
|
4
|
+
<article>
|
|
5
|
+
<route :comp="{name: 'login'}"></route>
|
|
6
|
+
</article>
|
|
7
|
+
</div>
|
|
8
|
+
</app-base>
|
|
20
9
|
</template>
|
|
21
10
|
|
|
22
11
|
<script>
|
|
23
|
-
|
|
24
|
-
|
|
12
|
+
import Vue from 'vue'
|
|
25
13
|
export default {
|
|
26
|
-
|
|
27
|
-
|
|
14
|
+
data () {
|
|
15
|
+
return {
|
|
16
|
+
lastTime: null, // 最后一次点击的时间
|
|
17
|
+
currentTime: null, // 当前点击的时间
|
|
18
|
+
// 获取一次不在获取控制
|
|
19
|
+
getConfig: false,
|
|
20
|
+
config: {
|
|
21
|
+
timeOut: 0, // 单位: 分钟
|
|
22
|
+
exitPrompt: '因您长时间未操作, 请重新登陆!'
|
|
23
|
+
},
|
|
24
|
+
}
|
|
25
|
+
},
|
|
26
|
+
ready () {
|
|
27
|
+
Vue.mmType = 'nginx'
|
|
28
|
+
Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
|
|
29
|
+
},
|
|
30
|
+
created () {
|
|
31
|
+
this.lastTime = new Date().getTime()
|
|
32
|
+
},
|
|
33
|
+
methods: {
|
|
34
|
+
async isTimeOut () {
|
|
35
|
+
// 获取config配置
|
|
36
|
+
if (!this.getConfig && this.$login.f && this.$login.f.dir) {
|
|
37
|
+
await this.$getConfig(this, 'App')
|
|
38
|
+
this.getConfig = true
|
|
39
|
+
}
|
|
40
|
+
// 无配置,不开启
|
|
41
|
+
if (this.config.timeOut <= 0) return
|
|
42
|
+
// 记录这次点击的时间
|
|
43
|
+
this.currentTime = new Date().getTime()
|
|
44
|
+
// 判断上次最后一次点击的时间和这次点击的时间间隔是否大于超时时间
|
|
45
|
+
if (this.currentTime - this.lastTime > (this.config.timeOut * 60 * 1000)) {
|
|
46
|
+
// 如果是登录状态
|
|
47
|
+
if (this.$login.f.id) {
|
|
48
|
+
await this.$showMessage(this.config.exitPrompt)
|
|
49
|
+
window.location.reload()
|
|
50
|
+
} else {
|
|
51
|
+
this.lastTime = new Date().getTime()
|
|
52
|
+
}
|
|
53
|
+
} else {
|
|
54
|
+
// 如果在超时时间内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
|
|
55
|
+
this.lastTime = new Date().getTime()
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
28
59
|
}
|
|
29
60
|
</script>
|
|
@@ -101,14 +101,14 @@
|
|
|
101
101
|
<th>表名</th>
|
|
102
102
|
<th>保存人</th>
|
|
103
103
|
<th>保存时间</th>
|
|
104
|
-
|
|
104
|
+
<th>操作</th>
|
|
105
105
|
</tr>
|
|
106
106
|
</template>
|
|
107
107
|
<template partial='body' >
|
|
108
108
|
<td>{{row.f_files_name}}</td>
|
|
109
109
|
<td>{{row.f_operator}}</td>
|
|
110
110
|
<td>{{row.f_operate_date}}</td>
|
|
111
|
-
|
|
111
|
+
<td><button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.delete(row)">删除</button></td>
|
|
112
112
|
</template>
|
|
113
113
|
</data-grid>
|
|
114
114
|
</criteria-paged>
|
|
@@ -177,6 +177,12 @@ export default {
|
|
|
177
177
|
this.reportHistory = true
|
|
178
178
|
this.model.search('1=1')
|
|
179
179
|
},
|
|
180
|
+
delete (row) {
|
|
181
|
+
this.$resetdelete('rs/entity/t_report_record', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
182
|
+
this.$dispatch('delect-report', '删除计划', row)
|
|
183
|
+
this.search()
|
|
184
|
+
})
|
|
185
|
+
},
|
|
180
186
|
getReportInfo (tname, cond) {
|
|
181
187
|
this.$resetpost('api/af-revenue/sql/manageSingleTable',{data: {
|
|
182
188
|
tablename: tname ? tname : this.tablename,
|
|
@@ -73,6 +73,16 @@
|
|
|
73
73
|
close-on-select :search="false">
|
|
74
74
|
</v-select>
|
|
75
75
|
</div>
|
|
76
|
+
<div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
|
|
77
|
+
<label class="font_normal_body">气量环比 </label>
|
|
78
|
+
<div class="row">
|
|
79
|
+
<input type="text" style="width:27%" class="input_search" v-model="model.amount_ratio1"
|
|
80
|
+
condition="amount_ratio >= {} " placeholder="">
|
|
81
|
+
<label class="font_normal_body"> ≤ x ≤ </label>
|
|
82
|
+
<input type="text" style="width:27%" class="input_search" v-model="model.amount_ratio2"
|
|
83
|
+
condition="amount_ratio <= {} " placeholder="">
|
|
84
|
+
</div>
|
|
85
|
+
</div>
|
|
76
86
|
|
|
77
87
|
</div>
|
|
78
88
|
</div>
|
|
@@ -230,7 +240,7 @@
|
|
|
230
240
|
footer:[],
|
|
231
241
|
data: {},
|
|
232
242
|
ratio: this.$appdata.getSingleValue('环比报警值百分比'),
|
|
233
|
-
model: new PagedList('api/af-revenue/sql/getHandRatioQuery', 20, {
|
|
243
|
+
model: new PagedList('api/af-revenue/sql/getHandRatioQuery', 20, {month_date: 'this.model.month_date', next_month_date: 'this.model.next_month_date', last_month_date: 'this.model.last_month_date'}),
|
|
234
244
|
initres: {
|
|
235
245
|
org:[this.$login.f.orgid],
|
|
236
246
|
dep:[]
|
|
@@ -412,6 +422,8 @@
|
|
|
412
422
|
this.$showMessage('请选择所属年月!')
|
|
413
423
|
return
|
|
414
424
|
}
|
|
425
|
+
let month_date = this.$refs.paged.$refs.cri.model.last_month_date
|
|
426
|
+
let { last_month_date, next_month_date } = this.getAdjacentMonths(month_date)
|
|
415
427
|
this.area = this.$refs.paged.$refs.cri.model.f_residential_area
|
|
416
428
|
if(this.area.length !== 0){
|
|
417
429
|
let str = JSON.stringify(this.area)
|
|
@@ -434,7 +446,11 @@
|
|
|
434
446
|
let ratio1 = this.ratio-0
|
|
435
447
|
let ratio2 = 0-this.ratio
|
|
436
448
|
let condition = `${args.condition} ` + this.orgCondtionStr + ` and (amount_ratio>=${ratio1} or amount_ratio<=${ratio2})`
|
|
437
|
-
this.model.search(condition,
|
|
449
|
+
this.model.search(condition, {
|
|
450
|
+
last_month_date: last_month_date,
|
|
451
|
+
next_month_date: next_month_date,
|
|
452
|
+
month_date: month_date
|
|
453
|
+
})
|
|
438
454
|
},
|
|
439
455
|
clear() {
|
|
440
456
|
//清空部门和人员
|
|
@@ -447,6 +463,30 @@
|
|
|
447
463
|
})
|
|
448
464
|
this.$refs.paged.$refs.cri.model.f_meter_classify = []
|
|
449
465
|
},
|
|
466
|
+
getAdjacentMonths(monthDate) {
|
|
467
|
+
// 解析年份和月份
|
|
468
|
+
let [year, month] = monthDate.split('-').map(Number)
|
|
469
|
+
|
|
470
|
+
// 计算上一个月
|
|
471
|
+
let lastYear = year
|
|
472
|
+
let lastMonth = month - 1
|
|
473
|
+
if (lastMonth < 1) {
|
|
474
|
+
lastMonth = 12
|
|
475
|
+
lastYear = year - 1
|
|
476
|
+
}
|
|
477
|
+
let last_month_date = `${lastYear}-${String(lastMonth).padStart(2, '0')}`
|
|
478
|
+
|
|
479
|
+
// 计算下一个月
|
|
480
|
+
let nextYear = year
|
|
481
|
+
let nextMonth = month + 1
|
|
482
|
+
if (nextMonth > 12) {
|
|
483
|
+
nextMonth = 1
|
|
484
|
+
nextYear = year + 1
|
|
485
|
+
}
|
|
486
|
+
let next_month_date = `${nextYear}-${String(nextMonth).padStart(2, '0')}`
|
|
487
|
+
|
|
488
|
+
return { last_month_date, next_month_date }
|
|
489
|
+
},
|
|
450
490
|
show() {
|
|
451
491
|
this.criteriaShow = true
|
|
452
492
|
},
|
|
@@ -73,6 +73,16 @@
|
|
|
73
73
|
close-on-select :search="false">
|
|
74
74
|
</v-select>
|
|
75
75
|
</div>
|
|
76
|
+
<div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
|
|
77
|
+
<label class="font_normal_body">气量环比 </label>
|
|
78
|
+
<div class="row">
|
|
79
|
+
<input type="text" style="width:27%" class="input_search" v-model="model.amount_ratio1"
|
|
80
|
+
condition="amount_ratio >= {} " placeholder="">
|
|
81
|
+
<label class="font_normal_body"> ≤ x ≤ </label>
|
|
82
|
+
<input type="text" style="width:27%" class="input_search" v-model="model.amount_ratio2"
|
|
83
|
+
condition="amount_ratio <= {} " placeholder="">
|
|
84
|
+
</div>
|
|
85
|
+
</div>
|
|
76
86
|
|
|
77
87
|
</div>
|
|
78
88
|
</div>
|
package/src/main.js
CHANGED
|
@@ -6,7 +6,7 @@ import { all } from 'vue-client'
|
|
|
6
6
|
import { system } from 'system-clients'
|
|
7
7
|
import { ldap } from 'ldap-clients'
|
|
8
8
|
import saleManage from './saleManage'
|
|
9
|
-
import ShanXianSaleManage from './filiale/
|
|
9
|
+
import ShanXianSaleManage from './filiale/liaoyuan/sale'
|
|
10
10
|
// import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
|
|
11
11
|
import webmeterManage from './webmeterManage'
|
|
12
12
|
import reportManage from './reportManage'
|