Merge branch '20210819' into 'master'
20210819 See merge request vue-project/liangXing/frontEnd!55
Showing
.gitignore
0 → 100644
... | ... | @@ -11,7 +11,7 @@ |
"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/ widgets/", | ||
"precommit": "npm run lint-fix", | ||
"init": "git submodule update --init --recursive && npm run update && npm install", | ||
"update": "git submodule update --recursive --remote --merge --force" | ||
"update": "git submodule update --recursive --remote --merge --force && npm install" | ||
}, | ||
"author": "", | ||
"license": "ISC", | ||
... | ... | @@ -53,6 +53,7 @@ |
"postcss-loader": "^3.0.0", | ||
"rimraf": "^2.6.2", | ||
"sass-loader": "^10.2.0", | ||
"sass-resources-loader": "^2.2.4", | ||
"uglifyjs-webpack-plugin": "^2.2.0", | ||
"url-loader": "^4.1.1", | ||
"vue-awesome-swiper": "^3.1.3", | ||
... | ... | @@ -67,7 +68,7 @@ |
}, | ||
"dependencies": { | ||
"axios": "^0.17.1", | ||
"echarts": "^5.1.2", | ||
"echarts": "^4.9.0", | ||
"qs": "^6.10.1", | ||
"vue": "^2.6.14", | ||
"vue-awesome-swiper": "^3.1.3", | ||
... | ... |
src/components/Header/images/header-bg.png
0 → 100644
36.8 KB
src/components/PopupFrame.vue
0 → 100644
src/components/Swiper/index.vue
0 → 100644
src/components/TitleLine/index.vue
0 → 100644
src/components/echarts/BarChart.vue
0 → 100644
src/components/echarts/BarPillarChart.vue
0 → 100644
src/components/echarts/BarStacked.vue
0 → 100644
src/components/echarts/ChinaMap/index.vue
0 → 100644
src/components/echarts/ChinaMap/mapConfig.js
0 → 100644
This diff is collapsed.
Click to expand it.
src/components/echarts/GuagePart.vue
0 → 100644
src/components/echarts/LineBar.vue
0 → 100644
src/components/echarts/LineChart.vue
0 → 100644
src/components/echarts/PieChart.vue
0 → 100644
src/pages/index.vue
deleted
100644 → 0
src/pages/index/Center.vue
0 → 100644
This diff is collapsed.
Click to expand it.
src/pages/index/Left.vue
0 → 100644
This diff is collapsed.
Click to expand it.
src/pages/index/Right.vue
0 → 100644
This diff is collapsed.
Click to expand it.
src/pages/index/active.vue
0 → 100644
src/pages/index/index.vue
0 → 100644
src/pages/login.vue
0 → 100644
static/images/index/03.jpg
0 → 100644
360 KB
static/images/index/03.png
0 → 100644
359 KB
static/images/index/3.png
0 → 100644
1.18 KB
static/images/index/720.png
0 → 100644
1.01 KB
static/images/index/bg.png
0 → 100644
This diff is collapsed.
Click to expand it.
static/images/index/bulletFrame-close.png
0 → 100644
1.39 KB
static/images/index/comm-bg.png
0 → 100644
11.8 KB
static/images/index/course.jpg
0 → 100644
334 KB
static/images/index/courseBG.png
0 → 100644
24.3 KB
static/images/index/distBg.png
0 → 100644
1.47 KB
static/images/index/female.png
0 → 100644
2.73 KB
static/images/index/frameworkBG.png
0 → 100644
54.4 KB
static/images/index/leftBg.png
0 → 100644
28.3 KB
static/images/index/male.png
0 → 100644
2.83 KB
static/images/index/mapFloatBG.png
0 → 100644
185 KB
static/images/index/more.png
0 → 100644
1.47 KB
static/images/index/persion.png
0 → 100644
17.4 KB
static/images/index/rightBg.png
0 → 100644
27.2 KB
static/images/index/starClassBg.png
0 → 100644
2.35 KB
static/images/index/studentDemeanor.jpg
0 → 100644
199 KB
static/images/index/studentDemeanor1.png
0 → 100644
311 KB
static/images/index/studentDemeanor2.png
0 → 100644
316 KB
static/images/index/studentDemeanor3.png
0 → 100644
313 KB
static/images/index/studentDemeanor4.png
0 → 100644
303 KB
static/images/index/supply-demand1.jpg
0 → 100644
375 KB
static/images/index/supply-demand2.jpg
0 → 100644
384 KB
static/images/index/topic-bg1.png
0 → 100644
45.6 KB
static/images/index/topic-bg2.png
0 → 100644
8.19 KB
static/images/index/topic-bg3.png
0 → 100644
17.5 KB
static/images/index/topic-bg4.png
0 → 100644
7.05 KB
static/images/login/2021.png
0 → 100644
25.4 KB
static/images/login/312.png
0 → 100644
39 KB
static/images/login/32copy.png
0 → 100644
This diff is collapsed.
Click to expand it.
static/images/login/56.png
0 → 100644
24.2 KB
static/images/login/60.png
0 → 100644
574 KB
static/images/login/7.png
0 → 100644
75 KB
static/images/login/9.png
0 → 100644
1.22 KB
static/images/login/peixun.png
0 → 100644
36.9 KB
static/images/login/shimingyuanjing.png
0 → 100644
62.4 KB
static/images/login/tuceng32.png
0 → 100644
This diff is collapsed.
Click to expand it.
static/images/login/zhangjiancopy.png
0 → 100644
41.1 KB