gitY
/
DiKongGanZhiPingTai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://123.132.248.154:10000/gitY/DiKongGanZhiPingTai

Browse Source
main
刘妍 1 month ago
parent 5c1f6ce683 9836661532
commit 467a0435d0
15 changed files with 326 additions and 227 deletions
Show Stats Download Patch File Download Diff File

4
src/api/sys/workplan.ts
Unescape Escape View File

@ -36,8 +36,8 @@ enum Api{
} }
// 项目 // 项目
export function getWorkspaceList(){ export function getWorkspaceList(params){
return defHttp.get({ url: Api.GetTaskPageList, params }); return defHttp.get({ url: Api.GetWorkspaceList,params});
} }
// 任务 // 任务

177
src/views/demo/system/mediaLibrary/index.vue
Unescape Escape View File

@ -219,7 +219,7 @@
<RenameModal @register="renameModal" @handleSuccess="handleSuccess" /> <RenameModal @register="renameModal" @handleSuccess="handleSuccess" />
<!-- 预览弹窗 --> <!-- 预览弹窗 -->
<a-modal <a-modal
v-model:open="open" v-model:open="openPreview"
width="100%" width="100%"
wrap-class-name="full-modal" wrap-class-name="full-modal"
:centered="true" :centered="true"
@ -268,7 +268,7 @@
</PageWrapper> </PageWrapper>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, watch, h } from 'vue'; import { reactive, ref, watch, h, onMounted } from 'vue';
import { BasicTable, useTable, TableAction } from '@/components/Table'; import { BasicTable, useTable, TableAction } from '@/components/Table';
import { PageWrapper } from '@/components/Page'; import { PageWrapper } from '@/components/Page';
import { useModal } from '@/components/Modal'; import { useModal } from '@/components/Modal';
@ -302,8 +302,9 @@
import { AddFolderModal, MoveFileModal, CompressFileModal, RenameModal } from './modal/modal'; import { AddFolderModal, MoveFileModal, CompressFileModal, RenameModal } from './modal/modal';
import { PermissionBtn } from '@/components/PermissionBtn/index'; import { PermissionBtn } from '@/components/PermissionBtn/index';
import { getAppEnvConfig } from '@/utils/env'; import { getAppEnvConfig } from '@/utils/env';
import { useRoute, useRouter } from 'vue-router';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
import { columns, searchFormSchema, svg_showOnMap_0, svg_showOnMap_1 } from './modal.data'; import { columns, searchFormSchema } from './modal.data';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { cloneDeep } from 'lodash-es'; import { cloneDeep } from 'lodash-es';
@ -323,11 +324,20 @@
// 格子 // 格子
if (newval === 'store') { if (newval === 'store') {
// 数据 // 数据
GetMediaFile({ let query = { ...searchParams.value, page: 1, limit: 1000 };
parentKey: nowParentKey.value, if (routeFlag.value) {
page: 1, query = {
limit: 1000, ...query,
}).then((res) => { taskId: route.query.flightId,
objectKeyExist: 1,
};
} else {
query = {
...query,
parentKey: nowParentKey.value,
};
}
GetMediaFile(query).then((res) => {
showTableData.value = res.items; showTableData.value = res.items;
tableTypeAfterShow.value = newval; tableTypeAfterShow.value = newval;
// 表格-隐藏 // 表格-隐藏
@ -416,6 +426,34 @@
} }
} }
// 工作计划跳转到媒体库，只看对应的工作计划文件夹
const route = useRoute();
const router = useRouter();
const routeFlag = ref(true);
onMounted(() => {
if (route.query.flightId) {
routeFlag.value = true;
// 获得对应的计划文件夹名称
getFloder();
} else {
routeFlag.value = false;
}
});
// 获得对应的计划文件夹名称
async function getFloder() {
GetMediaFile({
taskId: route.query.flightId,
objectKeyExist: 0,
page: 1,
limit: 10,
}).then((res) => {
floders.value.push({
id: res.items[0].id,
name: res.items[0].name,
});
});
}
// 表格 // 表格
// 目录 // 目录
const floders = ref([ const floders = ref([
@ -455,13 +493,26 @@
showTableSetting: true, showTableSetting: true,
beforeFetch: (data) => { beforeFetch: (data) => {
// 接口请求前 参数处理 // 接口请求前 参数处理
let temp = { // 工作计划跳转到媒体库的情况-只返回数据
...data, if (routeFlag.value) {
page: tableTypeAfterShow.value == 'table' ? data.page : 1, let temp = {
limit: tableTypeAfterShow.value == 'table' ? data.limit : 1000, ...data,
parentKey: nowParentKey.value, page: tableTypeAfterShow.value == 'table' ? data.page : 1,
}; limit: tableTypeAfterShow.value == 'table' ? data.limit : 1000,
return temp; taskId: route.query.flightId,
objectKeyExist: 1,
};
return temp;
} else {
// 正常情况
let temp = {
...data,
page: tableTypeAfterShow.value == 'table' ? data.page : 1,
limit: tableTypeAfterShow.value == 'table' ? data.limit : 1000,
parentKey: nowParentKey.value,
};
return temp;
}
}, },
handleSearchInfoFn(info) { handleSearchInfoFn(info) {
if (info.startTime && info.endTime) { if (info.startTime && info.endTime) {
@ -475,7 +526,8 @@
return info; return info;
}, },
afterFetch: (res) => { afterFetch: (res) => {
res.forEach((arr) => { let result = res;
result.forEach((arr) => {
if (arr.fileTags) { if (arr.fileTags) {
arr.fileTags = JSON.parse(arr.fileTags); arr.fileTags = JSON.parse(arr.fileTags);
} else { } else {
@ -487,18 +539,28 @@
arr.graffitiJson = []; arr.graffitiJson = [];
} }
}); });
return res; return result;
}, },
}); });
// 目录跳跃 // 目录跳跃
function getChildrenByProp(f, index) { async function getChildrenByProp(f, index) {
nowParentKey.value = f.id; // 工作计划跳转到媒体库的情况-只返回数据
floders.value = floders.value.splice(0, index + 1); if (f.name == '全部文件' && routeFlag.value) {
clearSelectedRowKeys(); const cleanQuery = { ...route.query };
reload().then((res) => { delete cleanQuery.flightId;
showTableData.value = res; await router.replace({
}); path: route.path,
query: cleanQuery,
});
} else {
nowParentKey.value = f.id;
floders.value = floders.value.splice(0, index + 1);
clearSelectedRowKeys();
reload().then((res) => {
showTableData.value = res;
});
}
} }
// 弹窗---------------------------------------------------------------------- // 弹窗----------------------------------------------------------------------
@ -522,18 +584,26 @@
if (previewRecordList.value.length != 0) { if (previewRecordList.value.length != 0) {
nowPreviewRecord.value = previewRecordList.value[index]; nowPreviewRecord.value = previewRecordList.value[index];
} else { } else {
open.value = false; openPreview.value = false;
} }
} }
}); });
} else { } else {
// 刷新当前查看项 // 刷新当前查看项
GetMediaFile({ let query = { ...searchParams.value, page: 1, limit: 1000 };
...searchParams.value, if (routeFlag.value) {
parentKey: nowParentKey.value, query = {
page: 1, ...query,
limit: 1000, taskId: route.query.flightId,
}).then((res) => { objectKeyExist: 1,
};
} else {
query = {
...query,
parentKey: nowParentKey.value,
};
}
GetMediaFile(query).then((res) => {
previewRecordList.value = uniqueByKey(res.items, nowPreviewRecord.value).sort((a, b) => { previewRecordList.value = uniqueByKey(res.items, nowPreviewRecord.value).sort((a, b) => {
return dayjs(a.createTime) - dayjs(b.createTime); return dayjs(a.createTime) - dayjs(b.createTime);
}); });
@ -615,7 +685,7 @@
} }
// 查看弹窗---------------------------------------------------------------------------- // 查看弹窗----------------------------------------------------------------------------
const open = ref(false); const openPreview = ref(false);
// 目前展示图片 // 目前展示图片
const nowPreviewRecord: any = ref(); const nowPreviewRecord: any = ref();
// 目前展示图片的列表 // 目前展示图片的列表
@ -624,18 +694,26 @@
async function lookRecord(record) { async function lookRecord(record) {
// 展示这个图片后者视频 // 展示这个图片后者视频
if (record.objectKey) { if (record.objectKey) {
GetMediaFile({ let query = { ...searchParams.value, page: 1, limit: 1000 };
...searchParams.value, if (routeFlag.value) {
parentKey: nowParentKey.value, query = {
page: 1, ...query,
limit: 100, taskId: route.query.flightId,
}).then((res) => { objectKeyExist: 1,
};
} else {
query = {
...query,
parentKey: nowParentKey.value,
};
}
GetMediaFile(query).then((res) => {
nowPreviewRecord.value = record; nowPreviewRecord.value = record;
// 同文件下的图片或者视频 // 同文件下的图片或者视频
previewRecordList.value = uniqueByKey(res.items, record).sort((a, b) => { previewRecordList.value = uniqueByKey(res.items, record).sort((a, b) => {
return dayjs(a.createTime) - dayjs(b.createTime); return dayjs(a.createTime) - dayjs(b.createTime);
}); });
open.value = true; openPreview.value = true;
}); });
} }
// 文件夹 // 文件夹
@ -695,7 +773,7 @@
// 关闭 // 关闭
function closeModal() { function closeModal() {
document.body.style.cursor = 'auto'; document.body.style.cursor = 'auto';
open.value = false; openPreview.value = false;
} }
// 变化检测弹窗---------------------------------------------------------------------- // 变化检测弹窗----------------------------------------------------------------------
@ -717,11 +795,20 @@
// 展示路径地图部分 // 展示路径地图部分
const pathDivShow = ref(false); const pathDivShow = ref(false);
function showPathDiv(record) { function showPathDiv(record) {
GetMediaFile({ let query = { ...searchParams.value, page: 1, limit: 1000 };
parentKey: record.parentKey, if (routeFlag.value) {
page: 1, query = {
limit: 1000, ...query,
}).then((res) => { taskId: route.query.flightId,
objectKeyExist: 1,
};
} else {
query = {
...query,
parentKey: nowParentKey.value,
};
}
GetMediaFile(query).then((res) => {
allImageDataList.value = res.items.filter( allImageDataList.value = res.items.filter(
(item) => item.objectKey && item.objectKey.includes('.jpeg'), (item) => item.objectKey && item.objectKey.includes('.jpeg'),
); );

28
src/views/demo/system/mediaLibrary/modal.data.ts
Unescape Escape View File

@ -201,30 +201,4 @@ export const renameSchema: FormSchema[] = [
label: '新名称', label: '新名称',
required: true, required: true,
} }
]; ];
export const svg_showOnMap_1 = `<svg
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 24 24"
width="16"
height="16"
>
<path
d="M19 5v11.17l2 2V5c0-1.1-.9-2-2-2H5.83l2 2H19zM2.81 2.81L1.39 4.22L3 5.83V19c0 1.1.9 2 2 2h13.17l1.61 1.61l1.41-1.41L2.81 2.81zM5 19V7.83l7.07 7.07l-.82 1.1L9 13l-3 4h8.17l2 2H5z"
fill="#000000"
></path>
</svg>`;
export const svg_showOnMap_0 = `<svg
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 24 24"
width="16"
height="16"
>
<path
d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-4.86 8.86l-3 3.87L9 13.14L6 17h12l-3.86-5.14z"
fill="#000000"
></path>
</svg>`;

31
src/views/demo/system/mediaLibrary/path/pathImageInfo.vue
Unescape Escape View File

@ -35,7 +35,7 @@
{{ {{
props.nowShowImageData.siz props.nowShowImageData.siz
? (props.nowShowImageData.size / 1024 / 1024).toFixed(2) + 'M' + '&nbsp;&nbsp;&nbsp;' ? (props.nowShowImageData.size / 1024 / 1024).toFixed(2) + 'M' + '&nbsp;&nbsp;&nbsp;'
: '' : imageSize + '&nbsp;&nbsp;&nbsp;'
}} }}
</span> </span>
<span> <span>
@ -835,6 +835,8 @@
} }
// 调整滑动条的位置 // 调整滑动条的位置
setScrollLeft(); setScrollLeft();
// 图片大小
getImageSize();
editNameFlag.value = true; editNameFlag.value = true;
}, },
{ {
@ -848,6 +850,31 @@
setScrollLeft(); setScrollLeft();
}); });
// 图片大小
const imageSize = ref('');
async function getImageSize() {
try {
const response = await fetch(
VITE_GLOB_MEDIALIBRARY_IMAGE_URL + props.nowShowImageData.objectKey,
{ method: 'HEAD' },
);
if (!response.ok) {
imageSize.value = '--';
throw new Error(`HTTP error! status: ${response.status}`);
}
const contentLength = response.headers.get('Content-Length');
if (contentLength) {
const sizeInBytes = parseInt(contentLength, 10);
const sizeInMB = (sizeInBytes / (1024 * 1024)).toFixed(2);
imageSize.value = parseFloat(sizeInMB) + 'M';
} else {
imageSize.value = '--';
}
} catch (error) {
imageSize.value = '--';
}
}
// 打开标签弹窗 // 打开标签弹窗
function addFileTagsChange() { function addFileTagsChange() {
addFileTagsFlag.value = true; addFileTagsFlag.value = true;
@ -1407,7 +1434,7 @@
// 关闭按钮 // 关闭按钮
.closeButton { .closeButton {
position: absolute; position: absolute;
top: 30px; top: 2%;
right: 20px; right: 20px;
z-index: 200; z-index: 200;
} }

18
src/views/demo/system/mediaLibrary/path/pathLeftMenu.vue
Unescape Escape View File

@ -139,7 +139,6 @@
CheckCircleOutlined, CheckCircleOutlined,
StopOutlined, StopOutlined,
} from '@ant-design/icons-vue'; } from '@ant-design/icons-vue';
import { showOnMap_1, showOnMap_0 } from './svg';
import { import {
UpdatePicStatus, UpdatePicStatus,
Deletepic, Deletepic,
@ -217,7 +216,6 @@
const searchValue = ref(''); const searchValue = ref('');
function handleChangeImageSearch() { function handleChangeImageSearch() {
let filterImageData = props.allImageDataList; let filterImageData = props.allImageDataList;
// let filterImageData = props.allImageDataList.filter((item) => item.showOnMap == 1);
// 标签筛选 // 标签筛选
if (tagSelect.value.length > 0) { if (tagSelect.value.length > 0) {
tagSelect.value.forEach((tag) => { tagSelect.value.forEach((tag) => {
@ -270,13 +268,6 @@
// 加载到地图上 // 加载到地图上
function funShowOnMapOrDisplay(show, type) { function funShowOnMapOrDisplay(show, type) {
// if (type == 'showOnMap') {
// if (show.showOnMap == 1) {
// show.showOnMap = 0;
// } else {
// show.showOnMap = 1;
// }
// }
if (type == 'display') { if (type == 'display') {
if (show.display == 1) { if (show.display == 1) {
show.display = 0; show.display = 0;
@ -291,13 +282,6 @@
display: show.display, display: show.display,
showOnMap: show.showOnMap, showOnMap: show.showOnMap,
}).then((res) => { }).then((res) => {
// if (type == 'showOnMap') {
// if (show.showOnMap) {
// createMessage.success('在地图上加载成功');
// } else {
// createMessage.success('在地图上取消加载成功');
// }
// }
emits('handleSuccessPath'); emits('handleSuccessPath');
emits('funUpdateDisplayOrShowOnMapData', show); emits('funUpdateDisplayOrShowOnMapData', show);
}); });
@ -425,7 +409,7 @@
.closeButton { .closeButton {
position: absolute; position: absolute;
top: 2%; top: 1%;
right: -25px; right: -25px;
width: 20px; width: 20px;
height: 20px; height: 20px;

27
src/views/demo/system/mediaLibrary/path/svg.ts
Unescape Escape View File

@ -1,30 +1,3 @@
export const showOnMap_1 = `<svg
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 24 24"
width="18"
height="18"
>
<path
d="M19 5v11.17l2 2V5c0-1.1-.9-2-2-2H5.83l2 2H19zM2.81 2.81L1.39 4.22L3 5.83V19c0 1.1.9 2 2 2h13.17l1.61 1.61l1.41-1.41L2.81 2.81zM5 19V7.83l7.07 7.07l-.82 1.1L9 13l-3 4h8.17l2 2H5z"
fill="#ffffff"
></path>
</svg>`;
export const showOnMap_0 = `<svg
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 24 24"
width="18"
height="18"
>
<path
d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-4.86 8.86l-3 3.87L9 13.14L6 17h12l-3.86-5.14z"
fill="#ffffff"
></path>
</svg>`;
export const graffiti_svg = `<svg width="25px" height="25px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> export const graffiti_svg = `<svg width="25px" height="25px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="作业区域-新增迭代724-展开" transform="translate(-1692, -817)"> <g id="作业区域-新增迭代724-展开" transform="translate(-1692, -817)">

24
src/views/demo/system/mediaLibrary/preview/index.vue
Unescape Escape View File

@ -3,13 +3,14 @@
<div class="title"> <div class="title">
<div class="title-1">{{ props.nowPreviewRecord.name }}</div> <div class="title-1">{{ props.nowPreviewRecord.name }}</div>
<div class="title-2"> <div class="title-2">
{{ <ClockCircleOutlined />
props.nowPreviewRecord.createTime + <span>
' ' + {{
props.nowPreviewRecord.size + '&nbsp;&nbsp;' +
' ' + dayjs(props.nowPreviewRecord.createTime).format('YYYY-MM-DD HH:mm:ss (UTCZ)') +
props.nowPreviewRecord.id '&nbsp;&nbsp;&nbsp;'
}} }}
</span>
</div> </div>
</div> </div>
<div class="closeButton"> <div class="closeButton">
@ -74,14 +75,14 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue'; import { ref } from 'vue';
import { CloseOutlined } from '@ant-design/icons-vue'; import { CloseOutlined, ClockCircleOutlined } from '@ant-design/icons-vue';
import { import {
PreviewImage, PreviewImage,
PreviewImageInformation, PreviewImageInformation,
PreviewVideo, PreviewVideo,
PreviewVideoInformation, PreviewVideoInformation,
} from './preview'; } from './preview';
import dayjs from 'dayjs';
const props = defineProps(['nowPreviewRecord', 'previewRecordList']); const props = defineProps(['nowPreviewRecord', 'previewRecordList']);
const emits = defineEmits([ const emits = defineEmits([
'closeModal', 'closeModal',
@ -132,11 +133,12 @@
z-index: 100; z-index: 100;
.title-1 { .title-1 {
font-size: 20px; font-size: 24px;
font-weight: 500;
color: #ffffff; color: #ffffff;
} }
.title-2 { .title-2 {
font-size: 16px; font-size: 18px;
color: #f0f3f3; color: #f0f3f3;
} }
} }

59
src/views/demo/system/mediaLibrary/preview/previewImage.vue
Unescape Escape View File

@ -326,42 +326,6 @@
<BorderHorizontalOutlined @click="c" /> <BorderHorizontalOutlined @click="c" />
</a-tooltip> </a-tooltip>
</div> </div>
<!-- 加载到地图上 -->
<!-- <div class="button2" @click="funShowOnMap">
<a-tooltip placement="top">
<template #title>
<span>
{{ props.nowPreviewRecord.showOnMap == 1 ? '在地图上取消加载' : '在地图上加载' }}
</span>
</template>
<svg
v-if="props.nowPreviewRecord.showOnMap == 1"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 24 24"
width="25"
height="25"
>
<path
d="M19 5v11.17l2 2V5c0-1.1-.9-2-2-2H5.83l2 2H19zM2.81 2.81L1.39 4.22L3 5.83V19c0 1.1.9 2 2 2h13.17l1.61 1.61l1.41-1.41L2.81 2.81zM5 19V7.83l7.07 7.07l-.82 1.1L9 13l-3 4h8.17l2 2H5z"
fill="#ffffff"
></path>
</svg>
<svg
v-if="props.nowPreviewRecord.showOnMap != 1"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 24 24"
width="25"
height="25"
>
<path
d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-4.86 8.86l-3 3.87L9 13.14L6 17h12l-3.86-5.14z"
fill="#ffffff"
></path>
</svg>
</a-tooltip>
</div> -->
<!-- 复制到剪贴板 --> <!-- 复制到剪贴板 -->
<div class="button"> <div class="button">
<a-tooltip placement="top"> <a-tooltip placement="top">
@ -700,29 +664,6 @@
} }
}; };
// // 加载到地图上
// function funShowOnMap() {
// if (props.nowPreviewRecord.showOnMap == 1) {
// props.nowPreviewRecord.showOnMap = 0;
// } else {
// props.nowPreviewRecord.showOnMap = 1;
// }
// UpdatePicStatus({
// id: props.nowPreviewRecord.id,
// fileTags: JSON.stringify(fileTags.value),
// graffitiJson: JSON.stringify(graffitis.value),
// display: props.nowPreviewRecord.display,
// showOnMap: props.nowPreviewRecord.showOnMap,
// }).then((res) => {
// if (props.nowPreviewRecord.showOnMap == 1) {
// createMessage.success('在地图上加载成功');
// } else {
// createMessage.success('在地图上取消加载成功');
// }
// emits('handleSuccessPreview');
// });
// }
// 下载 // 下载
async function fetchAndDownloadImage(url) { async function fetchAndDownloadImage(url) {
try { try {

37
src/views/demo/system/mediaLibrary/preview/previewImageInformation.vue
Unescape Escape View File

@ -51,7 +51,7 @@
{{ {{
props.nowPreviewRecord.size props.nowPreviewRecord.size
? (props.nowPreviewRecord.size / 1024 / 1024).toFixed(2) + 'M' ? (props.nowPreviewRecord.size / 1024 / 1024).toFixed(2) + 'M'
: '--' : imageSize
}} }}
</span> </span>
</a-col> </a-col>
@ -59,13 +59,13 @@
<span class="infotitle">拍摄飞机</span> <span class="infotitle">拍摄飞机</span>
</a-col> </a-col>
<a-col :span="17"> <a-col :span="17">
<span class="infovalue">{{ props.nowPreviewRecord.taskDronePortName || '--' }} </span> <span class="infovalue">{{ props.nowPreviewRecord.droneModelName || '0-100-1' }} </span>
</a-col> </a-col>
<a-col :span="7"> <a-col :span="7">
<span class="infotitle">拍摄负载</span> <span class="infotitle">拍摄负载</span>
</a-col> </a-col>
<a-col :span="17"> <a-col :span="17">
<span class="infovalue">{{ props.nowPreviewRecord.payloadModelKey || '--' }} </span> <span class="infovalue">{{ props.nowPreviewRecord.payloadModelName || '1-99-0' }} </span>
</a-col> </a-col>
<a-col :span="7"> <a-col :span="7">
<span class="infotitle">拍摄人员</span> <span class="infotitle">拍摄人员</span>
@ -225,6 +225,8 @@
import { Map } from './preview'; import { Map } from './preview';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
const { createMessage, createConfirm } = useMessage(); const { createMessage, createConfirm } = useMessage();
import { getAppEnvConfig } from '@/utils/env';
const { VITE_GLOB_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig();
const props = defineProps(['nowPreviewRecord', 'previewRecordList', 'hideOrShowTextboxFlag']); const props = defineProps(['nowPreviewRecord', 'previewRecordList', 'hideOrShowTextboxFlag']);
const emits = defineEmits(['chooseNowPreviewRecord', 'handleSuccessPreview', 'openPathModal']); const emits = defineEmits(['chooseNowPreviewRecord', 'handleSuccessPreview', 'openPathModal']);
@ -278,6 +280,7 @@
: []; : [];
fileTags.value = props.nowPreviewRecord.fileTags ? props.nowPreviewRecord.fileTags : []; fileTags.value = props.nowPreviewRecord.fileTags ? props.nowPreviewRecord.fileTags : [];
editNameFlag.value = true; editNameFlag.value = true;
getImageSize();
}, },
{ {
deep: true, deep: true,
@ -364,10 +367,30 @@
emits('chooseNowPreviewRecord', value); emits('chooseNowPreviewRecord', value);
} }
// // 打开路径弹窗 // 图片大小
// function openPathModal() { const imageSize = ref('');
// emits('openPathModal', props.nowPreviewRecord); async function getImageSize() {
// } try {
const response = await fetch(
VITE_GLOB_MEDIALIBRARY_IMAGE_URL + props.nowPreviewRecord.objectKey,
{ method: 'HEAD' },
);
if (!response.ok) {
imageSize.value = '--';
throw new Error(`HTTP error! status: ${response.status}`);
}
const contentLength = response.headers.get('Content-Length');
if (contentLength) {
const sizeInBytes = parseInt(contentLength, 10);
const sizeInMB = (sizeInBytes / (1024 * 1024)).toFixed(2);
imageSize.value = parseFloat(sizeInMB) + 'M';
} else {
imageSize.value = '--';
}
} catch (error) {
imageSize.value = '--';
}
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.title { .title {

66
src/views/demo/system/mediaLibrary/preview/previewVideoInformation.vue
Unescape Escape View File

@ -30,13 +30,13 @@
<span class="infotitle">航线名称</span> <span class="infotitle">航线名称</span>
</a-col> </a-col>
<a-col :span="17"> <a-col :span="17">
<span class="infovalue">{{ props.nowPreviewRecord.taskAirLineName || '--' }} </span> <span class="infovalue">{{ props.nowPreviewRecord.airLineName || '--' }} </span>
</a-col> </a-col>
<a-col :span="7"> <a-col :span="7">
<span class="infotitle">视频时长</span> <span class="infotitle">视频时长</span>
</a-col> </a-col>
<a-col :span="17"> <a-col :span="17">
<span class="infovalue">{{ taskAirLineName || '--' }} </span> <span class="infovalue">{{ videoDuration }} </span>
</a-col> </a-col>
<a-col :span="7"> <a-col :span="7">
<span class="infotitle">视频分辨率</span> <span class="infotitle">视频分辨率</span>
@ -45,8 +45,8 @@
<span class="infovalue"> <span class="infovalue">
{{ {{
props.nowPreviewRecord.width && props.nowPreviewRecord.height props.nowPreviewRecord.width && props.nowPreviewRecord.height
? props.nowPreviewRecord.width + '*' + props.nowPreviewRecord.height ? props.nowPreviewRecord.width + ' * ' + props.nowPreviewRecord.height
: '--' : videoWidth + ' * ' + videoHeight
}} }}
</span> </span>
</a-col> </a-col>
@ -55,20 +55,20 @@
</a-col> </a-col>
<a-col :span="17"> <a-col :span="17">
<span class="infovalue"> <span class="infovalue">
{{ props.nowPreviewRecord.size || '--' }} {{ props.nowPreviewRecord.size || videoSize }}
</span> </span>
</a-col> </a-col>
<a-col :span="7"> <a-col :span="7">
<span class="infotitle">拍摄负载</span> <span class="infotitle">拍摄负载</span>
</a-col> </a-col>
<a-col :span="17"> <a-col :span="17">
<span class="infovalue">{{ props.nowPreviewRecord.payloadModelKey || '--' }} </span> <span class="infovalue">{{ props.nowPreviewRecord.payloadModelName || '1-99-0' }} </span>
</a-col> </a-col>
<a-col :span="7"> <a-col :span="7">
<span class="infotitle">文件来源</span> <span class="infotitle">文件来源</span>
</a-col> </a-col>
<a-col :span="17"> <a-col :span="17">
<span class="infovalue">{{ createUserName || '--' }}</span> <span class="infovalue">{{ props.nowPreviewRecord.createUserName || '--' }}</span>
</a-col> </a-col>
<a-col :span="7"> <a-col :span="7">
<span class="infotitle">拍摄时间</span> <span class="infotitle">拍摄时间</span>
@ -155,6 +155,8 @@
import { UpdatePicName, UpdatePicStatus } from '@/api/demo/mediaLibrary'; import { UpdatePicName, UpdatePicStatus } from '@/api/demo/mediaLibrary';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
const { createMessage } = useMessage(); const { createMessage } = useMessage();
import { getAppEnvConfig } from '@/utils/env';
const { VITE_GLOB_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig();
const props = defineProps(['nowPreviewRecord', 'previewRecordList']); const props = defineProps(['nowPreviewRecord', 'previewRecordList']);
const emits = defineEmits(['chooseNowPreviewRecord', 'handleSuccessPreview']); const emits = defineEmits(['chooseNowPreviewRecord', 'handleSuccessPreview']);
@ -204,6 +206,8 @@
() => { () => {
fileTags.value = props.nowPreviewRecord.fileTags ? props.nowPreviewRecord.fileTags : []; fileTags.value = props.nowPreviewRecord.fileTags ? props.nowPreviewRecord.fileTags : [];
editNameFlag.value = true; editNameFlag.value = true;
getVideoSize();
getVideoDurationAndWH();
}, },
{ {
deep: true, deep: true,
@ -253,6 +257,54 @@
}); });
} }
// 视频大小
const videoSize = ref('');
async function getVideoSize() {
try {
const response = await fetch(
VITE_GLOB_MEDIALIBRARY_IMAGE_URL + props.nowPreviewRecord.objectKey,
{ method: 'HEAD' },
);
if (!response.ok) {
videoSize.value = '--';
throw new Error(`HTTP error! status: ${response.status}`);
}
const contentLength = response.headers.get('Content-Length');
if (contentLength) {
const sizeInBytes = parseInt(contentLength, 10);
const sizeInMB = (sizeInBytes / (1024 * 1024)).toFixed(2);
videoSize.value = sizeInMB + 'M';
} else {
videoSize.value = '--';
}
} catch (error) {
videoSize.value = '--';
}
}
// 视频时长和原始长宽
const videoDuration = ref('--');
const videoHeight = ref(0);
const videoWidth = ref(0);
function getVideoDurationAndWH() {
return new Promise((resolve, reject) => {
const video = document.createElement('video');
video.preload = 'metadata';
video.src = VITE_GLOB_MEDIALIBRARY_IMAGE_URL + props.nowPreviewRecord.objectKey;
video.onloadedmetadata = () => {
const duration = video.duration;
const minutes = Math.floor(duration / 60);
const seconds = Math.floor(duration % 60);
videoDuration.value = minutes + ':' + seconds.toString().padStart(2, '0');
videoHeight.value = video.videoHeight;
videoWidth.value = video.videoWidth;
video.remove();
};
video.onerror = (err) => {
videoDuration.value = '--';
};
});
}
// 选择 // 选择
function chooseNowPreviewRecord(value) { function chooseNowPreviewRecord(value) {
emits('chooseNowPreviewRecord', value); emits('chooseNowPreviewRecord', value);

45
src/views/demo/workmanagement/workplan/components/createWorkPlan.vue
Unescape Escape View File

@ -33,19 +33,20 @@
</div> </div>
</a-form-item> --> </a-form-item> -->
<!-- <a-form-item ref="name" label="选择项目" name="name"> <a-form-item ref="workspaceId" label="选择项目" name="workspaceId">
<a-button type="primary" style="width:100%;" @click="selectAriLine" v-show="!submitForm.airLineId"> <div class="">
<PlusOutlined /> <a-select
选择项目 v-model:value="submitForm.workspaceId"
</a-button> placeholder="请选择所属项目"
>
<div class="select-item" v-show="submitForm.airLineId"> <a-select-option
<div class="item-name">{{submitForm.taskAirLineName}}</div> v-for="(item,index) in workspaceList" :key="index" :value="item.Id">
<div class="item-operate" @click="selectAriLine"> {{item.WorkspaceName}}
<MoreOutlined /> </a-select-option>
</div>
</a-select>
</div> </div>
</a-form-item> --> </a-form-item>
<a-form-item ref="name" label="选择航线" name="name"> <a-form-item ref="name" label="选择航线" name="name">
@ -223,7 +224,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref, defineEmits, defineProps, watch } from "vue"; import { ref, defineEmits, defineProps, watch } from "vue";
import { PlusOutlined,LeftOutlined,DeleteOutlined,MoreOutlined } from '@ant-design/icons-vue'; import { PlusOutlined,LeftOutlined,DeleteOutlined,MoreOutlined } from '@ant-design/icons-vue';
import { addTask,editTask } from "@/api/sys/workplan"; import { addTask,editTask,getWorkspaceList } from "@/api/sys/workplan";
import { Modal, message } from 'ant-design-vue'; import { Modal, message } from 'ant-design-vue';
import { useRoute,useRouter } from 'vue-router' import { useRoute,useRouter } from 'vue-router'
@ -318,6 +319,16 @@ const submitForm = ref({
"externalTaskId": null, "externalTaskId": null,
}) })
// 获取workspace
const workspaceList = ref([]);
const loadWorkspaceList = async () => {
let res = await getWorkspaceList({isjoin:0});
workspaceList.value = res;
}
loadWorkspaceList();
const weekdays = ref([ const weekdays = ref([
{ {
@ -559,6 +570,9 @@ const rules = {
"taskName":[ "taskName":[
{ required: true, message: "计划名称不能为空！", trigger: "blur" }, { required: true, message: "计划名称不能为空！", trigger: "blur" },
], ],
"workspaceId":[
{ required: true, message: "请选择项目！", trigger: "blur" },
],
"onceTime":[ "onceTime":[
{ required: true, message: "时间不能为空！", trigger: "blur" }, { required: true, message: "时间不能为空！", trigger: "blur" },
] ]
@ -975,4 +989,9 @@ const handleRepeatTypeChange = ()=>{
-webkit-text-fill-color: #ffffff; /* 修改文字颜色（红色） */ -webkit-text-fill-color: #ffffff; /* 修改文字颜色（红色） */
transition: background-color 5000s ease-in-out 0s; /* 防止背景色闪烁 */ transition: background-color 5000s ease-in-out 0s; /* 防止背景色闪烁 */
} }
::v-deep .ant-select-selection-search-input::placeholder{
color:red!important;
}
</style> </style>

4
src/views/demo/workmanagement/workplan/components/map.vue
Unescape Escape View File

@ -288,14 +288,14 @@
watch( watch(
() => props.wayline, () => props.wayline,
(newVal, oldVal) => { (newVal, oldVal) => {
generatePreviewPoint(newVal?.Folder?.Placemark); // generatePreviewPoint(newVal?.Folder?.Placemark);
}, },
); );
watch( watch(
() => props.waylineInfo, () => props.waylineInfo,
(newVal,oldVal) => { (newVal,oldVal) => {
console.log("newval999",newVal);
} }
) )

13
src/views/demo/workmanagement/workplan/components/planList.vue
Unescape Escape View File

@ -39,9 +39,15 @@
<div class="ari-line" v-for="(item,index) in ariLineList" :key="index"> <div class="ari-line" v-for="(item,index) in ariLineList" :key="index">
<div class="title"> <div class="title">
<div v-for="(opt,idx) in planStatusOptions" :key="idx" v-show="item.status == opt.status" class="state" :style="{'border-color':opt.color,'color':opt.color}"> <a-tooltip placement="top">
{{ opt.label }} <template #title v-if="item.status == 2">
</div> <span>{{item.reason}}</span>
</template>
<div v-for="(opt,idx) in planStatusOptions" :key="idx" v-show="item.status == opt.status" class="state" :style="{'border-color':opt.color,'color':opt.color}">
{{ opt.label }}
</div>
</a-tooltip>
<div style="flex:1;"> <div style="flex:1;">
{{item.taskName}} {{item.taskName}}
@ -361,6 +367,7 @@
padding:0px 4px; padding:0px 4px;
position:relative; position:relative;
top:2px; top:2px;
cursor:pointer;
} }
.ari-line .state-no{ .ari-line .state-no{

2
src/views/demo/workmanagement/workplan/index.vue
Unescape Escape View File

@ -238,12 +238,10 @@ const workPlanStatus = ref("");
const planDetail =async (item) => { const planDetail =async (item) => {
formData.value = item; formData.value = item;
let info =await getAirLine({airLineId : formData.value?.airLineId}); let info =await getAirLine({airLineId : formData.value?.airLineId});
if(info){ if(info){
waylineInfo.value = info; waylineInfo.value = info;
wayline.value = await airLineDetail(info); wayline.value = await airLineDetail(info);
} }
workPlanFormShow.value = true; workPlanFormShow.value = true;
workPlanStatus.value = "detail" workPlanStatus.value = "detail"
} }

18
src/views/demo/workmanagement/workplan/lib/calculateAirLine.ts
Unescape Escape View File

@ -1,21 +1,33 @@
// 相机参数 // 相机参数
export const uavModel = { export const uavModel = {
"m4td":{ "m4td":{
"focalLength":6.83, "focalLength":6.72,
"sensorLength":9.85, "sensorLength":9.6,
"imageWidth":4032, "imageWidth":4032,
"imageHeight":3024, "imageHeight":3024,
"pixelLength":0.23914590747330963
} }
} }
// 输入gsd计算高度 // 输入gsd计算高度
export const calculateHeight = (gsd,uavModel) => { export const calculateHeight = (gsd,uavModel) => {
let height = 0; let height = 0;
// 飞行高度= GSD(cm)×实际焦距(mm)/像元尺寸(um)
let abc = (gsd * uavModel['focalLength'] / uavModel['pixelLength']);
console.log("abc",abc);
height = ( (gsd / 100) * (uavModel['focalLength'] / 1000) * uavModel['imageWidth'] ) / ( uavModel['sensorLength'] / 1000 ); height = ( (gsd / 100) * (uavModel['focalLength'] / 1000) * uavModel['imageWidth'] ) / ( uavModel['sensorLength'] / 1000 );
return height.toFixed(2);
return height.toFixed(2);
} }
// 140.2 = 5 * 6.72 / x
// 输入高度计算gsd // 输入高度计算gsd
export const calculateGsd = (height,uavModel) => { export const calculateGsd = (height,uavModel) => {
let gsd = 0; let gsd = 0;

Write Preview
Loading…
Cancel
Save