From d1215780d3df092b225191046f629a50e27e2fd1 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Sun, 9 Oct 2022 22:21:21 +0800 Subject: [PATCH] =?UTF-8?q?clay=20commit=20:=20=E8=A7=A3=E5=86=B3=E6=9C=89?= =?UTF-8?q?=E4=B8=89=E7=BA=A7=E8=8F=9C=E5=8D=95=E6=97=B6=E9=9D=A2=E5=8C=85?= =?UTF-8?q?=E5=B1=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/content/components/simple_list.vue | 7 +++ src/views/content/index.vue | 12 ++-- .../index/components/academy_and_sciences.vue | 12 ++++ src/views/index/components/news_center.vue | 7 ++- .../components/undergraduate_and_graduate.vue | 58 ++++++++++--------- 6 files changed, 66 insertions(+), 32 deletions(-) diff --git a/.env.development b/.env.development index 3d433fe..c61afa9 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ ENV = 'development' # EBTS/开发环境 #VUE_APP_BASE_API = '/dev-api' -VUE_APP_BASE_API = 'http://192.168.101.4:8085/dev-api' +VUE_APP_BASE_API = 'http://192.168.101.5:8085/dev-api' #VUE_APP_BASE_API = 'http://sist.swjtu.edu.cn/dev-api' SITE_TYPE = 'NEd5n92EMIpyyBslaNqsRgE' #VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api' diff --git a/src/views/content/components/simple_list.vue b/src/views/content/components/simple_list.vue index 21de6fc..ee325b4 100644 --- a/src/views/content/components/simple_list.vue +++ b/src/views/content/components/simple_list.vue @@ -102,7 +102,13 @@ export default { let time = new Date(date); let year = time.getFullYear(); let month = time.getMonth() + 1 + if (month < 10){ + month = "0"+month + } let day = time.getDate(); + if (day<10){ + day = "0"+ day + } return year + "-" + month + "-" + day; }, getContext(context) { @@ -177,6 +183,7 @@ export default { .article_name { float: left; + cursor: pointer; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; //作为弹性伸缩盒子模型显示。 diff --git a/src/views/content/index.vue b/src/views/content/index.vue index af072a3..4d5b0be 100644 --- a/src/views/content/index.vue +++ b/src/views/content/index.vue @@ -217,8 +217,8 @@ export default { this.type = this.$route.query && this.$route.query.type if (this.type == 3 || this.type == 1 || this.type == 2) { this.secondId = id - this.getCrumbs(); this.showSecond = false + this.getCrumbs(); let info = getParentNode(this.secondId); console.log("获取到info", info) if (arcId != undefined) { @@ -232,8 +232,10 @@ export default { } else { console.log(this.navId, "this.navId") if (undefined == this.navId) { + console.log(this.navId, "this.navId1") this.secondId = id this.getNodes() + this.getCrumbs(); } } this.showSecond = true @@ -245,7 +247,10 @@ export default { } catch (e) { } this.showIndex = 0 - console.log("开始循环查找id信息") + // if (this.secondId!=id){ + // this.getCrumbs(); + // } + console.log("开始循环查找id信息",this.secondId == id && this.navList,this.secondId , id, this.navList) if (this.secondId == id && this.navList) { for (let i = 0; i < this.navList.length; i++) { if (this.navId == this.navList[i].encodeId) { @@ -286,7 +291,7 @@ export default { /** * 获得面包屑导航 */ - getCrumbs() { + getCrumbs(id) { crumbs(this.secondId).then(res => { this.crumbs = res.data }) @@ -593,7 +598,6 @@ export default { a { text-decoration: none; - font-size: 1.4rem !important; color: #3C3C3C; } } diff --git a/src/views/index/components/academy_and_sciences.vue b/src/views/index/components/academy_and_sciences.vue index 5a44f78..5674771 100644 --- a/src/views/index/components/academy_and_sciences.vue +++ b/src/views/index/components/academy_and_sciences.vue @@ -153,14 +153,26 @@ export default { let time = new Date(date); let year = time.getFullYear(); let month = time.getMonth() + 1 + if (month < 10){ + month = "0"+month + } let day = time.getDate(); + if (day<10){ + day = "0"+ day + } return year + "-" + month + "-" + day; }, getMonthTime(date) { let time = new Date(date); let month = time.getMonth() + 1 + if (month < 10){ + month = "0"+month + } let day = time.getDate(); + if (day<10){ + day = "0"+ day + } return month + "-" + day; }, }, diff --git a/src/views/index/components/news_center.vue b/src/views/index/components/news_center.vue index 6090046..b48e879 100644 --- a/src/views/index/components/news_center.vue +++ b/src/views/index/components/news_center.vue @@ -81,7 +81,13 @@ export default { let time = new Date(date); let year = time.getFullYear(); let month = time.getMonth() + 1 + if (month < 10){ + month = "0"+month + } let day = time.getDate(); + if (day<10){ + day = "0"+ day + } return year + "-" + month + "-" + day; }, }, @@ -318,7 +324,6 @@ export default { } .time { - width: 6rem; height: 1.4rem; font-size: 1rem; font-weight: 500; diff --git a/src/views/index/components/undergraduate_and_graduate.vue b/src/views/index/components/undergraduate_and_graduate.vue index cb6dcdc..c2cf73b 100644 --- a/src/views/index/components/undergraduate_and_graduate.vue +++ b/src/views/index/components/undergraduate_and_graduate.vue @@ -9,12 +9,13 @@ {{ $t("message.undergraduate_education") }}
-
+
- {{getMonthTime(item.publishTime)}} + {{ getMonthTime(item.publishTime) }}
- {{item.title}} + {{ item.title }}
@@ -25,15 +26,17 @@
- + {{ $t("message.postgraduate_education") }}
-
+
- {{getMonthTime(item.publishTime)}} + {{ getMonthTime(item.publishTime) }}
- {{item.title}} + {{ item.title }}
@@ -54,10 +57,10 @@ import {lookMoreFixedComment} from "../../../utils/sist"; export default { name: "undergraduate_and_graduate", - data(){ - return{ - undergraduateData:[], - graduateData:[], + data() { + return { + undergraduateData: [], + graduateData: [], width: document.documentElement.clientWidth > 992 } }, @@ -97,18 +100,16 @@ export default { }); }, - getDateTime(date) { - let time = new Date(date); - let year = time.getFullYear(); - let month = time.getMonth() + 1 - let day = time.getDate(); - return year + "-" + month + "-" + day; - }, - getMonthTime(date) { let time = new Date(date); let month = time.getMonth() + 1 + if (month < 10) { + month = "0" + month + } let day = time.getDate(); + if (day < 10) { + day = "0" + day + } return month + "-" + day; }, }, @@ -118,9 +119,10 @@ export default {