diff --git a/ruoyi-ui/public/favicon.ico b/ruoyi-ui/public/favicon.ico index e263760..a615ef5 100644 Binary files a/ruoyi-ui/public/favicon.ico and b/ruoyi-ui/public/favicon.ico differ diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index 0a79c74..f916a9f 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -69,15 +69,12 @@ Vue.use(plugins) Vue.use(VueMeta) DictData.install() -/** - * If you don't want to use mock-server - * you want to use MockJs for mock api - * you can execute: mockXHR() - * - * Currently MockJs will be used in the production environment, - * please remove it before going online! ! ! - */ - +router.beforeEach((to, from, next) => { + if (to.meta.metaInfo) { + store.commit("CAHNGE_META_INFO", to.meta.metaInfo) + } + next() +}); Vue.use(Element, { size: Cookies.get('size') || 'medium' // set element-ui default size }) @@ -88,5 +85,17 @@ new Vue({ el: '#app', router, store, + metaInfo() { + return { + title: this.$store.state.metaInfo.title, + meta: [{ + name: "keywords", + content: this.$store.state.metaInfo.keywords + }, { + name: "description", + content: this.$store.state.metaInfo.description + }] + } + }, render: h => h(App) }) diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index b9aa83f..9c1febd 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -44,6 +44,7 @@ export const constantRoutes = [ { path: '/virtually',//首页 name:'virtually', + meta: { title: '首页' }, component: () => import('@/views/home'), hidden: true }, diff --git a/ruoyi-ui/src/store/index.js b/ruoyi-ui/src/store/index.js index 97aaef8..54a3fa8 100644 --- a/ruoyi-ui/src/store/index.js +++ b/ruoyi-ui/src/store/index.js @@ -19,6 +19,16 @@ const store = new Vuex.Store({ permission, settings }, + state: { + metaInfo: {},//网站三要素 + token:'', //token + + }, + mutations: { + CAHNGE_META_INFO(state, metaInfo) { + state.metaInfo = metaInfo; + }, + }, getters }) diff --git a/ruoyi-ui/src/views/home.vue b/ruoyi-ui/src/views/home.vue index 45c8342..4db82a7 100644 --- a/ruoyi-ui/src/views/home.vue +++ b/ruoyi-ui/src/views/home.vue @@ -268,6 +268,14 @@ export default { } }, mounted() { + let metaInfo = { + title: '首页', + keywords: '首页', + description: '首页', + } + document.title = '新的页面标题'; + + this.$store.commit('CAHNGE_META_INFO', metaInfo) // 页面加载完毕调用 this.tabLsit(); this.getWebBaseInfo() diff --git a/ruoyi-ui/src/views/officialWebsite/about.vue b/ruoyi-ui/src/views/officialWebsite/about.vue index ca7cfd3..e17cc43 100644 --- a/ruoyi-ui/src/views/officialWebsite/about.vue +++ b/ruoyi-ui/src/views/officialWebsite/about.vue @@ -10,9 +10,10 @@
-
-

首页 中心概况

-
+
+ + +
@@ -29,8 +30,8 @@
-
- {{ item.contentTitle }} +
+ {{ item.contentTitle }}
@@ -521,13 +522,20 @@ export default { display: grid; grid-template-columns: repeat(4, 1fr); gap: 10px; -} -.dataClass > div { +} +.ddj:hover{ + background-color: #00afff; + color: #fff; +} +.ddj{ border: 1px solid black; font-size: 18px; margin: 10px; text-align: center; padding: 20px; + border-radius: 2px; + cursor: pointer; } + diff --git a/ruoyi-ui/src/views/officialWebsite/cases.vue b/ruoyi-ui/src/views/officialWebsite/cases.vue index b6ade29..abd2279 100644 --- a/ruoyi-ui/src/views/officialWebsite/cases.vue +++ b/ruoyi-ui/src/views/officialWebsite/cases.vue @@ -10,9 +10,9 @@
-
-

首页 合作企业

-
+ + +
diff --git a/ruoyi-ui/src/views/officialWebsite/committee.vue b/ruoyi-ui/src/views/officialWebsite/committee.vue index 65976e8..99e2753 100644 --- a/ruoyi-ui/src/views/officialWebsite/committee.vue +++ b/ruoyi-ui/src/views/officialWebsite/committee.vue @@ -10,9 +10,10 @@
-
-

首页 专业委员会

-
+
+ + +
diff --git a/ruoyi-ui/src/views/officialWebsite/competition.vue b/ruoyi-ui/src/views/officialWebsite/competition.vue index 52580b6..b6169bc 100644 --- a/ruoyi-ui/src/views/officialWebsite/competition.vue +++ b/ruoyi-ui/src/views/officialWebsite/competition.vue @@ -10,9 +10,10 @@
-
-

首页 大赛风采

-
+
+ + +
@@ -142,9 +143,9 @@
- +
-

参赛人信息

+

参赛人信息①

@@ -157,7 +158,82 @@ v-model="ruleForm.stuGender" placeholder="学生性别" clearable - style="width: 125px"> + > + + + + + + + + + + + + + + + +
+ +
+

参赛人信息②

+ + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+

参赛人信息③

+ + + + + + + + +
-
-

首页 联系我们

-
+ + +
{{ item.categoryName }} diff --git a/ruoyi-ui/src/views/officialWebsite/news.vue b/ruoyi-ui/src/views/officialWebsite/news.vue index fb50977..e33c1e1 100644 --- a/ruoyi-ui/src/views/officialWebsite/news.vue +++ b/ruoyi-ui/src/views/officialWebsite/news.vue @@ -10,9 +10,10 @@
-
-

首页 教学研讨活动

-
+
+ + +
diff --git a/ruoyi-ui/src/views/officialWebsite/platform.vue b/ruoyi-ui/src/views/officialWebsite/platform.vue index dc8350c..0051553 100644 --- a/ruoyi-ui/src/views/officialWebsite/platform.vue +++ b/ruoyi-ui/src/views/officialWebsite/platform.vue @@ -10,9 +10,10 @@
-
-

首页 教学平台

-
+
+ + +
diff --git a/ruoyi-ui/src/views/officialWebsite/practice.vue b/ruoyi-ui/src/views/officialWebsite/practice.vue index 123b47e..deb05e4 100644 --- a/ruoyi-ui/src/views/officialWebsite/practice.vue +++ b/ruoyi-ui/src/views/officialWebsite/practice.vue @@ -10,9 +10,10 @@
-
-

首页 实践平台

-
+
+ + +
diff --git a/ruoyi-ui/src/views/officialWebsite/teaching.vue b/ruoyi-ui/src/views/officialWebsite/teaching.vue index d315c78..ba6ce39 100644 --- a/ruoyi-ui/src/views/officialWebsite/teaching.vue +++ b/ruoyi-ui/src/views/officialWebsite/teaching.vue @@ -10,9 +10,10 @@
-
-

首页 教学资源

-
+
+ + +
diff --git a/ruoyi-ui/src/views/officialWebsite/team.vue b/ruoyi-ui/src/views/officialWebsite/team.vue index f5ed8d1..6292df9 100644 --- a/ruoyi-ui/src/views/officialWebsite/team.vue +++ b/ruoyi-ui/src/views/officialWebsite/team.vue @@ -10,9 +10,10 @@
-
-

首页 教学团队

-
+
+ + +
@@ -48,9 +49,9 @@
-
教学团队
+
-
+
@@ -294,7 +295,7 @@ export default { .about-conts { width: 80%; - margin: 80px auto; + margin: 0 auto; padding: 30px 0; } @@ -353,8 +354,8 @@ export default { .about-conts .ayptjs-list .item .text { position: absolute; - width: 94%; - height: 191px; + width: 100%; + height: 210px; z-index: 3; background: linear-gradient(180deg, rgba(0, 83, 117, 0) 0%, #005375 100%); display: flex; @@ -457,9 +458,9 @@ export default { .about-conts .team { - padding: 30px 0; + width: 80%; - margin: 0 auto; + margin: 0px auto; } .about-conts .team .tt { @@ -478,6 +479,10 @@ export default { margin: 0 auto; justify-content: center; } +.team-list img{ + width: 80% !important; + text-align: center; +} .about-conts .team .team-list .item { width: 16%; @@ -676,4 +681,9 @@ export default { ::v-deep .el-pagination .btn-prev .el-icon { font-size: 18px; } +.qxing{ + img{ + width: 100%; + } +} diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 85f3133..f7a8a9e 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -7,7 +7,7 @@ function resolve(dir) { const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 +const name = process.env.VUE_APP_TITLE || '虚拟仿真实验教学中心' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口