diff --git a/src/components/ProTable/index.vue b/src/components/ProTable/index.vue index 60946ff..e47fa96 100644 --- a/src/components/ProTable/index.vue +++ b/src/components/ProTable/index.vue @@ -39,7 +39,7 @@ :stripe="stripe" :row-key="getRowKeys" @selection-change="selectionChange" - :header-cell-style="{ fontWeight: 500 }" + :header-cell-style="{ fontWeight: 500, backgroundColor: 'transparent' }" :cell-style="{ fontSize: '12px' }" class="protable" > @@ -95,6 +95,7 @@ :background="background" /> + @@ -114,6 +115,7 @@ import Pagination from "./components/Pagination.vue"; import ColSetting from "./components/ColSetting.vue"; import TableColumn from "./components/TableColumn.vue"; import printJS from "print-js"; +import changeTheme from "@/components/changeTheme/index.vue"; interface ProTableProps extends Partial, "data">> { columns: ColumnProps[]; // 列配置项 diff --git a/src/components/SearchForm/index.vue b/src/components/SearchForm/index.vue index fe929e9..998787c 100644 --- a/src/components/SearchForm/index.vue +++ b/src/components/SearchForm/index.vue @@ -49,6 +49,7 @@ const gridRef = ref(); width: 200px; } .card { + background-color: #092945; box-shadow: none; } // :deep(.el-form-item--default) { diff --git a/src/components/changeTheme/index.vue b/src/components/changeTheme/index.vue index 5494dca..db4804a 100644 --- a/src/components/changeTheme/index.vue +++ b/src/components/changeTheme/index.vue @@ -23,5 +23,8 @@ const { changePrimary } = useTheme(); display: flex; align-items: center; justify-content: space-around; + img:not(:first-child) { + cursor: pointer; + } } diff --git a/src/styles/element.scss b/src/styles/element.scss index a9cd358..6947639 100644 --- a/src/styles/element.scss +++ b/src/styles/element.scss @@ -25,7 +25,8 @@ box-sizing: border-box; padding: 20px; overflow-x: hidden; - background-color: var(--el-fill-color-blank); + background-color: #092945; + // background-color: var(--el-fill-color-blank); // border: 1px solid var(--el-border-color-light); border-radius: 8px; // box-shadow: 0 0 12px rgb(0 0 0 / 5%); @@ -91,6 +92,7 @@ width: 100%; height: 100%; border-radius: 8px; + position: relative; // table-search 表格搜索样式 .table-search { @@ -103,7 +105,16 @@ .el-form-item__content > * { width: 160px; } - + .el-form-item__label { + color: var(--el-color-primary); + } + .el-input__wrapper { + background-color: transparent; + box-shadow: 0 0 0 1px var(--el-color-primary, var(--el-color-primary)) inset; + } + .el-input__inner { + color: white; + } // 去除时间选择器上下 padding .el-range-editor.el-input__wrapper { padding: 0 10px; @@ -134,23 +145,60 @@ // el-table 表格样式 .el-table { + background-color: transparent; flex: 1; // 修复 safari 浏览器表格错位 https://github.com/HalseySpicy/Geeker-Admin/issues/83 table { width: 100%; } + tr { + background-color: transparent; + } + td.el-table__cell { + background-color: transparent !important; + } + th.el-table__cell { + border-bottom: 0 !important; + } + td.el-table-fixed-column--right { + background-color: transparent !important; + } + .el-table__header { + background-color: #09405f; + // background: url("@/assets/images/layoutImg/tableThead.png") no-repeat 0 0; + // background-size: 100% 100%; + } .el-table__header th { height: 60px; font-size: 14px; - // font-weight: bold; - color: #333333; - background: var(--el-fill-color-light); + color: var(--el-color-primary); + // background: var(--el-fill-color-light); + } + .el-table__row:nth-child(2n) { + height: 60px; + font-size: 14px; + background-color: #09314e; + // background: url("@/assets/images/layoutImg/tableTwoN.png") no-repeat 0 0; + // background-size: 100% 100%; + } + + .el-table__row:nth-child(2n-1) { + height: 60px; + font-size: 14px; + // background-color: transparent !important; + } + + .el-table__row:hover { + background-color: #09405f; + // background: url("@/assets/images/layoutImg/TableHover.png") no-repeat 0 0; + // background-size: 100% 100%; } .el-table__row { height: 60px; font-size: 14px; + color: white; } // 设置 el-table 中 header 文字不换行,并省略 @@ -185,6 +233,44 @@ display: flex; justify-content: center; margin-top: 20px; + .el-pagination__goto { + color: var(--el-color-primary); + } + .el-pagination__classifier { + color: var(--el-color-primary); + } + .el-input__wrapper { + color: var(--el-color-primary); + background-color: transparent; + border: none; + box-shadow: 0 0 0 1px var(--el-color-primary, var(--el-color-primary)) inset; + height: 26px; + } + .el-input__inner { + color: var(--el-color-primary); + } + .el-pager li { + color: var(--el-color-primary); + border: none; + height: 26px; + } + .el-pager li:active { + color: var(--el-color-primary); + border: none; + height: 26px; + } + .el-pagination__total { + color: var(--el-color-primary); + } + .btn-prev, + .btn-next, + .btn-prev:disabled, + .btn-next:disabled { + color: var(--el-color-primary); + background-color: transparent; + border: 1px solid var(--el-color-primary); + height: 26px; + } } } diff --git a/src/views/hz-project/projectMonitor/progressManagement/index.vue b/src/views/hz-project/projectMonitor/progressManagement/index.vue index 9cb994f..8ef230d 100644 --- a/src/views/hz-project/projectMonitor/progressManagement/index.vue +++ b/src/views/hz-project/projectMonitor/progressManagement/index.vue @@ -19,7 +19,6 @@ - @@ -29,7 +28,6 @@ import { ElMessage, ElMessageBox } from "element-plus"; import { useRouter } from "vue-router"; import { ColumnProps } from "@/components/ProTable/interface"; import ProTable from "@/components/ProTable/index.vue"; -import changeTheme from "@/components/changeTheme/index.vue"; import { getRoleList, getTreemRoleList, getTreeByIdList } from "@/api/modules/project"; import { GlobalStore } from "@/stores"; diff --git a/src/views/hz-project/projectMonitor/qualityManagement/index.vue b/src/views/hz-project/projectMonitor/qualityManagement/index.vue index 3928c32..7c12bca 100644 --- a/src/views/hz-project/projectMonitor/qualityManagement/index.vue +++ b/src/views/hz-project/projectMonitor/qualityManagement/index.vue @@ -1,14 +1,5 @@ - - - - {{ item.name }} - {{ item.value ? item.value : 0 }} - - - - { pageSize: Number(data.size) }; }; -// 获取顶部统计信息 -const getInfo = async () => { - const res = await statisticsInfo({ type: 2 }); - statisticsOption.value.map(item => { - item.value = res.result[item.prop]; - }); - console.log(res); -}; -onMounted(() => { - getInfo(); -}); +onMounted(() => {});