manage-client 3.3.132-hl → 3.3.133

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.
@@ -1,189 +1,189 @@
1
- var express = require('express')
2
- var webpack = require('webpack')
3
- var config = require('./webpack.dev.conf')
4
- var proxyMiddleware = require('http-proxy-middleware')
5
- // var httpProxy = require('http-proxy')
6
-
7
- var app = express()
8
- var compiler = webpack(config)
9
- // var proxy = httpProxy.createProxyServer()
10
-
11
- // Define HTTP proxies to your custom API backend
12
- // https://github.com/chimurai/http-proxy-middleware
13
- // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
- var shaoguan = 'http://119.146.1.106:8300/'
15
- var qtx= 'http://36.103.222.144:6300/'
16
- // var bendi = 'http://220.194.141.253:8600/'
17
- // var bendi = 'http://203.57.101.233:9001'
18
- // var bendi = 'http://172.168.1.11:9001/'
19
- // var bendi = 'http://203.57.101.233:8400/'
20
- // var bendi = 'http://121.36.106.17:8400/'
21
- // var fuwu = 'http://203.57.101.233:9001'
22
- var bendi = 'http://121.40.52.133:9001/#'
23
- // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://127.0.0.1:8488/'
25
- // 192.168.
26
- // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
- // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
28
- var proxyTable = {
29
- '/rs/logic/exportfile': {
30
- target: bendi
31
- },
32
- '/rs/sql/chargeQuery_by_gasproperties': {
33
- target: 'http://localhost:8084/'
34
- },
35
- '/rs/logic/chargeQuery_by_gasproperties_line': {
36
- target: 'http://localhost:8084/'
37
- },
38
- '/files': {
39
- target: bendi
40
- },
41
- // 查找资源服务数据
42
- '/rs/search': {
43
- target: bendi
44
- },
45
- // 查找资源服务数据
46
- '/rs/logic/getLogin': {
47
- target: bendi
48
- },
49
- // 查找资源服务数据
50
- '/rs/logic/getInitData': {
51
- target: bendi
52
- },
53
- '/rs/logic/getSaleInitData': {
54
- target: bendi
55
- },
56
- // 用户登录服务地址
57
- '/rs/user': {
58
- target: bendi
59
- },
60
- '/rs/path/getParams': {
61
- target: bendi
62
- },
63
- '/rs/data': {
64
- target: bendi
65
- },
66
- '/rs/license': {
67
- target: bendi
68
- },
69
- '/rs/db': {
70
- target: bendi
71
- },
72
- '/excel': {
73
- target: bendi
74
- },
75
- '/rs/config': {
76
- target: bendi
77
- },
78
- '/rs/sql/getLicenseById': {
79
- target: bendi
80
- },
81
- '/rs/report': {
82
- target: bendi
83
- },
84
- '/rs/vue': {
85
- target: bendi
86
- },
87
- '/rs/file': {
88
- target: bendi
89
- },
90
- '/rs/sql/singleTable': {
91
- target: bendi
92
- },
93
- '/rs/sql': {
94
- target: bendi
95
- },
96
- '/rs': {
97
- target: bendi
98
- }
99
- }
100
-
101
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
102
- publicPath: config.output.publicPath,
103
- stats: {
104
- colors: true,
105
- chunks: false
106
- }
107
- })
108
-
109
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
110
- // force page reload when html-webpack-plugin template changes
111
- compiler.plugin('compilation', function (compilation) {
112
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
113
- hotMiddleware.publish({action: 'reload'})
114
- cb()
115
- })
116
- })
117
-
118
- // proxy api requests
119
- Object.keys(proxyTable).forEach(function (context) {
120
- var options = proxyTable[context]
121
- if (typeof options === 'string') {
122
- options = {target: options}
123
- }
124
- app.use(proxyMiddleware(context, options))
125
- })
126
-
127
- // handle fallback for HTML5 history API
128
- app.use(require('connect-history-api-fallback')())
129
- // app.use(function (req, res, next) {
130
- // res.header('Access-Control-Allow-Origin', '*')
131
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
132
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
133
- // res.header('X-Powered-By', '3,2,1')
134
- // res.header('Access-Control-Allow-Credentials', 'true')
135
- // res.header('Content-Type', 'application/json;charset=utf-8')
136
- // next()
137
- // })
138
-
139
- // serve webpack bundle output
140
- app.use(devMiddleware)
141
-
142
- // enable hot-reload and state-preserving
143
- // compilation error display
144
- app.use(hotMiddleware)
145
-
146
- // serve pure static assets
147
- app.use('/static', express.static('./static'))
148
-
149
- // app.all('/rs/*', function (req, res) {
150
- // proxy.web(req, res, {
151
- // target: 'http://127.0.0.1:8081/reports'
152
- // })
153
- // })
154
-
155
- // app.all('/rs/*', function (req, res) {
156
- // proxy.web(req, res, {
157
- // target: 'http://127.0.0.1:8081/ldap'
158
- // })
159
- // })
160
- // app.all('/excel/*', function (req, res) {
161
- // proxy.web(req, res, {
162
- // target: 'http://127.0.0.1:8081/charge'
163
- // })
164
- // })
165
-
166
- // app.all('/rs/*', function (req, res) {
167
- // proxy.web(req, res, {
168
- // target: 'http://127.0.0.1:82/charge'
169
- // })
170
- // })
171
-
172
- // app.all('/*', function (req, res) {
173
- // proxy.web(req, res, {
174
- // target: 'http://127.0.0.1:82'
175
- // })
176
- // })
177
- // app.all('/rs/user', function (req, res) {
178
- // proxy.web(req, res, {
179
- // target: 'http://127.0.0.1:82'
180
- // })
181
- // })
182
-
183
- module.exports = app.listen(8015, function (err) {
184
- if (err) {
185
- console.log(err)
186
- return
187
- }
188
- console.log('Listening at http://localhost:8015')
189
- })
1
+ var express = require('express')
2
+ var webpack = require('webpack')
3
+ var config = require('./webpack.dev.conf')
4
+ var proxyMiddleware = require('http-proxy-middleware')
5
+ // var httpProxy = require('http-proxy')
6
+
7
+ var app = express()
8
+ var compiler = webpack(config)
9
+ // var proxy = httpProxy.createProxyServer()
10
+
11
+ // Define HTTP proxies to your custom API backend
12
+ // https://github.com/chimurai/http-proxy-middleware
13
+ // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
+ var shaoguan = 'http://119.146.1.106:8300/'
15
+ var qtx= 'http://36.103.222.144:6300/'
16
+ // var bendi = 'http://220.194.141.253:8600/'
17
+ // var bendi = 'http://203.57.101.233:9001'
18
+ // var bendi = 'http://172.168.1.11:9001/'
19
+ // var bendi = 'http://203.57.101.233:8400/'
20
+ // var bendi = 'http://121.36.106.17:8400/'
21
+ // var fuwu = 'http://203.57.101.233:9001'
22
+ var bendi = 'http://192.168.50.67:31785'
23
+ // var bendi = 'http://119.187.112.234:8400/'
24
+ var wode = 'http://192.168.50.67:31785'
25
+ // 192.168.
26
+ // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
+ // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
28
+ var proxyTable = {
29
+ '/rs/logic/exportfile': {
30
+ target: bendi
31
+ },
32
+ '/rs/sql/chargeQuery_by_gasproperties': {
33
+ target: 'http://localhost:8084/'
34
+ },
35
+ '/rs/logic/chargeQuery_by_gasproperties_line': {
36
+ target: 'http://localhost:8084/'
37
+ },
38
+ '/files': {
39
+ target: bendi
40
+ },
41
+ // 查找资源服务数据
42
+ '/rs/search': {
43
+ target: bendi
44
+ },
45
+ // 查找资源服务数据
46
+ '/rs/logic/getLogin': {
47
+ target: bendi
48
+ },
49
+ // 查找资源服务数据
50
+ '/rs/logic/getInitData': {
51
+ target: bendi
52
+ },
53
+ '/rs/logic/getSaleInitData': {
54
+ target: bendi
55
+ },
56
+ // 用户登录服务地址
57
+ '/rs/user': {
58
+ target: bendi
59
+ },
60
+ '/rs/path/getParams': {
61
+ target: bendi
62
+ },
63
+ '/rs/data': {
64
+ target: bendi
65
+ },
66
+ '/rs/license': {
67
+ target: bendi
68
+ },
69
+ '/rs/db': {
70
+ target: bendi
71
+ },
72
+ '/excel': {
73
+ target: bendi
74
+ },
75
+ '/rs/config': {
76
+ target: bendi
77
+ },
78
+ '/rs/sql/getLicenseById': {
79
+ target: bendi
80
+ },
81
+ '/rs/report': {
82
+ target: bendi
83
+ },
84
+ '/rs/vue': {
85
+ target: bendi
86
+ },
87
+ '/rs/file': {
88
+ target: bendi
89
+ },
90
+ '/rs/sql/singleTable': {
91
+ target: bendi
92
+ },
93
+ '/rs/sql': {
94
+ target: 'http://localhost:8084/'
95
+ },
96
+ '/rs': {
97
+ target: wode
98
+ }
99
+ }
100
+
101
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
102
+ publicPath: config.output.publicPath,
103
+ stats: {
104
+ colors: true,
105
+ chunks: false
106
+ }
107
+ })
108
+
109
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
110
+ // force page reload when html-webpack-plugin template changes
111
+ compiler.plugin('compilation', function (compilation) {
112
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
113
+ hotMiddleware.publish({action: 'reload'})
114
+ cb()
115
+ })
116
+ })
117
+
118
+ // proxy api requests
119
+ Object.keys(proxyTable).forEach(function (context) {
120
+ var options = proxyTable[context]
121
+ if (typeof options === 'string') {
122
+ options = {target: options}
123
+ }
124
+ app.use(proxyMiddleware(context, options))
125
+ })
126
+
127
+ // handle fallback for HTML5 history API
128
+ app.use(require('connect-history-api-fallback')())
129
+ // app.use(function (req, res, next) {
130
+ // res.header('Access-Control-Allow-Origin', '*')
131
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
132
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
133
+ // res.header('X-Powered-By', '3,2,1')
134
+ // res.header('Access-Control-Allow-Credentials', 'true')
135
+ // res.header('Content-Type', 'application/json;charset=utf-8')
136
+ // next()
137
+ // })
138
+
139
+ // serve webpack bundle output
140
+ app.use(devMiddleware)
141
+
142
+ // enable hot-reload and state-preserving
143
+ // compilation error display
144
+ app.use(hotMiddleware)
145
+
146
+ // serve pure static assets
147
+ app.use('/static', express.static('./static'))
148
+
149
+ // app.all('/rs/*', function (req, res) {
150
+ // proxy.web(req, res, {
151
+ // target: 'http://127.0.0.1:8081/reports'
152
+ // })
153
+ // })
154
+
155
+ // app.all('/rs/*', function (req, res) {
156
+ // proxy.web(req, res, {
157
+ // target: 'http://127.0.0.1:8081/ldap'
158
+ // })
159
+ // })
160
+ // app.all('/excel/*', function (req, res) {
161
+ // proxy.web(req, res, {
162
+ // target: 'http://127.0.0.1:8081/charge'
163
+ // })
164
+ // })
165
+
166
+ // app.all('/rs/*', function (req, res) {
167
+ // proxy.web(req, res, {
168
+ // target: 'http://127.0.0.1:82/charge'
169
+ // })
170
+ // })
171
+
172
+ // app.all('/*', function (req, res) {
173
+ // proxy.web(req, res, {
174
+ // target: 'http://127.0.0.1:82'
175
+ // })
176
+ // })
177
+ // app.all('/rs/user', function (req, res) {
178
+ // proxy.web(req, res, {
179
+ // target: 'http://127.0.0.1:82'
180
+ // })
181
+ // })
182
+
183
+ module.exports = app.listen(8015, function (err) {
184
+ if (err) {
185
+ console.log(err)
186
+ return
187
+ }
188
+ console.log('Listening at http://localhost:8015')
189
+ })
package/package.json CHANGED
@@ -1,111 +1,111 @@
1
- {
2
- "name": "manage-client",
3
- "version": "3.3.132-hl",
4
- "description": "经营管控模块前台组件",
5
- "main": "src/index.js",
6
- "directories": {
7
- "test": "test"
8
- },
9
- "dependencies": {
10
- "crypto-js": "^4.1.1",
11
- "swiper": "^5.4.5"
12
- },
13
- "devDependencies": {
14
- "axios": "0.15.3",
15
- "babel-core": "^6.0.0",
16
- "babel-loader": "^6.0.0",
17
- "babel-plugin-transform-runtime": "^6.0.0",
18
- "babel-preset-es2015": "^6.0.0",
19
- "babel-preset-stage-2": "^6.0.0",
20
- "chai": "^3.5.0",
21
- "co": "^4.6.0",
22
- "connect-history-api-fallback": "^1.1.0",
23
- "cross-env": "^1.0.7",
24
- "cross-spawn": "^2.1.5",
25
- "css-loader": "^0.23.0",
26
- "echarts": "^4.1.0",
27
- "eslint": "^2.0.0",
28
- "eslint-config-standard": "^5.1.0",
29
- "eslint-friendly-formatter": "^1.2.2",
30
- "eslint-loader": "^1.3.0",
31
- "eslint-plugin-html": "^1.3.0",
32
- "eslint-plugin-promise": "^1.0.8",
33
- "eslint-plugin-standard": "^1.3.2",
34
- "eslint-plugin-vue": "^0.1.1",
35
- "eventsource-polyfill": "^0.9.6",
36
- "express": "^4.13.3",
37
- "extract-text-webpack-plugin": "^1.0.1",
38
- "filemanager-webpack-plugin": "^2.0.5",
39
- "file-loader": "^0.8.4",
40
- "function-bind": "^1.0.2",
41
- "html-webpack-plugin": "^2.8.1",
42
- "http-proxy-middleware": "^0.11.0",
43
- "inject-loader": "^2.0.1",
44
- "isparta-loader": "^2.0.0",
45
- "jasmine-core": "^2.4.1",
46
- "jquery": "^3.3.1",
47
- "jsencrypt": "3.0.0-rc.1",
48
- "json-loader": "^0.5.4",
49
- "karma": "^1.4.1",
50
- "karma-chrome-launcher": "^2.2.0",
51
- "karma-coverage": "^1.1.1",
52
- "karma-mocha": "^1.3.0",
53
- "karma-sinon-chai": "^1.3.1",
54
- "karma-sourcemap-loader": "^0.3.7",
55
- "karma-spec-reporter": "0.0.31",
56
- "karma-webpack": "^2.0.2",
57
- "ldap-clients": "3.0.7",
58
- "less": "^2.7.3",
59
- "mkdirp": "^0.5.1",
60
- "mocha": "^3.2.0",
61
- "moment": "2.24.0",
62
- "ncp": "^2.0.0",
63
- "rimraf": "^2.5.0",
64
- "sale-client": "3.4.14",
65
- "selenium-server": "2.52.0",
66
- "sinon": "^2.1.0",
67
- "sinon-chai": "^2.8.0",
68
- "style": "0.0.3",
69
- "style-loader": "^0.20.3",
70
- "swiper": "^5.4.5",
71
- "system-clients": "3.2.61",
72
- "url-loader": "^0.5.7",
73
- "vue-amap": "0.5.10",
74
- "vue-client": "1.24.123",
75
- "vue-hot-reload-api": "^1.2.0",
76
- "vue-html-loader": "^1.0.0",
77
- "vue-loader": "8.2.1",
78
- "vue-resource": "^1.5.0",
79
- "vue-router": "^0.7.13",
80
- "vue-strap": "^1.0.9",
81
- "vue-style-loader": "^1.0.0",
82
- "vue-validator": "2.1.7",
83
- "webpack": "1.12.2",
84
- "webpack-dev-middleware": "^1.4.0",
85
- "webpack-hot-middleware": "^2.6.0",
86
- "webpack-merge": "^0.8.3",
87
- "webpack-parallel-uglify-plugin": "^1.0.0"
88
- },
89
- "scripts": {
90
- "unit": "karma start test/unit/karma.conf.js --single-run",
91
- "example": "node build/example-server.js",
92
- "dev": "node build/dev-server.js",
93
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
94
- "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
95
- "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
96
- "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
97
- "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
98
- "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
99
- "e2e": "node test/e2e/runner.js",
100
- "release": "bash build/release.sh"
101
- },
102
- "repository": {
103
- "type": "git",
104
- "url": "https://gitee.com/aote/management_modules.git"
105
- },
106
- "keywords": [
107
- "manage"
108
- ],
109
- "author": "liuxudong",
110
- "license": "ISC"
111
- }
1
+ {
2
+ "name": "manage-client",
3
+ "version": "3.3.133",
4
+ "description": "经营管控模块前台组件",
5
+ "main": "src/index.js",
6
+ "directories": {
7
+ "test": "test"
8
+ },
9
+ "dependencies": {
10
+ "crypto-js": "^4.1.1",
11
+ "swiper": "^5.4.5"
12
+ },
13
+ "devDependencies": {
14
+ "axios": "0.15.3",
15
+ "babel-core": "^6.0.0",
16
+ "babel-loader": "^6.0.0",
17
+ "babel-plugin-transform-runtime": "^6.0.0",
18
+ "babel-preset-es2015": "^6.0.0",
19
+ "babel-preset-stage-2": "^6.0.0",
20
+ "chai": "^3.5.0",
21
+ "co": "^4.6.0",
22
+ "connect-history-api-fallback": "^1.1.0",
23
+ "cross-env": "^1.0.7",
24
+ "cross-spawn": "^2.1.5",
25
+ "css-loader": "^0.23.0",
26
+ "echarts": "^4.1.0",
27
+ "eslint": "^2.0.0",
28
+ "eslint-config-standard": "^5.1.0",
29
+ "eslint-friendly-formatter": "^1.2.2",
30
+ "eslint-loader": "^1.3.0",
31
+ "eslint-plugin-html": "^1.3.0",
32
+ "eslint-plugin-promise": "^1.0.8",
33
+ "eslint-plugin-standard": "^1.3.2",
34
+ "eslint-plugin-vue": "^0.1.1",
35
+ "eventsource-polyfill": "^0.9.6",
36
+ "express": "^4.13.3",
37
+ "extract-text-webpack-plugin": "^1.0.1",
38
+ "filemanager-webpack-plugin": "^2.0.5",
39
+ "file-loader": "^0.8.4",
40
+ "function-bind": "^1.0.2",
41
+ "html-webpack-plugin": "^2.8.1",
42
+ "http-proxy-middleware": "^0.11.0",
43
+ "inject-loader": "^2.0.1",
44
+ "isparta-loader": "^2.0.0",
45
+ "jasmine-core": "^2.4.1",
46
+ "jquery": "^3.3.1",
47
+ "jsencrypt": "3.0.0-rc.1",
48
+ "json-loader": "^0.5.4",
49
+ "karma": "^1.4.1",
50
+ "karma-chrome-launcher": "^2.2.0",
51
+ "karma-coverage": "^1.1.1",
52
+ "karma-mocha": "^1.3.0",
53
+ "karma-sinon-chai": "^1.3.1",
54
+ "karma-sourcemap-loader": "^0.3.7",
55
+ "karma-spec-reporter": "0.0.31",
56
+ "karma-webpack": "^2.0.2",
57
+ "ldap-clients": "3.0.7",
58
+ "less": "^2.7.3",
59
+ "mkdirp": "^0.5.1",
60
+ "mocha": "^3.2.0",
61
+ "moment": "2.24.0",
62
+ "ncp": "^2.0.0",
63
+ "rimraf": "^2.5.0",
64
+ "sale-client": "3.4.14",
65
+ "selenium-server": "2.52.0",
66
+ "sinon": "^2.1.0",
67
+ "sinon-chai": "^2.8.0",
68
+ "style": "0.0.3",
69
+ "style-loader": "^0.20.3",
70
+ "swiper": "^5.4.5",
71
+ "system-clients": "3.2.61",
72
+ "url-loader": "^0.5.7",
73
+ "vue-amap": "0.5.10",
74
+ "vue-client": "1.24.123",
75
+ "vue-hot-reload-api": "^1.2.0",
76
+ "vue-html-loader": "^1.0.0",
77
+ "vue-loader": "8.2.1",
78
+ "vue-resource": "^1.5.0",
79
+ "vue-router": "^0.7.13",
80
+ "vue-strap": "^1.0.9",
81
+ "vue-style-loader": "^1.0.0",
82
+ "vue-validator": "2.1.7",
83
+ "webpack": "1.12.2",
84
+ "webpack-dev-middleware": "^1.4.0",
85
+ "webpack-hot-middleware": "^2.6.0",
86
+ "webpack-merge": "^0.8.3",
87
+ "webpack-parallel-uglify-plugin": "^1.0.0"
88
+ },
89
+ "scripts": {
90
+ "unit": "karma start test/unit/karma.conf.js --single-run",
91
+ "example": "node build/example-server.js",
92
+ "dev": "node build/dev-server.js",
93
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
94
+ "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
95
+ "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
96
+ "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
97
+ "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
98
+ "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
99
+ "e2e": "node test/e2e/runner.js",
100
+ "release": "bash build/release.sh"
101
+ },
102
+ "repository": {
103
+ "type": "git",
104
+ "url": "https://gitee.com/aote/management_modules.git"
105
+ },
106
+ "keywords": [
107
+ "manage"
108
+ ],
109
+ "author": "liuxudong",
110
+ "license": "ISC"
111
+ }
@@ -154,6 +154,15 @@
154
154
  style="width:60%"
