diff --git a/hx-ai-intelligent/src/App.vue b/hx-ai-intelligent/src/App.vue index af9b91f..d862cbb 100644 --- a/hx-ai-intelligent/src/App.vue +++ b/hx-ai-intelligent/src/App.vue @@ -79,24 +79,113 @@ // 区域阴影 // .ns-list-table { - // :deep(.ant-tabs) { - // // overflow: visible; - // box-shadow: @ns-content-box-shadow; - // border-radius: @ns-border-radius; - // .ns-table-search { - // box-shadow: none; - // border-top-left-radius: 0px !important; - // border-top-right-radius: 0px !important; - // } - // .ns-table-main { - // } - // .ant-tabs-tabpane-active > div { - // height: 100%; - // } - // } + :deep(.ant-tabs) { + // // overflow: visible; + // box-shadow: @ns-content-box-shadow; + // border-radius: @ns-border-radius; + .ns-table-search { + border-top-left-radius: 0px !important; + border-top-right-radius: 0px !important; + } + .ns-table-main { + border-bottom-left-radius: 0px !important; + border-bottom-right-radius: 0px !important; + } + // .ant-tabs-tabpane-active > div { + // height: 100%; + // } + } // .ant-tabs .ns-table-main { // border-bottom-left-radius: 0px !important; // border-bottom-right-radius: 0px !important; // } // } + + // 菜单icon(仅仅处理特殊需求:未选中时icon与文字不同色) + :deep(.anticon) { + color: #8d96a3 !important; + } + + :deep(.ant-menu-item-selected .ant-menu-item-only-child), + :deep(.ant-menu-submenu-selected .ant-menu-item-only-child), + :deep(.firstMenuItem-selected) { + .router-link-active > .anticon { + color: @white !important; + } + } + + :deep(.ant-menu-item-active) { + .anticon { + color: @primary-color !important; + } + } + :deep(.ant-menu-submenu-active), + :deep(.ant-menu-submenu-open), + :deep(.ant-menu-item-selected) { + .ant-menu-submenu-title { + .anticon { + color: @primary-color !important; + } + } + } + + @min-padding: 5px; + :deep(.ns-left-menu-space):not(.ns-left-menu-space-collapsed) { + .firstMenuItem-selected { + background-color: transparent !important; + } + .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected { + background-color: transparent; + &::before { + background-color: @primary-color; + opacity: 1; + height: calc(100% - @min-padding*2); + top: @min-padding; + border-radius: @ns-border-radius; + } + } + .ant-menu-item-active:not(.ant-menu-item-selected) { + background-color: transparent !important; + position: relative; + &::before { + content: ''; + position: absolute; + width: 100%; + background-color: rgb(@primary-color, 0.1); + height: calc(100% - @min-padding*2); + top: @min-padding; + left: 0; + border-radius: @ns-border-radius; + z-index: 0; + } + } + + // .ant-menu-inline .ant-menu-item-selected::after { + // content: ''; + // position: absolute; + // top: 50%; + // right: -20px; + // transform: translateY(-50%); + // width: 3px !important; + // border-radius: 2px; + // background-color: red; + // height: 30px; + // z-index: 2; + // border: none; + // } + + .ant-menu-title-content { + z-index: 1; + } + } + + :deep(.nsHeader_action) { + .action { + font-size: 18px; + font-weight: bold; + letter-spacing: 0px; + line-height: 24px; + color: rgba(51, 51, 51, 1); + } + } diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue index 8925bca..874ac97 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue @@ -739,27 +739,27 @@ options: [ { label: 'CO2', - value: 'CO2', + value: '1', }, { label: 'CO2e', - value: 'CO2e', + value: '2', }, { label: 'SF6', - value:'SF6', + value:'3', }, { label: 'CH4', - value: 'CH4', + value: '4', }, { label: 'PFCs', - value: 'PFCs', + value: '5', }, { label: 'HFCs', - value: 'HFCs', + value: '6', }, ], }, diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue index 62c8b54..8283309 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue @@ -291,10 +291,10 @@ // }; diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue index d792f11..412aae7 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue @@ -10,14 +10,14 @@ - + diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue index 4978f78..256c5cb 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue @@ -576,10 +576,10 @@ }; \ No newline at end of file diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue index 807cb39..468051b 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue @@ -61,8 +61,8 @@ return http.post(api, params); }; // 判断展示哪个页面 - const isMainPage = ref(true); - const fillInPage = ref(false); + const isMainPage = ref(false); + const fillInPage = ref(true); // 新增相关数据 const visible = ref(false); const formState = ref({}) diff --git a/lib/component/tree/tree-api.vue b/lib/component/tree/tree-api.vue index 3bb3574..510a152 100644 --- a/lib/component/tree/tree-api.vue +++ b/lib/component/tree/tree-api.vue @@ -3,8 +3,8 @@
- - {{ header.title }} + + {{ header.title }}
@@ -155,9 +155,9 @@ // padding-bottom: 10px; // border-bottom: 1px solid #e9e9e9; - > span { - padding-left: 6px; - } + // > span { + // padding-left: 6px; + // } & ~ div { padding: 0 @gap !important; width: 100%; diff --git a/lib/saas/view/system/layout/header.vue b/lib/saas/view/system/layout/header.vue index 24f59e6..e755452 100644 --- a/lib/saas/view/system/layout/header.vue +++ b/lib/saas/view/system/layout/header.vue @@ -93,7 +93,7 @@ " >{{ userName }} - +