feat:合并

This commit is contained in:
lixg
2023-02-01 17:33:42 +08:00
22 changed files with 752 additions and 1306 deletions

View File

@@ -195,7 +195,7 @@
<div class="onerow">
<div class="taskmain">快速创建项目详情</div>
</div>
<div class="second">
<div v-button-per="permissions" class="second">
<!-- @click="totask" -->
<div
class="taskbox"
@@ -423,6 +423,7 @@
批量面授报名
</button> -->
<router-link
v-button-per="permissions"
:to="{ path: `/taskadd`, query: { projectId: projectId } }"
>
<button class="edit">
@@ -570,7 +571,7 @@
>
</div>
</div>
<div class="operations">
<div v-button-per="permissions" class="operations">
<div
class="operation"
style="cursor: pointer"
@@ -672,7 +673,7 @@
</router-link>
<!-- 无数据创建任务 -->
</div>
<div v-else>
<div v-button-per="permissions" v-else>
<div
class="taskbox"
@click="
@@ -710,6 +711,7 @@
<a-tabs v-model:activeKey="activeKey1">
<a-tab-pane key="8" tab="学员管理">
<TableStudent
:permissions="permissions"
:type="1"
:id="projectId"
:columns="stuColumns"
@@ -750,7 +752,7 @@
</div>
</div>
</div>
<div class="second2">
<div class="second2" v-button-per="permissions">
<div class="btn1" @click="showModal2(1, null)">
<img src="../../assets/images/courseManage/add0.png" />
<span class="btn1text">创建小组</span>
@@ -781,7 +783,7 @@
style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
>. . .</span
>
<div class="moreItems">
<div class="moreItems" v-button-per="permissions">
<div class="sammo" @click="showModal2(2, item)">
编辑
</div>
@@ -838,7 +840,7 @@
<div class="split"></div>
<a-tabs v-model:activeKey="activeKeyNotice">
<a-tab-pane key="11" tab="公告">
<NoticePub v-model:projectId="projectId"></NoticePub>
<NoticePub :permissions="permissions" v-model:projectId="projectId"></NoticePub>
</a-tab-pane>
<a-tab-pane key="12" tab="历史公告" force-render>
<NoticeHis
@@ -849,7 +851,7 @@
</a-tabs>
</a-tab-pane>
<a-tab-pane key="5" tab="项目积分">
<ProjectScore :projectId="projectId"></ProjectScore>
<ProjectScore :permissions="permissions" :projectId="projectId"></ProjectScore>
</a-tab-pane>
<a-tab-pane key="6" tab="排行榜">
<div class="split"></div>
@@ -1096,7 +1098,7 @@
<div class="img"></div>
<div class="ed">编辑</div>
</div> -->
<div class="edit" v-if="status != 3" @click="toEdit">
<div v-button-per="permissions" class="edit" v-if="status != 3" @click="toEdit">
<div class="img"></div>
<div class="ed">编辑</div>
</div>
@@ -2143,6 +2145,7 @@ export default {
const store = useStore();
const route = useRoute();
const state = reactive({
permissions:'',
screenHeight: document.body.clientHeight,
screenWidth: document.body.clientWidth,
editRecord: {},
@@ -3853,6 +3856,7 @@ export default {
name: e.name,
}));
let info = res.data.data.projectInfo;
state.permissions = info.permissions;
// let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
let start = info.beginTime;
// let end = toDate(info.endTime / 1000, "Y-M-D h:m");