155
155
  v-model="model.f_instruct_title"></v-select>
156
156
  </div>
157
+
158
+ <div class="col-sm-2 form-group">
159
+ <label class="font_normal_body">操&nbsp;作&nbsp;人</label>
160
+ <v-select :options='$parent.$parent.operators' :value.sync="model.f_operator" close-on-select
161
+ condition="recordinfo.f_operator='{}'"
162
+ placeholder='操作人'
163
+ style="width:60%"
164
+ v-model="model.f_operator"></v-select>
165
+ </div>
157
166
  </div>
158
167
  </div>
159
168
  </criteria>
@@ -319,6 +328,7 @@
319
328
 
320
329
  let readyGen = async function (self) {
321
330
  await self.$MagLoadParams.loadParam()
331
+ await self.$MagGetSaleParam.initinputtor()
322
332
  self.initQueryParam()
323
333
  self.getinstructtype()
324
334
  self.getinstructtitle()
@@ -326,6 +336,7 @@
326
336
  await self.$getConfig(self, 'NewQueryInstruct')
327
337
  console.log('指令查看config', self.config)
328
338
  self.getfield = self.config.excelHeaders
339
+ self.getOperators(self.$login.f.orgid)
329
340
  // self.reflash()
330
341
  }
331
342
  export default {
@@ -339,6 +350,7 @@
339
350
  criteriaShow:false,
340
351
  Gasproperties:[],
341
352
  meterbrand: [],
353
+ operators:[],
342
354
  userType:[],
343
355
  instructtype:[],
344
356
  instructstate:[],
@@ -425,6 +437,21 @@
425
437
  })
426
438
  this.meterbrand = [{label: '全部', value: ''}, ...arr]
427
439
  },
440
+ //获取资源数据
441
+ getOperators(orgid) {
442
+ this.operators = []
443
+ this.$MagGetSaleParam.inputtors.forEach((res) => {
444
+ if(res.rolestr != null && res.rolestr!='' ){
445
+ if(res.rolestr.indexOf("营业员")>-1 && res.f_orgid == orgid) {
446
+ let temp = {
447
+ label :res.name,
448
+ value:res.name,
449
+ }
450
+ this.operators.push(temp)
451
+ }
452
+ }
453
+ })
454
+ },
428
455
  getinstructtype(){
429
456
  this.instructtype=[]
430
457
  let load = new HttpResetClass()