From 0bd8b4947527f0d1a3fe445d84fb776ce021507e Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 10:59:56 +0800
Subject: [PATCH] 1. 修改问题整改界面中左侧列表的状态图标
---
src/views/fysp/check/ProCheck.vue | 27 +++++++++++--
src/components.d.ts | 22 -----------
src/components/SideList.vue | 35 +++++++++++++----
src/components/core/BaseContentLayout.vue | 3 +
4 files changed, 51 insertions(+), 36 deletions(-)
diff --git a/src/components.d.ts b/src/components.d.ts
index 7d97466..e76e42c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,32 +12,22 @@
BasePanelLayout: typeof import('./components/core/BasePanelLayout.vue')['default']
CompQuickSet: typeof import('./components/search-option/CompQuickSet.vue')['default']
Content: typeof import('./components/core/Content.vue')['default']
- ElAffix: typeof import('element-plus/es')['ElAffix']
ElAside: typeof import('element-plus/es')['ElAside']
ElAvatar: typeof import('element-plus/es')['ElAvatar']
ElBadge: typeof import('element-plus/es')['ElBadge']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
ElButton: typeof import('element-plus/es')['ElButton']
- ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
- ElCalendar: typeof import('element-plus/es')['ElCalendar']
ElCard: typeof import('element-plus/es')['ElCard']
- ElCascader: typeof import('element-plus/es')['ElCascader']
- ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
ElCollapse: typeof import('element-plus/es')['ElCollapse']
ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElContainer: typeof import('element-plus/es')['ElContainer']
- ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
ElDialog: typeof import('element-plus/es')['ElDialog']
- ElDivider: typeof import('element-plus/es')['ElDivider']
ElDrawer: typeof import('element-plus/es')['ElDrawer']
- ElDropdown: typeof import('element-plus/es')['ElDropdown']
- ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
- ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
@@ -45,37 +35,25 @@
ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
- ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
- ElLink: typeof import('element-plus/es')['ElLink']
ElMain: typeof import('element-plus/es')['ElMain']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElMenuItemGroup: typeof import('element-plus/es')['ElMenuItemGroup']
ElOption: typeof import('element-plus/es')['ElOption']
- ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
- ElPagination: typeof import('element-plus/es')['ElPagination']
- ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElPopover: typeof import('element-plus/es')['ElPopover']
- ElRadio: typeof import('element-plus/es')['ElRadio']
- ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
- ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
- ElSegmented: typeof import('element-plus/es')['ElSegmented']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSpace: typeof import('element-plus/es')['ElSpace']
ElStep: typeof import('element-plus/es')['ElStep']
ElSteps: typeof import('element-plus/es')['ElSteps']
ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
- ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTabPane: typeof import('element-plus/es')['ElTabPane']
ElTabs: typeof import('element-plus/es')['ElTabs']
ElTag: typeof import('element-plus/es')['ElTag']
ElText: typeof import('element-plus/es')['ElText']
- ElTooltip: typeof import('element-plus/es')['ElTooltip']
- ElTransfer: typeof import('element-plus/es')['ElTransfer']
ElTree: typeof import('element-plus/es')['ElTree']
ElUpload: typeof import('element-plus/es')['ElUpload']
Footer: typeof import('./components/core/Footer.vue')['default']
diff --git a/src/components/SideList.vue b/src/components/SideList.vue
index fc8c61f..104fde9 100644
--- a/src/components/SideList.vue
+++ b/src/components/SideList.vue
@@ -19,15 +19,27 @@
: 'custom-tree-node'
"
>
- <el-icon v-if="data.type == 2" color="var(--el-color-success)"
- ><SuccessFilled
- /></el-icon>
- <el-icon v-else-if="data.type == 1" color="var(--el-color-warning)"
- ><WarningFilled
- /></el-icon>
- <el-icon v-else-if="data.type == 0" color="var(--el-color-danger)"
- ><WarningFilled
- /></el-icon>
+ <el-icon v-if="data.type == 0" color="var(--el-color-info)">
+ <SuccessFilled/>
+ </el-icon>
+ <el-icon v-else-if="data.type == 1" color="var(--el-color-danger)">
+ <QuestionFilled />
+ </el-icon>
+ <el-icon v-else-if="data.type == 2" color="var(--el-color-warning)">
+ <QuestionFilled />
+ </el-icon>
+ <el-icon v-else-if="data.type == 3" color="var(--el-color-danger)">
+ <WarnTriangleFilled />
+ </el-icon>
+ <el-icon v-else-if="data.type == 4" color="var(--el-color-danger)">
+ <WarningFilled/>
+ </el-icon>
+ <el-icon v-else-if="data.type == 5" color="var(--el-color-warning)">
+ <WarningFilled/>
+ </el-icon>
+ <el-icon v-else-if="data.type == 6" color="var(--el-color-success)">
+ <SuccessFilled/>
+ </el-icon>
<div>{{ node.label }}</div>
</div>
</slot>
@@ -139,6 +151,11 @@
</script>
<style lang="scss" scoped>
+.el-tree {
+ // background-color: aliceblue;
+ // width: var(--el-aside-width, 200px)
+}
+
.custom-tree-node {
display: flex;
align-items: center;
diff --git a/src/components/core/BaseContentLayout.vue b/src/components/core/BaseContentLayout.vue
index 46135f0..c68f43c 100644
--- a/src/components/core/BaseContentLayout.vue
+++ b/src/components/core/BaseContentLayout.vue
@@ -5,7 +5,7 @@
</el-header>
<el-container>
<el-aside class="el-aside" :style="'height: ' + mainHeight">
- <el-scrollbar>
+ <el-scrollbar :noresize="true">
<slot name="aside"></slot>
</el-scrollbar>
</el-aside>
@@ -47,6 +47,7 @@
<style scoped>
.el-aside {
/* width: initial; */
+ /* overflow-x: auto; */
position: relative;
/* height: calc(100vh - 60px * 2 - 20px * 2); */
/* background-color: aqua; */
diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue
index 7dc97a6..68d5b0c 100644
--- a/src/views/fysp/check/ProCheck.vue
+++ b/src/views/fysp/check/ProCheck.vue
@@ -279,15 +279,34 @@
//鑾峰彇浠诲姟闂鐨勫鏍告儏鍐�
getSubtaskType(s) {
let type = 0;
+ // 鏃犻棶棰�
if (s.proNum == 0) {
- type = 2;
- } else if (s.proCheckedNum == 0) {
type = 0;
- } else if (s.proCheckedNum < s.proNum) {
+ }
+ // 闂鏈鏍�
+ else if (s.proCheckedNum == 0) {
type = 1;
- } else {
+ }
+ // 闂閮ㄥ垎瀹℃牳
+ else if (s.proCheckedNum < s.proNum) {
type = 2;
}
+ // 鏈暣鏀�
+ else if (s.changeNum < s.proNum) {
+ type = 3;
+ }
+ // 鏁存敼鏈鏍�
+ else if (s.changeCheckedNum == 0) {
+ type = 4;
+ }
+ // 鏁存敼閮ㄥ垎瀹℃牳
+ else if (s.changeCheckedNum < s.changeNum) {
+ type = 5;
+ }
+ // 瀹屽叏瀹℃牳
+ else {
+ type = 6;
+ }
return type;
},
//鐐瑰嚮宸︿晶鑿滃崟浠诲姟浜嬩欢
--
Gitblit v1.9.3