dianliang/school_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端补正

Browse Source
This commit is contained in:
xiao-fajia 2024-08-04 20:33:59 +08:00
parent 05b79aefb2
commit 34b78574fb
5 changed files with 128 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-ui/src/views/home.vue
View File

@ -60,7 +60,7 @@
</swiper-slide> </swiper-slide>
</swiper> </swiper>
<div class="swiper-pagination"></div> <div class="swiper-pagination"></div>
<div style=" width: 156px;height: 42px;position: absolute;bottom: 30px; z-index: 99 " @click="golist(indexList[0].id)" > <div style=" width: 156px;height: 42px;position: absolute;bottom: 30px; z-index: 99 " @click="golist(indexList[0])" >
<img src="../assets/gw/anniu.png" style=" width: 156px;height: 42px" > <img src="../assets/gw/anniu.png" style=" width: 156px;height: 42px" >
</div> </div>
</div> </div>
@ -295,11 +295,12 @@ export default {
query:{ id: '1813829868593483776' } query:{ id: '1813829868593483776' }
}); });
}, },
golist(id){ golist(row){
console.log('跳转',id) // console.log('跳转',id)
console.log(row)
this.$router.push({ this.$router.push({
name: 'list', name: 'list',
query:{ id: id } query:{ id: row.id, categoryTitle: row.categoryName }
}); });
}, },
tabClick(item){ tabClick(item){

28
ruoyi-ui/src/views/officialWebsite/Components/page/index.vue
View File

@ -26,23 +26,36 @@ export default {
defaultValue: undefined, defaultValue: undefined,
required: false required: false
}, },
pageSize: {
type: Number,
defaultValue: 10,
required: false
},
pageNum: {
type: Number,
defaultValue: 1,
required: false
}
}, },
watch: { watch: {
categoryId(newVal) { categoryId(newVal) {
this.queryParams = { this.queryParams.categoryId = newVal
pageNum: 1, this.queryParams.pageNum = 1
pageSize: 10,
categoryId: newVal,
}
this.initPageData() this.initPageData()
}, },
pageSize(newVal){
this.queryParams.pageSize = newVal
},
pageNum(newVal){
this.queryParams.pageSize = newVal
},
}, },
data () { data () {
return{ return{
queryParams: { queryParams: {
categoryId:"", categoryId:"",
pageNum: 1, pageNum: this.pageNum || 1,
pageSize: 10, pageSize: this.pageSize || 10,
}, },
total: 0 total: 0
} }
@ -50,6 +63,7 @@ export default {
methods : { methods : {
initPageData() { initPageData() {
// console.log(1, this.queryParams) // console.log(1, this.queryParams)
// console.log(this.queryParams.pageNum)
getPageData(this.queryParams).then(res => { getPageData(this.queryParams).then(res => {
// console.log('列表',res) // console.log('列表',res)
this.listinfo = res.data.list; this.listinfo = res.data.list;

5
ruoyi-ui/src/views/officialWebsite/list.vue
View File

@ -9,6 +9,7 @@
</div> </div>
<!-- new --> <!-- new -->
<div class="b-box"> <div class="b-box">
<div style="font-size: 28px;text-align: center">{{categoryTitle}}</div>
<div class="gang_" v-for="(item,index) in listinfo" :key="index" @click="goDeatail(item)" > <div class="gang_" v-for="(item,index) in listinfo" :key="index" @click="goDeatail(item)" >
<div class="title_">{{item.contentTitle || '暂无标题' }}</div> <div class="title_">{{item.contentTitle || '暂无标题' }}</div>
<div class="time_" >{{item.createTime || 0.00 }}</div> <div class="time_" >{{item.createTime || 0.00 }}</div>
@ -70,6 +71,7 @@ export default {
content: "", content: "",
leaderList: "", leaderList: "",
categoryTitle: this.$route.query.categoryTitle,
} }
}, },
computed: { computed: {
@ -106,7 +108,8 @@ export default {
}, },
initPageData() { initPageData() {
// console.log("传参id", this.$route.query.id); // console.log("传参id", this.$route.query.id);
console.log(this.queryParams) // console.log(this.queryParams)
if (!this.queryParams.categoryId) return;
getPageData(this.queryParams).then(res => { getPageData(this.queryParams).then(res => {
console.log('列表',res) console.log('列表',res)
this.listinfo = res.data.list; this.listinfo = res.data.list;

124
ruoyi-ui/src/views/officialWebsite/practice.vue
View File

@ -26,8 +26,8 @@
<div v-for="(item, index) in nav " :key=index> <div v-for="(item, index) in nav " :key=index>
<div class="about-conts-item1" v-if="currentActive == index"> <div class="about-conts-item1" v-if="currentActive == index">
<!-- 实践平台 --> <!-- 实践平台 -->
<div v-if="item.id == '1813831828977618944'" class="list"> <div v-if="currentActive !== 0" class="list" >
<div class="item" v-for="(item, index) in teachingAchievements" :key="index"> <div class="item" v-for="(item, index) in teachingAchievements" :key="index" @click="toDetail(item.id)">
<div class="img"> <div class="img">
<img :src="imgurl + item.contentImg" alt=""> <img :src="imgurl + item.contentImg" alt="">
</div> </div>
@ -35,38 +35,37 @@
<div class="desc"> <div class="desc">
<div class="desc" v-html="item.summary"></div> <div class="desc" v-html="item.summary"></div>
</div> </div>
</div> </div>
</div> </div>
<!-- 实践项目 --> <!-- 实践项目 -->
<div v-else-if="item.id == '1813831932748894208'" class="swiper-list"> <!-- <div v-else-if="currentActive === 2" class="swiper-list">-->
<div class="item" v-for="(item, index) in teachingAchievements2" :key="index"> <!-- <div class="item" v-for="(item, index) in teachingAchievements2" :key="index">-->
<div class="img"> <!-- <div class="img">-->
<img :src="imgurl + item.contentImg" alt="" class="imgWO"> <!-- <img :src="imgurl + item.contentImg" alt="" class="imgWO">-->
</div> <!-- </div>-->
<div class="tt">{{ item.contentTitle }}</div> <!-- <div class="tt">{{ item.contentTitle }}</div>-->
<div class="desc"> <!-- <div class="desc">-->
{{ item.summary }} <!-- {{ item.summary }}-->
</div> <!-- </div>-->
<div class="time">{{ item.publishDate }}</div> <!-- <div class="time">{{ item.publishDate }}</div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<!-- 自制仪器设备 --> <!-- 自制仪器设备 -->
<div v-else-if="item.id == '1813832045458231296'" class="swiper-list"> <!-- <div v-else-if="currentActive === 3" class="swiper-list">-->
<div class="item" v-for="(item, index) in teachingAchievements3" :key="index"> <!-- <div class="item" v-for="(item, index) in teachingAchievements3" :key="index">-->
<div class="img"> <!-- <div class="img">-->
<img :src="imgurl + item.contentImg" alt=""> <!-- <img :src="imgurl + item.contentImg" alt="">-->
</div> <!-- </div>-->
<div class="tt">{{ item.contentTitle }}</div> <!-- <div class="tt">{{ item.contentTitle }}</div>-->
<!-- <div class="desc"> <!-- &lt;!&ndash; <div class="desc">-->
{{ item.summary }} <!-- {{ item.summary }}-->
</div> --> <!-- </div> &ndash;&gt;-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<!-- 通用 --> <!-- 通用 -->
<div class="neirong" v-html="pageContextList[index]" v-else></div> <div class="neirong" v-html="pageContextList[index]" v-else></div>
@ -78,6 +77,9 @@
</div> </div>
</div> </div>
<div>
<page-util :page-num="pageNum" :page-size="8" :category-id="categoryId" @event-message="handleDataFromPage"/>
</div>
<!-- 实践教学资源 --> <!-- 实践教学资源 -->
@ -153,12 +155,14 @@ import "swiper/css/swiper.min.css";
import { getPageData, getPageColumn } from "@/api/officialWebsite/getPageData"; import { getPageData, getPageColumn } from "@/api/officialWebsite/getPageData";
import footers from '@/views/officialWebsite/Components/footer.vue' import footers from '@/views/officialWebsite/Components/footer.vue'
import headers from '@/views/officialWebsite/Components/header.vue' import headers from '@/views/officialWebsite/Components/header.vue'
import PageUtil from '@/views/officialWebsite/Components/page'
export default { export default {
components: { components: {
headers, headers,
footers, footers,
Swiper, Swiper,
SwiperSlide, SwiperSlide,
PageUtil,
}, },
name: 'HelloWorld', name: 'HelloWorld',
props: { props: {
@ -173,6 +177,8 @@ export default {
teachingAchievements2: [], teachingAchievements2: [],
teachingAchievements3: [], teachingAchievements3: [],
pageContextList: [], pageContextList: [],
categoryId: "",
pageNum: 1,
input4: "", input4: "",
show_search: true, show_search: true,
nav: [ nav: [
@ -194,7 +200,7 @@ export default {
</p> </p>
<p style="box-sizing: inherit; margin-top: 0px; text-align: justify; text-indent: 2em; margin-bottom: 5px; line-height: 1.75em;"> <p style="box-sizing: inherit; margin-top: 0px; text-align: justify; text-indent: 2em; margin-bottom: 5px; line-height: 1.75em;">
<span style="box-sizing: inherit; font-family: 微软雅黑, MicrosoftYaHei;"></span><br/> <span style="box-sizing: inherit; font-family: 微软雅黑, MicrosoftYaHei;"></span><br/>
</p>` </p>`,
} }
}, },
mounted() { mounted() {
@ -216,6 +222,10 @@ export default {
if (this.currentActive == value) { if (this.currentActive == value) {
return return
} }
if (value !== 0){
this.categoryId = this.nav[value].id
this.pageNum = 1
}
this.currentActive = value; this.currentActive = value;
this.isShowDetails = false; this.isShowDetails = false;
}, },
@ -236,29 +246,49 @@ export default {
}); });
this.pageContextList.push(context); this.pageContextList.push(context);
//实践平台 // //实践平台
if (cloumnItem.id == "1813831828977618944") { // if (cloumnItem.id == "1813831828977618944") {
cloumnItem.children.list.forEach(element => { // cloumnItem.children.list.forEach(element => {
this.teachingAchievements.push(element); // this.teachingAchievements.push(element);
}); // });
} // }
//实践项目 // //实践项目
if (cloumnItem.id == "1813831932748894208") { // if (cloumnItem.id == "1813831932748894208") {
cloumnItem.children.list.forEach(element => { // cloumnItem.id
this.teachingAchievements2.push(element); // cloumnItem.children.list.forEach(element => {
}); // this.teachingAchievements2.push(element);
} // });
//自制仪器设备 // }
if (cloumnItem.id == "1813832045458231296") { // //自制仪器设备
cloumnItem.children.list.forEach(element => { // if (cloumnItem.id == "1813832045458231296") {
this.teachingAchievements3.push(element); // cloumnItem.children.list.forEach(element => {
}); // this.teachingAchievements3.push(element);
} // });
// }
// cloumnItem.categoryName // cloumnItem.categoryName
}); });
}); });
}, },
handleDataFromPage(data){
if (this.currentActive !== 0){
this.teachingAchievements = data
}
// if (this.currentActive === 2 || this.currentActive == 4){
// this.nav[this.currentActive].children.list = data
// }
// if (this.currentActive === 5){
// this.noticeList = data
// }
},
toDetail(id){
if (id){
this.$router.push({
name: 'details',
query:{ id: id }
});
}
}
} }
} }
@ -615,7 +645,7 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; /*justify-content: space-between;*/
margin-top: 0px; margin-top: 0px;
} }
@ -891,7 +921,7 @@ export default {
margin: 30px auto; margin: 30px auto;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; /*justify-content: space-between;*/
margin-top: 50px; margin-top: 50px;
} }

