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

Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

Browse Source
This commit is contained in:
zhangyc
2022-12-16 17:47:35 +08:00
parent 6bd7df51f9 9090261a8f
commit 94e0982817
12 changed files with 193 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/projectcenter/temTask.vue
View File

@@ -329,6 +329,7 @@
<!-- 添加外链侧弹窗 -->
<div class="lin"></div>
</div>
<!--TODO1216
<div class="item" @click="showDrawerAddDiscuss">
<div class="itcon">
<div class="img">
@@ -336,7 +337,7 @@
</div>
<div class="text">讨论</div>
</div>
<!-- 添加讨论侧弹窗 -->
<div>
<add-discuss
v-model:adddiscussVisible="adddiscussvisible"
@@ -349,10 +350,10 @@
v-model:projectTaskId="projectTaskId"
@changeData="updateTableData"
/>
</div>
<!-- 添加讨论侧弹窗 -->
</div>
<div class="lin"></div>
</div>
</div>-->
<div class="item" @click="showDrawerAddActive">
<div class="itcon">
<div class="img">
@@ -425,13 +426,15 @@
<!-- 添加评估侧弹窗 -->
<div class="lin"></div>
</div>
<!--TODO1216
<div class="item" @click="showDrawerAddVote">
<div class="itcon">
<div class="img">
<img src="../../assets/images/leveladd/tou.png" />
</div>
<div class="text">投票</div>
<!-- 添加投票侧弹窗 -->
<div>
<add-vote
v-model:addvoteVisible="addvotevisible"
@@ -447,9 +450,12 @@
v-model:ballotId="ballotId"
/>
</div>
<!-- 添加投票侧弹窗 -->
</div>
</div>
-->
</div>
<div class="boom">
<div class="boomcen">
@@ -1069,11 +1075,11 @@ import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue";
import AddLive from "../../components/drawers/AddLive.vue";
import AddRef from "../../components/drawers/AddRef.vue";
import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
//import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
import AddActive from "../../components/drawers/AddActive.vue";
import AddEval from "../../components/drawers/AddEval.vue";
import AddInvist from "../../components/drawers/AddInvist.vue";
import AddVote from "../../components/vote/AddVote.vue";
//import AddVote from "../../components/vote/AddVote.vue";
import { message } from "ant-design-vue";
import * as api from "../../api/indexTemplate";
import draggable from "vuedraggable";
@@ -1131,11 +1137,11 @@ export default {
AddTest,
AddLive,
AddRef,
AddDiscuss,
//AddDiscuss,
AddActive,
AddEval,
AddInvist,
AddVote,
//AddVote,
// UnlockMode,
},
setup() {