diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 032e4b7..fb1c0d1 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -5,8 +5,7 @@ VUE_APP_TITLE = 虚拟仿真实验教学中心 ENV = 'development' # 若依管理系统/开发环境 -# VUE_APP_BASE_API = 'https://f382b38516.zicp.fun' -VUE_APP_BASE_API = 'http://localhost:8080' +VUE_APP_BASE_API = 'https://f382b38516.zicp.fun' # 路由懒加载 diff --git a/ruoyi-ui/src/assets/images/bckimg.png b/ruoyi-ui/src/assets/images/bckimg.png new file mode 100644 index 0000000..13ec25e Binary files /dev/null and b/ruoyi-ui/src/assets/images/bckimg.png differ diff --git a/ruoyi-ui/src/views/officialWebsite/committee.vue b/ruoyi-ui/src/views/officialWebsite/committee.vue index c473abf..ca0c1c7 100644 --- a/ruoyi-ui/src/views/officialWebsite/committee.vue +++ b/ruoyi-ui/src/views/officialWebsite/committee.vue @@ -22,12 +22,23 @@
+
+
+
{{item.contentTitle}}
+
{{item.publishDate}}
+
+
+
+ +
+
-
+ +
-
+
{{item.contentTitle}} @@ -48,12 +59,14 @@ import "swiper/css/swiper.min.css"; import {getPageData, getPageColumn, getListById} from "@/api/officialWebsite/getPageData"; import footers from '@/views/officialWebsite/Components/footer.vue' import headers from '@/views/officialWebsite/Components/header.vue' +import PageUtil from '@/views/officialWebsite/Components/page/index.vue' export default { components: { headers, footers, Swiper, SwiperSlide, + "page-util": PageUtil }, name: 'HelloWorld', props: { @@ -61,7 +74,9 @@ export default { }, data() { return { + onelist:[], dataList: [], + categoryId:'', pageContextList: [], nav: [ // { name: '工作动态' }, @@ -82,6 +97,24 @@ export default { }, methods: { + handleDataFromPage(data){ + if (this.currentActive === 0){ + this.onelist = data + } + + }, + goDeatail(data){ + // console.log(data) + if(data.linkType == 0){ + this.$router.push({ + name: 'details', + query:{ id: data.id } + }); + } + if(data.linkType == 1){ + window.open(data.link, '_blank'); + } + }, getContentByCategoryId(id){ getListById(id).then(res => { this.dataList = res.data @@ -105,6 +138,10 @@ export default { "pageSize": 10 } getPageColumn(routeParam).then(response => { + + console.log('routeParam',response) + this.onelist = response.data[0].children.list + this.categoryId = response.data[0].id response.data.forEach(cloumnItem => { this.nav.push(cloumnItem); @@ -320,7 +357,7 @@ export default { .committee-cont { width: 80%; - margin: 100px auto; + margin: 15px auto; padding: 30px 0; } @@ -547,4 +584,15 @@ export default { text-align: center; padding: 20px; } +.noticeRsr{ + width: 100%; + padding: 1rem; + display: flex; + justify-content: space-between; + font-size: 20px; +} +.noticeRsr:hover{ + color: #00A0E8; + cursor: pointer; +} diff --git a/ruoyi-ui/src/views/officialWebsite/details.vue b/ruoyi-ui/src/views/officialWebsite/details.vue index 7189d1e..3251b94 100644 --- a/ruoyi-ui/src/views/officialWebsite/details.vue +++ b/ruoyi-ui/src/views/officialWebsite/details.vue @@ -149,9 +149,12 @@ export default { diff --git a/ruoyi-ui/src/views/officialWebsite/platform.vue b/ruoyi-ui/src/views/officialWebsite/platform.vue index ea876c1..03ae3ec 100644 --- a/ruoyi-ui/src/views/officialWebsite/platform.vue +++ b/ruoyi-ui/src/views/officialWebsite/platform.vue @@ -24,22 +24,22 @@
-
-
+
+
-
- 软硬件资源介绍 + @@ -67,12 +68,14 @@ import "swiper/css/swiper.min.css"; import { getPageData, getPageColumn } from "@/api/officialWebsite/getPageData"; import footers from '@/views/officialWebsite/Components/footer.vue' import headers from '@/views/officialWebsite/Components/header.vue' +import PageUtil from '@/views/officialWebsite/Components/page/index.vue' export default { components: { headers, footers, Swiper, SwiperSlide, + "page-util": PageUtil }, name: 'HelloWorld', props: { @@ -80,6 +83,9 @@ export default { }, data() { return { + imgurl:process.env.VUE_APP_BASE_API, + categoryId:'', + onelist:[], dataList: [], pageContextList: [], nav: [ @@ -90,18 +96,7 @@ export default { isMounted: false, professionalResources: "", content: "", - // content: `

- // 淄博瑞安输变电工程有限公司成立于2006年，公司原属国网淄博供电公司下属施工企业，现为山东泉舜控股集团有限公司全资子公司，注册资本5000万元。公司设立于历史悠久的齐文化发祥地淄博市，并在济南、青岛、聊城、东营、潍坊、济宁、泰安、李庄、邯郸等各地设有分支机构。企业人才结构合理，大专以上学历及具有各种专业技术职称的近300余人，是一支经过国家电网公司多年锻造、专业技术强、电力工程施工经验丰富的的铁军队伍。
 - //

- //

- // 公司主要经营范围包括:220千伏及以下电力工程总承包施工，电力输配电线路架设施工，变电站电气设备安装，建筑物土建施工，城市及道路照明工程施工；高低压电气设备修试:电力技术咨询；输配变电电力线路设备巡视、维护、维修及带电作业服务；电力销售；房屋、设备、车辆租赁及新能源技术开发、技术转让、技术服务。 - //

- //

- // 公司秉承山东泉舜控股集团有限公司建设“泉心立业、舜势百年”的百年企业的美好愿景，坚持“专业、规范、服务、诚信、创新、实力”的经营宗旨，为广大客户提供“电保姆”式的电力全产业链服务！ - //

- //

- //
- //

` + } }, mounted() { @@ -112,6 +107,21 @@ export default { }, methods: { + goDeatail(data){ + // console.log(data) + if(data.linkType == 0){ + this.$router.push({ + name: 'details', + query:{ id: data.id } + }); + } + if(data.linkType == 1){ + window.open(data.link, '_blank'); + } + }, + handleDataFromPage(data){ + this.onelist = data + }, // 触发导航 getCurrentActive(value) { if (this.currentActive == value) { @@ -127,6 +137,9 @@ export default { "pageSize": 10 } getPageColumn(routeParam).then(response => { + console.log(response,'119') + this.onelist = response.data[0].children.list + this.categoryId = response.data[0].id response.data.forEach(cloumnItem => { this.nav.push(cloumnItem); @@ -345,8 +358,8 @@ export default { .about-conts .ayptjs-list .item .text { position: absolute; - width: 94%; - height: 191px; + width: 100%; + height: 212px; z-index: 3; background: linear-gradient(180deg, rgba(0, 83, 117, 0) 0%, #005375 100%); display: flex; @@ -426,7 +439,7 @@ export default { color: #005375; font-size: 18px; position: absolute; - bottom: -10px; + bottom: -30px; display: none; } @@ -573,4 +586,53 @@ export default { line-height: 18px; } +/* 圆形分页按钮样式 */ +::v-deep .el-pagination .el-pager li:not(.disabled) { + border-radius: 100%; + /* 圆形 */ + width: 50px; + height: 50px; + /* 按钮高度 */ + line-height: 50px; + /* 文字垂直居中 */ + text-align: center; + /* 文字水平居中 */ + margin: 0 15px; + /* 按钮间距 */ + border-radius: 50%; + width: 50px; + height: 50px; + background: #FFFFFF; + + border: 1px solid #DDDDDD; +} + +/* 选中的页码按钮样式 */ +::v-deep .el-pagination .el-pager .active { + background-color: #005375; +; + /* 背景颜色 */ + color: #fff; + /* 文字颜色 */ +} + +::v-deep .el-pagination.is-background .btn-next, +::v-deep .el-pagination.is-background .btn-prev { + + background-color: #f4f4f5; + color: #333; + margin: 0 15px; + border-radius: 50%; + width: 50px; + height: 50px; + background: #FFFFFF; + + border: 1px solid #DDDDDD; +} + +::v-deep .el-pagination .btn-next .el-icon, +::v-deep .el-pagination .btn-prev .el-icon { + font-size: 18px; +} + diff --git a/ruoyi-ui/src/views/officialWebsite/teaching.vue b/ruoyi-ui/src/views/officialWebsite/teaching.vue index f96d3a3..0b4fdf6 100644 --- a/ruoyi-ui/src/views/officialWebsite/teaching.vue +++ b/ruoyi-ui/src/views/officialWebsite/teaching.vue @@ -23,17 +23,57 @@
-
-
-
-
-
+
+
+
+ +
+
+
{{item.publishDate}}
+
{{item.contentTitle}}
+
+ + 查看详情 +
+
+
+
+
+ +
+
+
{{item.publishDate}}
+
{{item.contentTitle}}
+
+ + 查看详情 + +
+
+
+
+
+ +
+
+
{{item.publishDate}}
+
{{item.contentTitle}}
+
+ + + 查看详情 + +
+
+
+
+
+
+
-
-
@@ -45,8 +85,11 @@ import { getPageData, getPageColumn } from "@/api/officialWebsite/getPageData"; import footers from '@/views/officialWebsite/Components/footer.vue' import headers from '@/views/officialWebsite/Components/header.vue' +import PageUtil from '@/views/officialWebsite/Components/page/index.vue' + export default { components: { + "page-util": PageUtil, headers, footers, Swiper, @@ -58,7 +101,16 @@ export default { }, data() { return { + imgurl:process.env.VUE_APP_BASE_API, + onelist:[], + oneid:'', + twolist:[], + twoid:'', + threelist:[], + threeid:'', + categoryId: "", pageContextList: [], + nav: [ // { name: '教学大纲' }, // { name: '实验指导书' }, @@ -80,6 +132,29 @@ export default { }, methods: { + goDeatail(data){ + // console.log(data) + if(data.linkType == 0){ + this.$router.push({ + name: 'details', + query:{ id: data.id } + }); + } + if(data.linkType == 1){ + window.open(data.link, '_blank'); + } + }, + handleDataFromPage(data){ + if (this.currentActive == 0){ + this.onelist = data + } + if (this.currentActive == 1){ + this.twolist = data + } + if (this.currentActive == 2){ + this.threelist = data + } + }, // 触发导航 getCurrentActive(value) { if (this.currentActive == value) { @@ -95,6 +170,14 @@ export default { "pageSize": 10 } getPageColumn(routeParam).then(response => { + console.log(response) + this.onelist = response.data[0].children.list + this.oneid = response.data[0].id + this.twolist = response.data[1].children.list + this.twoid = response.data[1].id + this.threelist = response.data[2].children.list + this.threeid = response.data[2].id + this.categoryId = response.data[0].id response.data.forEach(cloumnItem => { this.nav.push(cloumnItem); @@ -150,9 +233,9 @@ export default {