sale-client 3.6.19 → 3.6.21
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 +85 -85
- package/package.json +1 -1
- package/src/components/charge/saletab.vue +68 -68
- package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue +203 -203
- package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue +333 -304
- package/src/components/revenue/machineHandManage/machineHand.vue +2068 -2068
- package/src/filiale/haile/FilesManage/MeterinfoTest.vue +986 -0
- package/src/filiale/haile/FilesManage/UserEssentialInfoTest.vue +336 -0
- package/src/filiale/haile/MachineMeterCenter.vue +20 -3
- package/src/filiale/haile/sale.js +5 -0
- package/src/plugins/CardService.js +2110 -2068
package/build/dev-server.js
CHANGED
|
@@ -1,85 +1,85 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
const [localUrl, serverRul] = ['http://
|
|
3
|
-
var merge = require('webpack-merge')
|
|
4
|
-
var baseConfig = require('./webpack.dev.conf')
|
|
5
|
-
var devConfig = {
|
|
6
|
-
devServer: {
|
|
7
|
-
contentBase: path.join(__dirname, 'src'),
|
|
8
|
-
hot: true,
|
|
9
|
-
publicPath: baseConfig.output.publicPath,
|
|
10
|
-
historyApiFallback: true,
|
|
11
|
-
host: '127.0.0.1',
|
|
12
|
-
port: 8089,
|
|
13
|
-
open: true,
|
|
14
|
-
stats: {
|
|
15
|
-
colors: false, // 配置控制台输出彩色日志
|
|
16
|
-
chunks: false, // 不输出构建 chunk 信息
|
|
17
|
-
children: false // 不输出子模块构建信息
|
|
18
|
-
},
|
|
19
|
-
proxy: {
|
|
20
|
-
'/rs/file': {
|
|
21
|
-
target: serverRul
|
|
22
|
-
},
|
|
23
|
-
'/invoice': {
|
|
24
|
-
target: serverRul
|
|
25
|
-
},
|
|
26
|
-
// 查找资源服务数据
|
|
27
|
-
'/rs/search': {
|
|
28
|
-
target: serverRul
|
|
29
|
-
},
|
|
30
|
-
// 查找资源服务数据
|
|
31
|
-
'/rs/logic/getLogin': {
|
|
32
|
-
target: serverRul
|
|
33
|
-
},
|
|
34
|
-
// 查找资源服务数据
|
|
35
|
-
'/rs/logic/getInitData': {
|
|
36
|
-
target: serverRul
|
|
37
|
-
},
|
|
38
|
-
'/rs/logic/getSaleInitData': {
|
|
39
|
-
target: serverRul
|
|
40
|
-
},
|
|
41
|
-
// 用户登录服务地址
|
|
42
|
-
'/rs/user': {
|
|
43
|
-
target: serverRul
|
|
44
|
-
},
|
|
45
|
-
'/rs/path': {
|
|
46
|
-
target: serverRul
|
|
47
|
-
},
|
|
48
|
-
'/rs/data': {
|
|
49
|
-
target: serverRul
|
|
50
|
-
},
|
|
51
|
-
'/rs/license': {
|
|
52
|
-
target: serverRul
|
|
53
|
-
},
|
|
54
|
-
'/rs/db': {
|
|
55
|
-
target: serverRul
|
|
56
|
-
},
|
|
57
|
-
'/excel': {
|
|
58
|
-
target: serverRul
|
|
59
|
-
},
|
|
60
|
-
'/rs/config': {
|
|
61
|
-
target: serverRul
|
|
62
|
-
},
|
|
63
|
-
'/rs/report': {
|
|
64
|
-
target: serverRul
|
|
65
|
-
},
|
|
66
|
-
'/rs/vue': {
|
|
67
|
-
target: serverRul
|
|
68
|
-
},
|
|
69
|
-
'/rs/logic': {
|
|
70
|
-
target: localUrl
|
|
71
|
-
},
|
|
72
|
-
'/rs/sql': {
|
|
73
|
-
target: localUrl
|
|
74
|
-
},
|
|
75
|
-
'/webmeter': {
|
|
76
|
-
target: serverRul
|
|
77
|
-
},
|
|
78
|
-
'/rs': {
|
|
79
|
-
target: serverRul
|
|
80
|
-
// changeOrigin: true
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
module.exports = merge(baseConfig, devConfig)
|
|
1
|
+
var path = require('path')
|
|
2
|
+
const [localUrl, serverRul] = ['http://121.36.106.17:8400', 'http://121.36.106.17:8400']
|
|
3
|
+
var merge = require('webpack-merge')
|
|
4
|
+
var baseConfig = require('./webpack.dev.conf')
|
|
5
|
+
var devConfig = {
|
|
6
|
+
devServer: {
|
|
7
|
+
contentBase: path.join(__dirname, 'src'),
|
|
8
|
+
hot: true,
|
|
9
|
+
publicPath: baseConfig.output.publicPath,
|
|
10
|
+
historyApiFallback: true,
|
|
11
|
+
host: '127.0.0.1',
|
|
12
|
+
port: 8089,
|
|
13
|
+
open: true,
|
|
14
|
+
stats: {
|
|
15
|
+
colors: false, // 配置控制台输出彩色日志
|
|
16
|
+
chunks: false, // 不输出构建 chunk 信息
|
|
17
|
+
children: false // 不输出子模块构建信息
|
|
18
|
+
},
|
|
19
|
+
proxy: {
|
|
20
|
+
'/rs/file': {
|
|
21
|
+
target: serverRul
|
|
22
|
+
},
|
|
23
|
+
'/invoice': {
|
|
24
|
+
target: serverRul
|
|
25
|
+
},
|
|
26
|
+
// 查找资源服务数据
|
|
27
|
+
'/rs/search': {
|
|
28
|
+
target: serverRul
|
|
29
|
+
},
|
|
30
|
+
// 查找资源服务数据
|
|
31
|
+
'/rs/logic/getLogin': {
|
|
32
|
+
target: serverRul
|
|
33
|
+
},
|
|
34
|
+
// 查找资源服务数据
|
|
35
|
+
'/rs/logic/getInitData': {
|
|
36
|
+
target: serverRul
|
|
37
|
+
},
|
|
38
|
+
'/rs/logic/getSaleInitData': {
|
|
39
|
+
target: serverRul
|
|
40
|
+
},
|
|
41
|
+
// 用户登录服务地址
|
|
42
|
+
'/rs/user': {
|
|
43
|
+
target: serverRul
|
|
44
|
+
},
|
|
45
|
+
'/rs/path': {
|
|
46
|
+
target: serverRul
|
|
47
|
+
},
|
|
48
|
+
'/rs/data': {
|
|
49
|
+
target: serverRul
|
|
50
|
+
},
|
|
51
|
+
'/rs/license': {
|
|
52
|
+
target: serverRul
|
|
53
|
+
},
|
|
54
|
+
'/rs/db': {
|
|
55
|
+
target: serverRul
|
|
56
|
+
},
|
|
57
|
+
'/excel': {
|
|
58
|
+
target: serverRul
|
|
59
|
+
},
|
|
60
|
+
'/rs/config': {
|
|
61
|
+
target: serverRul
|
|
62
|
+
},
|
|
63
|
+
'/rs/report': {
|
|
64
|
+
target: serverRul
|
|
65
|
+
},
|
|
66
|
+
'/rs/vue': {
|
|
67
|
+
target: serverRul
|
|
68
|
+
},
|
|
69
|
+
'/rs/logic': {
|
|
70
|
+
target: localUrl
|
|
71
|
+
},
|
|
72
|
+
'/rs/sql': {
|
|
73
|
+
target: localUrl
|
|
74
|
+
},
|
|
75
|
+
'/webmeter': {
|
|
76
|
+
target: serverRul
|
|
77
|
+
},
|
|
78
|
+
'/rs': {
|
|
79
|
+
target: serverRul
|
|
80
|
+
// changeOrigin: true
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -1,68 +1,68 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div role="tabpanel"
|
|
3
|
-
v-bind:class="{hide:!show}"
|
|
4
|
-
v-if="show"
|
|
5
|
-
:transition="transition"
|
|
6
|
-
style = "height:
|
|
7
|
-
>
|
|
8
|
-
<slot></slot>
|
|
9
|
-
</div>
|
|
10
|
-
</template>
|
|
11
|
-
|
|
12
|
-
<script>
|
|
13
|
-
import coerceBoolean from 'vue-client/src/vue-strap/src/utils/coerceBoolean.js'
|
|
14
|
-
|
|
15
|
-
export default {
|
|
16
|
-
props: {
|
|
17
|
-
header: {
|
|
18
|
-
type: String
|
|
19
|
-
},
|
|
20
|
-
disabled: {
|
|
21
|
-
type: Boolean,
|
|
22
|
-
coerce: coerceBoolean,
|
|
23
|
-
default: false
|
|
24
|
-
}
|
|
25
|
-
},
|
|
26
|
-
data () {
|
|
27
|
-
return {
|
|
28
|
-
index: 0,
|
|
29
|
-
show: false
|
|
30
|
-
}
|
|
31
|
-
},
|
|
32
|
-
watch: {
|
|
33
|
-
'header' (val) {
|
|
34
|
-
// header变化时，通知tabset
|
|
35
|
-
let data = this.$parent.renderData.find((v) => v.comp === this)
|
|
36
|
-
data.header = val
|
|
37
|
-
}
|
|
38
|
-
},
|
|
39
|
-
computed: {
|
|
40
|
-
show () {
|
|
41
|
-
return (this.$parent.active === this.index)
|
|
42
|
-
},
|
|
43
|
-
transition () {
|
|
44
|
-
return this.$parent.effect
|
|
45
|
-
}
|
|
46
|
-
},
|
|
47
|
-
created () {
|
|
48
|
-
this.$parent.renderData.push({
|
|
49
|
-
comp: this,
|
|
50
|
-
header: this.header,
|
|
51
|
-
disabled: this.disabled
|
|
52
|
-
})
|
|
53
|
-
},
|
|
54
|
-
ready () {
|
|
55
|
-
// 找到当前tab的索引
|
|
56
|
-
this.index = this.$parent.$children.findIndex((v) => v.$el === this.$el)
|
|
57
|
-
},
|
|
58
|
-
beforeDestroy () {
|
|
59
|
-
this.$parent.renderData.splice(this.index, 1)
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
</script>
|
|
63
|
-
|
|
64
|
-
<style scoped>
|
|
65
|
-
.tab-content > .tab-pane {
|
|
66
|
-
display: block;
|
|
67
|
-
}
|
|
68
|
-
</style>
|
|
1
|
+
<template>
|
|
2
|
+
<div role="tabpanel"
|
|
3
|
+
v-bind:class="{hide:!show}"
|
|
4
|
+
v-if="show"
|
|
5
|
+
:transition="transition"
|
|
6
|
+
style = "height: 95%"
|
|
7
|
+
>
|
|
8
|
+
<slot></slot>
|
|
9
|
+
</div>
|
|
10
|
+
</template>
|
|
11
|
+
|
|
12
|
+
<script>
|
|
13
|
+
import coerceBoolean from 'vue-client/src/vue-strap/src/utils/coerceBoolean.js'
|
|
14
|
+
|
|
15
|
+
export default {
|
|
16
|
+
props: {
|
|
17
|
+
header: {
|
|
18
|
+
type: String
|
|
19
|
+
},
|
|
20
|
+
disabled: {
|
|
21
|
+
type: Boolean,
|
|
22
|
+
coerce: coerceBoolean,
|
|
23
|
+
default: false
|
|
24
|
+
}
|
|
25
|
+
},
|
|
26
|
+
data () {
|
|
27
|
+
return {
|
|
28
|
+
index: 0,
|
|
29
|
+
show: false
|
|
30
|
+
}
|
|
31
|
+
},
|
|
32
|
+
watch: {
|
|
33
|
+
'header' (val) {
|
|
34
|
+
// header变化时，通知tabset
|
|
35
|
+
let data = this.$parent.renderData.find((v) => v.comp === this)
|
|
36
|
+
data.header = val
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
computed: {
|
|
40
|
+
show () {
|
|
41
|
+
return (this.$parent.active === this.index)
|
|
42
|
+
},
|
|
43
|
+
transition () {
|
|
44
|
+
return this.$parent.effect
|
|
45
|
+
}
|
|
46
|
+
},
|
|
47
|
+
created () {
|
|
48
|
+
this.$parent.renderData.push({
|
|
49
|
+
comp: this,
|
|
50
|
+
header: this.header,
|
|
51
|
+
disabled: this.disabled
|
|
52
|
+
})
|
|
53
|
+
},
|
|
54
|
+
ready () {
|
|
55
|
+
// 找到当前tab的索引
|
|
56
|
+
this.index = this.$parent.$children.findIndex((v) => v.$el === this.$el)
|
|
57
|
+
},
|
|
58
|
+
beforeDestroy () {
|
|
59
|
+
this.$parent.renderData.splice(this.index, 1)
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
</script>
|
|
63
|
+
|
|
64
|
+
<style scoped>
|
|
65
|
+
.tab-content > .tab-pane {
|
|
66
|
+
display: block;
|
|
67
|
+
}
|
|
68
|
+
</style>
|