sale-client 3.5.13 → 3.5.14
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/package.json +117 -117
- package/src/components/common/userinfo_detail/TableUsageChart.vue +81 -0
- package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue +3 -0
- package/src/components/revenue/concentrator/ncArchivesList.vue +4 -4
- package/src/filiale/shaoguan/sale.js +2 -1
- package/src/filiale/tongchuan/common/userinfo_detail/UserInfoDetailManageNew.vue +3 -0
- package/src/sale.js +2 -0
package/package.json
CHANGED
|
@@ -1,117 +1,117 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "sale-client",
|
|
3
|
-
"version": "3.5.
|
|
4
|
-
"description": "收费模块前台组件",
|
|
5
|
-
"main": "src/index.js",
|
|
6
|
-
"scripts": {
|
|
7
|
-
"example": "node build/example-server.js",
|
|
8
|
-
"dev": "node build/dev-server.js",
|
|
9
|
-
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
10
|
-
"unit": "karma start test/unit/karma.conf.js",
|
|
11
|
-
"build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
12
|
-
"e2e": "node test/e2e/runner.js",
|
|
13
|
-
"release": "bash build/release.sh"
|
|
14
|
-
},
|
|
15
|
-
"repository": {
|
|
16
|
-
"type": "git",
|
|
17
|
-
"url": "https://gitee.com/aote/product.git"
|
|
18
|
-
},
|
|
19
|
-
"dependencies": {
|
|
20
|
-
"examples": "^0.1.0",
|
|
21
|
-
"js-file-download": "0.4.12",
|
|
22
|
-
"less-loader": "^2.2.3",
|
|
23
|
-
"qrcodejs2": "0.0.2",
|
|
24
|
-
"vue": "^1.0.17",
|
|
25
|
-
"yarn": "^1.22.10"
|
|
26
|
-
},
|
|
27
|
-
"devDependencies": {
|
|
28
|
-
"address-client": "3.2.29",
|
|
29
|
-
"axios": "0.15.3",
|
|
30
|
-
"babel-core": "^6.0.0",
|
|
31
|
-
"babel-loader": "^6.0.0",
|
|
32
|
-
"babel-plugin-transform-runtime": "^6.0.0",
|
|
33
|
-
"babel-preset-es2015": "^6.0.0",
|
|
34
|
-
"babel-preset-stage-2": "^6.0.0",
|
|
35
|
-
"chai": "^3.5.0",
|
|
36
|
-
"co": "^4.6.0",
|
|
37
|
-
"compression-webpack-plugin": "1.1.2",
|
|
38
|
-
"connect-history-api-fallback": "^1.1.0",
|
|
39
|
-
"cross-env": "^1.0.7",
|
|
40
|
-
"cross-spawn": "^2.1.5",
|
|
41
|
-
"css-loader": "^0.23.0",
|
|
42
|
-
"echarts": "^4.1.0",
|
|
43
|
-
"eslint": "^3.19.0",
|
|
44
|
-
"eslint-config-standard": "^10.2.1",
|
|
45
|
-
"eslint-friendly-formatter": "^3.0.0",
|
|
46
|
-
"eslint-loader": "^1.7.1",
|
|
47
|
-
"eslint-plugin-html": "^3.0.0",
|
|
48
|
-
"eslint-plugin-import": "^2.7.0",
|
|
49
|
-
"eslint-plugin-node": "^5.2.0",
|
|
50
|
-
"eslint-plugin-promise": "^3.4.0",
|
|
51
|
-
"eslint-plugin-standard": "^3.0.1",
|
|
52
|
-
"eventsource-polyfill": "^0.9.6",
|
|
53
|
-
"express": "^4.13.3",
|
|
54
|
-
"extract-text-webpack-plugin": "^1.0.1",
|
|
55
|
-
"file-loader": "^0.8.4",
|
|
56
|
-
"filemanager-webpack-plugin": "^2.0.5",
|
|
57
|
-
"function-bind": "^1.0.2",
|
|
58
|
-
"html-webpack-plugin": "^2.8.1",
|
|
59
|
-
"http-proxy-middleware": "^0.11.0",
|
|
60
|
-
"inject-loader": "^2.0.1",
|
|
61
|
-
"isparta-loader": "^2.0.0",
|
|
62
|
-
"jasmine-core": "^2.4.1",
|
|
63
|
-
"jquery": "^3.3.1",
|
|
64
|
-
"jsencrypt": "3.0.0-rc.1",
|
|
65
|
-
"json-loader": "^0.5.4",
|
|
66
|
-
"karma": "^1.4.1",
|
|
67
|
-
"karma-chrome-launcher": "^2.2.0",
|
|
68
|
-
"karma-coverage": "^1.1.1",
|
|
69
|
-
"karma-mocha": "^1.3.0",
|
|
70
|
-
"karma-sinon-chai": "^1.3.1",
|
|
71
|
-
"karma-sourcemap-loader": "^0.3.7",
|
|
72
|
-
"karma-spec-reporter": "0.0.31",
|
|
73
|
-
"karma-webpack": "^2.0.2",
|
|
74
|
-
"ldap-clients": "3.0.7",
|
|
75
|
-
"less": "^2.7.3",
|
|
76
|
-
"manage-client": "3.1.8-88",
|
|
77
|
-
"mkdirp": "^0.5.1",
|
|
78
|
-
"mocha": "^3.2.0",
|
|
79
|
-
"moment": "2.24.0",
|
|
80
|
-
"ncp": "^2.0.0",
|
|
81
|
-
"nightwatch": "^0.8.18",
|
|
82
|
-
"qrcodejs2": "0.0.2",
|
|
83
|
-
"rimraf": "^2.5.0",
|
|
84
|
-
"selenium-server": "2.52.0",
|
|
85
|
-
"sinon": "^2.1.0",
|
|
86
|
-
"sinon-chai": "^2.8.0",
|
|
87
|
-
"style": "0.0.3",
|
|
88
|
-
"style-loader": "^0.20.3",
|
|
89
|
-
"system-clients": "3.2.6-1",
|
|
90
|
-
"url-loader": "^0.5.7",
|
|
91
|
-
"vue-client": "1.24.55",
|
|
92
|
-
"vue-clipboard2": "0.3.1",
|
|
93
|
-
"vue-hot-reload-api": "^1.2.0",
|
|
94
|
-
"vue-html-loader": "^1.0.0",
|
|
95
|
-
"vue-loader": "^8.2.1",
|
|
96
|
-
"vue-resource": "^1.5.0",
|
|
97
|
-
"vue-router": "^0.7.13",
|
|
98
|
-
"vue-strap": "^1.0.9",
|
|
99
|
-
"vue-style-loader": "^1.0.0",
|
|
100
|
-
"vue-validator": "2.1.7",
|
|
101
|
-
"webpack": "^1.12.2",
|
|
102
|
-
"webpack-dev-middleware": "^1.4.0",
|
|
103
|
-
"webpack-hot-middleware": "^2.6.0",
|
|
104
|
-
"webpack-merge": "^0.8.3",
|
|
105
|
-
"webpack-parallel-uglify-plugin": "^1.0.0",
|
|
106
|
-
"weixin-js-sdk": "^1.2.0"
|
|
107
|
-
},
|
|
108
|
-
"keywords": [
|
|
109
|
-
"selling-clients"
|
|
110
|
-
],
|
|
111
|
-
"author": "张桥",
|
|
112
|
-
"license": "ISC",
|
|
113
|
-
"directories": {
|
|
114
|
-
"example": "examples",
|
|
115
|
-
"test": "test"
|
|
116
|
-
}
|
|
117
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "sale-client",
|
|
3
|
+
"version": "3.5.14",
|
|
4
|
+
"description": "收费模块前台组件",
|
|
5
|
+
"main": "src/index.js",
|
|
6
|
+
"scripts": {
|
|
7
|
+
"example": "node build/example-server.js",
|
|
8
|
+
"dev": "node build/dev-server.js",
|
|
9
|
+
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
10
|
+
"unit": "karma start test/unit/karma.conf.js",
|
|
11
|
+
"build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
12
|
+
"e2e": "node test/e2e/runner.js",
|
|
13
|
+
"release": "bash build/release.sh"
|
|
14
|
+
},
|
|
15
|
+
"repository": {
|
|
16
|
+
"type": "git",
|
|
17
|
+
"url": "https://gitee.com/aote/product.git"
|
|
18
|
+
},
|
|
19
|
+
"dependencies": {
|
|
20
|
+
"examples": "^0.1.0",
|
|
21
|
+
"js-file-download": "0.4.12",
|
|
22
|
+
"less-loader": "^2.2.3",
|
|
23
|
+
"qrcodejs2": "0.0.2",
|
|
24
|
+
"vue": "^1.0.17",
|
|
25
|
+
"yarn": "^1.22.10"
|
|
26
|
+
},
|
|
27
|
+
"devDependencies": {
|
|
28
|
+
"address-client": "3.2.29",
|
|
29
|
+
"axios": "0.15.3",
|
|
30
|
+
"babel-core": "^6.0.0",
|
|
31
|
+
"babel-loader": "^6.0.0",
|
|
32
|
+
"babel-plugin-transform-runtime": "^6.0.0",
|
|
33
|
+
"babel-preset-es2015": "^6.0.0",
|
|
34
|
+
"babel-preset-stage-2": "^6.0.0",
|
|
35
|
+
"chai": "^3.5.0",
|
|
36
|
+
"co": "^4.6.0",
|
|
37
|
+
"compression-webpack-plugin": "1.1.2",
|
|
38
|
+
"connect-history-api-fallback": "^1.1.0",
|
|
39
|
+
"cross-env": "^1.0.7",
|
|
40
|
+
"cross-spawn": "^2.1.5",
|
|
41
|
+
"css-loader": "^0.23.0",
|
|
42
|
+
"echarts": "^4.1.0",
|
|
43
|
+
"eslint": "^3.19.0",
|
|
44
|
+
"eslint-config-standard": "^10.2.1",
|
|
45
|
+
"eslint-friendly-formatter": "^3.0.0",
|
|
46
|
+
"eslint-loader": "^1.7.1",
|
|
47
|
+
"eslint-plugin-html": "^3.0.0",
|
|
48
|
+
"eslint-plugin-import": "^2.7.0",
|
|
49
|
+
"eslint-plugin-node": "^5.2.0",
|
|
50
|
+
"eslint-plugin-promise": "^3.4.0",
|
|
51
|
+
"eslint-plugin-standard": "^3.0.1",
|
|
52
|
+
"eventsource-polyfill": "^0.9.6",
|
|
53
|
+
"express": "^4.13.3",
|
|
54
|
+
"extract-text-webpack-plugin": "^1.0.1",
|
|
55
|
+
"file-loader": "^0.8.4",
|
|
56
|
+
"filemanager-webpack-plugin": "^2.0.5",
|
|
57
|
+
"function-bind": "^1.0.2",
|
|
58
|
+
"html-webpack-plugin": "^2.8.1",
|
|
59
|
+
"http-proxy-middleware": "^0.11.0",
|
|
60
|
+
"inject-loader": "^2.0.1",
|
|
61
|
+
"isparta-loader": "^2.0.0",
|
|
62
|
+
"jasmine-core": "^2.4.1",
|
|
63
|
+
"jquery": "^3.3.1",
|
|
64
|
+
"jsencrypt": "3.0.0-rc.1",
|
|
65
|
+
"json-loader": "^0.5.4",
|
|
66
|
+
"karma": "^1.4.1",
|
|
67
|
+
"karma-chrome-launcher": "^2.2.0",
|
|
68
|
+
"karma-coverage": "^1.1.1",
|
|
69
|
+
"karma-mocha": "^1.3.0",
|
|
70
|
+
"karma-sinon-chai": "^1.3.1",
|
|
71
|
+
"karma-sourcemap-loader": "^0.3.7",
|
|
72
|
+
"karma-spec-reporter": "0.0.31",
|
|
73
|
+
"karma-webpack": "^2.0.2",
|
|
74
|
+
"ldap-clients": "3.0.7",
|
|
75
|
+
"less": "^2.7.3",
|
|
76
|
+
"manage-client": "3.1.8-88",
|
|
77
|
+
"mkdirp": "^0.5.1",
|
|
78
|
+
"mocha": "^3.2.0",
|
|
79
|
+
"moment": "2.24.0",
|
|
80
|
+
"ncp": "^2.0.0",
|
|
81
|
+
"nightwatch": "^0.8.18",
|
|
82
|
+
"qrcodejs2": "0.0.2",
|
|
83
|
+
"rimraf": "^2.5.0",
|
|
84
|
+
"selenium-server": "2.52.0",
|
|
85
|
+
"sinon": "^2.1.0",
|
|
86
|
+
"sinon-chai": "^2.8.0",
|
|
87
|
+
"style": "0.0.3",
|
|
88
|
+
"style-loader": "^0.20.3",
|
|
89
|
+
"system-clients": "3.2.6-1",
|
|
90
|
+
"url-loader": "^0.5.7",
|
|
91
|
+
"vue-client": "1.24.55",
|
|
92
|
+
"vue-clipboard2": "0.3.1",
|
|
93
|
+
"vue-hot-reload-api": "^1.2.0",
|
|
94
|
+
"vue-html-loader": "^1.0.0",
|
|
95
|
+
"vue-loader": "^8.2.1",
|
|
96
|
+
"vue-resource": "^1.5.0",
|
|
97
|
+
"vue-router": "^0.7.13",
|
|
98
|
+
"vue-strap": "^1.0.9",
|
|
99
|
+
"vue-style-loader": "^1.0.0",
|
|
100
|
+
"vue-validator": "2.1.7",
|
|
101
|
+
"webpack": "^1.12.2",
|
|
102
|
+
"webpack-dev-middleware": "^1.4.0",
|
|
103
|
+
"webpack-hot-middleware": "^2.6.0",
|
|
104
|
+
"webpack-merge": "^0.8.3",
|
|
105
|
+
"webpack-parallel-uglify-plugin": "^1.0.0",
|
|
106
|
+
"weixin-js-sdk": "^1.2.0"
|
|
107
|
+
},
|
|
108
|
+
"keywords": [
|
|
109
|
+
"selling-clients"
|
|
110
|
+
],
|
|
111
|
+
"author": "张桥",
|
|
112
|
+
"license": "ISC",
|
|
113
|
+
"directories": {
|
|
114
|
+
"example": "examples",
|
|
115
|
+
"test": "test"
|
|
116
|
+
}
|
|
117
|
+
}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
<template lang="html">
|
|
2
|
+
<div id="TableUsageChart">
|
|
3
|
+
<div id="TableUsageChart_chart" :style="{width:'100%',height:'98%'}"></div>
|
|
4
|
+
</div>
|
|
5
|
+
</template>
|
|
6
|
+
|
|
7
|
+
<script>
|
|
8
|
+
import echarts from 'echarts'
|
|
9
|
+
|
|
10
|
+
export default {
|
|
11
|
+
props: {
|
|
12
|
+
row: {}
|
|
13
|
+
},
|
|
14
|
+
data () {
|
|
15
|
+
return {}
|
|
16
|
+
},
|
|
17
|
+
methods: {
|
|
18
|
+
async searchdata () {
|
|
19
|
+
let param = {
|
|
20
|
+
f_userinfo_id: this.row.f_userinfo_id
|
|
21
|
+
}
|
|
22
|
+
let usage = await this.$resetpost('rs/logic/tableUsageChart', {data: param}, {resolveMsg: null, rejectMsg: '获取用气信息出错!'})
|
|
23
|
+
let xData = []
|
|
24
|
+
let YData = []
|
|
25
|
+
if (usage.data.length === 0) {
|
|
26
|
+
this.$showMessage('未查询到任何数据')
|
|
27
|
+
} else if (usage.data.length === 1) {
|
|
28
|
+
xData[0] = usage.data[0].min_date
|
|
29
|
+
xData[1] = usage.data[0].max_date
|
|
30
|
+
YData[0] = 0
|
|
31
|
+
YData[1] = usage.data[0].f_pregas
|
|
32
|
+
} else {
|
|
33
|
+
for (let row of usage.data) {
|
|
34
|
+
xData.push(row.min_date)
|
|
35
|
+
YData.push(row.f_pregas)
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
this.set(xData, YData)
|
|
39
|
+
},
|
|
40
|
+
set (xData, YData) {
|
|
41
|
+
this.xc = echarts.init(document.getElementById('TableUsageChart_chart'))
|
|
42
|
+
this.xc.setOption({
|
|
43
|
+
tooltip: {
|
|
44
|
+
trigger: 'axis'
|
|
45
|
+
},
|
|
46
|
+
toolbox: {
|
|
47
|
+
show: true,
|
|
48
|
+
feature: {
|
|
49
|
+
dataView: {show: true, readOnly: false},
|
|
50
|
+
magicType: {show: true, type: ['line', 'bar']},
|
|
51
|
+
restore: {show: true},
|
|
52
|
+
saveAsImage: {show: true}
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
xAxis: {
|
|
56
|
+
type: 'category',
|
|
57
|
+
data: xData
|
|
58
|
+
},
|
|
59
|
+
yAxis: {
|
|
60
|
+
type: 'value'
|
|
61
|
+
},
|
|
62
|
+
series: [{
|
|
63
|
+
data: YData,
|
|
64
|
+
type: 'line'
|
|
65
|
+
}]
|
|
66
|
+
})
|
|
67
|
+
}
|
|
68
|
+
},
|
|
69
|
+
ready () {
|
|
70
|
+
this.searchdata()
|
|
71
|
+
},
|
|
72
|
+
watch: {}
|
|
73
|
+
}
|
|
74
|
+
</script>
|
|
75
|
+
<style lang="less">
|
|
76
|
+
#TableUsageChart {
|
|
77
|
+
div{
|
|
78
|
+
height: auto;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
</style>
|
|
@@ -66,6 +66,9 @@
|
|
|
66
66
|
<saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
|
|
67
67
|
<meter-param :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
|
|
68
68
|
</saletab>
|
|
69
|
+
<saletab header="表使用量图表">
|
|
70
|
+
<table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
|
|
71
|
+
</saletab>
|
|
69
72
|
</saletabbut>
|
|
70
73
|
</div>
|
|
71
74
|
</div>
|
|
@@ -14,13 +14,13 @@
|
|
|
14
14
|
</div>
|
|
15
15
|
<div :class="$parent.$parent.style" >
|
|
16
16
|
<label class="font_normal_body">集中器编码</label>
|
|
17
|
-
<input type="text" class="input_search" style="width:60%" v-model="model.
|
|
18
|
-
condition="
|
|
17
|
+
<input type="text" class="input_search" style="width:60%" v-model="model.f_mpc_number"
|
|
18
|
+
condition="f_mpc_number like '%{}%'" placeholder="集中器编码"/>
|
|
19
19
|
</div>
|
|
20
20
|
<div :class="$parent.$parent.style" v-if="$parent.$parent.areaShow">
|
|
21
21
|
<label class="font_normal_body">集中器</label>
|
|
22
|
-
<input type="text" class="input_search" style="width:60%" v-model="model.
|
|
23
|
-
condition="
|
|
22
|
+
<input type="text" class="input_search" style="width:60%" v-model="model.f_mpc_alias"
|
|
23
|
+
condition="f_mpc_alias like '%{}%'" placeholder="集中器别名"/>
|
|
24
24
|
</div>
|
|
25
25
|
|
|
26
26
|
<div class="col-sm-4 form-group button-range">
|
|
@@ -43,7 +43,8 @@ let specialComp = {
|
|
|
43
43
|
// 抄表记录维护
|
|
44
44
|
'hand-list-maintain': (resolve) => { require(['./handListMaintain'], resolve) },
|
|
45
45
|
// 用户地址
|
|
46
|
-
'file-user-address': (resolve) => { require(['./FileUserAddress'], resolve) }
|
|
46
|
+
'file-user-address': (resolve) => { require(['./FileUserAddress'], resolve) },
|
|
47
|
+
'charge-list': (resolve) => { require(['./charge/ChargeList'], resolve) }
|
|
47
48
|
|
|
48
49
|
}
|
|
49
50
|
exports.specialComp = specialComp
|
|
@@ -66,6 +66,9 @@
|
|
|
66
66
|
<saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
|
|
67
67
|
<meter-param :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
|
|
68
68
|
</saletab>
|
|
69
|
+
<saletab header="表使用量图表">
|
|
70
|
+
<table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
|
|
71
|
+
</saletab>
|
|
69
72
|
</saletabbut>
|
|
70
73
|
</div>
|
|
71
74
|
</div>
|
package/src/sale.js
CHANGED
|
@@ -680,6 +680,8 @@ export default function (filiale) {
|
|
|
680
680
|
Vue.component('user-base-info', (resolve) => { require(['./components/common/userinfo_detail/UserBaseInfo'], resolve) })
|
|
681
681
|
Vue.component('user-info-detail-manage-new', (resolve) => { require(['./components/common/userinfo_detail/UserInfoDetailManageNew'], resolve) })
|
|
682
682
|
Vue.component('user-base-info-new', (resolve) => { require(['./components/common/userinfo_detail/UserBaseInfoNew'], resolve) })
|
|
683
|
+
// 单户各表具用气量折断图
|
|
684
|
+
Vue.component('table-usage-chart', (resolve) => { require(['./components/common/userinfo_detail/TableUsageChart'], resolve) })
|
|
683
685
|
// automatic-purse卡表机表相关组件
|
|
684
686
|
Vue.component('fill-gas-query-user', (resolve) => { require(['./components/common/userinfo_detail/ic_detail/FillGasQueryUser'], resolve) })
|
|
685
687
|
|