diff --git a/package.json b/package.json index 7414355..53ce1da 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,9 @@ "node-sass": "^4.14.1", "sass-loader": "^7.3.1", "vue": "^2.6.11", - "vue-router": "3.5.2" + "vue-router": "3.5.2", + "echarts": "^5.3.2", + "moment": "^2.29.1" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.4.5", diff --git a/src/assets/css/Footer.css b/src/assets/css/Footer.css index e1ebd9c..3536f32 100644 --- a/src/assets/css/Footer.css +++ b/src/assets/css/Footer.css @@ -1,4 +1,4 @@ -.footer{ +.footer { position: absolute; bottom: 0; height: 11.3vw; @@ -7,18 +7,18 @@ background-color: #0a1d30; } -.footer-content{ +.footer-content { display: flex; justify-content: center; align-items: center; margin: 3.2vw; } -.osredm-logo{ +.osredm-logo { width: 200px; } -.text{ +.text { text-align: center; align-items: center; margin-left: 50px; @@ -27,13 +27,13 @@ vertical-align: middle; } -a:hover{ +a:hover { color: rgb(250, 202, 46); } -a:active{ +a:active { color: rgb(250, 202, 46); } -a{ +a { text-decoration: none; color: white; } \ No newline at end of file diff --git a/src/assets/css/Header.css b/src/assets/css/Header.css index 99369ac..c6d6541 100644 --- a/src/assets/css/Header.css +++ b/src/assets/css/Header.css @@ -19,14 +19,14 @@ img { float: right; } -.nav{ +.nav { display: flex; justify-content: center; } -.el-menu-item{ +.el-menu-item { font-size: 1.1rem; } -::v-deep .el-submenu__title{ +::v-deep .el-submenu__title { font-size: 1.1rem !important; } diff --git a/src/assets/css/common.css b/src/assets/css/common.css index b56ea9e..96967b6 100644 --- a/src/assets/css/common.css +++ b/src/assets/css/common.css @@ -7,22 +7,23 @@ .breadcrumb { margin: 2vw 0; font-size: 1.1rem; - } -.edit-content{ + +.edit-content { display: flex; flex-direction: column; justify-content: center; - margin: 0 17vw 3vw; text-align: center; + margin: 0vw 17vw 3vw; } + /* 面板 */ .content { display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - margin: 0 6vw 3vw; + flex-direction: column; /* 纵向排列 */ + justify-content: center; /* 垂直居中 */ + align-items: center; /* 水平居中 */ + margin: 0vw 6vw 3vw; } .content ul { list-style-type: none; @@ -30,9 +31,9 @@ /* 卡片内容 */ .card { - background-color: white; width: 66vw; - box-shadow: 0 4px 10px 0 rgba(0,0,0,0.15); + background-color: white; + box-shadow: 0px 4px 10px 0 rgba(0,0,0,0.15); margin-bottom: 3vw; } .card-content { @@ -42,10 +43,10 @@ margin: 2vw; } .card-content-left { - text-align: left; display: block; position: relative; float: left; + text-align: left; margin: 1vw 1.5vw; } .card-img { @@ -55,9 +56,3 @@ height: auto; } -/* 分割线 */ -.el-divider { - width: 95%; - height: 2px; - margin: 1vw auto; - } diff --git a/src/components/404.vue b/src/components/404.vue index 16aea95..20d1734 100644 --- a/src/components/404.vue +++ b/src/components/404.vue @@ -72,9 +72,6 @@ export default { color: #ee8145; } } - .not-found-btn-gohome { - - } } .el-button--primary { diff --git a/src/components/AdminHeader.vue b/src/components/AdminHeader.vue index a8f2fca..33ec949 100644 --- a/src/components/AdminHeader.vue +++ b/src/components/AdminHeader.vue @@ -14,21 +14,27 @@ diff --git a/src/components/Footer.vue b/src/components/Footer.vue index 64a0e2d..9be43e0 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -28,11 +28,13 @@ diff --git a/src/components/Header.vue b/src/components/Header.vue index f2d199f..844ee7f 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -46,7 +46,7 @@ import pageUtils from "../utils/pageUtils"; export default { name: "Header", - data() { + data(){ return { banner: require("@/assets/logo/banner.jpg"), osredmLogo: require("@/assets/logo/osredmLogo.svg"), @@ -59,7 +59,7 @@ export default { }; }, - methods: { + methods:{ // 导航栏页面更改 handleSelect(key, keyPath) { @@ -68,34 +68,34 @@ export default { pageUtils.openPage(this.$router,"/" + this.$route.params.compId + "/home") break; case "chat": - pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/chat") + pageUtils.openPage(this.$router,"/" + this.$route.params.compId +"/chat") break; case "guide": - pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/guide") + pageUtils.openPage(this.$router,"/" + this.$route.params.compId +"/guide") break; case "apply": - pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/apply") + pageUtils.openPage(this.$router,"/" + this.$route.params.compId +"/apply") break; case "submit": - pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/submit") + pageUtils.openPage(this.$router,"/" + this.$route.params.compId +"/submit") break; case "chart": - pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/chart") + pageUtils.openPage(this.$router,"/" + this.$route.params.compId +"/chart") break; case "contactUs": - pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/contactUs") + pageUtils.openPage(this.$router,"/" + this.$route.params.compId +"/contactUs") break; case "applyList": - pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/applyList") + pageUtils.openPage(this.$router,"/" + this.$route.params.compId +"/applyList") break; case "submitList": - pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/submitList") + pageUtils.openPage(this.$router,"/" + this.$route.params.compId +"/submitList") break; case "notice": - pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/notice") + pageUtils.openPage(this.$router,"/" + this.$route.params.compId +"/notice") break; case "rank": - pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/rank") + pageUtils.openPage(this.$router,"/" + this.$route.params.compId +"/rank") break; } // console.log(key) @@ -123,18 +123,16 @@ export default { // 获取路由path 得到当前页 getPath(){ - var path = this.$route.path this.activeIndex = path.split("/")[2] } }, - mounted() { + mounted(){ this.userName = sessionStorage.getItem("name"); this.userPass = sessionStorage.getItem("pass"); - this.userAvatar = require("@/assets/logo/user.jpg"); - this.getPath() + this.userAvatar = require("@/assets/logo/user.jpg"); /* var userRank = sessionStorage.getItem("rank"); if (userRank == 1) { this.rankIf = true; @@ -142,8 +140,9 @@ export default { this.rankIf = false; } */ - }, + this.getPath(); + }, } diff --git a/src/components/Login.vue b/src/components/Login.vue index 4a391d4..47c10fa 100644 --- a/src/components/Login.vue +++ b/src/components/Login.vue @@ -1,4 +1,5 @@ + - \ No newline at end of file + + + + diff --git a/src/pages/Home/Home.vue b/src/pages/Home/Home.vue index b5c2d12..a1e8c53 100644 --- a/src/pages/Home/Home.vue +++ b/src/pages/Home/Home.vue @@ -2,7 +2,7 @@
- 编辑 + 编辑
@@ -28,34 +28,40 @@ // import 'mavon-editor/dist/css/index.css' import Video from "@/components/Video"; import pageUtils from "@/utils/pageUtils"; + export default { name: "Home", - components: { - Video + + components:{ + Video, }, + data(){ return{ data: "", - videoTitle:"标题", - videoSrc:"https://outin-396971199eed11e991a100163e1c7426.oss-cn-shanghai.aliyuncs.com/sv/34277901-180465b8b73/34277901-180465b8b73.mp4", + videoTitle: "标题", + videoSrc: "https://outin-396971199eed11e991a100163e1c7426.oss-cn-shanghai.aliyuncs.com/sv/34277901-180465b8b73/34277901-180465b8b73.mp4", videoWidth: "100%", - content:'测试内容测试内容测试内容' + content: "测试内容测试内容测试内容", } }, + methods:{ + checkComp(){ - - - pageUtils.checkComp(this.$router,this.$route.params.compId,this.$api) - + pageUtils.checkComp( this.$router,this.$route.params.compId,this.$api ); } + }, + mounted() { this.checkComp() } + } +