diff --git a/src/router/index.js b/src/router/index.js index 89098837..29880f91 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -221,7 +221,7 @@ router.beforeEach((to, from, next) => { children: [ { url: "/visual/basicinfo/basicInfoMain", - name: "基础信息", + name: "人房信息统计", id: "5feawfwaefwa5", }, { diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue index 52a060ec..8223ab3b 100644 --- a/src/views/modules/base/epidemic/travel.vue +++ b/src/views/modules/base/epidemic/travel.vue @@ -116,11 +116,11 @@ 加入关注 + @click="handleAttention">加入核酸检测关注 取消关注 + @click="handleDeletes">取消核酸检测关注 调动 + class="div-table-button--detail">变动 { if (n.value === row[item.columnName]) _val = n.label }) + if (row[item.columnName] == '0') _val = '--' } + return _val || row[item.columnName] }, handleSearch (val) { @@ -1146,14 +1148,14 @@ export default { .tabs-other-info { ::v-deep .el-tabs__item { // width: 50px; - height: 20px; + height: 24px; box-sizing: border-box; margin-right: 7px; padding: 0 10px !important; - font-size: 8px; - font-weight: 500; + font-size: 16px; + font-weight: 400; color: #666666; - line-height: 20px; + line-height: 24px; background: #ebecf1; border-radius: 2px; } diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue index c1cce0ed..91c75e9c 100644 --- a/src/views/modules/communityParty/elegant/index.vue +++ b/src/views/modules/communityParty/elegant/index.vue @@ -186,7 +186,7 @@ - + - +
需求和资源匹配分析
+
服务清单
导出
@@ -254,7 +255,7 @@ export default { if (item.legendCode == 'unfinished') { desc += `
尚有 ${item.serviceDemandTotal} 个需求未完成
` }else { - desc += `
共 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个
` + desc += `
共有 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个
` } }) @@ -645,6 +646,25 @@ export default { } } } +.card-left-title { + position: relative; + padding-left: 40px; + font-size: 16px; + font-weight: 500; + color: #fff; +} +.card-left-title::after { + content: ''; + position: absolute; + top: 50%; + left: 20px; + width: 12px; + height: 12px; + box-sizing: border-box; + margin-top: -6px; + background: #2865FA; + border-radius: 50%; +} .second-select { margin: 0 10px 0 0; ::v-deep .el-input { @@ -799,5 +819,7 @@ export default { border: 0; } } - +.mt30 { + margin-top: 30px; +}