manage-client 4.1.81 → 4.1.83

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,145 +1,145 @@
1
- const express = require('express')
2
- const webpack = require('webpack')
3
- const config = require('./webpack.dev.conf')
4
- const proxyMiddleware = require('http-proxy-middleware')
5
-
6
- const app = express()
7
- const compiler = webpack(config)
8
-
9
- const server = 'http://192.168.50.67:31567/'
10
- const local = 'http://127.0.0.1:9026/'
11
- const proxyTable = {
12
- '/rs/logic/exportfile': {
13
- target: server
14
- },
15
- '/dataManage': {
16
- target: server
17
- },
18
- '/api/af-revenue/sql/': {
19
- pathRewrite: {
20
- '^/api/af-revenue': '/'
21
- },
22
- target: local
23
- },
24
- '/api/af-revenue/report/': {
25
- pathRewrite: {
26
- '^/api/af-revenue': '/'
27
- },
28
- target: local
29
- },
30
- '/api/af-revenue/logic': {
31
- pathRewrite: {
32
- '^/api/af-revenue': '/'
33
- },
34
- target: local
35
- },
36
- '/api': {
37
- target: server
38
- },
39
- '/rs/sql/chargeQuery_by_gasproperties': {
40
- target: server
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
99
- },
100
- '/rs': {
101
- target: server
102
- }
103
- }
104
-
105
- const devMiddleware = require('webpack-dev-middleware')(compiler, {
106
- publicPath: config.output.publicPath,
107
- stats: {
108
- colors: true,
109
- chunks: false
110
- }
111
- })
112
-
113
- const hotMiddleware = require('webpack-hot-middleware')(compiler)
114
- // force page reload when html-webpack-plugin template changes
115
- compiler.plugin('compilation', function (compilation) {
116
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
117
- hotMiddleware.publish({action: 'reload'})
118
- cb()
119
- })
120
- })
121
-
122
- // proxy api requests
123
- Object.keys(proxyTable).forEach(function (context) {
124
- let options = proxyTable[context]
125
- if (typeof options === 'string') {
126
- options = {target: options}
127
- }
128
- app.use(proxyMiddleware(context, options))
129
- })
130
-
131
- app.use(require('connect-history-api-fallback')())
132
-
133
- app.use(devMiddleware)
134
-
135
- app.use(hotMiddleware)
136
-
137
- app.use('/static', express.static('./static'))
138
-
139
- module.exports = app.listen(8015, function (err) {
140
- if (err) {
141
- console.log(err)
142
- return
143
- }
144
- console.log('Listening at http://localhost:8015')
145
- })
1
+ const express = require('express')
2
+ const webpack = require('webpack')
3
+ const config = require('./webpack.dev.conf')
4
+ const proxyMiddleware = require('http-proxy-middleware')
5
+
6
+ const app = express()
7
+ const compiler = webpack(config)
8
+
9
+ const server = 'http://218.77.35.25:30785/'
10
+ const local = 'http://218.77.35.25:30785/'
11
+ const proxyTable = {
12
+ '/rs/logic/exportfile': {
13
+ target: server
14
+ },
15
+ '/dataManage': {
16
+ target: server
17
+ },
18
+ '/api/af-revenue/sql/': {
19
+ // pathRewrite: {
20
+ // '^/api/af-revenue': '/'
21
+ // },
22
+ target: local
23
+ },
24
+ '/api/af-revenue/report/': {
25
+ // pathRewrite: {
26
+ // '^/api/af-revenue': '/'
27
+ // },
28
+ target: local
29
+ },
30
+ '/api/af-revenue/logic': {
31
+ // pathRewrite: {
32
+ // '^/api/af-revenue': '/'
33
+ // },
34
+ target: local
35
+ },
36
+ '/api': {
37
+ target: server
38
+ },
39
+ '/rs/sql/chargeQuery_by_gasproperties': {
40
+ target: server
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
99
+ },
100
+ '/rs': {
101
+ target: server
102
+ }
103
+ }
104
+
105
+ const devMiddleware = require('webpack-dev-middleware')(compiler, {
106
+ publicPath: config.output.publicPath,
107
+ stats: {
108
+ colors: true,
109
+ chunks: false
110
+ }
111
+ })
112
+
113
+ const hotMiddleware = require('webpack-hot-middleware')(compiler)
114
+ // force page reload when html-webpack-plugin template changes
115
+ compiler.plugin('compilation', function (compilation) {
116
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
117
+ hotMiddleware.publish({action: 'reload'})
118
+ cb()
119
+ })
120
+ })
121
+
122
+ // proxy api requests
123
+ Object.keys(proxyTable).forEach(function (context) {
124
+ let options = proxyTable[context]
125
+ if (typeof options === 'string') {
126
+ options = {target: options}
127
+ }
128
+ app.use(proxyMiddleware(context, options))
129
+ })
130
+
131
+ app.use(require('connect-history-api-fallback')())
132
+
133
+ app.use(devMiddleware)
134
+
135
+ app.use(hotMiddleware)
136
+
137
+ app.use('/static', express.static('./static'))
138
+
139
+ module.exports = app.listen(8015, function (err) {
140
+ if (err) {
141
+ console.log(err)
142
+ return
143
+ }
144
+ console.log('Listening at http://localhost:8015')
145
+ })
package/package.json CHANGED
@@ -1,111 +1,111 @@
1
- {
2
- "name": "manage-client",
3
- "version": "4.1.81",
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
- "less": "^2.7.3",
58
- "mkdirp": "^0.5.1",
59
- "mocha": "^3.2.0",
60
- "moment": "2.24.0",
61
- "ncp": "^2.0.0",
62
- "rimraf": "^2.5.0",
63
- "sale-client": "3.4.14",
64
- "selenium-server": "2.52.0",
65
- "sinon": "^2.1.0",
66
- "sinon-chai": "^2.8.0",
67
- "style": "0.0.3",
68
- "style-loader": "^0.20.3",
69
- "swiper": "^5.4.5",
70
- "system-clients": "4.0.12",
71
- "ldap-clients": "3.0.96",
72
- "url-loader": "^0.5.7",
73
- "vue-amap": "0.5.10",
74
- "vue-client": "1.26.6",
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": "4.1.83",
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
+ "less": "^2.7.3",
58
+ "mkdirp": "^0.5.1",
59
+ "mocha": "^3.2.0",
60
+ "moment": "2.24.0",
61
+ "ncp": "^2.0.0",
62
+ "rimraf": "^2.5.0",
63
+ "sale-client": "3.4.14",
64
+ "selenium-server": "2.52.0",
65
+ "sinon": "^2.1.0",
66
+ "sinon-chai": "^2.8.0",
67
+ "style": "0.0.3",
68
+ "style-loader": "^0.20.3",
69
+ "swiper": "^5.4.5",
70
+ "system-clients": "4.0.12",
71
+ "ldap-clients": "3.0.96",
72
+ "url-loader": "^0.5.7",
73
+ "vue-amap": "0.5.10",
74
+ "vue-client": "1.26.6",
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
+ }
@@ -200,7 +200,7 @@
200
200
  </template>
