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

This commit is contained in:
zhangyc
2022-12-16 17:47:35 +08:00
12 changed files with 193 additions and 156 deletions

View File

@@ -380,6 +380,7 @@
</div>
<div class="lin"></div>
</div>
<!-- TODO1216
<div class="item" @click="showDrawerAddDiscuss">
<div class="itcon">
<div class="img">
@@ -401,7 +402,7 @@
/>
</div>
<div class="lin"></div>
</div>
</div>-->
<div class="item" @click="showDrawerAddActive">
<div class="itcon">
<div class="img">
@@ -474,13 +475,14 @@
</div>
<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"
@@ -494,10 +496,11 @@
v-model:routerTaskId="routerTaskId"
/>
</div>
<!-- 添加投票侧弹窗 -->
</div>
<div class="lin"></div>
</div>
-->
<div class="item" @click="showDrawerAddProj">
<div class="itcon">
<div class="img">
@@ -1049,11 +1052,11 @@ import AddOnline from "../../components/drawers/AddOnline.vue";
import AddCase from "../../components/drawers/AddCase.vue";
import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.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 AddLive from "../../components/drawers/AddLive.vue";
import AddRef from "../../components/drawers/AddRef.vue";
import AddProject from "../../components/drawers/AddProject.vue";
@@ -1077,12 +1080,12 @@ export default {
AddOnline,
AddCase,
AddHomework,
AddDiscuss,
//AddDiscuss,
AddActive,
AddTest,
AddEval,
AddInvist,
AddVote,
//AddVote,
AddLive,
AddRef,
draggable,