manage-client 3.2.43-aode → 3.2.44-aode

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.
Files changed (9) hide show
  1. package/build/dev-server.js +5 -1
  2. package/build/webpack.base.conf.js +78 -76
  3. package/package.json +3 -2
  4. package/src/components/sale/config/exportConfig.js +260 -260
  5. package/src/components/sale/report/aode/YearByChargeTpye.vue +254 -220
  6. package/src/components/sale/report/aode/YearByUserType.vue +342 -307
  7. package/src/components/webmeter/DrillData/NewUserGasAll.vue +14 -6
  8. package/src/components/webmeter/DrillData/UserGasAll.vue +12 -9
  9. package/src/main.js +56 -56
package/build/dev-server.js CHANGED
@@ -13,8 +13,12 @@ var compiler = webpack(config)
13
13
  // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
14
  // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
15
15
  var str = 'http://192.168.10.14:8300', fuwu = 'http://192.168.10.14:8300', bendi = 'http://192.168.10.14:8300'
16
+ // var str = 'http://121.36.106.17:8400' , fuwu = 'http://121.36.106.17:8400' , bendi = 'http://192.168.10.14:8300'
16
17
  var proxyTable = {
17
18
 
19
+ '/rs/easyexcel/': {
20
+ target: 'http://192.168.10.14:8600/manage/'
21
+ },
18
22
  '/rs/logic/exportfile': {
19
23
  target: fuwu
20
24
  },
@@ -29,7 +33,7 @@ var proxyTable = {
29
33
  target: 'http://192.168.10.236:9304/manage'
30
34
  },
31
35
 
32
- '/rs/sql/addValueQuery': {
36
+ '/rs/sql/webmeter_getUserGasList': {
33
37
  target: bendi
34
38
  },
35
39
  '/rs/sql/getNewUserGasAll': {
package/build/webpack.base.conf.js CHANGED
@@ -1,76 +1,78 @@
1
- var path = require('path')
2
- var cssLoaders = require('./css-loaders')
3
- var projectRoot = path.resolve(__dirname, '../')
4
- module.exports = {
5
- entry: {
6
- app: './src/main.js'
7
- },
8
- output: {
9
- path: path.resolve(__dirname, '../dist/static'),
10
- publicPath: 'static/',
11
- filename: '[name].js'
12
- },
13
- resolve: {
14
- extensions: ['', '.js', '.vue'],
15
- fallback: [path.join(__dirname, '../node_modules')],
16
- alias: {
17
- 'src': path.resolve(__dirname, '../src'),
18
- 'test': path.resolve(__dirname, '../test')
19
- }
20
- },
21
- resolveLoader: {
22
- fallback: [path.join(__dirname, '../node_modules')]
23
- },
24
- module: {
25
- loaders: [
26
- {
27
- test: /\.vue$/,
28
- loader: 'vue'
29
- },
30
- {
31
- test: /\.js$/,
32
- loader: 'babel',
33
- include: [
34
- `${projectRoot}\\src`,
35
- `${projectRoot}\\build`,
36
- `${projectRoot}\\examples`,
37
- `${projectRoot}\\test`,
38
- `${projectRoot}\\node_modules\\vue-client\\src`,
39
- `${projectRoot}\\node_modules\\vue-strap\\src`,
40
- `${projectRoot}\\node_modules\\system-clients\\src`,
41
- `${projectRoot}\\node_modules\\sale-client\\src`,
42
- ]
43
- },
44
- {
45
- test: /\.json$/,
46
- loader: 'json'
47
- },
48
- {
49
- test: /\.html$/,
50
- loader: 'vue-html'
51
- },
52
- {
53
- test: /\.less$/,
54
- loader: 'style!css!less'
55
- },
56
- {
57
- test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
58
- loader: 'url',
59
- query: {
60
- limit: 10000,
61
- name: '[name].[ext]?[hash:7]'
62
- }
63
- }
64
- ]
65
- },
66
- vue: {
67
- loaders: cssLoaders({
68
- sourceMap: false,
69
- extract: false
70
- })
71
- },
72
- plugins: [],
73
- eslint: {
74
- formatter: require('eslint-friendly-formatter')
75
- }
76
- }
1
+ var path = require('path')
2
+ var cssLoaders = require('./css-loaders')
3
+ var projectRoot = path.resolve(__dirname, '../')
4
+ module.exports = {
5
+ entry: {
6
+ app: './src/main.js'
7
+ },
8
+ output: {
9
+ path: path.resolve(__dirname, '../dist/static'),
10
+ publicPath: 'static/',
11
+ filename: '[name].js'
12
+ },
13
+ resolve: {
14
+ extensions: ['', '.js', '.vue'],
15
+ fallback: [path.join(__dirname, '../node_modules')],
16
+ alias: {
17
+ 'src': path.resolve(__dirname, '../src'),
18
+ 'test': path.resolve(__dirname, '../test')
19
+ }
20
+ },
21
+ resolveLoader: {
22
+ fallback: [path.join(__dirname, '../node_modules')]
23
+ },
24
+ module: {
25
+ loaders: [
26
+ {
27
+ test: /\.vue$/,
28
+ loader: 'vue'
29
+ },
30
+ {
31
+ test: /\.js$/,
32
+ loader: 'babel',
33
+ include: [
34
+ `${projectRoot}\\src`,
35
+ `${projectRoot}\\build`,
36
+ `${projectRoot}\\examples`,
37
+ `${projectRoot}\\test`,
38
+ `${projectRoot}\\node_modules\\vue-client\\src`,
39
+ `${projectRoot}\\node_modules\\vue-strap\\src`,
40
+ `${projectRoot}\\node_modules\\system-clients\\src`,
41
+ `${projectRoot}\\node_modules\\jsencrypt`,
42
+ `${projectRoot}\\node_modules\\axios`,
43
+ `${projectRoot}\\node_modules\\sale-client\\src`,
44
+ ]
45
+ },
46
+ {
47
+ test: /\.json$/,
48
+ loader: 'json'
49
+ },
50
+ {
51
+ test: /\.html$/,
52
+ loader: 'vue-html'
53
+ },
54
+ {
55
+ test: /\.less$/,
56
+ loader: 'style!css!less'
57
+ },
58
+ {
59
+ test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
60
+ loader: 'url',
61
+ query: {
62
+ limit: 10000,
63
+ name: '[name].[ext]?[hash:7]'
64
+ }
65
+ }
66
+ ]
67
+ },
68
+ vue: {
69
+ loaders: cssLoaders({
70
+ sourceMap: false,
71
+ extract: false
72
+ })
73
+ },
74
+ plugins: [],
75
+ eslint: {
76
+ formatter: require('eslint-friendly-formatter')
77
+ }
78
+ }
package/package.json CHANGED
@@ -1,12 +1,13 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.43-aode",
3
+ "version": "3.2.44-aode",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
7
7
  "test": "test"
8
8
  },
9
9
  "dependencies": {
10
+ "axios": "^1.2.0",
10
11
  "jsencrypt": "*",
11
12
  "vue-json-excel": "^0.3.0"
12
13
  },
@@ -65,7 +66,7 @@
65
66
  "system-clients": "3.1.94-aode",
66
67
  "url-loader": "^0.5.7",
67
68
  "vue-amap": "0.5.10",
68
- "vue-client": "1.22.25-aode",
69
+ "vue-client": "^1.22.28-aode",
69
70
  "vue-hot-reload-api": "^1.2.0",
70
71
  "vue-html-loader": "^1.0.0",
71
72
  "vue-loader": "8.2.1",