diff --git a/src/App.vue b/src/App.vue index cc56da1..93fe788 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,15 +8,38 @@ export default { name: 'App', created () { - //在页面加载时读取sessionStorage里的状态信息 - if (sessionStorage.getItem("kd_client_store") ) { - this.$store.replaceState(Object.assign({}, this.$store.state,JSON.parse(sessionStorage.getItem("kd_client_store")))) - } - - //在页面刷新时将vuex里的信息保存到sessionStorage里 - window.addEventListener("beforeunload",()=>{ - sessionStorage.setItem("kd_client_store",JSON.stringify(this.$store.state)) - }) + // 在页面加载时读取sessionStorage里的状态信息 + if (sessionStorage.getItem("kd_client_store") ) { + this.$store.replaceState(Object.assign({}, this.$store.state,JSON.parse(sessionStorage.getItem("kd_client_store")))) + } + // 在页面刷新时将vuex里的信息保存到sessionStorage里 + window.addEventListener("beforeunload",()=>{ + sessionStorage.setItem("kd_client_store",JSON.stringify(this.$store.state)) + }) + } } + + \ No newline at end of file diff --git a/src/assets/css/main.css b/src/assets/css/main.css new file mode 100644 index 0000000..a9db430 --- /dev/null +++ b/src/assets/css/main.css @@ -0,0 +1,438 @@ +* { + margin: 0; + padding: 0; +} + +html, +body, +#app, +.wrapper { + width: 100%; + height: 100%; + overflow: hidden; +} + +body { + font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif; + font-size: 16px; +} + +a { + text-decoration: none +} +i{ + font-style: normal; + cursor: pointer; +} +li { + list-style-type:none; +} +img{ + cursor: pointer; +} + +.content-box { + height: 100%; + -webkit-transition: left .3s ease-in-out; + transition: left .3s ease-in-out; + background: #fff; +} + +.clearfix::after { + display: block; + content: "."; + height: 0; + clear: both; + visibility: hidden; +} + +.content { + height: 100vh; + width: auto; + overflow-y: auto; + /* width: 1960px; */ + overflow-x: hidden; + /* height: 100%; */ + box-sizing: border-box; + position: relative; +} + +.content_back{ + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 530px; +} + +/* .content-collapse { + left: 65px; +} */ +.scroll_wrap{ + height: 100vh; + overflow-y: auto; +} +.container { + padding: 30px; + background: #fff; + border: 1px solid #ddd; + border-radius: 5px; +} + +.crumbs { + margin: 10px 0; +} + +.el-table tr:hover { + background: #f5f7fa; +} + +#app .el-table thead{ + color: #2D2D2D; +} +/* table表格 */ +.el-table th{ + /* background-color: #E5E5E5!important; */ + font-size: 18px; + font-weight: normal; +} +.el-table td{ + font-size: 16px; + font-weight: normal; +} +/* 分页按钮 */ +.pagination { + margin: 20px 0; + text-align: right; +} + +.pagination .el-pagination__total{ + font-size: 16px!important; +} + +#app .el-pagination.is-background .btn-next:last-child{ + margin-right: 0!important; + /* background-color: #fff!important; */ +} + +#app .pagination_pageNumber{ + color: #ccc; + margin-right: 4px; + margin-bottom: 20px; +} +#app .el-cascader{ + display: block!important; +} + +.plugins-tips { + padding: 20px 10px; + margin-bottom: 20px; +} + +.el-button+.el-tooltip { + margin-left: 10px; +} + +#app .el-row { + margin-left: 0!important; + margin-right: 0!important; +} +#app .information .el-col-24{ + padding-left: 0!important; + padding-right: 0!important; +} +/* 边距 */ +.mab20{ + margin-bottom: 20px; +} + +.mar20{ + margin-right: 20px; +} + +.mat20 { + margin-top: 20px; +} + +.mar50{ + margin: 50px 0; +} + +.ml20{ + margin-left: 20px; +} + +.hr_tag{ + width: 8px; + height: 18px; + background: #2D2D2D; +} + +.hr_text{ + font-size: 18px; + color: #2D2D2D; + margin-left: 10px; +} + +.hr_tag_red{ + width: 8px; + height: 20px; + background: #BB2A17; +} + +.hr_text_red{ + font-size: 18px; + color: #2D2D2D; + font-weight: bold; + margin-left: 10px; +} + +/* 下拉选择框 */ +#app .el-select{ + display: block!important; +} + +.move-enter-active, +.move-leave-active { + transition: opacity .5s; +} + +.move-enter, +.move-leave { + opacity: 0; +} + +/*BaseForm*/ + +.form-box { + width: 600px; +} + +.form-box .line { + text-align: center; +} +/* form-item的label */ +#app .el-form-item__label{ + font-size: 16px; +} + +.el-time-panel__content::after, +.el-time-panel__content::before { + margin-top: -7px; +} + +.el-time-spinner__wrapper .el-scrollbar__wrap:not(.el-scrollbar__wrap--hidden-default) { + padding-bottom: 0; +} + +/*Upload*/ + +.pure-button { + width: 150px; + height: 40px; + line-height: 40px; + text-align: center; + color: #fff; + border-radius: 3px; +} + +.g-core-image-corp-container .info-aside { + height: 45px; +} + +/*VueEditor*/ + +.ql-container { + min-height: 400px; +} + +.ql-snow .ql-tooltip { + transform: translateX(117.5px) translateY(10px) !important; +} + +.editor-btn { + margin-top: 20px; +} +#app .ml10{ + margin-left: 10px; +} +#app .mr10{ + margin-right: 10px; +} +.mab200{ + margin-bottom: 200px; +} +.mat40{ + margin-top: 40px; +} +.mat25{ + margin-top: 25px; +} +.mat10{ + margin-top: 10px; +} +.hr_tag{ + width: 8px; + height: 18px; + background: white; +} + +.hr_text{ + font-size: 16px; + color: #2D2D2D; + margin-left: 10px; +} +/*flex*/ +.flex-center{ + display: flex; + align-items: center; +} +.flex-end{ + display: flex; + /* justify-content: space-between; + align-items: flex-end; */ + justify-content:end + +} +.flex-start{ + display: flex; + align-items: flex-start; +} +.flex-between{ + display: flex; + align-items: center; + justify-content: space-between; +} +.flex-column-between{ + display: flex; + justify-content: space-between; + flex-direction: column; +} +.flex-start-between{ + display: flex; + align-items: flex-start; + justify-content: space-between; +} +.flex-around{ + display: flex; + align-items: center; + justify-content: space-around; +} +.flex-start-around{ + display: flex; + align-items: flex-start; + justify-content: center; +} +.flex-end-content{ + display: flex; + align-items: center; + justify-content: flex-end; +} + +.flex-justify-content{ + display: flex; + align-items: center; + justify-content: center; +} + +.flex-column-content{ + display: flex; + align-items: center; + flex-direction: column; +} + +/* 输入框圆角 */ +#app .el-input--suffix .el-input__inner{ + border-radius: 8px; +} +/* 输入框圆角 */ +/* #app .dialog .el-input--suffix .el-input__inner{ + border-radius: 0; +} */ +#app .el-date-editor--daterange.el-input__inner{ + width: 100%; + border-radius: 8px; +} +#app .bondDate .el-date-editor--daterange.el-input__inner{ + width: 30%; + margin: 0 25px 0 10px; +} +/* 消除数字input箭头 */ +input::-webkit-outer-spin-button, +input::-webkit-inner-spin-button { + -webkit-appearance: none; +} +input[type="number"]{ + -moz-appearance: textfield; +} + +.class_name .el-form-item__content{ + margin-left: 0!important; +} + .class_detail .el-row{ + margin-left: 20px!important; + margin-right: 20px!important; +} + +[v-cloak] { + display: none; +} +/* 溢出省略号 */ +.ellipsis{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.search_view{ + padding: 30px 0 20px 0; + border-bottom: 1px solid #e5e5e5; +} +.mal10{ + margin-left: 10px; +} +.pab0{ + padding-bottom: 0; +} +.two_nxetStep{ + margin-top: 20px; + text-align: center; +} +.el-divider>.el-divider__text{ + color: #5277F7; + font-size: 23px; + } +.el-page-header__left:hover{ + opacity: 0.7; + } + .el-page-header{ + position: fixed; + } +.el-page-header__left{ + top: 40px; + left: 20px; + } +.el-page-header__left>.el-icon-back{ + font-size: 20px; + color: #5277F7; +} +.el-page-header__left>.el-page-header__title{ + font-size: 20px; + color: #5277F7; +} + /*滚动条样式*/ + ::-webkit-scrollbar { + width: 1px; + height: 1px; +} +::-webkit-scrollbar-thumb { + border-radius: 1px; + -webkit-box-shadow: inset 0 0 1px white; + background: white; +} +::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 1px white; + border-radius: 0; + background:white; + +} \ No newline at end of file diff --git a/src/assets/img/add.png b/src/assets/img/add.png new file mode 100644 index 0000000..3d0962c Binary files /dev/null and b/src/assets/img/add.png differ diff --git a/src/assets/img/equal.png b/src/assets/img/equal.png new file mode 100644 index 0000000..fc50572 Binary files /dev/null and b/src/assets/img/equal.png differ diff --git a/src/assets/img/indexBg.jpg b/src/assets/img/indexBg.jpg index a05ca86..4c6f19b 100644 Binary files a/src/assets/img/indexBg.jpg and b/src/assets/img/indexBg.jpg differ diff --git a/src/assets/img/left_up.png b/src/assets/img/left_up.png new file mode 100644 index 0000000..319ab70 Binary files /dev/null and b/src/assets/img/left_up.png differ diff --git a/src/assets/img/right_up.png b/src/assets/img/right_up.png new file mode 100644 index 0000000..e298f6c Binary files /dev/null and b/src/assets/img/right_up.png differ diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue index 45590e8..783b921 100644 --- a/src/components/common/Header.vue +++ b/src/components/common/Header.vue @@ -36,15 +36,16 @@ export default { }, methods: { loginout() { - this.$get(this.api.logout,{ - token:this.$store.state.token - }).then(res => { - this.$store.replaceState({}) - sessionStorage.removeItem('kd_client_username'); - this.$router.push('/login') - }) - - // location.reload() + this.$router.push('/login') + this.$store.replaceState({}) + sessionStorage.clear() + // this.$get(this.api.logout,{ + // token:this.$store.state.token + // }).then(res => { + // this.$store.replaceState({}) + // sessionStorage.clear() + // this.$router.push('/login') + // }) }, toPersonalCenter(){ this.$router.push('/personalcenter') diff --git a/src/components/common/Studentcommon/registration.vue b/src/components/common/Studentcommon/registration.vue index d7187fd..fca1fc2 100644 --- a/src/components/common/Studentcommon/registration.vue +++ b/src/components/common/Studentcommon/registration.vue @@ -1,9 +1,6 @@