mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-15 22:06:45 +08:00
Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop
This commit is contained in:
@@ -316,6 +316,7 @@
|
||||
<!-- 添加外链侧弹窗 -->
|
||||
<div class="lin"></div>
|
||||
</div>
|
||||
<!--TODO1216
|
||||
<div class="item" @click="showDrawerAddDiscuss">
|
||||
<div class="itcon">
|
||||
<div class="img">
|
||||
@@ -323,7 +324,7 @@
|
||||
</div>
|
||||
<div class="text">讨论</div>
|
||||
</div>
|
||||
<!-- 添加讨论侧弹窗 -->
|
||||
|
||||
<div>
|
||||
<add-discuss
|
||||
v-model:adddiscussVisible="adddiscussvisible"
|
||||
@@ -336,9 +337,10 @@
|
||||
@changeData="updateTableData"
|
||||
/>
|
||||
</div>
|
||||
<!-- 添加讨论侧弹窗 -->
|
||||
|
||||
<div class="lin"></div>
|
||||
</div>
|
||||
-->
|
||||
<div class="item" @click="showDrawerAddActive">
|
||||
<div class="itcon">
|
||||
<div class="img">
|
||||
@@ -405,16 +407,18 @@
|
||||
v-model:EditInvistId="EditInvistId"
|
||||
/>
|
||||
</div>
|
||||
<!-- 添加评估侧弹窗 -->
|
||||
|
||||
<div class="lin"></div>
|
||||
</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"
|
||||
@@ -430,10 +434,12 @@
|
||||
v-model:ballotId="ballotId"
|
||||
/>
|
||||
</div>
|
||||
<!-- 添加投票侧弹窗 -->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
-->
|
||||
|
||||
</div>
|
||||
<div class="boom">
|
||||
<div class="boomcen">
|
||||
<div class="onerow">
|
||||
@@ -1052,11 +1058,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/indexTaskadd";
|
||||
import * as apistage from "../../api/indexStage";
|
||||
@@ -1076,11 +1082,11 @@ export default {
|
||||
AddTest,
|
||||
AddLive,
|
||||
AddRef,
|
||||
AddDiscuss,
|
||||
// AddDiscuss,
|
||||
AddActive,
|
||||
AddEval,
|
||||
AddInvist,
|
||||
AddVote,
|
||||
//AddVote,
|
||||
// UnlockMode,
|
||||
},
|
||||
setup() {
|
||||
|
||||
Reference in New Issue
Block a user