diff --git a/.env.development b/.env.development index e864986..5882923 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,8 @@ ENV = 'development' # EBTS/开发环境 #VUE_APP_BASE_API = '/dev-api' -VUE_APP_BASE_API = 'http://localhost:8085/dev-api' +#VUE_APP_BASE_API = 'http://localhost: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/utils/sist.js b/src/utils/sist.js index 43e6845..638ef11 100644 --- a/src/utils/sist.js +++ b/src/utils/sist.js @@ -7,6 +7,7 @@ let vm = null import {info} from "@/api"; + export function setThis(that) { vm = that } @@ -14,6 +15,7 @@ export function setThis(that) { export function getParentNode(id) { try { let menuList = JSON.parse(sessionStorage.getItem("menu")); + console.log(menuList,"menuList") for (let menu of menuList) { for (let child of menu.children) { if (id == child.encodeId) { @@ -66,40 +68,42 @@ export function setLanguage() { } -export function toArticle(news,width) { - console.log(width,"width") +export function toArticle(news, width) { + console.log(width, "width") info(news.id).then(res => { let info = null try { - info = getParentNode(res.data.encodeId) + info = getParentNode(res.data.encodeId) console.log(info) - }catch (e){} - if (info == null){ + } catch (e) { + } + if (info == null) { return } if (info.three == null) { if (width) { - vm.$router.push("/pc/" + info.second.encodeId + "?id=" + news.id +"&type=" + info.second.type+ "&lang=" + sessionStorage.getItem("lang")); + vm.$router.push("/pc/" + info.second.encodeId + "?id=" + news.id + "&type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); } else { - vm.$router.push("/mobile/" + info.second.encodeId + "?id=" + news.id +"&type=" + info.second.type+ "&lang=" + sessionStorage.getItem("lang")); + vm.$router.push("/mobile/" + info.second.encodeId + "?id=" + news.id + "&type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); } } else { if (width) { - vm.$router.push("/pc/" + info.second.encodeId + "/" + info.three.encodeId + "&id=" + news.id +"?type=" + info.second.type+ "&lang=" + sessionStorage.getItem("lang")); + vm.$router.push("/pc/" + info.second.encodeId + "/" + info.three.encodeId + "&id=" + news.id + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); } else { - vm.$router.push("/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "&id=" + news.id +"?type=" + info.second.type+ "&lang=" + sessionStorage.getItem("lang")); + vm.$router.push("/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "&id=" + news.id + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); } } }) } -export function lookMoreComment(item,width) { +export function lookMoreComment(item, width) { info(item.id).then(res => { let info = null try { - info = getParentNode(res.data.encodeId) - }catch (e){} - if (info == null){ + info = getParentNode(res.data.encodeId) + } catch (e) { + } + if (info == null) { return } if (info.three == null) { @@ -119,6 +123,32 @@ export function lookMoreComment(item,width) { } +export function lookMoreFixedComment(id, width) { + let info = null + try { + info = getParentNode(id) + console.log(info) + } catch (e) { + } + if (info == null) { + return + } + if (info.three == null) { + if (width) { + vm.$router.push("/pc/" + info.second.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); + } else { + vm.$router.push("/mobile/" + info.second.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); + } + } else { + if (width) { + vm.$router.push("/pc/" + info.second.encodeId + "/" + info.three.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); + } else { + vm.$router.push("/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); + } + } +} + + diff --git a/src/views/content/components/file_list.vue b/src/views/content/components/file_list.vue index 41d20a0..9c62ea1 100644 --- a/src/views/content/components/file_list.vue +++ b/src/views/content/components/file_list.vue @@ -49,7 +49,6 @@ @current-change="handleCurrentChange" :current-page.sync="value.pageNum" :page-sizes="[10,20, 30, 50, 100]" - :page-size="value.pageSize" layout="prev, pager,next,sizes, jumper" :total="value.total"> @@ -66,10 +65,12 @@ export default { props: { value: { type: Object, - default: { - data: [{}], - pageNum: 1, - pageSize: 10, + default() { + return{ + data:[], + pageNum: 1, + pageSize: 10, + } }, }, }, @@ -78,12 +79,16 @@ export default { width: document.documentElement.clientWidth, small: document.documentElement.clientWidth <= 992, query: '', + pageSize:value.pageSize } }, methods: { getDateTime(date) { let time = new Date(date); - return time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate(); + let year = time.getFullYear(); + let month = time.getMonth() + 1 + let day = time.getDate(); + return year + "-" + month + "-" + day; }, handleSizeChange(val) { console.log(`每页 ${val} 条`); @@ -120,6 +125,7 @@ export default { if (this.type != null && this.type != 0) { data.id = this.value.secondId } + console.log(data,"data") getNode(data).then(res => { this.value.data = res.rows this.value.total = res.total @@ -131,7 +137,8 @@ export default { }, getTime(time) { let date = new Date(time); - return date.getFullYear() + "-" + date.getMonth() + 1 + let month = date.getMonth() + 1; + return date.getFullYear() + "-" + month } } } diff --git a/src/views/content/components/list.vue b/src/views/content/components/list.vue index fabe0df..18e925a 100644 --- a/src/views/content/components/list.vue +++ b/src/views/content/components/list.vue @@ -78,10 +78,12 @@ export default { props: { value: { type: Object, - default: { - data: [{}], - pageNum: 1, - pageSize: 5, + default() { + return { + data: [], + pageNum: 1, + pageSize: 10, + } }, }, }, @@ -124,7 +126,7 @@ export default { } this.getData() }, - getData(){ + getData() { let data = { title: this.query, id: this.value.navId, @@ -149,7 +151,8 @@ export default { }, getTime(time) { let date = new Date(time); - return date.getFullYear() + "-" + date.getMonth() + 1 + let month = date.getMonth() + 1 + return date.getFullYear() + "-" + month } } } @@ -243,7 +246,9 @@ export default { .tw_context_text { margin-top: .8rem; font-size: 1.6rem; + height: 6rem; font-weight: 400; + letter-spacing: 1px; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; //作为弹性伸缩盒子模型显示。 diff --git a/src/views/content/index.vue b/src/views/content/index.vue index 6a1690d..2e7cc34 100644 --- a/src/views/content/index.vue +++ b/src/views/content/index.vue @@ -357,15 +357,13 @@ export default { data: res.rows, total: res.total, pageNum: data.pageNum, + pageSize: data.pageSize, navId: menu.encodeId, secondId: this.secondId, } } else if (this.type == 1) { this.contextData = res.data } else if (this.type == 3) { - - - this.contextData = handleTree(res.data, "id", "pid", null, null) console.log(this.contextData,"this.contextData") } diff --git a/src/views/header/index.vue b/src/views/header/index.vue index 970204e..c1cb992 100644 --- a/src/views/header/index.vue +++ b/src/views/header/index.vue @@ -65,10 +65,10 @@
{{ menu.title }} {{ menu.englishTitle }} -
diff --git a/src/views/index/components/news_center.vue b/src/views/index/components/news_center.vue index cab80f9..928ced2 100644 --- a/src/views/index/components/news_center.vue +++ b/src/views/index/components/news_center.vue @@ -96,6 +96,7 @@