diff --git a/package.json b/package.json index 6071aac..36096a3 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,9 @@ "clipboard": "^2.0.6", "core-js": "^3.8.2", "dayjs": "^1.10.3", - "echarts": "^5.0.0", - "echarts-wordcloud": "^1.1.3", - "element-ui": "^2.14.1", + "echarts": "^5.0.1", + "echarts-wordcloud": "^2.0.0", + "element-ui": "^2.15.0", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.20", "maptalks": "^0.49.1", @@ -76,11 +76,11 @@ "babel-eslint": "^10.1.0", "body-parser": "^1.19.0", "chalk": "^4.1.0", - "chokidar": "^3.5.0", - "eslint": "^7.17.0", + "chokidar": "^3.5.1", + "eslint": "^7.18.0", "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-vue": "^7.4.1", - "filemanager-webpack-plugin": "^3.0.0", + "filemanager-webpack-plugin": "^3.1.0", "image-webpack-loader": "^7.0.1", "lint-staged": "^10.5.3", "plop": "^2.7.4", diff --git a/src/plugins/echarts.js b/src/plugins/echarts.js index 79e00e7..c78285f 100644 --- a/src/plugins/echarts.js +++ b/src/plugins/echarts.js @@ -1,57 +1,5 @@ -import 'echarts/lib/component/dataset' -import 'echarts/lib/component/transform' -import 'echarts/lib/chart/line' -import 'echarts/lib/chart/bar' -import 'echarts/lib/chart/pie' -import 'echarts/lib/chart/scatter' -import 'echarts/lib/chart/radar' -import 'echarts/lib/chart/map' -import 'echarts/lib/chart/tree' -import 'echarts/lib/chart/treemap' -import 'echarts/lib/chart/graph' -import 'echarts/lib/chart/gauge' -import 'echarts/lib/chart/funnel' -import 'echarts/lib/chart/parallel' -import 'echarts/lib/chart/sankey' -import 'echarts/lib/chart/boxplot' -import 'echarts/lib/chart/candlestick' -import 'echarts/lib/chart/effectScatter' -import 'echarts/lib/chart/lines' -import 'echarts/lib/chart/heatmap' -import 'echarts/lib/chart/pictorialBar' -import 'echarts/lib/chart/themeRiver' -import 'echarts/lib/chart/sunburst' -import 'echarts/lib/chart/custom' -import 'echarts/lib/component/grid' -import 'echarts/lib/component/polar' -import 'echarts/lib/component/geo' -import 'echarts/lib/component/singleAxis' -import 'echarts/lib/component/parallel' -import 'echarts/lib/component/calendar' -import 'echarts/lib/component/graphic' -import 'echarts/lib/component/toolbox' -import 'echarts/lib/component/tooltip' -import 'echarts/lib/component/axisPointer' -import 'echarts/lib/component/brush' -import 'echarts/lib/component/title' -import 'echarts/lib/component/timeline' -import 'echarts/lib/component/markPoint' -import 'echarts/lib/component/markLine' -import 'echarts/lib/component/markArea' -import 'echarts/lib/component/legendScroll' -import 'echarts/lib/component/legend' -import 'echarts/lib/component/dataZoom' -import 'echarts/lib/component/dataZoomInside' -import 'echarts/lib/component/dataZoomSlider' -import 'echarts/lib/component/visualMap' -import 'echarts/lib/component/visualMapContinuous' -import 'echarts/lib/component/visualMapPiecewise' -import 'echarts/lib/component/aria' import * as echarts from 'echarts' -import 'zrender/lib/svg/svg' import VabChart from 'vue-echarts' -import theme from './echarts/theme/vab-echarts-theme.json' -VabChart.registerTheme('vab-echarts-theme', theme) VabChart.graphic = echarts.graphic export default VabChart diff --git a/src/plugins/echarts/theme/vab-echarts-theme.json b/src/plugins/echarts/theme/vab-echarts-theme.json deleted file mode 100644 index 199c109..0000000 --- a/src/plugins/echarts/theme/vab-echarts-theme.json +++ /dev/null @@ -1,317 +0,0 @@ -{ - "color": ["#1890FF", "#36CBCB", "#4ECB73", "#FBD437", "#F2637B", "#975FE5"], - "backgroundColor": "rgba(252,252,252,0)", - "textStyle": {}, - "title": { - "textStyle": { - "color": "#666666" - }, - "subtextStyle": { - "color": "#999999" - } - }, - "line": { - "itemStyle": { - "borderWidth": "2" - }, - "lineStyle": { - "normal": { - "width": "3" - } - }, - "symbolSize": "8", - "symbol": "emptyCircle", - "smooth": false - }, - "radar": { - "itemStyle": { - "borderWidth": "2" - }, - "lineStyle": { - "normal": { - "width": "3" - } - }, - "symbolSize": "8", - "symbol": "emptyCircle", - "smooth": false - }, - "bar": { - "itemStyle": { - "barBorderWidth": 0, - "barBorderColor": "#ccc" - } - }, - "pie": { - "itemStyle": { - "borderWidth": 0, - "borderColor": "#ccc" - } - }, - "scatter": { - "itemStyle": { - "borderWidth": 0, - "borderColor": "#ccc" - } - }, - "boxplot": { - "itemStyle": { - "borderWidth": 0, - "borderColor": "#ccc" - } - }, - "parallel": { - "itemStyle": { - "borderWidth": 0, - "borderColor": "#ccc" - } - }, - "sankey": { - "itemStyle": { - "borderWidth": 0, - "borderColor": "#ccc" - } - }, - "funnel": { - "itemStyle": { - "borderWidth": 0, - "borderColor": "#ccc" - } - }, - "gauge": { - "itemStyle": { - "borderWidth": 0, - "borderColor": "#ccc" - } - }, - "candlestick": { - "itemStyle": { - "color": "#e6a0d2", - "color0": "transparent", - "borderColor": "#e6a0d2", - "borderColor0": "#1890FF", - "borderWidth": "2" - } - }, - "graph": { - "itemStyle": { - "borderWidth": 0, - "borderColor": "#ccc" - }, - "lineStyle": { - "normal": { - "width": "1", - "color": "#cccccc" - } - }, - "symbolSize": "8", - "symbol": "emptyCircle", - "smooth": false, - "color": ["#1890FF", "#36CBCB", "#4ECB73", "#FBD437", "#F2637B", "#975FE5"], - "label": { - "color": "#ffffff" - } - }, - "map": { - "itemStyle": { - "areaColor": "#eeeeee", - "borderColor": "#aaaaaa", - "borderWidth": 0.5 - }, - "label": { - "color": "#ffffff" - } - }, - "geo": { - "itemStyle": { - "areaColor": "#eeeeee", - "borderColor": "#aaaaaa", - "borderWidth": 0.5 - }, - "label": { - "color": "#ffffff" - } - }, - "categoryAxis": { - "axisLine": { - "show": true, - "lineStyle": { - "color": "#cccccc" - } - }, - "axisTick": { - "show": false, - "lineStyle": { - "color": "#333" - } - }, - "axisLabel": { - "show": true, - "color": "#999999" - }, - "splitLine": { - "show": true, - "lineStyle": { - "color": ["#eeeeee"] - } - }, - "splitArea": { - "show": false, - "areaStyle": { - "color": ["rgba(250,250,250,0.05)", "rgba(200,200,200,0.02)"] - } - } - }, - "valueAxis": { - "axisLine": { - "show": true, - "lineStyle": { - "color": "#cccccc" - } - }, - "axisTick": { - "show": true, - "lineStyle": { - "color": "#cccccc" - } - }, - "axisLabel": { - "show": true, - "color": "#999999" - }, - "splitLine": { - "show": true, - "lineStyle": { - "color": ["#eeeeee"] - } - }, - "splitArea": { - "show": false, - "areaStyle": { - "color": ["rgba(250,250,250,0.05)", "rgba(200,200,200,0.02)"] - } - } - }, - "logAxis": { - "axisLine": { - "show": true, - "lineStyle": { - "color": "#cccccc" - } - }, - "axisTick": { - "show": false, - "lineStyle": { - "color": "#333" - } - }, - "axisLabel": { - "show": true, - "color": "#999999" - }, - "splitLine": { - "show": true, - "lineStyle": { - "color": ["#eeeeee"] - } - }, - "splitArea": { - "show": false, - "areaStyle": { - "color": ["rgba(250,250,250,0.05)", "rgba(200,200,200,0.02)"] - } - } - }, - "timeAxis": { - "axisLine": { - "show": true, - "lineStyle": { - "color": "#cccccc" - } - }, - "axisTick": { - "show": false, - "lineStyle": { - "color": "#333" - } - }, - "axisLabel": { - "show": true, - "color": "#999999" - }, - "splitLine": { - "show": true, - "lineStyle": { - "color": ["#eeeeee"] - } - }, - "splitArea": { - "show": false, - "areaStyle": { - "color": ["rgba(250,250,250,0.05)", "rgba(200,200,200,0.02)"] - } - } - }, - "toolbox": { - "iconStyle": { - "borderColor": "#999999" - } - }, - "legend": { - "textStyle": { - "color": "#999999" - } - }, - "tooltip": { - "axisPointer": { - "lineStyle": { - "color": "#ffffff", - "width": 1 - }, - "crossStyle": { - "color": "#ffffff", - "width": 1 - } - } - }, - "timeline": { - "lineStyle": { - "color": "#4ECB73", - "width": 1 - }, - "itemStyle": { - "color": "#4ECB73", - "borderWidth": 1 - }, - "controlStyle": { - "color": "#4ECB73", - "borderColor": "#4ECB73", - "borderWidth": 0.5 - }, - "checkpointStyle": { - "color": "#1890FF", - "borderColor": "rgba(63,177,227,0.15)" - }, - "label": { - "color": "#4ECB73" - } - }, - "visualMap": { - "color": ["#1890FF", "#afe8ff"] - }, - "dataZoom": { - "backgroundColor": "rgba(255,255,255,0)", - "dataBackgroundColor": "rgba(222,222,222,1)", - "fillerColor": "rgba(114,230,212,0.25)", - "handleColor": "#cccccc", - "handleSize": "100%", - "textStyle": { - "color": "#999999" - } - }, - "markPoint": { - "label": { - "color": "#ffffff" - } - } -} diff --git a/src/styles/variables.scss b/src/styles/variables.scss index d71882d..347982d 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -5,11 +5,11 @@ /* stylelint-disable */ @charset "utf-8"; //框架默认主题色 -$base-color-default: #1890ff; +$base-color-default: #5470c6; //默认层级 $base-z-index: 999; //横向布局纵向布局时菜单背景色 -$base-menu-background: rgb(40, 44, 52); +$base-menu-background: #2f3447; //菜单文字颜色 $base-menu-color: hsla(0, 0%, 100%, 0.95); //菜单选中文字颜色