hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 10:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2023-01-16 19:27:03 +08:00
parent d3b7efc548 32ba887c05
commit 9d05692500
4 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/drawers/NoticeHis.vue
View File

@@ -9,14 +9,15 @@
<div class="noticeContent"> <div class="noticeContent">
<div v-for="item in notice" :key="item.id" class="item"> <div v-for="item in notice" :key="item.id" class="item">
<!-- <div class="itemcontent">{{ item.content }}</div> --> <!-- <div class="itemcontent">{{ item.content }}</div> -->
<a-textarea <!-- <a-textarea
class="itemcontent" class="itemcontent"
disabled="true" disabled="true"
v-model:value="item.content" v-model:value="item.content"
:maxlength="150" :maxlength="150"
placeholder="公告信息最多输入150个字" placeholder="公告信息最多输入150个字"
style="margin-top: -10px; height: 120px;background-color: #fff;" style="margin-top: -10px; height: 120px;background-color: #fff;"
/> /> -->
<pre style="text-align: left;padding-left: 20px">{{item.content}}</pre>
<div class="itemtime">{{ item.pubtime }}</div> <div class="itemtime">{{ item.pubtime }}</div>
</div> </div>
</div> </div>
@@ -138,7 +139,7 @@ export default {
margin-top: 20px; margin-top: 20px;
margin-left: 32px; margin-left: 32px;
.item { .item {
height: 66px; // height: 66px;
width: 74%; width: 74%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

15
src/components/drawers/NoticePub.vue
View File

@@ -17,13 +17,14 @@
<!-- <div class="txt-content"> <!-- <div class="txt-content">
{{ noticeContent1 ? noticeContent1 : "暂无公告" }} {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
</div> --> </div> -->
<a-textarea <!-- <a-textarea
disabled="true" disabled="true"
v-model:value="noticeContent1" v-model:value="noticeContent1"
:maxlength="150" :maxlength="150"
placeholder="公告信息最多输入150个字" placeholder="公告信息最多输入150个字"
style="margin-top: -10px; height: 160px; resize: none;background-color: #fff;color:#666;" style="margin-top: -10px; height: 160px; resize: none;background-color: #fff;color:#666;"
/> /> -->
<pre>{{noticeContent1}}</pre>
<div class="btn-content"> <div class="btn-content">
<a-button type="primary" @click="handleEdit">编辑</a-button> <a-button type="primary" @click="handleEdit">编辑</a-button>
</div> </div>
@@ -33,19 +34,13 @@
<!-- <div class="txt-content"> <!-- <div class="txt-content">
{{ noticeContent1 ? noticeContent1 : "暂无公告" }} {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
</div> --> </div> -->
<a-textarea <pre>{{noticeContent1}}</pre>
disabled="true"
v-model:value="noticeContent1"
:maxlength="150"
placeholder="公告信息最多输入150个字"
style="margin-top: -10px; height:160px; resize: none;background-color: #fff;color:#666;"
/>
<p>编辑新公告：</p> <p>编辑新公告：</p>
<a-textarea <a-textarea
v-model:value="noticeContent" v-model:value="noticeContent"
:maxlength="150" :maxlength="150"
placeholder="公告信息最多输入150个字" placeholder="公告信息最多输入150个字"
style="margin-top: -10px; height: 160px" style="margin-top: -10px; height: 160px; width:340px;"
/> />
<div class="btn-content"> <div class="btn-content">
<a-button class="cancel" @click="handleCancel">取消</a-button> <a-button class="cancel" @click="handleCancel">取消</a-button>

2
src/components/drawers/project/ProjectOnlineManage.vue
View File

@@ -385,7 +385,7 @@ export default {
"status": state.projectName, "status": state.projectName,
"studentName": state.name, "studentName": state.name,
"targetId":props.datasource.projectId, "targetId":props.datasource.projectId,
"taskId": props.datasource.projectTaskId, "taskId": props.datasource.courseId,
"thirdId": props.datasource.targetId, "thirdId": props.datasource.targetId,
"type": 1 "type": 1
}); });

2
src/components/drawers/router/RouterCommonManage.vue
View File

@@ -387,7 +387,7 @@ export default {
"chapterId": props.datasource.chapterId, "chapterId": props.datasource.chapterId,
"status": state.projectName, "status": state.projectName,
"studentName": state.name, "studentName": state.name,
"taskId": props.datasource.routerTaskId, "taskId": props.datasource.courseId,
"thirdId": props.datasource.targetId, "thirdId": props.datasource.targetId,
"type": 1 "type": 1
}); });