提交 1c5700ed authored 作者: coderBryanFu's avatar coderBryanFu

fix:对华工作日历模块修改

上级 6083b679
......@@ -45,28 +45,32 @@
</div>
<div class="tooltip-main">
<div class="tooltip-main-item" v-for="item, index in currentDetailList" :key="index">
<div class="item-header flex-display">
<div class="item-header-left flex-display">
<div class="logo">
<img style="width:100%; height: 100%" :src="item.orgLogoUrl" alt="logo">
</div>
<div class="name text-bold">{{ item.orgName }}</div>
<div class="status">
<div class="status-on text-tip-2" v-if="item.stauts === 2">{{ '已落实' }}</div>
<div class="status-off text-tip-2" v-else>{{ '未落实' }}</div>
</div>
</div>
<div class="item-header-right flex-display">
<AreaTag v-for="tag, idx in item.techDomainList.slice(0, 3)" :key="idx" :tagName="tag"></AreaTag>
</div>
</div>
<div class="item-content text-compact">{{ item.name }}</div>
<div class="item-footer color-bg-active flex-display" @click="handleToDetail(item)">
<div class="footer-text text-tip-2 main-color">{{ item.administrativeOrderInfoTitle }}</div>
<div class="footer-text text-tip-2 main-color">{{ item.name }}</div>
<div class="footer-arrow">
<img src="./right-arrow.svg" alt="">
</div>
</div>
<div class="item-list" v-for="val, idx in item.list" :key="idx">
<div class="item-header flex-display">
<div class="item-header-left flex-display">
<div class="logo">
<img style="width:100%; height: 100%" :src="val.orgLogoUrl" alt="logo">
</div>
<div class="name text-primary-80-clor text-bold">{{ val.orgName }}</div>
<div class="status">
<div class="status-on text-tip-2" v-if="val.stauts === 2">{{ '已落实' }}</div>
<div class="status-off text-tip-2" v-else>{{ '未落实' }}</div>
</div>
</div>
<div class="item-header-right flex-display">
<AreaTag v-for="tag, idxx in val.techDomainList.slice(0, 3)" :key="idxx" :tagName="tag"></AreaTag>
</div>
</div>
<div class="item-content text-compact">{{ val.name }}</div>
</div>
</div>
</div>
</el-dialog>
......@@ -282,7 +286,7 @@ function getOption() {
const titles = months.map((month, index) => ({
// text: `{month|${month.format('M月')}} {stats| ${monthStats[index].total} , 已落实 ${monthStats[index].resolved} 项}`,
text: index ===0 ?`{month|${month.format('M月')}} {stats| ${monthStats[index].total} , 已落实 0 项}`:` {month|${month.format('M月')}} {stats| ${monthStats[index].total} , 已落实 0 项}`,
text: index === 0 ? `{month|${month.format('M月')}} {stats| ${monthStats[index].total} , 已落实 0 项}` : ` {month|${month.format('M月')}} {stats| ${monthStats[index].total} , 已落实 0 项}`,
left: `${gapPercent + index * (calendarWidthPercent + gapPercent)}%`,
top: 10,
textStyle: {
......@@ -447,7 +451,20 @@ onMounted(() => {
const list = params.data[1].raw
if (list.length > 0) {
currentDate.value = date
currentDetailList.value = list
// 按 administrativeOrderInfoTitle 分类
const grouped = [];
const map = new Map();
list.forEach(item => {
const key = item.administrativeOrderInfoTitle;
if (!map.has(key)) {
map.set(key, { name: key, list: [] });
grouped.push(map.get(key));
}
map.get(key).list.push(item);
});
currentDetailList.value = grouped;
console.log('currentDetailList', currentDetailList.value);
// 统计不同 orgName 的个数
const orgNames = new Set(list.map(item => item.orgName));
currentOrgNum.value = orgNames.size
......@@ -505,8 +522,9 @@ onBeforeUnmount(() => {
}
.tooltip-main-item {
padding: 10px 0;
width: 622px;
height: 144px;
/* height: 144px; */
border-bottom: 1px solid rgb(234, 236, 238);
}
......@@ -559,7 +577,7 @@ onBeforeUnmount(() => {
.item-footer {
width: 622px;
height: 30px;
height: 40px;
padding: 0 8px;
margin-top: 4px;
border-radius: 4px;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论