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

This commit is contained in:
Ggysh-7
2022-12-01 21:27:09 +08:00
36 changed files with 1906 additions and 1641 deletions

View File

@@ -59,7 +59,7 @@
<div class="items2">
<a-popover
placement="topLeft"
v-if="element.tit.length > 10"
v-if="element.tit?.length > 10"
>
<template #content>
<div style="width: 130px">
@@ -73,7 +73,7 @@
{{ element.tit }}
</div>
</a-popover>
<div class="nname" v-if="element.tit.length <= 10">
<div class="nname" v-if="element.tit?.length <= 10">
{{ element.tit }}
</div>
</div>
@@ -124,18 +124,17 @@
</div>
</div>
<div class="rightt">
<div class="select">
<!-- 2022-11-30注释 后面放开 -->
<!-- <div class="select">
<span>学习模式</span>
<div class="inputbox">
<input type="text" placeholder="按学习时间解锁" />
<!-- v-model:unlockModeVisible="unlockModeVisible" -->
<div class="bottonbox" @click="showModeVisible">
<div class="btnText">切换模式</div>
</div>
<!-- 切换模式抽屉 -->
<unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
</div>
</div>
</div> -->
<div class="line"></div>
<!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
<div class="pub">保存</div>
@@ -1036,7 +1035,7 @@ import * as apistage from "../../api/indexStage";
import * as apimove from "../../api/indexMovetask";
import draggable from "vuedraggable";
import { storage } from "../../api/storage";
import UnlockMode from "../../components/drawers/UnlockMode.vue";
// import UnlockMode from "../../components/drawers/UnlockMode.vue";
// import * as api1 from "../../api/index1";
import { useRouter } from "vue-router";
export default {
@@ -1055,7 +1054,7 @@ export default {
AddEval,
AddInvist,
AddVote,
UnlockMode,
// UnlockMode,
},
setup() {
const router = useRouter();