manage-client 4.1.131 → 4.1.132-dexin
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 +12 -11
- package/index.html +18 -12
- package/package.json +3 -3
- package/src/App.vue +53 -22
- package/src/filiale/liaoyuan/HandplanRatioQuery.vue +1 -1
- package/src/filiale/liaoyuan/WebHandplanRatioQuery.vue +1 -1
- package/src/filiale/tongchuan/RecordInfoQuery.vue +1 -1
- package/src/filiale/xinjiangdexin/ChangeMeterQuery.vue +24 -0
- package/src/filiale/xinjiangdexin/config/exportConfig.js +1 -0
- package/src/main.js +1 -1
package/build/dev-server.js
CHANGED
|
@@ -6,8 +6,8 @@ const proxyMiddleware = require('http-proxy-middleware')
|
|
|
6
6
|
const app = express()
|
|
7
7
|
const compiler = webpack(config)
|
|
8
8
|
|
|
9
|
-
const server = '
|
|
10
|
-
const local = '
|
|
9
|
+
const server = 'https://af.dexinrq.com:31467'
|
|
10
|
+
const local = 'https://af.dexinrq.com:31467'
|
|
11
11
|
const proxyTable = {
|
|
12
12
|
'/rs/logic/exportfile': {
|
|
13
13
|
target: server
|
|
@@ -16,21 +16,21 @@ const proxyTable = {
|
|
|
16
16
|
target: server
|
|
17
17
|
},
|
|
18
18
|
'/api/af-revenue/sql/': {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
pathRewrite: {
|
|
20
|
+
'^/api/af-revenue': '/'
|
|
21
|
+
},
|
|
22
22
|
target: local
|
|
23
23
|
},
|
|
24
24
|
'/api/af-revenue/report/': {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
pathRewrite: {
|
|
26
|
+
'^/api/af-revenue': '/'
|
|
27
|
+
},
|
|
28
28
|
target: local
|
|
29
29
|
},
|
|
30
30
|
'/api/af-revenue/logic': {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
pathRewrite: {
|
|
32
|
+
'^/api/af-revenue': '/'
|
|
33
|
+
},
|
|
34
34
|
target: local
|
|
35
35
|
},
|
|
36
36
|
'/api': {
|
|
@@ -125,6 +125,7 @@ Object.keys(proxyTable).forEach(function (context) {
|
|
|
125
125
|
if (typeof options === 'string') {
|
|
126
126
|
options = {target: options}
|
|
127
127
|
}
|
|
128
|
+
options.secure = false;
|
|
128
129
|
app.use(proxyMiddleware(context, options))
|
|
129
130
|
})
|
|
130
131
|
|
package/index.html
CHANGED
|
@@ -6,23 +6,29 @@
|
|
|
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 src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
|
|
11
|
+
|
|
12
|
+
<!-- <!–引入UI组件库（1.1版本） –>-->
|
|
13
|
+
<script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
|
|
14
|
+
<title>智慧燃气</title>
|
|
15
|
+
|
|
16
|
+
<script>
|
|
17
|
+
window.versionTime = parseInt('<%= date %>');
|
|
18
|
+
</script>
|
|
10
19
|
<style media="screen">
|
|
11
20
|
/*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
|
-
}
|
|
21
|
+
body{width: 100%;background:#7f8eaf no-repeat center bottom; background-size: cover;}
|
|
22
|
+
body .loginbg{ width:100%; height:100%; background:url(./static/loginbgmain.jpg) no-repeat center top;}
|
|
23
23
|
</style>
|
|
24
24
|
</head>
|
|
25
25
|
<body id="bodymain" class="themeOne">
|
|
26
26
|
<app></app>
|
|
27
|
+
<div style="display: none" id="btnid"></div>
|
|
27
28
|
</body>
|
|
28
29
|
</html>
|
|
30
|
+
<style>
|
|
31
|
+
* {
|
|
32
|
+
font-family: PingFangSC-Regular;
|
|
33
|
+
}
|
|
34
|
+
</style>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.132-dexin",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -67,11 +67,11 @@
|
|
|
67
67
|
"style": "0.0.3",
|
|
68
68
|
"style-loader": "^0.20.3",
|
|
69
69
|
"swiper": "^5.4.5",
|
|
70
|
-
"system-clients": "4.
|
|
70
|
+
"system-clients": "4.1.1",
|
|
71
71
|
"ldap-clients": "3.0.96",
|
|
72
72
|
"url-loader": "^0.5.7",
|
|
73
73
|
"vue-amap": "0.5.10",
|
|
74
|
-
"vue-client": "1.26.
|
|
74
|
+
"vue-client": "1.26.13",
|
|
75
75
|
"vue-hot-reload-api": "^1.2.0",
|
|
76
76
|
"vue-html-loader": "^1.0.0",
|
|
77
77
|
"vue-loader": "8.2.1",
|
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>
|
|
@@ -433,7 +433,7 @@
|
|
|
433
433
|
}
|
|
434
434
|
let ratio1 = this.ratio-0
|
|
435
435
|
let ratio2 = 0-this.ratio
|
|
436
|
-
let condition = `${args.condition} ` + this.orgCondtionStr + ` and amount_ratio>=${ratio1}
|
|
436
|
+
let condition = `${args.condition} ` + this.orgCondtionStr + ` and (amount_ratio>=${ratio1} or amount_ratio<=${ratio2})`
|
|
437
437
|
this.model.search(condition, args.model)
|
|
438
438
|
},
|
|
439
439
|
clear() {
|
|
@@ -444,7 +444,7 @@ export default {
|
|
|
444
444
|
}
|
|
445
445
|
let ratio1 = this.ratio-0
|
|
446
446
|
let ratio2 = 0-this.ratio
|
|
447
|
-
let condition = `${args.condition} ` + this.orgCondtionStr + ` and amount_ratio>=${ratio1}
|
|
447
|
+
let condition = `${args.condition} ` + this.orgCondtionStr + ` and ( amount_ratio>=${ratio1} or amount_ratio<=${ratio2})`
|
|
448
448
|
this.model.search(condition, args.model)
|
|
449
449
|
},
|
|
450
450
|
clear () {
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
10
10
|
<div class="col-sm-2 form-group" >
|
|
11
|
-
<label class="font_normal_body"
|
|
11
|
+
<label class="font_normal_body">客户编号</label>
|
|
12
12
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
|
|
13
13
|
condition="f_userinfo_code = '{}' " placeholder="客户编号">
|
|
14
14
|
</div>
|
|
@@ -184,6 +184,26 @@
|
|
|
184
184
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_card_old"
|
|
185
185
|
condition="f_card_old = '{}'" placeholder='旧卡号'>
|
|
186
186
|
</div>
|
|
187
|
+
<div class="col-sm-2 form-group">
|
|
188
|
+
<label class="font_normal_body">建档开始</label>
|
|
189
|
+
<datepicker id="startCreateFileDate" placeholder="开始日期" style="width:60%"
|
|
190
|
+
v-model="model.startCreateFileDate"
|
|
191
|
+
:value.sync="model.startCreateFileDate"
|
|
192
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
193
|
+
:show-reset-button="true"
|
|
194
|
+
condition="f_createfile_date >= '{}'">
|
|
195
|
+
</datepicker>
|
|
196
|
+
</div>
|
|
197
|
+
<div class="col-sm-2 form-group">
|
|
198
|
+
<label class="font_normal_body">建档结束</label>
|
|
199
|
+
<datepicker id="endCreateFileDate" placeholder="结束日期" style="width:60%"
|
|
200
|
+
v-model="model.endCreateFileDate"
|
|
201
|
+
:value.sync="model.endCreateFileDate"
|
|
202
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
203
|
+
:show-reset-button="true"
|
|
204
|
+
condition="f_createfile_date <= '{}'">
|
|
205
|
+
</datepicker>
|
|
206
|
+
</div>
|
|
187
207
|
</div>
|
|
188
208
|
</div>
|
|
189
209
|
</criteria>
|
|
@@ -289,6 +309,7 @@
|
|
|
289
309
|
<th><nobr>旧表类型</nobr></th>
|
|
290
310
|
<th><nobr>新表类型</nobr></th>
|
|
291
311
|
<th><nobr>用户类型</nobr></th>
|
|
312
|
+
<th><nobr>建档时间</nobr></th>
|
|
292
313
|
<th><nobr>附件</nobr></th>
|
|
293
314
|
</tr>
|
|
294
315
|
</template>
|
|
@@ -393,6 +414,9 @@
|
|
|
393
414
|
<td style="text-align: center;">
|
|
394
415
|
<nobr>{{row.f_user_type}}</nobr>
|
|
395
416
|
</td>
|
|
417
|
+
<td style="text-align: center;">
|
|
418
|
+
<nobr>{{row.f_createfile_date}}</nobr>
|
|
419
|
+
</td>
|
|
396
420
|
<td style="text-align: center;"><nobr>
|
|
397
421
|
<button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
|
|
398
422
|
</nobr></td>
|
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/xinjiangdexin/sale'
|
|
10
10
|
// import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
|
|
11
11
|
import webmeterManage from './webmeterManage'
|
|
12
12
|
import reportManage from './reportManage'
|