diff --git a/.env.local b/.env.local index c22b406f..a3752946 100644 --- a/.env.local +++ b/.env.local @@ -4,7 +4,7 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://192.168.0.172:48080' +VITE_BASE_URL='http://192.168.0.74:48080' # VITE_BASE_URL='http://192.168.0.189:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 diff --git a/src/views/board/allBoard/index.vue b/src/views/board/allBoard/index.vue index 93467fba..4ccaecd4 100644 --- a/src/views/board/allBoard/index.vue +++ b/src/views/board/allBoard/index.vue @@ -33,7 +33,9 @@ 已取消 - {{ data.cancelledNum || 0 }} + + {{ data.cancelledNum || 0 }} + @@ -77,7 +79,9 @@ 离线 - {{ data.statistics.offline || 0 }} + + {{ data.statistics.offline || 0 }} + @@ -92,105 +96,207 @@ - - + + + - 执行中 - 查看更多 - - - - - - - - - + 执行中 + + 查看更多 + + + + + + + + + + - + - 待执行 - 查看更多 - - - - - - - - + 待执行 + + 查看更多 + + + + + + + + + - 2 - - - - - 异常信息 - 查看更多 - - - - - - - - - + + + + + + + + + + + + + + {{ filterTypeFun(n.deviceType, typeList) }} + + + + + + + + 数量: - - {{ scope.row.warnMsg || '' }} + + {{ n.totalNum || 0 }} - - - - - - + + + 正常数量: + + + {{ n.normalNum || 0 }} + + + + + 异常数量: + + + {{ n.abnormalNum || 0 }} + + + + + - + + + + - 车辆信息 - 查看更多 + 异常信息 + 查看更多 + + + + + + + + + + + {{ scope.row.warnMsg || '' }} + + + + + + + - - - - - - {{ scope.row.doLock === 0 ? '正常' : '锁定' }} - - - - - — - + + + + + 车辆信息 + 查看更多 + + + + + + + {{ scope.row.doLock === 0 ? '正常' : '锁定' }} + + + + + — + - - - - - - - - + + + + + + + + + {{ scope.row.batSoc || 0 }}% - {{scope.row.batSoc || 0}}% - - - - - + + + + @@ -201,18 +307,30 @@ @@ -304,58 +600,57 @@ onMounted(() => { color: #1677ff; cursor: pointer; } -.bottom-box-item-table{ +.bottom-box-item-table { width: 100%; } -.battery-box{ +.battery-box { width: 22px; height: 11px; position: relative; - } -.battery-box-img{ +.battery-box-img { width: 100%; height: 100%; vertical-align: top; } -.battery-box-inner{ +.battery-box-inner { width: 17px; height: 8px; position: absolute; - left: 50%; + left: 50%; top: 50%; transform: translateX(-50%) translateY(-50%); } -.battery-box-inner-inner{ +.battery-box-inner-inner { height: 100%; - } -.green-bg{ - background: #52C41A; +.green-bg { + background: #52c41a; } -.yellow-bg{ - background: #F1CD0B; +.yellow-bg { + background: #f1cd0b; } -.red-bg{ - background: #C60606; +.red-bg { + background: #c60606; } -.battery-box-text{ - font-family: PingFangSC, PingFang SC; -font-weight: 400; -font-size: 12px; -color: #0D162A; -margin-left: 3px; +.battery-box-text { + font-family: + PingFangSC, + PingFang SC; + font-weight: 400; + font-size: 12px; + color: #0d162a; + margin-left: 3px; } -.battery-box-all{ +.battery-box-all { display: flex; align-items: center; flex-wrap: wrap; } -.warn-msg{ +.warn-msg { display: flex; - } -.warn-msg-color{ +.warn-msg-color { width: 8px; height: 8px; flex-shrink: 0; @@ -363,13 +658,99 @@ margin-left: 3px; margin-right: 4px; margin-top: 4px; } -.warn-msg-text{ +.warn-msg-text { flex: 1; + font-family: + PingFangSC, + PingFang SC; + font-weight: 400; + font-size: 12px; + color: #0d162a; + margin-top: -3px; +} +/* 容器样式 */ +.scroll-container { + width: 100%; + height: 104px; + overflow: hidden; + position: relative; + cursor: grab; + user-select: none; + background: #fff; + margin-top: 10px; +} + +/* 隐藏滚动条 */ +.scroll-container::-webkit-scrollbar { + display: none; +} + +/* 内容布局 */ +.content { + display: inline-flex; + height: 100%; + padding: 20px 0; + white-space: nowrap; +} + +/* 单个项目样式 */ +.item { + display: inline-flex; + align-items: center; + + padding: 17px 30px; + background: #fff; + transition: transform 0.2s; + border-right: 2px solid #e9e9e9; +} + +/* .item:hover { + transform: translateY(-3px); +} */ + +/* 拖拽时状态 */ +.scroll-container:active { + cursor: grabbing; +} +.scroll-container-item-left-title { + font-family: + PingFangSC, + PingFang SC; + font-weight: 500; + font-size: 14px; + color: #0d162a; + margin-bottom: 14px; + flex-shrink: 0; +} +.scroll-container-item-left-img { + width: 40px; + height: 40px; + vertical-align: top; + flex-shrink: 0; +} +.scroll-container-item-right { + flex-shrink: 0; + margin-left: 16px; +} +.noBoarder{ + border-right: none; +} +.scroll-container-item-right-item{ + display: flex; + flex-shrink: 0; +} +.scroll-container-item-right-item-title{ font-family: PingFangSC, PingFang SC; font-weight: 400; font-size: 12px; color: #0D162A; -margin-top: -3px; - +flex-shrink: 0; +} +.scroll-container-item-right-item-num{ + font-family: PingFangSC, PingFang SC; +font-weight: 400; +font-size: 12px; +color: #0D162A; +flex-shrink: 0; } diff --git a/src/views/board/allBoard/indexPage.vue b/src/views/board/allBoard/indexPage.vue new file mode 100644 index 00000000..31b988e8 --- /dev/null +++ b/src/views/board/allBoard/indexPage.vue @@ -0,0 +1,1055 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 库位名: + + + {{ item.showData.locationNo || '' }} + + + + + 所属线库: + + + {{ item.showData.laneName || '' }} + + + + + 所属区域: + + + {{ item.showData.areaName || '' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 行驶路线 + + + + + 车辆 + + + + + + 图例 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/mapPage/realTimeMap/components/indexPage.vue b/src/views/mapPage/realTimeMap/components/indexPage.vue index 8444b0fd..b6e6be64 100644 --- a/src/views/mapPage/realTimeMap/components/indexPage.vue +++ b/src/views/mapPage/realTimeMap/components/indexPage.vue @@ -10,7 +10,7 @@ }" > - + @@ -239,8 +239,8 @@ placement="top" v-if="item.type == 1" > - - + + @@ -899,6 +899,14 @@ onUnmounted(() => { width: 100%; position: relative; } +.indexpage-container-active{ + width: 100%; + position: relative; + cursor: grab; +} +.indexpage-container-active:active { + cursor: grabbing; +} .indexpage-container .affix-container-top { width: 100%; height: 80px;