manage-client 3.2.256 → 3.2.257

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.
@@ -19,13 +19,17 @@ let getData = function* (self) {
19
19
  self.texttile = '用户类型'
20
20
  // let arrparams = []
21
21
  console.log('获取数据。。', res.data)
22
+ let num1 = []
23
+ let num2 = []
24
+ let num3 = []
22
25
  let naturedata = []
23
- let num = []
24
26
  for (var i = 0; i < res.data.length; i++) {
25
27
  naturedata[i] = res.data[i].f_user_nature
26
- num[i] = res.data[i].number
27
28
  }
28
- self.set(naturedata, num)
29
+ num1[0] = res.data[0].number
30
+ num2[0] = res.data[1].number
31
+ num3[0] = res.data[2].number
32
+ self.set(naturedata, num1, num2, num3)
29
33
  })
30
34
  }
31
35
  export default {
@@ -53,30 +57,27 @@ export default {
53
57
  }
54
58
  },
55
59
  methods: {
56
- set (naturedata, num) {
60
+ set (naturedata, num1, num2, num3) {
57
61
  this.xc = echarts.init(document.getElementById('bm'))
58
62
  this.xc.setOption({
59
- color: ['#FE974B', '#3D72FF'],
63
+ color: ['#FE974B', '#3D72FF', '#00C953'],
60
64
  title: {
61
65
  text: '新增用户散列图',
62
66
  subtext: '数据查询来源',
63
67
  x: 'left'
64
68
  },
65
69
  tooltip: {
66
- trigger: 'axis',
70
+ trigger: 'item',
67
71
  formatter: function (params) {
68
- var str = ''
69
- str += params[0].name + '</br>'
70
- for (var i = 0; i < params.length; i++) {
71
- str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '户' + '</br>'
72
- }
72
+ let str = ''
73
+ str += params.marker + params.seriesName + ': ' + params.value + '户'
73
74
  return str
74
75
  }
75
76
  },
76
77
  legend: {
77
78
  x: 'left',
78
79
  y: 'bottom',
79
- data: ['户数']
80
+ data: ['工业户数', '民用户数', '商业户数']
80
81
  },
81
82
  toolbox: {
82
83
  show: true,
@@ -91,7 +92,7 @@ export default {
91
92
  xAxis: [
92
93
  {
93
94
  type: 'category',
94
- data: naturedata
95
+ data: ['新增用户数据']
95
96
  }
96
97
  ],
97
98
  yAxis: [
@@ -101,23 +102,33 @@ export default {
101
102
  ],
102
103
  series: [
103
104
  {
104
- name: '户数',
105
+ name: '工业户数',
106
+ type: 'bar',
107
+ data: num1,
108
+ markLine: {
109
+ data: [
110
+ {type: 'average', name: '平均值'}
111
+ ]
112
+ }
113
+ },
114
+ {
115
+ name: '民用户数',
116
+ type: 'bar',
117
+ data: num2,
118
+ markLine: {
119
+ data: [
120
+ {type: 'average', name: '平均值'}
121
+ ]
122
+ }
123
+ },
124
+ {
125
+ name: '商业户数',
105
126
  type: 'bar',
106
- data: num,
127
+ data: num3,
107
128
  markLine: {
108
129
  data: [
109
130
  {type: 'average', name: '平均值'}
110
131
  ]
111
- },
112
- itemStyle: {
113
- normal: {
114
- color: function (params) {
115
- // 给出颜色组
116
- var colorList = ['#FE974B', '#3D72FF', '#00C953']
117
- // 循环调用
118
- return colorList[params.dataIndex % colorList.length]
119
- }
120
- }
121
132
  }
122
133
  }
123
134
  ]
package/src/main.js CHANGED
@@ -1,68 +1,66 @@
1
- import Vue from 'vue'
2
- import App from './App'
3
- import { all } from 'vue-client'
4
-
5
- // import { sale } from 'sale-client'
6
- import { system } from 'system-clients'
7
- import { ldap } from 'ldap-clients'
8
- import saleManage from './saleManage'
9
- import saleManageRongchuang from './filiale/wenxi/sale'
10
- import webmeterManage from './webmeterManage'
11
- import reportManage from './reportManage'
12
- import newmanage from './newmanage'
13
- import ManageHome from './ManageHome'
14
- import echarts from 'echarts'
15
- import AMap from 'vue-amap'
16
-
17
- Vue.config.silent = true
18
- // Vue.mmType = 'AES'
19
-
20
- Vue.use(AMap);
21
-
22
- // 初始化vue-amap
23
- AMap.initAMapApiLoader({
24
- // 高德key
25
- key: '3cec9ae8e2349207f7ac29279e3f4abe',
26
- // 插件集合 (插件按需引入)
27
- plugin: [
28
- "AMap.Autocomplete", //输入提示插件
29
- "AMap.PlaceSearch", //POI搜索插件
30
- "AMap.Scale", //右下角缩略图插件 比例尺
31
- "AMap.OverView", //地图鹰眼插件
32
- "AMap.ToolBar", //地图工具条0
33
- "AMap.MapType", //类别切换控件,实现默认图层与卫星图、实施交通图层之间切换的控制
34
- "AMap.PolyEditor", //编辑 折线多,边形
35
- "AMap.CircleEditor", //圆形编辑器插件
36
- "AMap.Geolocation" //定位控件,用来获取和展示用户主机所在的经纬度位置
37
- ],
38
- uiVersion: "1.0"
39
- });
40
- /** **************************通用组件******************************/
41
-
42
- Vue.prototype.$echarts = echarts
43
- all()
44
- //sale('rongchuang')
45
- ldap()
46
- system(false)
47
-
48
- saleManage()
49
- saleManageRongchuang()
50
- webmeterManage()
51
- ManageHome()
52
- newmanage()
53
- reportManage()
54
- require('system-clients/src/styles/less/bootstrap.less')
55
- require('./components/qinhua/Style/qinhuaStyle.less')
56
- // require('./bootstrap/less/manageStyle/manageChile.less')
57
- // require('./bootstrap/less/manageStyle/safeStyle.less')
58
-
59
- //大屏展示要放开的样式
60
- // require('system-clients/src/styles/less/manageStyle/manageChile.less')
61
- // require('system-clients/src/styles/less/manageStyle/safeStyle.less')
62
- // require('system-clients/src/styles/less/manageStyle/manageStyle.less')
63
-
64
- new Vue({
65
- el: 'body',
66
- components: { App }
67
- })
68
-
1
+ import Vue from 'vue'
2
+ import App from './App'
3
+ import { all } from 'vue-client'
4
+
5
+ // import { sale } from 'sale-client'
6
+ import { system } from 'system-clients'
7
+ import { ldap } from 'ldap-clients'
8
+ import saleManage from './saleManage'
9
+ import webmeterManage from './webmeterManage'
10
+ import reportManage from './reportManage'
11
+ import newmanage from './newmanage'
12
+ import ManageHome from './ManageHome'
13
+ import echarts from 'echarts'
14
+ import AMap from 'vue-amap'
15
+
16
+ Vue.config.silent = true
17
+ // Vue.mmType = 'AES'
18
+
19
+ Vue.use(AMap);
20
+
21
+ // 初始化vue-amap
22
+ AMap.initAMapApiLoader({
23
+ // 高德key
24
+ key: '3cec9ae8e2349207f7ac29279e3f4abe',
25
+ // 插件集合 (插件按需引入)
26
+ plugin: [
27
+ "AMap.Autocomplete", //输入提示插件
28
+ "AMap.PlaceSearch", //POI搜索插件
29
+ "AMap.Scale", //右下角缩略图插件 比例尺
30
+ "AMap.OverView", //地图鹰眼插件
31
+ "AMap.ToolBar", //地图工具条0
32
+ "AMap.MapType", //类别切换控件,实现默认图层与卫星图、实施交通图层之间切换的控制
33
+ "AMap.PolyEditor", //编辑 折线多,边形
34
+ "AMap.CircleEditor", //圆形编辑器插件
35
+ "AMap.Geolocation" //定位控件,用来获取和展示用户主机所在的经纬度位置
36
+ ],
37
+ uiVersion: "1.0"
38
+ });
39
+ /** **************************通用组件******************************/
40
+
41
+ Vue.prototype.$echarts = echarts
42
+ all()
43
+ // sale()
44
+ ldap()
45
+ system(false)
46
+
47
+ saleManage()
48
+ webmeterManage()
49
+ ManageHome()
50
+ newmanage()
51
+ reportManage()
52
+ require('system-clients/src/styles/less/bootstrap.less')
53
+ require('./components/qinhua/Style/qinhuaStyle.less')
54
+ // require('./bootstrap/less/manageStyle/manageChile.less')
55
+ // require('./bootstrap/less/manageStyle/safeStyle.less')
56
+
57
+ //大屏展示要放开的样式
58
+ // require('system-clients/src/styles/less/manageStyle/manageChile.less')
59
+ // require('system-clients/src/styles/less/manageStyle/safeStyle.less')
60
+ // require('system-clients/src/styles/less/manageStyle/manageStyle.less')
61
+
62
+ new Vue({
63
+ el: 'body',
64
+ components: { App }
65
+ })
66
+
@@ -1,109 +0,0 @@
1
- {
2
- "name": "manage-client",
3
- "version": "3.2.174",
4
- "description": "经营管控模块前台组件",
5
- "main": "src/index.js",
6
- "directories": {
7
- "test": "test"
8
- },
9
- "dependencies": {
10
- "swiper": "^5.4.5"
11
- },
12
- "devDependencies": {
13
- "axios": "0.15.3",
14
- "babel-core": "^6.0.0",
15
- "babel-loader": "^6.0.0",
16
- "babel-plugin-transform-runtime": "^6.0.0",
17
- "babel-preset-es2015": "^6.0.0",
18
- "babel-preset-stage-2": "^6.0.0",
19
- "chai": "^3.5.0",
20
- "co": "^4.6.0",
21
- "connect-history-api-fallback": "^1.1.0",
22
- "cross-env": "^1.0.7",
23
- "cross-spawn": "^2.1.5",
24
- "css-loader": "^0.23.0",
25
- "echarts": "^4.1.0",
26
- "eslint": "^2.0.0",
27
- "eslint-config-standard": "^5.1.0",
28
- "eslint-friendly-formatter": "^1.2.2",
29
- "eslint-loader": "^1.3.0",
30
- "eslint-plugin-html": "^1.3.0",
31
- "eslint-plugin-promise": "^1.0.8",
32
- "eslint-plugin-standard": "^1.3.2",
33
- "eslint-plugin-vue": "^0.1.1",
34
- "eventsource-polyfill": "^0.9.6",
35
- "express": "^4.13.3",
36
- "extract-text-webpack-plugin": "^1.0.1",
37
- "filemanager-webpack-plugin": "^2.0.5",
38
- "file-loader": "^0.8.4",
39
- "function-bind": "^1.0.2",
40
- "html-webpack-plugin": "^2.8.1",
41
- "http-proxy-middleware": "^0.11.0",
42
- "inject-loader": "^2.0.1",
43
- "isparta-loader": "^2.0.0",
44
- "jasmine-core": "^2.4.1",
45
- "jquery": "^3.3.1",
46
- "jsencrypt": "3.0.0-rc.1",
47
- "json-loader": "^0.5.4",
48
- "karma": "^1.4.1",
49
- "karma-chrome-launcher": "^2.2.0",
50
- "karma-coverage": "^1.1.1",
51
- "karma-mocha": "^1.3.0",
52
- "karma-sinon-chai": "^1.3.1",
53
- "karma-sourcemap-loader": "^0.3.7",
54
- "karma-spec-reporter": "0.0.31",
55
- "karma-webpack": "^2.0.2",
56
- "ldap-clients": "3.0.28",
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": "3.1.89-20",
71
- "url-loader": "^0.5.7",
72
- "vue-amap": "0.5.10",
73
- "vue-client": "1.24.51",
74
- "vue-hot-reload-api": "^1.2.0",
75
- "vue-html-loader": "^1.0.0",
76
- "vue-loader": "8.2.1",
77
- "vue-resource": "^1.5.0",
78
- "vue-router": "^0.7.13",
79
- "vue-strap": "^1.0.9",
80
- "vue-style-loader": "^1.0.0",
81
- "vue-validator": "2.1.7",
82
- "webpack": "1.12.2",
83
- "webpack-dev-middleware": "^1.4.0",
84
- "webpack-hot-middleware": "^2.6.0",
85
- "webpack-merge": "^0.8.3",
86
- "webpack-parallel-uglify-plugin": "^1.0.0"
87
- },
88
- "scripts": {
89
- "unit": "karma start test/unit/karma.conf.js --single-run",
90
- "example": "node build/example-server.js",
91
- "dev": "node build/dev-server.js",
92
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
93
- "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",
94
- "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",
95
- "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",
96
- "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",
97
- "e2e": "node test/e2e/runner.js",
98
- "release": "bash build/release.sh"
99
- },
100
- "repository": {
101
- "type": "git",
102
- "url": "https://gitee.com/aote/management_modules.git"
103
- },
104
- "keywords": [
105
- "manage"
106
- ],
107
- "author": "liuxudong",
108
- "license": "ISC"
109
- }