hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-11 11:56:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwyTeacher' into 'master'

Browse Source 
Zcwy teacher

See merge request !44
This commit is contained in:
joshen
2023-09-07 14:31:08 +08:00
parent 2048b4b2de 558f44ccc7
commit f73d54a5c3
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/PortalHeader.vue
View File

@@ -243,7 +243,7 @@ export default {
// four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130', // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
five: urlPre + "/boe/new-employee/index.html", five: urlPre + "/boe/new-employee/index.html",
six: urlPre + "/web/contributor/index", six: urlPre + "/web/contributor/index",
seven:this.webBaseUrl + '/grateful' seven: this.webBaseUrl + '/grateful/index'
}; };
window.open(obj[val]); window.open(obj[val]);
} }

2
src/layout/components/TopNav/Index.vue
View File

@@ -268,7 +268,7 @@ export default {
three: this.webBaseUrl + "/study/index?study=1", three: this.webBaseUrl + "/study/index?study=1",
// four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130', // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
five: urlPre + "/boe/new-employee/index.html", five: urlPre + "/boe/new-employee/index.html",
seven: this.webBaseUrl + '/grateful' seven: this.webBaseUrl + '/grateful/index'
}; };
window.open(obj[val]); window.open(obj[val]);
} }

4
src/views/grateful/GratefulHomePage.vue
View File

@@ -10,7 +10,7 @@
background: `url(${fileBaseUrl + item.image background: `url(${fileBaseUrl + item.image
}) no-repeat 100% / 100%`, }) no-repeat 100% / 100%`,
}"></div> }"></div>
<img class="banner-img" style="margin: 0 auto;width:100%;" :src="fileBaseUrl + item.image" alt="" /> <img class="banner-img" style="margin: 0 auto;" :src="fileBaseUrl + item.image" alt="" />
</swiper-slide> </swiper-slide>
</swiper> </swiper>
</div> </div>
@@ -22,7 +22,7 @@
background: `url(${fileBaseUrl + item.image background: `url(${fileBaseUrl + item.image
}) no-repeat 100% / 100%`, }) no-repeat 100% / 100%`,
}"></div> }"></div>
<img class="banner-img" style="margin: 0 auto;width:100%;" :src="fileBaseUrl + item.image" alt="" /> <img class="banner-img" style="margin: 0 auto;" :src="fileBaseUrl + item.image" alt="" />
</swiper-slide> </swiper-slide>
<div class="swiper-pagination" slot="pagination"></div> <div class="swiper-pagination" slot="pagination"></div>
</swiper> </swiper>

17
src/views/grateful/NoticeDetail.vue
View File

@@ -23,13 +23,13 @@
<div class="title">{{ name }}</div> <div class="title">{{ name }}</div>
<!--内容列表内容--> <!--内容列表内容-->
<div class="timeAndAuthor"> <div class="timeAndAuthor">
<div class="author">发布人：{{ createName }}</div> <!-- <div class="author">发布人：{{ createName }}</div> -->
<div class="case-info-date portal-time"> <div class="case-info-date portal-time">
<i class="el-icon-time" style="margin-right: 5px;"></i> <i class="el-icon-time" style="margin-right: 5px;"></i>
<time-show :time="createTime"></time-show> <time-show :time="createTime"></time-show>
</div> </div>
</div> </div>
<div class="topTitle">通知内容</div> <div class="topTitle"></div>
<!-- <div class="noticeContent" style="white-space: pre;">{{ content }}</div> --> <!-- <div class="noticeContent" style="white-space: pre;">{{ content }}</div> -->
<div class="noticeContent" v-html="content"></div> <div class="noticeContent" v-html="content"></div>
</div> </div>
@@ -120,6 +120,7 @@ export default {
.title { .title {
font-weight: 600; font-weight: 600;
padding: 20px; padding: 20px;
font-size: 28px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
@@ -137,15 +138,17 @@ export default {
} }
.topTitle { .topTitle {
display: flex; width: 100%;
justify-content: center; height: 50px;
font-size: 18px;
font-weight: 600;
margin-bottom: 30px;
} }
.noticeContent { .noticeContent {
padding: 0 80px; padding: 0 80px;
::v-deep p {
min-height: 28px !important;
line-height: 28px !important;
}
} }
} }
</style> </style>