23
ruoyi-ui/src/views/officialWebsite/team.vue
View File

@ -66,7 +66,9 @@
<div class="neirong" v-html="detailsContent"></div> <div class="neirong" v-html="detailsContent"></div>
</div> </div>
<div>
<page-util :page-size="8" :category-id="categoryId" @event-message="handleDataFromPage" />
</div>
</div> </div>
<footers></footers> <footers></footers>
@ -79,12 +81,15 @@ import "swiper/css/swiper.min.css";
import { getPageData, getPageColumn } from "@/api/officialWebsite/getPageData"; import { getPageData, getPageColumn } from "@/api/officialWebsite/getPageData";
import footers from '@/views/officialWebsite/Components/footer.vue' import footers from '@/views/officialWebsite/Components/footer.vue'
import headers from '@/views/officialWebsite/Components/header.vue' import headers from '@/views/officialWebsite/Components/header.vue'
import PageUtil from "@/views/officialWebsite/Components/page"
export default { export default {
components: { components: {
headers, headers,
footers, footers,
Swiper, Swiper,
SwiperSlide, SwiperSlide,
PageUtil,
}, },
name: 'HelloWorld', name: 'HelloWorld',
props: { props: {
@ -103,7 +108,7 @@ export default {
], ],
currentActive: 0, currentActive: 0,
isMounted: false, isMounted: false,
categoryId: "0"
} }
}, },
created() { created() {
@ -127,6 +132,9 @@ export default {
} }
this.currentActive = value this.currentActive = value
this.isShowDetails = false; this.isShowDetails = false;
if (value === 1){
this.categoryId = this.nav[value].id
}
}, },
initPageData() { initPageData() {
@ -161,6 +169,17 @@ export default {
}); });
}, },
handleDataFromPage(data){
if (this.currentActive !== 0){
this.teachingAchievements = data
}
// if (this.currentActive === 2 || this.currentActive == 4){
// this.nav[this.currentActive].children.list = data
// }
// if (this.currentActive === 5){
// this.noticeList = data
// }
},
} }
} }