201
201
  <template partial='body'>
202
202
  <td style="text-align: center;">
203
- <nobr>{{row.f_userinfo_code}}</nobr>
203
+ <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
204
204
  </td>
205
205
  <td style="text-align: center;">
206
206
  <nobr>{{row.f_user_name}}</nobr>
@@ -274,9 +274,9 @@
274
274
  </tr>
275
275
  </table>
276
276
  </div>
277
- <!-- <div class="flex" v-if="show">-->
278
- <!-- <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>-->
279
- <!-- </div>-->
277
+ <div class="flex" v-if="show">
278
+ <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
279
+ </div>
280
280
  </div>
281
281
  <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
282
282
  <article slot="modal-body">
@@ -362,6 +362,11 @@
362
362
  })
363
363
  },
364
364
  methods: {
365
+ showmsg(obj){
366
+ this.rowdata=obj
367
+ console.log('this.rowdata', this.rowdata)
368
+ this.show=true
369
+ },
365
370
  view(row){
366
371
  this.showupload = true
367
372
  this.selected= row
@@ -456,7 +461,7 @@
456
461
  },
457
462
  dealmsg(val) {
458
463
  console.log('---------------dealmsg')
459
- this.rowdata=val
464
+ // this.rowdata=val
460
465
  this.show=true
461
466
  val.model = this.model.model
462
467
  this.$dispatch('deal-msg', val)
@@ -126,6 +126,9 @@
126
126
  </data-grid>
127
127
  </criteria-paged>
128
128
  </div>
129
+ <div class="flex" v-if="show">
130
+ <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
131
+ </div>
129
132
  </div>
130
133
  </div>
131
134
  </template>
package/src/main.js CHANGED
@@ -2,7 +2,7 @@ import Vue from 'vue'
2
2
  import App from './App'
3
3
  import { all } from 'vue-client'
4
4
 
5
- // import { sale } from 'sale-client'
5
+ import { sale } from 'sale-client'
6
6
  import { system } from 'system-clients'
7
7
  import { ldap } from 'ldap-clients'
8
8
  import saleManage from './saleManage'
@@ -42,7 +42,7 @@ AMap.initAMapApiLoader({
42
42
 
43
43
  Vue.prototype.$echarts = echarts
44
44
  all()
45
- // sale()
45
+ sale()
46
46
  ldap()
47
47
  system(false)
48
48
  saleManage()