feat:合并

This commit is contained in:
lixg
2023-02-03 18:40:20 +08:00
parent 7ce64d1a83
commit a3ca45b775
4 changed files with 321 additions and 438 deletions

View File

@@ -423,7 +423,7 @@
批量面授报名
</button> -->
<router-link
v-if="checkPer(permissions)"
v-if="checkPer(permissions)"
:to="{ path: `/taskadd`, query: { projectId: projectId } }"
>
<button class="edit">
@@ -840,7 +840,10 @@
<div class="split"></div>
<a-tabs v-model:activeKey="activeKeyNotice">
<a-tab-pane key="11" tab="公告">
<NoticePub :permissions="permissions" 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
@@ -851,7 +854,10 @@
</a-tabs>
</a-tab-pane>
<a-tab-pane key="5" tab="项目积分">
<ProjectScore :permissions="permissions" :projectId="projectId"></ProjectScore>
<ProjectScore
:permissions="permissions"
:projectId="projectId"
></ProjectScore>
</a-tab-pane>
<a-tab-pane key="6" tab="排行榜">
<div class="split"></div>
@@ -1098,7 +1104,11 @@
<div class="img"></div>
<div class="ed">编辑</div>
</div> -->
<div class="edit" v-if="status != 3 && checkPer(permissions)" @click="toEdit">
<div
class="edit"
v-if="status != 3 && checkPer(permissions)"
@click="toEdit"
>
<div class="img"></div>
<div class="ed">编辑</div>
</div>
@@ -1431,7 +1441,10 @@
/>
<!-- 添加证书抽屉 -->
<AddCertificate v-model:ACertificate="ACertificate" />
<AddCertificate
v-model:ACertificate="ACertificate"
v-model:projectId="projectId"
/>
<!-- 创建证书抽屉 -->
<CreateCertificate v-model:CCertificate="CCertificate" />
@@ -2108,7 +2121,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
import TableStudent from "@/components/student/TableStudent";
import { getStuPage } from "@/api/index1";
import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
import {checkPer} from "@/utils/utils";
import { checkPer } from "@/utils/utils";
export default {
name: "taskPage",
@@ -2147,7 +2160,7 @@ export default {
const store = useStore();
const route = useRoute();
const state = reactive({
permissions:'',
permissions: "",
screenHeight: document.body.clientHeight,
screenWidth: document.body.clientWidth,
editRecord: {},
@@ -4544,6 +4557,7 @@ export default {
/* 证书 */
}
function addCertificate() {
console.log("点击添加证书");
state.ACertificate = true;
}