Commit 06c93b82a4f611f581e2f9ebc3523a6f96a06c0e
1 parent
a6ad0dd2
feat: 修改样式
Showing
4 changed files
with
62 additions
and
122 deletions
src/components/ConstForm/index.vue
| 1 | <template> | 1 | <template> |
| 2 | - <div v-loading="loading" element-loading-text="加载详情..." element-loading-svg-view-box="-10, -10, 50, 50" | ||
| 3 | - element-loading-background="#062a5ac5"> | 2 | + <div v-loading="loading" element-loading-text="加载详情..." element-loading-svg-view-box="-10, -10, 50, 50"> |
| 4 | <div class="person-info"> | 3 | <div class="person-info"> |
| 5 | <div class="font-box"> | 4 | <div class="font-box"> |
| 6 | <span class="label"> | 5 | <span class="label"> |
| @@ -35,7 +34,7 @@ | @@ -35,7 +34,7 @@ | ||
| 35 | </div> | 34 | </div> |
| 36 | </div> | 35 | </div> |
| 37 | </div> | 36 | </div> |
| 38 | - <div style="display: flex;align-items: center;margin-bottom: 7px; color: #0CFCFC; font-size: 13px; margin-top: 15px;"> | 37 | + <div style="display: flex;align-items: center;margin-bottom: 7px; color: green; font-size: 13px; margin-top: 15px;"> |
| 39 | 打卡详情</div> | 38 | 打卡详情</div> |
| 40 | <div class="mainTable"> | 39 | <div class="mainTable"> |
| 41 | <el-table :data="info.signInfos" style="width: 100%;"> | 40 | <el-table :data="info.signInfos" style="width: 100%;"> |
| @@ -115,26 +114,26 @@ watch( | @@ -115,26 +114,26 @@ watch( | ||
| 115 | :deep(.mainTable .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th) { | 114 | :deep(.mainTable .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th) { |
| 116 | text-align: center; | 115 | text-align: center; |
| 117 | font-weight: bold; | 116 | font-weight: bold; |
| 118 | - color: white; | ||
| 119 | - background-color: #0359A4 !important; | 117 | + color: black; |
| 118 | + background-color: #f4f4f5d3 !important; | ||
| 120 | font-size: 0.5vw; | 119 | font-size: 0.5vw; |
| 121 | height: 20px !important; | 120 | height: 20px !important; |
| 122 | } | 121 | } |
| 123 | 122 | ||
| 124 | :deep(.mainTable .el-table__empty-text) { | 123 | :deep(.mainTable .el-table__empty-text) { |
| 125 | line-height: 30px !important; | 124 | line-height: 30px !important; |
| 126 | - color: white; | 125 | + color: black; |
| 127 | font-weight: bold; | 126 | font-weight: bold; |
| 128 | font-size: 0.5vw; | 127 | font-size: 0.5vw; |
| 129 | } | 128 | } |
| 130 | 129 | ||
| 131 | :deep(.mainTable .el-table__empty-block) { | 130 | :deep(.mainTable .el-table__empty-block) { |
| 132 | min-height: 30px !important; | 131 | min-height: 30px !important; |
| 133 | - background-color: #041e74d5; | 132 | + background-color: #f4f4f5d3; |
| 134 | } | 133 | } |
| 135 | 134 | ||
| 136 | :deep(.mainTable .el-table tr) { | 135 | :deep(.mainTable .el-table tr) { |
| 137 | - background-color: #03113F; | 136 | + background-color: #f4f4f5d3; |
| 138 | } | 137 | } |
| 139 | 138 | ||
| 140 | :deep(.mainTable .el-table .el-table__cell) { | 139 | :deep(.mainTable .el-table .el-table__cell) { |
| @@ -143,17 +142,12 @@ watch( | @@ -143,17 +142,12 @@ watch( | ||
| 143 | } | 142 | } |
| 144 | 143 | ||
| 145 | :deep(.mainTable .el-table tbody tr:hover>td) { | 144 | :deep(.mainTable .el-table tbody tr:hover>td) { |
| 146 | - background: rgba(39, 54, 91, 0.571) !important; | 145 | + background: #ffffff !important; |
| 147 | } | 146 | } |
| 148 | 147 | ||
| 149 | -// :deep(.mainTable .el-table th) { | ||
| 150 | -// border: 1px solid black !important; | ||
| 151 | -// border-right: none !important; | ||
| 152 | -// border-bottom: none !important; | ||
| 153 | -// } | ||
| 154 | 148 | ||
| 155 | :deep(.el-table td) { | 149 | :deep(.el-table td) { |
| 156 | - border: 1px solid #033E72; | 150 | + border: 1px solid #c5c7c9; |
| 157 | border-right: none !important; | 151 | border-right: none !important; |
| 158 | } | 152 | } |
| 159 | 153 | ||
| @@ -161,12 +155,13 @@ watch( | @@ -161,12 +155,13 @@ watch( | ||
| 161 | :deep(.mainTable td .cell) { | 155 | :deep(.mainTable td .cell) { |
| 162 | text-align: center; | 156 | text-align: center; |
| 163 | font-size: 0.5vw; | 157 | font-size: 0.5vw; |
| 164 | - color: white; | 158 | + color: black; |
| 165 | } | 159 | } |
| 166 | 160 | ||
| 167 | // 修改行单元格内边距 | 161 | // 修改行单元格内边距 |
| 168 | :deep(.mainTable .el-table .cell) { | 162 | :deep(.mainTable .el-table .cell) { |
| 169 | padding: 1px !important; | 163 | padding: 1px !important; |
| 164 | + box-sizing: border-box; | ||
| 170 | } | 165 | } |
| 171 | 166 | ||
| 172 | .person-info { | 167 | .person-info { |
| @@ -174,6 +169,7 @@ watch( | @@ -174,6 +169,7 @@ watch( | ||
| 174 | display: flex; | 169 | display: flex; |
| 175 | flex-wrap: wrap; | 170 | flex-wrap: wrap; |
| 176 | justify-content: space-between; | 171 | justify-content: space-between; |
| 172 | + box-sizing: border-box; | ||
| 177 | 173 | ||
| 178 | .font-box { | 174 | .font-box { |
| 179 | width: 50%; | 175 | width: 50%; |
| @@ -184,19 +180,19 @@ watch( | @@ -184,19 +180,19 @@ watch( | ||
| 184 | align-items: center; | 180 | align-items: center; |
| 185 | 181 | ||
| 186 | .label { | 182 | .label { |
| 187 | - color: #0CFCFC; | 183 | + color: green; |
| 188 | font-family: "黑体", "圆体"; | 184 | font-family: "黑体", "圆体"; |
| 189 | font-weight: 500; | 185 | font-weight: 500; |
| 190 | width: 39px; | 186 | width: 39px; |
| 191 | } | 187 | } |
| 192 | 188 | ||
| 193 | .content-box { | 189 | .content-box { |
| 194 | - color: white; | 190 | + color: black; |
| 195 | width: 95.5px; | 191 | width: 95.5px; |
| 196 | box-sizing: border-box; | 192 | box-sizing: border-box; |
| 197 | padding: 2px; | 193 | padding: 2px; |
| 198 | text-align: center; | 194 | text-align: center; |
| 199 | - background-color: #03113F; | 195 | + background-color: #f4f4f5d3; |
| 200 | 196 | ||
| 201 | .content-text { | 197 | .content-text { |
| 202 | display: flex; | 198 | display: flex; |
src/components/FleetContentBox/index.vue
| 1 | <template> | 1 | <template> |
| 2 | <div @wheel="handleWheel" ref="fleetContentBox" :class="{ scrolling: isScrolling }" class="fleet-content-box"> | 2 | <div @wheel="handleWheel" ref="fleetContentBox" :class="{ scrolling: isScrolling }" class="fleet-content-box"> |
| 3 | - <!-- <vue3-seamless-scroll :list="item.fleetInfos" :step="1" :hoverStop="true" :hover="true"> --> | ||
| 4 | <!-- 线路信息 --> | 3 | <!-- 线路信息 --> |
| 5 | - <div v-for="(childItem, childIndex) in item.fleetInfos" :key="childItem.lineName" class="fleet-line-info-container"> | ||
| 6 | - <!-- <div class="line-box" style="height: 1px; margin: 5px; background-color: #0761ba;"></div> --> | ||
| 7 | - | 4 | + <div v-for="(childItem, childIndex) in item.fleetInfos" :key="childItem.lineName" ref="fleetLineInfoContainer" |
| 5 | + class="fleet-line-info-container"> | ||
| 8 | <div :id="childItem.lineName" class="fleet-line-title"> | 6 | <div :id="childItem.lineName" class="fleet-line-title"> |
| 9 | {{ childItem.lineName }} | 7 | {{ childItem.lineName }} |
| 10 | </div> | 8 | </div> |
| @@ -12,7 +10,8 @@ | @@ -12,7 +10,8 @@ | ||
| 12 | <div ref="fleetNbbmInfoContainer" class="fleet-nbbm-info-container"> | 10 | <div ref="fleetNbbmInfoContainer" class="fleet-nbbm-info-container"> |
| 13 | <div v-for="(sunItem, sunIndex) in childItem.lineInfos" :key="sunItem.nbbm" class="fleet-nbbm-info-item"> | 11 | <div v-for="(sunItem, sunIndex) in childItem.lineInfos" :key="sunItem.nbbm" class="fleet-nbbm-info-item"> |
| 14 | <div v-if="sunItem.saleInfoVo != null" class="fleet-nbbm-info-have-sale"> | 12 | <div v-if="sunItem.saleInfoVo != null" class="fleet-nbbm-info-have-sale"> |
| 15 | - <el-popover popper-class="fleet-popover-style" placement="top" :title="childItem.lineName" :width="320" | 13 | + <el-popover popper-class="fleet-popover-style" placement="top-start" :title="childItem.lineName" :width="320" |
| 14 | + :open-delay="500" :popper-options="{ boundariesElement: 'viewport', removeOnDestroy: true }" | ||
| 16 | :show-after="200" @after-enter="alterEnterHandler(sunItem.driverInfoVo.jobCode)"> | 15 | :show-after="200" @after-enter="alterEnterHandler(sunItem.driverInfoVo.jobCode)"> |
| 17 | <ConstForm :showFlag="personSignInfo.jobCode == sunItem.driverInfoVo.jobCode" | 16 | <ConstForm :showFlag="personSignInfo.jobCode == sunItem.driverInfoVo.jobCode" |
| 18 | :currentDateKey="currentDateKey" :jobCode="sunItem.driverInfoVo.jobCode" /> | 17 | :currentDateKey="currentDateKey" :jobCode="sunItem.driverInfoVo.jobCode" /> |
| @@ -30,7 +29,8 @@ | @@ -30,7 +29,8 @@ | ||
| 30 | </span> | 29 | </span> |
| 31 | </span> | 30 | </span> |
| 32 | </div> | 31 | </div> |
| 33 | - <el-popover popper-class="fleet-popover-style" placement="top" :title="childItem.lineName" :width="320" | 32 | + <el-popover popper-class="fleet-popover-style" placement="top-start" :title="childItem.lineName" :width="320" |
| 33 | + :open-delay="500" :popper-options="{ boundariesElement: 'viewport', removeOnDestroy: true }" | ||
| 34 | :show-after="200" @after-enter="alterEnterHandler(sunItem.saleInfoVo.jobCode)"> | 34 | :show-after="200" @after-enter="alterEnterHandler(sunItem.saleInfoVo.jobCode)"> |
| 35 | <ConstForm :showFlag="personSignInfo.jobCode == sunItem.saleInfoVo.jobCode" :currentDateKey="currentDateKey" | 35 | <ConstForm :showFlag="personSignInfo.jobCode == sunItem.saleInfoVo.jobCode" :currentDateKey="currentDateKey" |
| 36 | :jobCode="sunItem.saleInfoVo.jobCode" /> | 36 | :jobCode="sunItem.saleInfoVo.jobCode" /> |
| @@ -41,7 +41,8 @@ | @@ -41,7 +41,8 @@ | ||
| 41 | </el-popover> | 41 | </el-popover> |
| 42 | </div> | 42 | </div> |
| 43 | <el-popover v-else :show-after="200" @after-enter="alterEnterHandler(sunItem.driverInfoVo.jobCode)" | 43 | <el-popover v-else :show-after="200" @after-enter="alterEnterHandler(sunItem.driverInfoVo.jobCode)" |
| 44 | - placement="top" :title="childItem.lineName" popper-class="fleet-popover-style" :width="320"> | 44 | + :open-delay="500" :popper-options="{ boundariesElement: 'viewport', removeOnDestroy: true }" |
| 45 | + placement="top-start" :title="childItem.lineName" popper-class="fleet-popover-style" :width="320"> | ||
| 45 | <ConstForm :showFlag="personSignInfo.jobCode == sunItem.driverInfoVo.jobCode" :currentDateKey="currentDateKey" | 46 | <ConstForm :showFlag="personSignInfo.jobCode == sunItem.driverInfoVo.jobCode" :currentDateKey="currentDateKey" |
| 46 | :jobCode="sunItem.driverInfoVo.jobCode" /> | 47 | :jobCode="sunItem.driverInfoVo.jobCode" /> |
| 47 | <template #reference> | 48 | <template #reference> |
| @@ -55,12 +56,12 @@ | @@ -55,12 +56,12 @@ | ||
| 55 | </div> | 56 | </div> |
| 56 | </div> | 57 | </div> |
| 57 | </div> | 58 | </div> |
| 58 | - <!-- </vue3-seamless-scroll> --> | ||
| 59 | </div> | 59 | </div> |
| 60 | </template> | 60 | </template> |
| 61 | <script setup> | 61 | <script setup> |
| 62 | import ConstForm from '@/components/ConstForm/index.vue'; | 62 | import ConstForm from '@/components/ConstForm/index.vue'; |
| 63 | -import { nextTick, onMounted, ref } from 'vue'; | 63 | +import { nextTick, onMounted, reactive, ref } from 'vue'; |
| 64 | +const popoverRef = ref({}); | ||
| 64 | const props = defineProps({ | 65 | const props = defineProps({ |
| 65 | item: { | 66 | item: { |
| 66 | type: Object, | 67 | type: Object, |
| @@ -91,7 +92,8 @@ const personSignInfo = reactive( | @@ -91,7 +92,8 @@ const personSignInfo = reactive( | ||
| 91 | const isScrolling = ref(false); | 92 | const isScrolling = ref(false); |
| 92 | // 元素信息 | 93 | // 元素信息 |
| 93 | const fleetNbbmInfoContainer = ref(); | 94 | const fleetNbbmInfoContainer = ref(); |
| 94 | -const fleetContentBox = ref() | 95 | +const fleetContentBox = ref(); |
| 96 | +const fleetLineInfoContainer = ref(); | ||
| 95 | /** | 97 | /** |
| 96 | * 显示弹窗 | 98 | * 显示弹窗 |
| 97 | * @param {*} val 工号 | 99 | * @param {*} val 工号 |
| @@ -103,16 +105,21 @@ const alterEnterHandler = (val) => { | @@ -103,16 +105,21 @@ const alterEnterHandler = (val) => { | ||
| 103 | /** | 105 | /** |
| 104 | * 处理容器滚动回调函数 | 106 | * 处理容器滚动回调函数 |
| 105 | * @param container HTML parent element | 107 | * @param container HTML parent element |
| 108 | + * @param boxContainerElement HTML parent element | ||
| 106 | */ | 109 | */ |
| 107 | -const handleContainerScrollCallBack = (container) => { | ||
| 108 | - if (container.scrollHeight > container.clientHeight) { | ||
| 109 | - // 内容溢出 | ||
| 110 | - isScrolling.value = true; | ||
| 111 | - } else { | ||
| 112 | - // 内容未溢出 | ||
| 113 | - isScrolling.value = false; | ||
| 114 | - } | ||
| 115 | - props.handleLoadSuccess(false); | 110 | +const handleContainerScrollCallBack = (container, boxContainerElement) => { |
| 111 | + let element = container[0]; | ||
| 112 | + let parentLength = element.offsetWidth - 1; | ||
| 113 | + let styles = window.getComputedStyle(element.firstElementChild); | ||
| 114 | + let margin = Number(styles.marginRight.substring(0, styles.marginRight.length - 2)); | ||
| 115 | + let childLength = element.firstElementChild.offsetWidth - 1 + margin; | ||
| 116 | + let elementCount = Math.floor(parentLength / childLength); | ||
| 117 | + let containerLength = elementCount * childLength; | ||
| 118 | + let surplus = Math.floor((parentLength - containerLength) / 2) - 1; | ||
| 119 | + boxContainerElement.forEach(boxElement => { | ||
| 120 | + boxElement.style.paddingLeft = surplus + "px"; | ||
| 121 | + boxElement.style.paddingRight = surplus + "px"; | ||
| 122 | + }); | ||
| 116 | } | 123 | } |
| 117 | 124 | ||
| 118 | /** | 125 | /** |
| @@ -126,56 +133,31 @@ const handleWheel = (el) => { | @@ -126,56 +133,31 @@ const handleWheel = (el) => { | ||
| 126 | // el.preventDefault(); | 133 | // el.preventDefault(); |
| 127 | // 根据滚轮滚动的距离来计算滚动量 | 134 | // 根据滚轮滚动的距离来计算滚动量 |
| 128 | const scrollAmount = el.deltaY > 0 ? 100 : -100; | 135 | const scrollAmount = el.deltaY > 0 ? 100 : -100; |
| 129 | - | ||
| 130 | // 修改盒子的滚动位置 | 136 | // 修改盒子的滚动位置 |
| 131 | containerElement.scrollTop += scrollAmount; | 137 | containerElement.scrollTop += scrollAmount; |
| 132 | - | ||
| 133 | } | 138 | } |
| 134 | - | ||
| 135 | } | 139 | } |
| 136 | 140 | ||
| 137 | onMounted(() => { | 141 | onMounted(() => { |
| 138 | - // 处理容器滚动 | ||
| 139 | - // nextTick(() => { | ||
| 140 | - // if (containerElement != null) { | ||
| 141 | - // // containerElement.forEach((el) => { | ||
| 142 | - // // const nbbmHaveSaleInfo = el.firstElementChild.firstElementChild; | ||
| 143 | - // // if ("fleet-nbbm-info-have-sale" == nbbmHaveSaleInfo.className) { | ||
| 144 | - // // const textWidth = nbbmHaveSaleInfo.children[1].firstElementChild.offsetWidth; | ||
| 145 | - // // // 有售票员 | ||
| 146 | - // // for (let index = 0; index < el.children.length; index++) { | ||
| 147 | - // // const element = el.children[index]; | ||
| 148 | - // // element.style.width = `${textWidth}px`; | ||
| 149 | - // // } | ||
| 150 | - // // // 无售票员 | ||
| 151 | - // // } else { | ||
| 152 | - // // const textWidth = nbbmHaveSaleInfo.firstElementChild.offsetWidth; | ||
| 153 | - // // for (let index = 0; index < el.children.length; index++) { | ||
| 154 | - // // const element = el.children[index]; | ||
| 155 | - // // element.style.width = `${textWidth}px`; | ||
| 156 | - // // } | ||
| 157 | - // // } | ||
| 158 | - // // }) | ||
| 159 | - // loading.value = false; | ||
| 160 | - // } else { | ||
| 161 | - | ||
| 162 | - // } | ||
| 163 | - // }) | ||
| 164 | nextTick(() => { | 142 | nextTick(() => { |
| 165 | - const containerElement = fleetContentBox.value; | ||
| 166 | - handleContainerScrollCallBack(containerElement); | 143 | + const containerElement = fleetNbbmInfoContainer.value; |
| 144 | + const boxContainerElement = fleetLineInfoContainer.value; | ||
| 145 | + try { | ||
| 146 | + handleContainerScrollCallBack(containerElement, boxContainerElement); | ||
| 147 | + } catch (error) { | ||
| 148 | + console.log("元素为空"); | ||
| 149 | + } | ||
| 150 | + props.handleLoadSuccess(false); | ||
| 167 | }) | 151 | }) |
| 168 | }) | 152 | }) |
| 169 | 153 | ||
| 154 | + | ||
| 170 | </script> | 155 | </script> |
| 171 | 156 | ||
| 172 | <style lang="scss" scoped> | 157 | <style lang="scss" scoped> |
| 173 | .fleet-content-box { | 158 | .fleet-content-box { |
| 174 | height: calc(100% - clamp(0.8rem, -0.907rem + 5.71vw, 1.3rem)); | 159 | height: calc(100% - clamp(0.8rem, -0.907rem + 5.71vw, 1.3rem)); |
| 175 | - // height: auto; | ||
| 176 | width: auto; | 160 | width: auto; |
| 177 | - // overflow-y: hidden; | ||
| 178 | - // overflow-x: hidden; | ||
| 179 | overflow: hidden; | 161 | overflow: hidden; |
| 180 | 162 | ||
| 181 | .scrolling { | 163 | .scrolling { |
| @@ -210,8 +192,6 @@ onMounted(() => { | @@ -210,8 +192,6 @@ onMounted(() => { | ||
| 210 | box-sizing: border-box; | 192 | box-sizing: border-box; |
| 211 | display: flex; | 193 | display: flex; |
| 212 | flex-wrap: wrap; | 194 | flex-wrap: wrap; |
| 213 | - justify-content: space-between; | ||
| 214 | - // justify-content: flex-start; | ||
| 215 | font-size: 0.8vw; | 195 | font-size: 0.8vw; |
| 216 | 196 | ||
| 217 | .fleet-nbbm-info-item { | 197 | .fleet-nbbm-info-item { |
| @@ -219,7 +199,7 @@ onMounted(() => { | @@ -219,7 +199,7 @@ onMounted(() => { | ||
| 219 | height: 2.4vh; | 199 | height: 2.4vh; |
| 220 | box-sizing: border-box; | 200 | box-sizing: border-box; |
| 221 | margin-top: 0.4vw; | 201 | margin-top: 0.4vw; |
| 222 | - // margin-right: 0.4vw; | 202 | + margin-right: 0.4vw; |
| 223 | color: black; | 203 | color: black; |
| 224 | 204 | ||
| 225 | .fleet-nbbm-info-have-sale { | 205 | .fleet-nbbm-info-have-sale { |
| @@ -289,46 +269,8 @@ onMounted(() => { | @@ -289,46 +269,8 @@ onMounted(() => { | ||
| 289 | } | 269 | } |
| 290 | } | 270 | } |
| 291 | } | 271 | } |
| 292 | - | ||
| 293 | - | ||
| 294 | - | ||
| 295 | - | ||
| 296 | } | 272 | } |
| 297 | } | 273 | } |
| 298 | - | ||
| 299 | - | ||
| 300 | - | ||
| 301 | -/* 定义滚动条样式 */ | ||
| 302 | -.fleet-content-box::-webkit-scrollbar { | ||
| 303 | - width: 6px; | ||
| 304 | - height: 6px; | ||
| 305 | -} | ||
| 306 | - | ||
| 307 | -/*定义滑块 内阴影+圆角*/ | ||
| 308 | -.fleet-content-box::-webkit-scrollbar-thumb { | ||
| 309 | - border-radius: 6px; | ||
| 310 | - // box-shadow: inset 0 0 0px rgba(237, 44, 37, .5); | ||
| 311 | - background-color: #01366c; | ||
| 312 | - background-image: url('../assets/bigview/scroll-box.png'); | ||
| 313 | -} | ||
| 314 | - | ||
| 315 | -/* 设置滚动条拖拽按钮的样式 */ | ||
| 316 | -.fleet-content-box::-webkit-scrollbar-thumb:vertical { | ||
| 317 | - background-color: #0761ba; | ||
| 318 | - /* 背景图片的尺寸适应滑块 */ | ||
| 319 | - background-size: cover; | ||
| 320 | -} | ||
| 321 | - | ||
| 322 | -.fleet-content-box::-webkit-scrollbar-button { | ||
| 323 | - display: none; | ||
| 324 | -} | ||
| 325 | - | ||
| 326 | -/*定义滚动条轨道 内阴影+圆角*/ | ||
| 327 | -.fleet-content-box::-webkit-scrollbar-track { | ||
| 328 | - box-shadow: inset 0 0 0px #01DEDD; | ||
| 329 | - border-radius: 6px; | ||
| 330 | - background-color: #121622; | ||
| 331 | -} | ||
| 332 | </style> | 274 | </style> |
| 333 | <style> | 275 | <style> |
| 334 | .fleet-popover-style { | 276 | .fleet-popover-style { |
| @@ -338,8 +280,7 @@ onMounted(() => { | @@ -338,8 +280,7 @@ onMounted(() => { | ||
| 338 | } | 280 | } |
| 339 | 281 | ||
| 340 | .el-popover.fleet-popover-style { | 282 | .el-popover.fleet-popover-style { |
| 341 | - border-color: #146EBD; | ||
| 342 | - background-color: #062a5ac5; | 283 | + border-color: #f4f4f5; |
| 343 | } | 284 | } |
| 344 | 285 | ||
| 345 | .fleet-popover-style .el-popover__title { | 286 | .fleet-popover-style .el-popover__title { |
| @@ -348,7 +289,7 @@ onMounted(() => { | @@ -348,7 +289,7 @@ onMounted(() => { | ||
| 348 | } | 289 | } |
| 349 | 290 | ||
| 350 | .el-popper[data-popper-placement^=top]>.el-popper__arrow::before { | 291 | .el-popper[data-popper-placement^=top]>.el-popper__arrow::before { |
| 351 | - border-top-color: #062a5ac5 !important; | ||
| 352 | - background-color: #062a5ac5 !important; | 292 | + border-top-color: rgba(244, 244, 245, 0.735) !important; |
| 293 | + background-color: rgba(244, 244, 245, 0.735) !important; | ||
| 353 | } | 294 | } |
| 354 | </style> | 295 | </style> |
src/views/home/index.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div class="app-container"> | 2 | <div class="app-container"> |
| 3 | <!-- 可视化大屏 --> | 3 | <!-- 可视化大屏 --> |
| 4 | <div class="box-view" v-loading="loading" element-loading-text="Loading..." | 4 | <div class="box-view" v-loading="loading" element-loading-text="Loading..." |
| 5 | - element-loading-svg-view-box="-10, -10, 50, 50" element-loading-background="#081138"> | 5 | + element-loading-svg-view-box="-10, -10, 50, 50"> |
| 6 | <!-- 标题 --> | 6 | <!-- 标题 --> |
| 7 | <div class="big-view-container-title"> | 7 | <div class="big-view-container-title"> |
| 8 | <!-- 标题 --> | 8 | <!-- 标题 --> |
| @@ -19,9 +19,9 @@ | @@ -19,9 +19,9 @@ | ||
| 19 | <div class="big-view-container-global-info common-style"> | 19 | <div class="big-view-container-global-info common-style"> |
| 20 | <div v-for=" (item, index) in globalInfoBoxList" :key="index" class="global-info-box"> | 20 | <div v-for=" (item, index) in globalInfoBoxList" :key="index" class="global-info-box"> |
| 21 | <div class="global-info-box-container"> | 21 | <div class="global-info-box-container"> |
| 22 | - <div class="global-info-box-container-left"> | ||
| 23 | - <!-- <img :src="item.icon" /> --> | ||
| 24 | - </div> | 22 | + <!--<div class="global-info-box-container-left"> |
| 23 | + <img :src="item.icon" /> | ||
| 24 | + </div>--> | ||
| 25 | <div class="global-info-box-container-right"> | 25 | <div class="global-info-box-container-right"> |
| 26 | <div class="global-info-box-container-right-title"> | 26 | <div class="global-info-box-container-right-title"> |
| 27 | {{ item.title }} | 27 | {{ item.title }} |
| @@ -446,6 +446,9 @@ const handleGlobalInfo = (data, num) => { | @@ -446,6 +446,9 @@ const handleGlobalInfo = (data, num) => { | ||
| 446 | .global-info-box-container-right-number { | 446 | .global-info-box-container-right-number { |
| 447 | font-weight: bold; | 447 | font-weight: bold; |
| 448 | color: black; | 448 | color: black; |
| 449 | + text-align: center; | ||
| 450 | + // display: flex; | ||
| 451 | + // align-items: center; | ||
| 449 | } | 452 | } |
| 450 | } | 453 | } |
| 451 | } | 454 | } |
src/views/in/in/index.vue
| @@ -394,7 +394,7 @@ function handleDelete(row) { | @@ -394,7 +394,7 @@ function handleDelete(row) { | ||
| 394 | function handleExport() { | 394 | function handleExport() { |
| 395 | proxy.download('in/in/export', { | 395 | proxy.download('in/in/export', { |
| 396 | ...queryParams.value | 396 | ...queryParams.value |
| 397 | - }, `in_${new Date().getTime()}.xlsx`) | 397 | + }, `${queryParams.value.date}打卡记录表.xlsx`) |
| 398 | } | 398 | } |
| 399 | 399 | ||
| 400 | watch(open, (val1, val2) => { | 400 | watch(open, (val1, val2) => { |