From 5c239e2491da67614a39e4085c6062254a7e84f1 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 27 Jun 2025 10:03:34 +0800
Subject: [PATCH] Merge branch 'all_setting_styles' of http://139.196.74.78:10010/r/drone/drone-web-manage into all_setting_styles
---
src/components/basic-container/main.vue | 2
src/views/wel/components/statistics.vue | 9
src/views/wel/index.vue | 45 +
src/store/modules/user.js | 2
src/views/wel/components/flyratio.vue | 3
src/page/index/index.vue | 1
src/views/device/airport.vue | 8
src/views/wel/components/backlog.vue | 21
vite.config.mjs | 6
src/components/wel-container/main.vue | 80 ++++
src/main.js | 5
src/views/dataCenter/dataCenter.vue | 900 ++++++++++++++++++++++++++++-------------------
src/styles/variables.scss | 4
src/page/index/top/index.vue | 1
src/views/algorithmRepository/algorithmRepository.vue | 18
src/views/wel/components/calendarBox.vue | 30
16 files changed, 712 insertions(+), 423 deletions(-)
diff --git a/src/components/basic-container/main.vue b/src/components/basic-container/main.vue
index 051d2fe..fdac84e 100644
--- a/src/components/basic-container/main.vue
+++ b/src/components/basic-container/main.vue
@@ -43,7 +43,7 @@
}
</script>
-<style lang="scss">
+<style lang="scss" scoped>
.basic-container {
height: 0;
flex: 1;
diff --git a/src/components/wel-container/main.vue b/src/components/wel-container/main.vue
new file mode 100644
index 0000000..f8fe55f
--- /dev/null
+++ b/src/components/wel-container/main.vue
@@ -0,0 +1,80 @@
+<template>
+ <div class="basic-container" :style="styleName" :class="{ 'basic-container--block': block }">
+ <el-card class="basic-container__card">
+ <slot></slot>
+ </el-card>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'basicContainer',
+ props: {
+ radius: {
+ type: [String, Number],
+ default: 10,
+ },
+ background: {
+ type: String,
+ },
+ block: {
+ type: Boolean,
+ default: false,
+ },
+ },
+ computed: {
+ styleName() {
+ return {
+ borderRadius: `${this.radius}px`,
+ background: this.background,
+ };
+ },
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.basic-container {
+ height: 0;
+ flex: 1;
+padding-top: 0 !important;
+ // box-sizing: border-box;
+ // height: 100%;
+ .el-card {
+ background-color: transparent !important;
+ }
+ .basic-container__card {
+ height: 100% !important;
+ overflow: hidden;
+
+ :deep(.el-card__body) {
+ display: flex;
+ flex-direction: column;
+ height: 100% !important;
+ overflow: hidden;
+ box-sizing: border-box;
+ padding-top: 0 !important;
+ & > div {
+ height: 0;
+ flex: 1;
+ }
+ }
+ }
+
+ &--block {
+ height: 100%;
+
+ .basic-container__card {
+ height: 100%;
+ }
+ }
+
+ &__card {
+ width: 100%;
+ }
+
+ &:first-child {
+ padding-top: 0;
+ }
+}
+</style>
diff --git a/src/main.js b/src/main.js
index 58ae120..886400b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,6 +30,7 @@
import avueUeditor from 'avue-plugin-ueditor'
import basicBlock from 'components/basic-block/main.vue'
import basicContainer from 'components/basic-container/main.vue'
+import welContainer from 'components/wel-container/main.vue'
import basicMainContent from 'components/basic-main-content/main.vue'
import thirdRegister from './components/third-register/main.vue'
@@ -88,6 +89,7 @@
app.component(key, component)
}
app.component('basicContainer', basicContainer)
+app.component('welContainer', welContainer)
app.component('basicMainContent', basicMainContent)
app.component('basicBlock', basicBlock)
@@ -99,6 +101,9 @@
app.config.globalProperties.$dayjs = dayjs
app.config.globalProperties.website = website
app.config.globalProperties.getScreen = getScreen
+app.config.globalProperties.pxToVh = height => height / 10.8 + 'vh'
+app.config.globalProperties.pxToRem = width => width * 0.1 + 'rem'
+
app.use(error)
app.use(i18n)
app.use(store)
diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index 65ec8cd..c0b819c 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -131,5 +131,6 @@
background: transparent;
padding: 0 10px;
--el-color-primary: rgba(20, 65, 255, 1);
+ height: pxToVh(55);
}
</style>
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 9761509..2478ef5 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -133,6 +133,7 @@
flex: 1;
display: flex;
align-items: center;
+ height: pxToVh(80);
}
.top-bar__right {
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3b6a410..ee2940d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -39,7 +39,7 @@
token: getStore({ name: 'token' }) || '',
refreshToken: getStore({ name: 'refreshToken' }) || '',
parentDeptInfo: getStore({ name: 'parentDeptInfo' }) || '',
-
+
},
actions: {
//根据用户名登录
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index ef29df7..8c395ec 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -1,3 +1,7 @@
$sidebar_width: 230px;
$sidebar_collapse: 60px;
$top_height: 50px;
+
+@function pxToVh($px) {
+ @return calc($px / 1080) * 100vh;
+}
diff --git a/src/views/algorithmRepository/algorithmRepository.vue b/src/views/algorithmRepository/algorithmRepository.vue
index 5561427..d3cbf0f 100644
--- a/src/views/algorithmRepository/algorithmRepository.vue
+++ b/src/views/algorithmRepository/algorithmRepository.vue
@@ -107,7 +107,7 @@
});
import { getDictionaryByCode } from '@/api/system/dictbiz';
import { getalgorithmList, selectDeviceList } from '@/api/algorithm';
-// import { getSmallImg } from '@/utils/util';
+import { getSmallImg } from '@/utils/util';
import { useRouter } from 'vue-router';
const router = useRouter();
const baseUrl = import.meta.env.VITE_APP_PICTURE_URL;
@@ -127,10 +127,6 @@
size: 10,
});
-const getSmallImg = (url) => {
-
- return url ? encodeURI(url.substring(0, url.lastIndexOf('.')) + '_small' + url.substring(url.lastIndexOf('.'))) : ''
-}
// 请求字典字段
let AlgorithmData = ref([]);
const detailData = ref([]);
@@ -208,15 +204,19 @@
</script>
<style scoped lang="scss">
+.algorithContainer {
+height: 100%;
+overflow: auto;
+}
.algorithItem {
- padding: 20px;
+ // padding: 20px;
display: grid;
grid-template-columns: repeat(5, 1fr);
- gap: 53px;
+ // gap: 13px;
text-align: center;
vertical-align: middle;
.item {
- height: 300px;
+ height: 267px;
display: flex;
flex-direction: column;
justify-content: center;
@@ -231,7 +231,7 @@
.imgicon {
width: 100px;
height: 100px;
- margin-bottom: 47px;
+ margin-bottom: 17px;
}
&:hover {
background: url('/src/assets/images/ht-sfbg-hover.png') no-repeat center;
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index 6552ad2..3676273 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -1,166 +1,288 @@
<template>
- <basic-container>
- <div class="dataCenter-table">
- <searchData @search="searchClick" @downFun="downloadFile" @allDownFun="aLLDownloadFile"></searchData>
- <!-- 表格部分 -->
- <div class="dataTable">
- <el-table v-loading="loadings" element-loading-text="加载中" stripe :data="tableData" class="custom-header"
- @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" />
- <el-table-column label="序号" type="index" width="60">
- <template #default="{ $index }">
- {{
- ($index + 1 + (jobListParams.current - 1) * jobListParams.size)
- .toString()
- .padStart(2, '0')
- }}
- </template>
- </el-table-column>
- <el-table-column prop="regionName" label="所属区域" v-if="!isDistrictLevel">
- <template #default="scope">
- <span>{{ processAddress(scope.row.regionName) }}</span>
- </template>
- </el-table-column>
- <el-table-column property="nestName" label="所属机巢" />
- <el-table-column property="jobName" label="任务名称" show-overflow-tooltip />
- <el-table-column prop="nickName" label="文件名称" show-overflow-tooltip />
- <el-table-column property="link" label="缩图" width="120">
- <template #default="scope">
- <img class="quanjing" @click="clickpanorama(scope.row)" v-if="scope.row?.resultType === 5"
- :src="scope.row?.smallUrl" alt="" />
- <img v-else-if="scope.row?.resultType === 1" :src="convertVideoUrlToThumbnail(scope.row?.link)" alt=""
- class="imageBox" @click="enterFullScreen(scope.row)" />
- <!-- 正射 -->
- <img v-else-if="scope.row?.resultType === 4" :src="getzsSmallImg(scope.row?.link)" alt=""
- class="imageBox" />
- <el-image v-else :src="scope.row?.smallUrl" :preview-src-list="[scope.row?.showUrl]" fit="cover"
- preview-teleported />
- </template>
- </el-table-column>
- <el-table-column prop="jobTime" label="任务时间" />
- <el-table-column property="photoType" label="文件类别">
- <template #default="scope">
- <span>{{ photoTypeMap[scope.row.photoType] }}</span>
- </template>
- </el-table-column>
- <el-table-column property="resultType" label="文件格式">
- <template #default="{ row }">
- <span>{{ resultTypeMap[row?.resultType] }}</span>
- </template>
- </el-table-column>
- <el-table-column label="操作" width="150" align="center">
- <template #default="scope">
- <span class="look" @click="lookDetail(scope.row)">查看</span>
- <span class="delete" @click="deleteDetail(scope.row)" v-if="scope.row.resultType !== 2">删除</span>
- <!-- && !isTifFile(scope.row.nickName)
- scope.row.resultType !== 1-->
- <span class="location" @click="positionDetail(scope.row)" v-if="shouldShowLocation(scope.row)">定位</span>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <!-- 分页 -->
- <div class="pagination">
- <el-pagination v-model:current-page="jobListParams.current" v-model:page-size="jobListParams.size"
- :page-sizes="[10, 20, 30, 40]" background layout="total, sizes, prev, pager, next, jumper" :total="total"
- @size-change="handleSizeChange" @current-change="handleCurrentChange" />
- </div>
- <!-- 查看弹框 -->
- <el-dialog v-model="dialogVisible" width="60%" append-to-body @close="dialogClose">
- <template #header="{ titleId, titleClass }">
- <div class="my-header">
- <h4 :id="titleId" :class="titleClass">{{ detailTitle }}</h4>
- </div>
- </template>
- <div class="detailContainer">
- <div class="leftImg">
- <img v-if="dialogDetailList?.resultType === 1" :src="convertVideoUrlToThumbnail(dialogDetailList?.link)"
- alt="" class="imageBox" />
- <!-- 地图 -->
- <div v-else-if="dialogDetailList?.resultType === 4" id="detaildataCenterMap" class="ztzf-cesium"></div>
- <img v-else :src="getSmallImg(dialogDetailList?.link)" alt="" />
- </div>
- <div class="rightDetail">
- <div class="title">
- <div class="inputEdit">
- 文件名称：<span class="fileTitle" v-if="!dialogDetailList?.checkedinput">{{
- dialogDetailList?.editName
- }}</span>
- <el-input v-else v-model="dialogDetailList.editName" @keyup.enter="saveTitle()" class="title-input"
- clearable />
- </div>
- <div class="editname">
- <span v-if="!dialogDetailList?.checkedinput" @click="editTitle(dialogDetailList)"><el-icon>
- <Edit />
- </el-icon></span>
- <div v-else class="suffixBoxEdit">
- <div class="editText" @click="submitEditSuffix(dialogDetailList)">✔</div>
- <div class="editText" @click="cancelEditSuffix(dialogDetailList)">✖</div>
- </div>
- </div>
- </div>
- <div>任务名称：{{ dialogDetailList?.jobName }}</div>
- <div>所属区域：{{ dialogDetailList?.regionName }}</div>
- <div>拍摄机巢：{{ dialogDetailList?.nestName }}</div>
- <div>
- 照片位置：{{ _.round(dialogDetailList?.longitude, 3) }},{{
- _.round(dialogDetailList?.latitude, 3)
- }}
- </div>
- <div>任务时间：{{ dialogDetailList?.jobTime }}</div>
- <div>拍摄时间：{{ dialogDetailList?.createTime }}</div>
- <div>文件类型：{{ photoTypeMap[dialogDetailList?.photoType] }}</div>
- <div>文件格式：{{ resultTypeMap[dialogDetailList?.resultType] }}</div>
- <div>照片文件大小：{{ bytesToMB(dialogDetailList?.attachSize) }}</div>
- <div>
- <el-button type="success" plain icon="el-icon-download"
- @click="detailDownLoad(dialogDetailList)">下载</el-button>
- </div>
- </div>
- </div>
- </el-dialog>
- <!-- 全景预览 -->
- <PanoramaPopup v-model:panoramaParamsShow="panoramaParamsShow" v-model:panoramaParamsUrl="panoramaParamsUrl">
- </PanoramaPopup>
- <!-- 视频预览 -->
- <el-dialog :title="currentVideoTitle" modal-class="videoDialog" append-to-body width="54%" v-model="VideoShow"
- :close-on-click-modal="false" :destroy-on-close="true" @close="currentVideoIndex = -1">
- <div class="video-container">
- <video style="width: 100%" class="videoBox" ref="videoRefs" controls autoplay :src="currentVideoUrl"></video>
- </div>
- </el-dialog>
- <!-- 地图弹框 -->
- <dataCenterMap ref="mapComponent" v-model:show="dataCenterMapVisible" :jobId="jobId" @lookDetail="lookDetail"
- :dotData="mapList"></dataCenterMap>
+<basic-container>
+ <div class="dataCenter-table">
+ <searchData
+ @search="searchClick"
+ @downFun="downloadFile"
+ @allDownFun="aLLDownloadFile"
+ ></searchData>
+ <!-- 表格部分 -->
+ <div class="dataTable">
+ <el-table
+ v-loading="loadings"
+ element-loading-text="加载中"
+ stripe
+ :data="tableData"
+ class="custom-header"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55" />
+ <el-table-column label="序号" type="index" width="60">
+ <template #default="{ $index }">
+ {{
+ ($index + 1 + (jobListParams.current - 1) * jobListParams.size)
+ .toString()
+ .padStart(2, '0')
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="regionName" label="所属区域" v-if="!isDistrictLevel">
+ <template #default="scope">
+ <span>{{ processAddress(scope.row.regionName) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column property="nestName" label="所属机巢" />
+ <el-table-column property="jobName" label="任务名称" show-overflow-tooltip />
+ <el-table-column prop="nickName" label="文件名称" show-overflow-tooltip />
+ <el-table-column property="link" label="缩图" width="120">
+ <template #default="scope">
+ <img
+ class="quanjing"
+ @click="clickpanorama(scope.row)"
+ v-if="scope.row?.resultType === 5"
+ :src="scope.row?.smallUrl"
+ alt=""
+ />
+ <img
+ v-else-if="scope.row?.resultType === 1"
+ :src="convertVideoUrlToThumbnail(scope.row?.link)"
+ alt=""
+ class="imageBox"
+ @click="enterFullScreen(scope.row)"
+ />
+ <!-- 正射 -->
+ <img
+ v-else-if="scope.row?.resultType === 4"
+ :src="getzsSmallImg(scope.row?.link)"
+ alt=""
+ class="imageBox"
+ />
+ <el-image
+ v-else
+ :src="scope.row?.smallUrl"
+ :preview-src-list="[scope.row?.showUrl]"
+ fit="cover"
+ preview-teleported
+ />
+ </template>
+ </el-table-column>
+ <el-table-column prop="jobTime" label="任务时间" />
+ <el-table-column property="photoType" label="文件类别">
+ <template #default="scope">
+ <span>{{ photoTypeMap[scope.row.photoType] }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column property="resultType" label="文件格式">
+ <template #default="{ row }">
+ <span>{{ resultTypeMap[row?.resultType] }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" width="150" align="center">
+ <template #default="scope">
+ <span class="look" @click="lookDetail(scope.row)">查看</span>
+ <span class="delete" @click="deleteDetail(scope.row)" v-if="scope.row.resultType !== 2"
+ >删除</span
+ >
+
+ <span
+ class="location"
+ @click="positionDetail(scope.row)"
+ v-if="shouldShowLocation(scope.row)"
+ >定位</span
+ >
+ </template>
+ </el-table-column>
+ </el-table>
</div>
- </basic-container>
+ <!-- 分页 -->
+ <div class="pagination">
+ <el-pagination
+ v-model:current-page="jobListParams.current"
+ v-model:page-size="jobListParams.size"
+ :page-sizes="[10, 20, 30, 40]"
+ background
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+ <!-- 查看弹框 -->
+ <el-dialog v-model="dialogVisible" width="60%" append-to-body @close="dialogClose">
+ <template #header="{ titleId, titleClass }">
+ <div class="my-header">
+ <h4 :id="titleId" :class="titleClass">{{ detailTitle }}</h4>
+ </div>
+ </template>
+ <div class="detailContainer">
+ <div class="leftImg">
+ <!-- <img
+ v-if="dialogDetailList?.resultType === 1"
+ :src="convertVideoUrlToThumbnail(dialogDetailList?.link)"
+ alt=""
+ class="imageBox"
+ /> -->
+ <!-- 视频 -->
+ <video
+ v-if="dialogDetailList?.resultType === 1"
+ style="width: 100%"
+ class="imageBox"
+ ref="videoRefs"
+ controls
+ autoplay
+ :src="dialogDetailList.link"
+ ></video>
+ <!-- 全景 -->
+ <!-- <img
+ class="quanjing"
+ @click="clickpanorama(dialogDetailList)"
+ v-else-if="dialogDetailList?.resultType === 5"
+ :src="dialogDetailList?.resultType?.smallUrl"
+ alt=""
+ /> -->
+ <!-- 地图 -->
+ <div
+ v-else-if="dialogDetailList?.resultType === 4"
+ id="detaildataCenterMap"
+ class="ztzf-cesium"
+ ></div>
+ <img v-else :src="getSmallImg(dialogDetailList?.link)" alt="" />
+ </div>
+ <div class="rightDetail">
+ <div class="title">
+ <div class="inputEdit">
+ 文件名称：<span class="fileTitle" v-if="!dialogDetailList?.checkedinput">{{
+ dialogDetailList?.nickName ? dialogDetailList?.nickName : '--'
+ }}</span>
+ <el-input
+ v-else
+ v-model="dialogDetailList.nickName"
+ @keyup.enter="saveTitle()"
+ class="title-input"
+ clearable
+ />
+ </div>
+ <div class="editname">
+ <span v-if="!dialogDetailList?.checkedinput" @click="editTitle(dialogDetailList)"
+ ><el-icon><Edit /></el-icon
+ ></span>
+ <div v-else class="suffixBoxEdit">
+ <div class="editText" @click="submitEditSuffix(dialogDetailList)">✔</div>
+ <div class="editText" @click="cancelEditSuffix(dialogDetailList)">✖</div>
+ </div>
+ </div>
+ </div>
+ <div>任务名称：{{ dialogDetailList?.jobName ? dialogDetailList?.jobName : '--' }}</div>
+ <div>
+ 所属区域：{{ dialogDetailList?.regionName ? dialogDetailList?.regionName : '--' }}
+ </div>
+ <div>拍摄机巢：{{ dialogDetailList?.nestName ? dialogDetailList?.nestName : '--' }}</div>
+ <div>
+ 照片位置：{{ _.round(dialogDetailList?.longitude, 3) }},{{
+ _.round(dialogDetailList?.latitude, 3)
+ }}
+ </div>
+ <div>任务时间：{{ dialogDetailList?.jobTime ? dialogDetailList?.jobTime : '--' }}</div>
+ <div>
+ 拍摄时间：{{ dialogDetailList?.createTime ? dialogDetailList?.createTime : '--' }}
+ </div>
+ <div>
+ 文件类型：{{
+ photoTypeMap[dialogDetailList?.photoType]
+ ? photoTypeMap[dialogDetailList?.photoType]
+ : '--'
+ }}
+ </div>
+ <div>
+ 文件格式：{{
+ resultTypeMap[dialogDetailList?.resultType]
+ ? resultTypeMap[dialogDetailList?.resultType]
+ : '--'
+ }}
+ </div>
+ <div>
+ 照片文件大小：{{
+ bytesToMB(dialogDetailList?.attachSize)
+ ? bytesToMB(dialogDetailList?.attachSize)
+ : '--'
+ }}
+ </div>
+ <div>
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-download"
+ @click="detailDownLoad(dialogDetailList)"
+ >下载</el-button
+ >
+ </div>
+ </div>
+ </div>
+ </el-dialog>
+ <!-- 全景预览 -->
+ <PanoramaPopup
+ v-model:panoramaParamsShow="panoramaParamsShow"
+ v-model:panoramaParamsUrl="panoramaParamsUrl"
+ ></PanoramaPopup>
+ <!-- 视频预览 -->
+ <el-dialog
+ :title="currentVideoTitle"
+ modal-class="videoDialog"
+ append-to-body
+ width="54%"
+ v-model="VideoShow"
+ :close-on-click-modal="false"
+ :destroy-on-close="true"
+ @close="currentVideoIndex = -1"
+ >
+ <div class="video-container">
+ <video
+ style="width: 100%"
+ class="videoBox"
+ ref="videoRefs"
+ controls
+ autoplay
+ :src="currentVideoUrl"
+ ></video>
+ </div>
+ </el-dialog>
+ <!-- 地图弹框 -->
+ <dataCenterMap
+ ref="mapComponent"
+ v-model:show="dataCenterMapVisible"
+ :jobId="jobId"
+ @lookDetail="lookDetail"
+ :dotData="mapList"
+ ></dataCenterMap>
+ </div>
+ </basic-container>
</template>
<script setup>
-import { useStore } from 'vuex'
-import { PublicCesium } from '@/utils/cesium/publicCesium'
-import { Cartesian3 } from 'cesium'
-import * as Cesium from 'cesium'
-import EventPopUpBox from '@/hooks/components/EventPopUpBox.vue'
-import { nextTick, render } from 'vue'
-import defaultIcon from '@/assets/images/dataCenter/datamap/eventCompleted.png'
-const userInfo = computed(() => store.getters.userInfo)
-const isShow = defineModel('show')
-const viewerRef = shallowRef(null)
-let viewer = null
+import { useStore } from 'vuex';
+import { PublicCesium } from '@/utils/cesium/publicCesium';
+import { Cartesian3 } from 'cesium';
+import * as Cesium from 'cesium';
+import EventPopUpBox from '@/hooks/components/EventPopUpBox.vue';
+import { nextTick, render } from 'vue';
+import defaultIcon from '@/assets/images/dataCenter/datamap/eventCompleted.png';
+const userInfo = computed(() => store.getters.userInfo);
+const isShow = defineModel('show');
+const viewerRef = shallowRef(null);
+let viewer = null;
-const viewInstance = shallowRef(null)
-const store = useStore()
-const currentAreaPosition = ref({ height: 1987280, latitude: 27.636112, longitude: 115.732975 })
-let handler = null
+const viewInstance = shallowRef(null);
+const store = useStore();
+const currentAreaPosition = ref({ height: 1987280, latitude: 27.636112, longitude: 115.732975 });
+let handler = null;
-import EventBus from '@/utils/eventBus'
-import dataCenterMap from '@/views/dataCenter/components/dataCenterMap.vue'
-import PanoramaPopup from '@/components/PanoramaPopup/PanoramaPopup.vue' //全景
-import { ElMessage, ElMessageBox, ElLoading } from 'element-plus'
-import searchData from '@/views/dataCenter/components/searchData.vue'
-import fy1 from '@/assets/images/dataCenter/1.jpeg'
-import _ from 'lodash'
+import EventBus from '@/utils/eventBus';
+import dataCenterMap from '@/views/dataCenter/components/dataCenterMap.vue';
+import PanoramaPopup from '@/components/PanoramaPopup/PanoramaPopup.vue'; //全景
+import { ElMessage, ElMessageBox, ElLoading } from 'element-plus';
+import searchData from '@/views/dataCenter/components/searchData.vue';
+import fy1 from '@/assets/images/dataCenter/1.jpeg';
+import _ from 'lodash';
import {
getaiImagesPageAPI,
getAttachInfoAPI,
@@ -168,26 +290,24 @@
downloadApi,
updataTitleApi,
getOrthoimageInfo,
-} from '@/api/dataCenter/dataCenter'
-import { getShowImg, getSmallImg, getzsSmallImg } from '@/utils/util'
-import { onMounted, watch } from 'vue'
-import dayjs from 'dayjs'
+} from '@/api/dataCenter/dataCenter';
+import { getShowImg, getSmallImg, getzsSmallImg } from '@/utils/util';
+import { onMounted, watch } from 'vue';
+import dayjs from 'dayjs';
-
-
-function bytesToMB (bytes, decimalPlaces = 2) {
- if (typeof bytes !== 'number' || bytes < 0) return '无效输入'
- return (bytes / 1048576).toFixed(decimalPlaces) + ' MB'
+function bytesToMB(bytes, decimalPlaces = 2) {
+ if (typeof bytes !== 'number' || bytes < 0) return '无效输入';
+ return (bytes / 1048576).toFixed(decimalPlaces) + ' MB';
}
// 视频一帧
-function convertVideoUrlToThumbnail (videoUrl) {
+function convertVideoUrlToThumbnail(videoUrl) {
// 检查是否是有效的视频URL
if (!videoUrl || typeof videoUrl !== 'string') {
- return videoUrl
+ return videoUrl;
}
// 替换文件扩展名
- const thumbnailUrl = videoUrl.replace(/\.mp4$/, '_small.jpg')
- return thumbnailUrl
+ const thumbnailUrl = videoUrl.replace(/\.mp4$/, '_small.jpg');
+ return thumbnailUrl;
}
const resultTypeMap = {
0: '照片',
@@ -195,85 +315,84 @@
2: 'AI识别',
5: '全景',
4: '正射',
-}
+};
const photoTypeMap = {
visible: '可见光',
ir: '红外',
-}
+};
// 判断省市区
-const areaCode = userInfo.value?.detail?.areaCode || ''
-
+const areaCode = userInfo.value?.detail?.areaCode || '';
// 判断账号级别
-const isProvinceLevel = computed(() => areaCode.endsWith('00000000')) // 省级：后8位为0
-const isCityLevel = computed(() => !isProvinceLevel.value && areaCode.endsWith('000000')) // 市级：后6位为0
-const isDistrictLevel = computed(() => !isProvinceLevel.value && !isCityLevel.value) // 区县级
+const isProvinceLevel = computed(() => areaCode.endsWith('00000000')); // 省级：后8位为0
+const isCityLevel = computed(() => !isProvinceLevel.value && areaCode.endsWith('000000')); // 市级：后6位为0
+const isDistrictLevel = computed(() => !isProvinceLevel.value && !isCityLevel.value); // 区县级
// 处理区域名称的函数
-function processAddress (str) {
- if (!str) return ''
+function processAddress(str) {
+ if (!str) return '';
- const parts = str.split(',')
+ const parts = str.split(',');
// 省级账号：显示市和区（去除省级）
if (isProvinceLevel.value) {
- return parts.filter(part => !part.endsWith('省')).join(',')
+ return parts.filter(part => !part.endsWith('省')).join(',');
}
// 市级账号：只显示区（去除省和市）
if (isCityLevel.value) {
- return parts.filter(part => !part.endsWith('省') && !part.endsWith('市')).join(',')
+ return parts.filter(part => !part.endsWith('省') && !part.endsWith('市')).join(',');
}
// 区县级账号：不显示区域信息（在模板中已隐藏该列）
- return ''
+ return '';
}
const showRegionColumn = computed(() => {
// 检查表格数据中是否有任何行的 regionName 处理后不为空
return tableData.value.some(row => {
- const processed = processAddress(row.regionName || '')
- return processed !== ''
- })
-})
-const loadings = ref(true)
-let loading
-const total = ref(0)
-const startTime = dayjs().subtract(6, 'day').startOf('day')
-const endTime = dayjs().endOf('day')
-const timeRange = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')]
+ const processed = processAddress(row.regionName || '');
+ return processed !== '';
+ });
+});
+const loadings = ref(true);
+let loading;
+const total = ref(0);
+const startTime = dayjs().subtract(6, 'day').startOf('day');
+const endTime = dayjs().endOf('day');
+const timeRange = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
// 全景预览
-const panoramaParamsShow = ref(false)
-const panoramaParamsUrl = ref(null)
+const panoramaParamsShow = ref(false);
+const panoramaParamsUrl = ref(null);
const clickpanorama = val => {
- panoramaParamsShow.value = true
- panoramaParamsUrl.value = val.link
-}
+ panoramaParamsShow.value = true;
+ panoramaParamsUrl.value = val.link;
+};
// 视频
-const currentVideoTitle = ref('')
-const VideoShow = ref(false)
-const currentVideoUrl = ref(null)
+const currentVideoTitle = ref('');
+const VideoShow = ref(false);
+const currentVideoUrl = ref(null);
const enterFullScreen = val => {
- currentVideoTitle.value = val?.nickName
- currentVideoUrl.value = val?.link
- VideoShow.value = true
-}
+ currentVideoTitle.value = val?.nickName;
+ currentVideoUrl.value = val?.link;
+ VideoShow.value = true;
+};
const jobListParams = reactive({
current: 1,
size: 10,
orderByCreateTime: true,
searchParams: { startTime: timeRange[0], endTime: timeRange[1] },
-})
-const tableData = ref([])
+});
+const tableData = ref([]);
// 获取列表数据
const getaiImagesPage = () => {
- loadings.value = true
+ loadings.value = true;
const params = {
orderByCreateTime: jobListParams.orderByCreateTime,
...jobListParams.searchParams,
- }
+ };
getaiImagesPageAPI(params, { current: jobListParams.current, size: jobListParams.size }).then(
res => {
- total.value = res.data.data.total
+ total.value = res.data.data.total;
tableData.value = res.data.data.records.map(i => ({
...i,
checked: false,
@@ -281,37 +400,37 @@
smallUrl: getSmallImg(i?.link),
showUrl: getShowImg(i?.link),
file_name: i.name.split('/').pop(),
- }))
- // console.log('res', tableData.value);
- loadings.value = false
+ }));
+
+ loadings.value = false;
}
- )
-}
+ );
+};
// 查询
const searchClick = params => {
- jobListParams.current = 1
- jobListParams.size = 10
- jobListParams.searchParams = params
- getaiImagesPage()
-}
+ jobListParams.current = 1;
+ jobListParams.size = 10;
+ jobListParams.searchParams = params;
+ getaiImagesPage();
+};
const handleSizeChange = val => {
- jobListParams.size = val
- getaiImagesPage()
-}
+ jobListParams.size = val;
+ getaiImagesPage();
+};
const handleCurrentChange = val => {
- jobListParams.current = val
- getaiImagesPage()
-}
+ jobListParams.current = val;
+ getaiImagesPage();
+};
// 多选
-const selectedRows = ref([])
+const selectedRows = ref([]);
const handleSelectionChange = val => {
// 更新选中状态
tableData.value.forEach(item => {
- item.checked = val.some(selected => selected.id === item.id)
- })
+ item.checked = val.some(selected => selected.id === item.id);
+ });
- selectedRows.value = val
-}
+ selectedRows.value = val;
+};
// 删除
const deleteDetail = val => {
ElMessageBox.confirm('您确定删除吗?', '提示', {
@@ -322,236 +441,285 @@
.then(() => {
deleteFileMultipleApi(val.id)
.then(res => {
- ElMessage.success('删除成功')
- getaiImagesPage()
+ ElMessage.success('删除成功');
+ getaiImagesPage();
})
.catch(error => {
- ElMessage.error('删除失败')
- })
+ ElMessage.error('删除失败');
+ });
})
- .catch(() => { })
-}
+ .catch(() => {});
+};
// url下载
-function aLinkDownload (url, name) {
- const a = document.createElement('a')
- a.style.display = 'none'
- a.href = url
- a.download = name
- document.body.appendChild(a)
- a.click()
- document.body.removeChild(a)
+function aLinkDownload(url, name) {
+ const a = document.createElement('a');
+ a.style.display = 'none';
+ a.href = url;
+ a.download = name;
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
}
const fileDownload = () => {
- const list = selectedRows.value.filter(i => i.checked)
- if (!list?.length) return ElMessage.warning('请选择文件')
+ const list = selectedRows.value.filter(i => i.checked);
+ if (!list?.length) return ElMessage.warning('请选择文件');
if (list.length === 1) {
list.forEach((item, index) => {
setTimeout(() => {
- aLinkDownload(item.url, item?.nickName)
- }, index * 500) // 每个文件下载间隔50毫秒
- })
+ aLinkDownload(item.url, item?.nickName);
+ }, index * 500); // 每个文件下载间隔50毫秒
+ });
} else {
- loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' })
- const fileIds = list.map(i => i.id)
+ loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' });
+ const fileIds = list.map(i => i.id);
let aaa = {
+ areaCode: '',
attachIds: fileIds,
- }
+ dockSn: '',
+ endTime: '',
+ fileName: '',
+ fileType: '',
+ jobName: '',
+ resultType: '',
+ startTime: '',
+ wayLineJobIds: [],
+ };
+
downloadApi(aaa).then(res => {
- aLinkDownload(res.data.data, `sjzx-file-pack-${dayjs().format('YYYYMMDDHHmmss')}.zip`)
- loading.close()
- })
+ aLinkDownload(res.data.data, `sjzx-file-pack-${dayjs().format('YYYYMMDDHHmmss')}.zip`);
+ loading.close();
+ });
}
-}
+};
// 下载
const downloadFile = () => {
- fileDownload()
-}
+ fileDownload();
+};
const detailDownLoad = val => {
- aLinkDownload(val.link, val?.nickName)
-}
+ aLinkDownload(val.link, val?.nickName);
+};
// 全部下载
const aLLDownloadFile = () => {
- loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' })
+ loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' });
const params = {
...jobListParams.searchParams,
- }
- params.areaCode = ''
+ };
+ params.areaCode = '';
downloadApi(params).then(res => {
- aLinkDownload(res.data.data, `sjzx-file-pack-${dayjs().format('YYYYMMDDHHmmss')}.zip`)
- loading.close()
- })
-}
+ aLinkDownload(res.data.data, `sjzx-file-pack-${dayjs().format('YYYYMMDDHHmmss')}.zip`);
+ loading.close();
+ });
+};
// 地图弹框
-const mapComponent = ref(null) // 创建子组件引用
-const mapList = ref(null)
-const dataCenterMapVisible = ref(false)
-const jobId = ref('')
-const statusType = ref(null)
+const mapComponent = ref(null); // 创建子组件引用
+const mapList = ref(null);
+const dataCenterMapVisible = ref(false);
+const jobId = ref('');
+const statusType = ref(null);
const positionDetail = val => {
- jobId.value = val.wayLineJobId
- mapList.value = val
- dataCenterMapVisible.value = true
+ jobId.value = val.wayLineJobId;
+ mapList.value = val;
+ dataCenterMapVisible.value = true;
// 确保地图组件加载完成
nextTick(() => {
if (mapComponent.value) {
// 调用子组件方法并传递数据
- mapComponent.value.initEntityOrPopup(val)
+ mapComponent.value.initEntityOrPopup(val);
}
- })
-}
+ });
+};
-const fileNameedit = ref('')
+const fileNameedit = ref('');
// 编辑文件名
const editTitle = val => {
- val.checkedinput = true
- fileNameedit.value = val?.nickName
-}
+ val.checkedinput = true;
+ fileNameedit.value = val?.nickName;
+};
// 取消
const cancelEditSuffix = item => {
- item.nickName = fileNameedit.value
- item.checkedinput = false
-}
+ item.nickName = fileNameedit.value;
+ item.checkedinput = false;
+};
const submitEditSuffix = item => {
- saveTitle(item)
-}
+ saveTitle(item);
+};
// 通用空值检查函数
const validateNickname = (name, fieldName) => {
if (!name || name.trim() === '') {
- ElMessage.warning(`${fieldName}不能为空`)
- return false
+ ElMessage.warning(`${fieldName}不能为空`);
+ return false;
}
if (name.length > 50) {
- ElMessage.warning(`${fieldName}不能超过50个字符`)
- return false
+ ElMessage.warning(`${fieldName}不能超过50个字符`);
+ return false;
}
- return true
-}
+ return true;
+};
// 保存文件名
const saveTitle = item => {
const updateparams = {
id: item.id,
- nickName: `${item.editName.trim()}`,
- }
+ nickName: `${item.nickName.trim()}`,
+ };
// 验证并提示
- if (!validateNickname(updateparams.nickName, '名称')) return
- item.checkedinput = false
- detailTitle.value = item.editName
+ if (!validateNickname(updateparams.nickName, '名称')) return;
+ item.checkedinput = false;
+ detailTitle.value = item.nickName;
updataTitleApi(updateparams)
.then(res => {
if (res.status === 200) {
- ElMessage.success('修改成功')
- getaiImagesPage()
+ ElMessage.success('修改成功');
+ getaiImagesPage();
} else {
- ElMessage.error(res.data.message || '修改失败')
+ ElMessage.error(res.data.message || '修改失败');
}
})
.catch(error => {
- ElMessage.error('请求失败，请稍后重试')
- console.error('API error:', error)
- })
-}
+ ElMessage.error('请求失败，请稍后重试');
+ console.error('API error:', error);
+ });
+};
// 正射地图
-const yxShowBox = ref(false)
-
+const yxShowBox = ref(false);
const removeHandler = () => {
- handler?.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
- handler?.destroy()
- handler = null
-}
-const isMapInitialized = ref(false) //地图加载
+ handler?.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+ handler?.destroy();
+ handler = null;
+};
+const isMapInitialized = ref(false); //地图加载
const initMap = () => {
- if (viewer || isMapInitialized.value) return
+ if (viewer || isMapInitialized.value) return;
- const container = document.getElementById('detaildataCenterMap')
+ const container = document.getElementById('detaildataCenterMap');
if (!container) {
- console.error('地图容器未找到')
- return
+ console.error('地图容器未找到');
+ return;
}
viewInstance.value = new PublicCesium({
dom: 'detaildataCenterMap',
flatMode: false,
terrain: false,
mapFilter: true,
- })
- viewer = viewInstance.value.getViewer()
- viewerRef.value = viewer
+ });
+ viewer = viewInstance.value.getViewer();
+ viewerRef.value = viewer;
- isMapInitialized.value = true
+ isMapInitialized.value = true;
// console.log('地图初始化完成');
-}
-// 查看弹框
-function isTifFile (filename) {
- const lastDot = filename.lastIndexOf('.')
- if (lastDot === -1) return false // 无后缀
- return filename.slice(lastDot + 1).toLowerCase() === 'tif'
+};
+// 判断是否是正射
+function isTifFile(filename) {
+ const lastDot = filename.lastIndexOf('.');
+ if (lastDot === -1) return false; // 无后缀
+ return filename.slice(lastDot + 1).toLowerCase() === 'tif';
}
const shouldShowLocation = row => {
- return row.resultType !== 1 && row.resultType !== 4
-}
-const dialogVisible = ref(false)
-const dialogDetailList = ref(null)
-const detailTitle = ref('')
-let curCustomImageryProvider = null
-const orthoimageApi = ref('')
-const odmToken = ref(null)
+ return row.resultType !== 1 && row.resultType !== 4;
+};
+// 查看弹框
+const dialogVisible = ref(false);
+const dialogDetailList = ref(null);
+const detailTitle = ref('');
+let curCustomImageryProvider = null;
+const orthoimageApi = ref('');
+const positiongeom = ref('');
+const odmToken = ref(null);
const lookDetail = val => {
if (val.resultType === 4) {
// 正射
getOrthoimageInfo(val.wayLineJobId).then(async res => {
- dialogVisible.value = true
- detailTitle.value = val.nickName
- dialogDetailList.value = val
- await nextTick()
- initMap()
- orthoimageApi.value = res.data.data.orthoimageApi
- odmToken.value = res.data.data.odmToken
+ dialogVisible.value = true;
+ detailTitle.value = val.nickName;
+ dialogDetailList.value = val;
+ console.log('3333', detailTitle.value, dialogDetailList.value);
+
+ await nextTick();
+ initMap();
+ positiongeom.value = res.data.data.geom;
+ orthoimageApi.value = res.data.data.orthoimageApi;
+ odmToken.value = res.data.data.odmToken;
if (res.data.data != null && isMapInitialized.value === true) {
curCustomImageryProvider = viewInstance.value.addCustomImageryProviderDataSource(
new Cesium.UrlTemplateImageryProvider({
- url: `${import.meta.env.VITE_APP_AREA_NAME}/webodm${res.data.data.orthoimageApi}?jwt=${res.data.data.odmToken.split(' ')[1]
- }`,
+ url: `${import.meta.env.VITE_APP_AREA_NAME}/webodm${res.data.data.orthoimageApi}?jwt=${
+ res.data.data.odmToken.split(' ')[1]
+ }`,
// maximumLevel: 12,
})
- )
- yxShowBox.value = true
+ );
+ yxShowBox.value = true;
+ // 添加定位
+ if (positiongeom.value) {
+ // 解析WKT格式的多边形坐标
+ const wktString = positiongeom.value;
+ const coordinates = parseWKTCoordinates(wktString);
+ if (coordinates.length > 0) {
+ // 创建多边形边界
+ const positions = coordinates.map(coord =>
+ Cesium.Cartesian3.fromDegrees(coord[0], coord[1])
+ );
+ // 计算多边形的包围球
+ const boundingSphere = Cesium.BoundingSphere.fromPoints(positions);
+ const viewer = viewInstance.value.getViewer();
+ if (viewer && viewer.camera) {
+ viewer.camera.flyToBoundingSphere(boundingSphere, {
+ duration: 0, // 飞行动画持续时间（秒）
+ offset: new Cesium.HeadingPitchRange(0, -0.5, boundingSphere.radius * 1.5),
+ });
+ } else {
+ console.error('无法获取有效的 Viewer 或 camera 对象');
+ }
+ }
+ }
}
- })
+ });
} else {
getAttachInfoAPI(val.id).then(res => {
- detailTitle.value = res.data.data.nickName.split('.jpeg')[0]
- // dialogDetailList.value = res.data.data;
+ detailTitle.value = res.data.data.nickName.split('.jpeg')[0];
dialogDetailList.value = {
...res.data.data,
checkedinput: false,
editName: res.data.data?.nickName?.split('.jpeg')[0],
- }
- dialogVisible.value = true
- })
+ };
+ dialogVisible.value = true;
+ });
}
+};
+// WKT坐标解析函数
+function parseWKTCoordinates(wktString) {
+ // 解析POLYGON格式的WKT字符串
+ const regex = /POLYGON\s*\(\((.*?)\)\)/i;
+ const match = wktString.match(regex);
+ if (!match || !match[1]) return [];
+ // 分割坐标对
+ const coordinatePairs = match[1].split(/,\s*/);
+ return coordinatePairs.map(pair => {
+ const [lon, lat] = pair.trim().split(/\s+/).map(Number);
+ return [lon, lat];
+ });
}
-
-function dialogClose () {
+function dialogClose() {
// 对话框关闭时清理资源
- viewInstance.value?.viewerDestroy()
- viewer = null
- isMapInitialized.value = false
+ viewInstance.value?.viewerDestroy();
+ viewer = null;
+ isMapInitialized.value = false;
}
onMounted(() => {
- getaiImagesPage()
+ getaiImagesPage();
// 监听打开全景事件
EventBus.on('open-panorama', params => {
- panoramaParamsShow.value = params.show
- panoramaParamsUrl.value = params.url
- })
-})
+ panoramaParamsShow.value = params.show;
+ panoramaParamsUrl.value = params.url;
+ });
+});
onBeforeUnmount(() => {
// 组件卸载时移除事件监听，防止内存泄漏
- EventBus.off('open-panorama')
- viewInstance.value?.removeAllCustomImageryProviderDataSource(curCustomImageryProvider)
- viewInstance.value?.viewerDestroy()
-})
+ EventBus.off('open-panorama');
+ viewInstance.value?.removeAllCustomImageryProviderDataSource(curCustomImageryProvider);
+ viewInstance.value?.viewerDestroy();
+});
</script>
<style scoped lang="scss">
@@ -725,4 +893,4 @@
}
}
}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index 8122b80..936b63c 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -510,10 +510,10 @@
...mapGetters(['permission']),
permissionList () {
return {
- addBtn: this.validData(this.permission.airport_add, true),
- viewBtn: this.validData(this.permission.airport_view, true),
- delBtn: this.validData(this.permission.airport_delete, true),
- editBtn: this.validData(this.permission.airport_edit, true),
+ addBtn: this.validData(this.permission.air_add, true),
+ viewBtn: this.validData(this.permission.air_view, true),
+ delBtn: this.validData(this.permission.air_delete, true),
+ editBtn: this.validData(this.permission.air_edit, true),
}
},
ids () {
diff --git a/src/views/wel/components/backlog.vue b/src/views/wel/components/backlog.vue
index ad3d306..dbd74a7 100644
--- a/src/views/wel/components/backlog.vue
+++ b/src/views/wel/components/backlog.vue
@@ -233,11 +233,16 @@
getOrderCount();
});
</script>
-
+<style>
+.el-empty__image {
+width: 100px !important; }
+</style>
<style lang="scss" scoped>
+
.bocklogBox {
width: 100%;
- height: 306px;
+ // height: 306px;
+ height: pxToVh(326);
background: rgba(255, 255, 255, 0.41);
box-shadow: 0px 3px 4px -1px rgba(125, 125, 125, 0.25);
border-radius: 8px 8px 8px 8px;
@@ -276,7 +281,8 @@
}
.dots {
width: 17px;
- height: 17px;
+ // height: 17px;
+ height: pxToVh(17);
border-radius: 50%;
background: #366fff;
color: #fff;
@@ -289,7 +295,8 @@
}
.dots1 {
width: 17px;
- height: 17px;
+ // height: 17px;
+ height: pxToVh(17);
border-radius: 50%;
background: none !important;
color: #366fff !important;
@@ -303,7 +310,8 @@
}
.todo-items {
margin-top: 10px;
- height: 250px;
+ // height: 250px;
+ height: pxToVh(250);
overflow-y: scroll;
}
@@ -317,7 +325,8 @@
box-shadow: 0px 2px 4px 0px rgba(173, 173, 173, 0.18);
transition: all 0.2s ease;
border-left: 4px solid transparent;
- height: 42px;
+ // height: 42px;
+ height: pxToVh(42);
&:hover {
transform: translateY(-2px);
box-shadow: 0 3px 8px rgba(0, 0, 0, 0.05);
diff --git a/src/views/wel/components/calendarBox.vue b/src/views/wel/components/calendarBox.vue
index 20ce47e..44c8ceb 100644
--- a/src/views/wel/components/calendarBox.vue
+++ b/src/views/wel/components/calendarBox.vue
@@ -105,9 +105,10 @@
</script>
<style lang="scss">
.calenBox {
- height: 630px;
+// height: 630px;
+height: pxToVh(610);
.el-calendar {
- height: 100%; // 日历填充容器
+ // height: 80%; // 日历填充容器
// 标题样式
&__title {
font-weight: bold;
@@ -116,14 +117,15 @@
}
// 日历主体
- &__body {
- height: 98%; // 关键：继承父高度
+ // &__body {
+ // height: 98%; // 关键：继承父高度
- .el-calendar-table {
- height: 90% !important; // 百分比生效
- }
- }
-
+ // .el-calendar-table {
+ // height: 90% !important; // 百分比生效
+ // }
+ // }
+.el-calendar-table .el-calendar-day{
+height: 78px !important;}
// 选中日期样式
.el-calendar-table td.is-selected {
background-color: #f0f7ff;
@@ -145,18 +147,18 @@
</style>
<style lang="scss" scoped>
.calenBox {
- margin-top: 17px;
- height: 630px;
+ margin-top: 10px;
+ // height: 630px;
+ height: pxToVh(610);
+ border-radius: 10px;
overflow: hidden;
+ background-color: #fff;
.event-item {
font-size: 12px;
// padding: 2px;
border-radius: 3px;
white-space: nowrap;
- // overflow: hidden;
- // text-overflow: ellipsis;
-
&.work-order {
font-weight: 400;
font-size: 12px;
diff --git a/src/views/wel/components/flyratio.vue b/src/views/wel/components/flyratio.vue
index eef3091..3894a64 100644
--- a/src/views/wel/components/flyratio.vue
+++ b/src/views/wel/components/flyratio.vue
@@ -230,7 +230,8 @@
}
.nestCenter {
width: 100%;
- height: 600px;
+ // height: 600px;
+ height: pxToVh(600);
.chart {
width: 100%;
height: 100%;
diff --git a/src/views/wel/components/statistics.vue b/src/views/wel/components/statistics.vue
index cb3fb32..d0642df 100644
--- a/src/views/wel/components/statistics.vue
+++ b/src/views/wel/components/statistics.vue
@@ -295,7 +295,8 @@
<style scoped lang="scss">
.statistics {
- min-height: 174px;
+ // height: 174px;
+ height: pxToVh(174);
background: #ffffff;
border-radius: 8px 8px 8px 8px;
margin-bottom: 10px;
@@ -332,15 +333,15 @@
padding: 0 14px 0 21px;
// display: grid;
// grid-template-columns: repeat(4, 1fr);
- height: 80px;
+ height: pxToVh(80);
display: flex;
justify-content: space-around;
:deep(.el-empty ){
width: 60px;
- height: 60px;
+ height: pxToVh(60);
.el-empty__image{
width: 60px !important;
- height: 60px !important;}
+ height: pxToVh(60)!important;}
.custom-text {
font-size: 12px;
color: #7c8091;
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 6611797..3f72d17 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -1,4 +1,5 @@
<template>
+<welContainer>
<div class="workbench">
<div class="workleft">
<!-- 设备统计 -->
@@ -95,6 +96,7 @@
<CalenBox></CalenBox>
</div>
</div>
+ </welContainer>
</template>
<script setup>
@@ -511,20 +513,23 @@
</style>
<style scoped lang="scss">
.workbench {
- padding: 0px 20px 0 10px;
+ height: 100%;
+ flex: 1;
+ // padding: 0px 20px 0 10px;
display: flex;
justify-content: space-between;
-height: calc(100% - 5rem);
}
.workleft {
width: 68%;
margin-right: 10px;
+ height: 100%;
.comprehensiveCon {
- // height: 736px;
- background: #ffffff;
+ background: #ffffff !important;
+ height: pxToVh(766);
border-radius: 8px 8px 8px 8px;
.comprehensive {
- padding: 17px 14px 0 21px;
+
+ padding: 14px 14px 0 21px;
.title {
display: flex;
justify-content: space-between;
@@ -548,7 +553,8 @@
}
.time-card {
text-align: center;
- height: 30px;
+ // height: 30px;
+ height: pxToVh(30);
background: #ffffff;
border-radius: 4px 0px 0px 4px;
border: 1px solid #e5e5e5;
@@ -561,7 +567,7 @@
.card-item {
width: 94px;
height: 100%;
- line-height: 32px;
+ line-height: 28px;
cursor: pointer;
font-family: 'Source Han Sans CN';
font-weight: 400;
@@ -587,7 +593,7 @@
width: 60%;
border-right: 1px solid #dfdfdf;
.workOrder {
- margin-top: 31px;
+ margin-top: 11px;
display: flex;
justify-content: space-between;
border-bottom: 1px solid #dfdfdf;
@@ -595,7 +601,7 @@
width: 40%;
.card-title {
display: flex;
- margin-bottom: 17px;
+ margin-bottom: 10px;
align-items: center;
img {
width: 36px;
@@ -629,16 +635,16 @@
grid-template-columns: repeat(2, 1fr);
row-gap: 14px;
gap: 10px;
- margin-bottom: 27px;
+ padding-bottom: 5px;
.status-item {
display: flex;
text-align: center;
justify-content: space-between;
height: 97px;
+ // height: pxToVh(107);
max-width: 158px;
background: #f6f8fe;
border-radius: 8px 8px 8px 8px;
- margin-bottom: 9px;
img {
width: 26px;
height: 26px;
@@ -685,8 +691,8 @@
}
.charts {
margin-top: 30px;
- width: 348px;
- height: 242px;
+ width: 100%;
+ height: auto;
.chart {
width: 100%;
height: 100%;
@@ -696,7 +702,7 @@
// 飞行统计
.flyOrder {
- margin-top: 10px;
+ margin-top: 5px;
.fytitle {
display: flex;
align-items: center;
@@ -711,7 +717,8 @@
}
}
.flycenter {
- margin-top: 22px;
+ margin-top: 13px;
+
.centerBox {
display: flex;
justify-content: space-between;
@@ -720,7 +727,8 @@
padding: 7px 7px 0 15px;
// width: 196px;
flex: 1;
- height: 80px;
+ // height: 80px;
+ height: pxToVh(80);
background: #f6f8fe;
box-shadow: 0px 5px 4px 0px #ebf1ff;
border-radius: 8px 8px 8px 8px;
@@ -739,7 +747,7 @@
color: #7c8091;
}
.flydata {
- margin-top: 15px;
+ margin-top: 10px;
text-align: right;
font-size: 14px;
color: #7c8091;
@@ -773,6 +781,9 @@
}
.workright {
+height: 100%;
width: 32%;
+ // display: flex;
+ // flex-direction: column;
}
</style>
diff --git a/vite.config.mjs b/vite.config.mjs
index a80022b..c93c35f 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -56,6 +56,12 @@
},
},
css: {
+ preprocessorOptions: {
+ scss: {
+ api: 'modern-compiler',
+ additionalData: `@use "@/styles/variables.scss" as *;`,
+ },
+ },
postcss: {
plugins: [
postCssPxToRem({
--
Gitblit v1.9.3