osredm_test
/
osredm-comp-custom
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

update

This commit is contained in:
以说 2022-06-07 19:43:12 +08:00
parent 51434afe72
commit da94201fd0
15 changed files with 148 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/assets/css/Footer.css
View File

@ -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;
}

6
src/assets/css/Header.css
View File

@ -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;
}

17
src/assets/css/common.css
View File

@ -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;
@ -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 {

3
src/components/404.vue
View File

@ -72,9 +72,6 @@ export default {
color: #ee8145;
}
}
.not-found-btn-gohome {
}
}
.el-button--primary {

9
src/components/AdminHeader.vue
View File

@ -14,21 +14,24 @@
<script>
export default {
name: "AdminHeader",
data() {
data(){
return {
osredmLogo: require("@/assets/logo/osredmLogo.svg"),
activeIndex: '1',
activeIndex2: '1'
};
},
methods: {
methods:{
handleSelect(key, keyPath) {
console.log(key, keyPath);
},
backOsredm(){
window.location.href='https://www.osredm.com'
}
}
},
}
</script>

4
src/components/Footer.vue
View File

@ -28,11 +28,13 @@
<script>
export default {
name: "Footer",
data(){
return{
osredmLogo: require("@/assets/logo/osredmLogo-white.svg")
}
}
},
}
</script>

9
src/components/Header.vue
View File

@ -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) {
@ -123,18 +123,17 @@ 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.getPath();
/* var userRank = sessionStorage.getItem("rank");
if (userRank == 1) {
this.rankIf = true;

40
src/components/Login.vue
View File

@ -1,4 +1,5 @@
<template>
<div class="loginWraper">
<!-- v-bind:model的缩写 绑定登录表格
表单验证规则 自己设定
@ -11,7 +12,7 @@
label-width="0px"
class="login-container"
>
<h3 class="title"></h3>
<h3 class="title">登录</h3>
<el-form-item prop="adminName" class="a">
<el-input
type="text"
@ -72,10 +73,12 @@
>
</el-form-item>
</el-form>
<div class="footer"><p>@ 1703050328 张启磊</p></div>
</div>
</template>
<script>
import Cookies from "js-cookie";
@ -86,15 +89,15 @@ export default {
// 定义数据
return {
logining: false,
loginForm: {
loginForm:{
// 登录表格
adminName: "",
adminPass: "",
captcha: "",
src: "http://localhost:8088/graduate_evaluate/createPicCode",
//src: "http://localhost:8088/graduate_evaluate/createPicCode",
},
Rules: {
// 表单验证规则 必须填写
Rules:{
// 表单验证规则:必须填写
adminName: [{ required: true, message: "请输入账号", trigger: "blur" }],
adminPass: [{ required: true, message: "请输入密码", trigger: "blur" }],
captcha: [{ required: true, message: "请输入验证码", trigger: "blur" }],
@ -102,16 +105,17 @@ export default {
};
},
methods: {
methods:{
// 定义方法
login() {
login(){
let adminInfo = {
picCode: this.loginForm.captcha,
adminName: this.loginForm.adminName,
adminPass: this.loginForm.adminPass,
};
this.$api.login
alert("登录请求正在开发中。。。");
/* this.$api.login
.login(adminInfo)
.then((res) => {
console.log(res);
@ -131,18 +135,22 @@ export default {
.catch(function (res) {
alert(res);
this.refreshCaptcha();
});
}); */
},
// 刷新验证码
refreshCaptcha: function () {
this.loginForm.src =
refreshCaptcha:function(){
alert("验证码请求正在开发中。。。");
/* this.loginForm.src =
"http://localhost:8088/graduate_evaluate/createPicCode?t=" +
new Date().getTime();
new Date().getTime(); */
},
// 重置表单
reset() {
reset(){
this.$refs.loginForm.resetFields();
},
@ -185,7 +193,7 @@ export default {
top: 0;
bottom: 0;
right: 0;
background: url(../../assets/Pic/loginPic.jpg) no-repeat;
/* background: url(../../assets/Pic/loginPic.jpg) no-repeat; */
background-size: cover;
}
.login-container .el-input {
@ -209,4 +217,4 @@ export default {
border-color: #7890ee;
}
</style>
</style>

17
src/components/Video.vue
View File

@ -1,5 +1,5 @@
<template>
<div id="mui-player" />
<div id="mui-player"/>
</template>
<script>
@ -27,10 +27,13 @@ export default {
}
},
name: "Video",
data() {
data(){
return {}
},
mounted() {
mounted(){
var mp = new MuiPlayer({
container: '#mui-player',
title: this.title,
@ -42,12 +45,16 @@ export default {
})
]
})
// 音量调节时触发
mp.on('volume-change', function(e) {
mp.on('volume-change', function(e){
mp.video().volume = e.size;
});
},
methods: {}
methods:{}
}
</script>

74
src/pages/Chat/Chat.vue
View File

@ -1,16 +1,15 @@
<template>
<!-- 加载等待 -->
<div v-loading="contentLoading" element-loading-background="rgb(255, 255, 255)">
<div class="content-button" >
<div class="content-button">
<el-button plain class="edit-button" @click="goToEdit">编辑</el-button>
</div>
<div class="content" >
<div class="content">
<div class="white"></div>
<div class="card">
<el-image :src="chat" class="flot-img"/>
<el-image :src="chat" class="flot-img"/>
<div class="card-content-left">
<h3>交流互动</h3>
<div>dadasdadsad</div>
@ -39,36 +38,41 @@
</div>
</template>
<script>
import pageUtils from "@/utils/pageUtils";
import {Message} from "element-ui";
import { Message } from "element-ui";
export default {
name: "Chat",
data(){
return{
chat:'/api/files/chat-img.png',
chat_link1:'/api/files/chat-icon.png',
chat_link2:'/api/files/chat-icon.png',
chat_link3:'/api/files/chat-icon.png',
chat: "/api/files/chat-img.png",
chat_link1: "/api/files/chat-icon.png",
chat_link2: "/api/files/chat-icon.png",
chat_link3: "/api/files/chat-icon.png",
contentLoading: true,
loadingBg:'#FFF'
loadingBg: "#FFF",
}
},
methods:{
initPage(){
pageUtils.checkComp(this.$router,this.$route.params.compId,this.$api)
pageUtils.checkComp(this.$router,this.$route.params.compId,this.$api);
this.$api.getPageData(this.$route.params.compId,'chat').then((res) => {
console.log(res)
console.log(res);
//先判断 该页面是否展示
if (res.data.show) {
this.chat_link1 = res.data.logoOne
this.chat_link2 = res.data.logoTwo
this.chat_link3 = res.data.logoThree
this.chat = res.data.imgUrl
this.contentLoading = false
this.chat_link1 = res.data.logoOne;
this.chat_link2 = res.data.logoTwo;
this.chat_link3 = res.data.logoThree;
this.chat = res.data.imgUrl;
this.contentLoading = false;
}else {
Message.warning("该页面不存在")
Message.warning("该页面不存在");
this.$router.push({
path: '/404'
});
@ -76,44 +80,44 @@ export default {
})
},
goToEdit(){
// 跳转至编辑页面
pageUtils.openPage(this.$router,"/" + this.$route.params.compId + "/chatEdit")
// 跳转至编辑页面
goToEdit(){
pageUtils.openPage(this.$router,"/" + this.$route.params.compId + "/chatEdit");
}
},
mounted() {
this.initPage()
},
created() {
}
}
</script>
<style scoped>
.flot-img{
/*margin-top: -50px;*/
padding: 1vw;
.white {
height: 66px;
}
.flot-img {
position: relative;
float: left;
width:35vw;
height: auto;
margin-top: -70px;
margin-left: 20px;
margin-bottom: 20px;
width:35vw;
height: auto;
padding: 1vw;
box-shadow: inset 0 3px 8px rgba(219,227,255,.7)
}
.white {
height: 66px;
}
.chat-link {
display: flex;
margin: 1vw auto;
align-items: center;
}
.img-link {
width: auto;

24
src/pages/Chat/ChatEdit.vue
View File

@ -1,7 +1,8 @@
<template>
<div class="edit-content">
<el-breadcrumb class="breadcrumb" separator="/">
<el-breadcrumb-item :to="{ path: '/' + this.$route.params.compId +'/chat' }">交流互动</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/' + this.$route.params.compId + '/chat' }">交流互动</el-breadcrumb-item>
<el-breadcrumb-item>编辑</el-breadcrumb-item>
</el-breadcrumb>
<mavon-editor :ishljs="true" v-model="data" @change="change"/>
@ -10,37 +11,42 @@
<el-button>取消</el-button>
</div>
</div>
</template>
<script>
export default {
name: "ChatEdit",
data(){
return{
data: "",
html:""
html: "",
}
},
methods:{
change(value,render){
this.html = render
this.html = render;
},
submit(){
console.log(this.data)
console.log(this.html)
console.log(this.data);
console.log(this.html);
}
}
}
</script>
<style src="@/assets/css/common.css" scoped>
</style>
<style>
.button-group{
margin-top: 50px;
}
</style>
</style>
<style src="@/assets/css/common.css" scoped/>

20
src/pages/Home/Home.vue
View File

@ -2,7 +2,7 @@
<div>
<div class="content-button">
<el-button plain>编辑</el-button>
<el-button plain>编辑</el-button>
</div>
<div class="content">
@ -28,11 +28,14 @@
// 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: "",
@ -42,20 +45,23 @@ export default {
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()
}
}
</script>
<style scoped>
.video {

12
src/pages/Home/HomeEdit.vue
View File

@ -1,4 +1,5 @@
<template>
<div class="edit-content">
<el-breadcrumb class="breadcrumb" separator="/">
<el-breadcrumb-item :to="{ path: '/' + this.$route.params.compId + '/home' }">赛事首页</el-breadcrumb-item>
@ -6,23 +7,28 @@
</el-breadcrumb>
<mavon-editor :ishljs="true" v-model="data" @save="save"/>
</div>
</template>
<script>
export default {
name: "HomeEdit",
data(){
return{
data: ""
data: "",
}
},
methods:{
save(value,render){
// value是markdown格式
// render是html格式
console.log(value)
console.log(render)
console.log(value);
console.log(render);
}
}
}
</script>

2
src/pages/Notice/Notice.vue
View File

@ -41,7 +41,7 @@ export default {
data(){
return{
noticeAll:[],
noticeAll: [],
noticeId: "",
noticeTop: "",
noticeMiddle: "",

8
src/utils/pageUtils.js
View File

@ -1,8 +1,6 @@
import { Message } from 'element-ui'
// Header导航栏页面更改
function openPage(router, path){
router.push({
path: path
@ -10,7 +8,7 @@ function openPage(router, path){
}
// 检测竞赛是否存在
function checkComp(router,compId, http){
function checkComp(router,compId,http){
var compInfo = {
compId
}
@ -22,7 +20,7 @@ function checkComp(router,compId, http){
//正式上线 可以显示页面
}else {
// 未正式上线，需要拦截等操作，跳转404
Message.warning("该竞赛还未上线")
Message.warning("该竞赛还未上线");
//TODO: 可添加判断是否为白名单用户进行测试工作
router.push({
path: '/404'
@ -31,7 +29,7 @@ function checkComp(router,compId, http){
}else {
// 不存在该竞赛 提示 并跳转404
Message.warning("不存在该竞赛")
Message.warning("不存在该竞赛");
router.push({
path: '/404'
});