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

This commit is contained in:
wuxt
2023-03-08 00:46:50 +08:00
27 changed files with 516 additions and 255 deletions

View File

@@ -826,7 +826,7 @@
>
<div style="width: 90%">
<div class="grouptitle">
<div class="goodgruop">{{ item.groupName }}</div>
<div class="goodgruop" :title="item.groupName" >{{ item.groupName }}</div>
<div class="more">
<span
style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
@@ -846,7 +846,7 @@
<div class="grocenter">
<div class="leader1">进度</div>
<a-progress
:percent="(item.completeRatio || 0) * 100"
:percent="Math.round((item.completeRatio || 0) * 100)"
/>
</div>
<div
@@ -3091,10 +3091,13 @@ export default {
state.isEdit = isEdit;
state.stugroup = true;
state.groupInfo = item || {};
state.groupMemberCountContrast = item.groupMemberCount;
if (isEdit) {
state.groupMemberCountContrast = item.groupMemberCount;
}
};
const closeModal2 = () => {
state.stugroup = false;
state.buttonLoading = false
state.groupInfo = {};
state.groupMemberCountContrast = null;
getGroup();
@@ -3931,7 +3934,6 @@ export default {
};
//创建小组
const createGroup = async () => {
debugger;
console.log("state.groupPageList" + state.groupPageList);
const id = state.groupInfo.id;
const d = state.groupPageList
@@ -6792,6 +6794,12 @@ export default {
font-size: 16px;
line-height: 36px;
font-weight: 600;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
}
.more {