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

媒体库环境文件修改名称，打包后演示环境也可以成功获取媒体库服务器链接

Browse Source
main
滕嵩 4 months ago
parent f32b432766
commit 49bf010dbf
10 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File

4
src/utils/env.ts
Unescape Escape View File

@ -37,7 +37,7 @@ export function getAppEnvConfig() {
VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_URL,
VITE_GLOB_APP_LOGO, VITE_GLOB_APP_LOGO,
VITE_GLOB_INFO_IMAGE_URL, VITE_GLOB_INFO_IMAGE_URL,
VITE_MEDIALIBRARY_IMAGE_URL, VITE_GLOB_MEDIALIBRARY_IMAGE_URL,
VITE_GLOB_APP_MANAGEMENT_UNIT, VITE_GLOB_APP_MANAGEMENT_UNIT,
VITE_GLOB_APP_TECHINICAL_SUPPORT, VITE_GLOB_APP_TECHINICAL_SUPPORT,
VITE_GLOB_APP_VERSIONS, VITE_GLOB_APP_VERSIONS,
@ -57,7 +57,7 @@ export function getAppEnvConfig() {
VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_URL,
VITE_GLOB_APP_LOGO, VITE_GLOB_APP_LOGO,
VITE_GLOB_INFO_IMAGE_URL, VITE_GLOB_INFO_IMAGE_URL,
VITE_MEDIALIBRARY_IMAGE_URL, VITE_GLOB_MEDIALIBRARY_IMAGE_URL,
VITE_GLOB_APP_MANAGEMENT_UNIT, VITE_GLOB_APP_MANAGEMENT_UNIT,
VITE_GLOB_APP_TECHINICAL_SUPPORT, VITE_GLOB_APP_TECHINICAL_SUPPORT,
VITE_GLOB_APP_VERSIONS, VITE_GLOB_APP_VERSIONS,

26
src/views/demo/system/mediaLibrary/LeftTree.vue
Unescape Escape View File

@ -43,34 +43,16 @@
id: 'infrared', id: 'infrared',
name: '红外照片', name: '红外照片',
}, },
// {
// id: 'alone',
// name: '单拍照片',
// },
{ {
id: 'video', id: 'video',
name: '视频资源', name: '视频资源',
}, },
], ],
}, },
// {
// id: 'achievementModel',
// name: '成果模型',
// children: [
// {
// id: '2d',
// name: '二维正摄',
// },
// {
// id: '3d',
// name: '三维模型',
// },
// ],
// },
// {
// id: 'gas',
// name: '气体探测',
// },
// {
// id: 'vr',
// name: 'VR全景',
// },
]; ];
// 显示到一级 // 显示到一级

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

@ -37,7 +37,7 @@
<!-- 图片 --> <!-- 图片 -->
<img <img
v-if="record.objectKey && record.objectKey.includes('jpeg')" v-if="record.objectKey && record.objectKey.includes('jpeg')"
:src="`${VITE_MEDIALIBRARY_IMAGE_URL + (record.minipic ? record.minipic : record.objectKey)}`" :src="`${VITE_GLOB_MEDIALIBRARY_IMAGE_URL + (record.minipic ? record.minipic : record.objectKey)}`"
:width="30" :width="30"
:height="20" :height="20"
/> />
@ -182,7 +182,7 @@
<!-- 图片 --> <!-- 图片 -->
<img <img
v-if="record.objectKey && record.objectKey.includes('jpeg')" v-if="record.objectKey && record.objectKey.includes('jpeg')"
:src="`${VITE_MEDIALIBRARY_IMAGE_URL + (record.minipic ? record.minipic : record.objectKey)}`" :src="`${VITE_GLOB_MEDIALIBRARY_IMAGE_URL + (record.minipic ? record.minipic : record.objectKey)}`"
:width="100" :width="100"
:height="60" :height="60"
style="position: absolute; top: 10px; left: 32.5px" style="position: absolute; top: 10px; left: 32.5px"
@ -330,7 +330,7 @@
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { cloneDeep } from 'lodash-es'; import { cloneDeep } from 'lodash-es';
const { VITE_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig(); const { VITE_GLOB_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig();
const { createConfirm, createMessage } = useMessage(); const { createConfirm, createMessage } = useMessage();
// 表格数据-------------------------------------------------------------------- // 表格数据--------------------------------------------------------------------

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

@ -133,7 +133,7 @@
transition: 'transform 0.2s', transition: 'transform 0.2s',
width: `${imageWidth}px`, width: `${imageWidth}px`,
height: `${imageHeight}px`, height: `${imageHeight}px`,
background: `url(${VITE_MEDIALIBRARY_IMAGE_URL + props.nowShowImageData.objectKey}) no-repeat center center`, background: `url(${VITE_GLOB_MEDIALIBRARY_IMAGE_URL + props.nowShowImageData.objectKey}) no-repeat center center`,
backgroundSize: 'contain', backgroundSize: 'contain',
backgroundPosition: 'center', backgroundPosition: 'center',
}" }"
@ -430,6 +430,15 @@
<RotateLeftOutlined @click="rotateCounterClockwise" /> <RotateLeftOutlined @click="rotateCounterClockwise" />
</a-tooltip> </a-tooltip>
</div> </div>
<!-- 云台偏航角查看图片 -->
<!-- <div class="button">
<a-tooltip placement="top">
<template #title>
<span>云台偏航角查看图片</span>
</template>
<InstagramOutlined @click="rotateGimbalYawDegree" />
</a-tooltip>
</div> -->
<!-- 刷新 --> <!-- 刷新 -->
<div class="button"> <div class="button">
<a-tooltip placement="top"> <a-tooltip placement="top">
@ -507,7 +516,7 @@
<img <img
:src=" :src="
li.minipic li.minipic
? VITE_MEDIALIBRARY_IMAGE_URL + li.minipic ? VITE_GLOB_MEDIALIBRARY_IMAGE_URL + li.minipic
: 'https://m.tuniucdn.com/fb2/t1/G5/M00/44/52/Cii-s1soezyIF2UxABn76u-yKl8AAIwBgB34jAAGfwC3020871' : 'https://m.tuniucdn.com/fb2/t1/G5/M00/44/52/Cii-s1soezyIF2UxABn76u-yKl8AAIwBgB34jAAGfwC3020871'
" "
loading="lazy" loading="lazy"
@ -595,6 +604,7 @@
AimOutlined, AimOutlined,
ClockCircleOutlined, ClockCircleOutlined,
PlusSquareOutlined, PlusSquareOutlined,
InstagramOutlined,
} from '@ant-design/icons-vue'; } from '@ant-design/icons-vue';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { UpdatePicStatus, UpdatePicName } from '@/api/demo/mediaLibrary'; import { UpdatePicStatus, UpdatePicName } from '@/api/demo/mediaLibrary';
@ -603,7 +613,7 @@
import { cloneDeep } from 'lodash-es'; import { cloneDeep } from 'lodash-es';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
const { createMessage, createConfirm } = useMessage(); const { createMessage, createConfirm } = useMessage();
const { VITE_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig(); const { VITE_GLOB_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig();
const props = defineProps(['nowShowImageData', 'allImageDataList']); const props = defineProps(['nowShowImageData', 'allImageDataList']);
const emits = defineEmits([ const emits = defineEmits([
@ -723,6 +733,10 @@
function rotateCounterClockwise() { function rotateCounterClockwise() {
rotationAngle.value -= 90; // 每次旋转-90度 rotationAngle.value -= 90; // 每次旋转-90度
} }
// 云台偏航角查看图片
function rotateGimbalYawDegree() {
rotationAngle.value = parseFloat(props.nowShowImageData.gimbalYawDegree) + 180;
}
// 宽高 // 宽高
const imageWidth = ref(1040); const imageWidth = ref(1040);
@ -841,6 +855,7 @@
? props.nowShowImageData.graffitiJson ? props.nowShowImageData.graffitiJson
: []; : [];
fileTags.value = props.nowShowImageData.fileTags ? props.nowShowImageData.fileTags : []; fileTags.value = props.nowShowImageData.fileTags ? props.nowShowImageData.fileTags : [];
// rotationAngle.value = parseFloat(props.nowShowImageData.gimbalYawDegree) + 180;
}, },
{ {
deep: true, deep: true,

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

@ -87,7 +87,7 @@
<template #title> <template #title>
<div> <div>
<img <img
:src="VITE_MEDIALIBRARY_IMAGE_URL + show.minipic" :src="VITE_GLOB_MEDIALIBRARY_IMAGE_URL + show.minipic"
loading="lazy" loading="lazy"
width="230" width="230"
height="190" height="190"
@ -182,7 +182,7 @@
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'; import { getAppEnvConfig } from '@/utils/env';
const { VITE_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig(); const { VITE_GLOB_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig();
const props = defineProps(['leftMenuShow', 'floderName', 'allImageDataList', 'nowShowImageData']); const props = defineProps(['leftMenuShow', 'floderName', 'allImageDataList', 'nowShowImageData']);
const emits = defineEmits([ const emits = defineEmits([

4
src/views/demo/system/mediaLibrary/path/pathMap.vue
Unescape Escape View File

@ -26,7 +26,7 @@
import { WktToGeojson, GeojsonToWkt } from '@/components/MapboxMaps/src/WktGeojsonTransform'; import { WktToGeojson, GeojsonToWkt } from '@/components/MapboxMaps/src/WktGeojsonTransform';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { getAppEnvConfig } from '@/utils/env'; import { getAppEnvConfig } from '@/utils/env';
const { VITE_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig(); const { VITE_GLOB_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig();
const props = defineProps([ const props = defineProps([
'allImageDataList', 'allImageDataList',
@ -362,7 +362,7 @@
const image = new Image(); const image = new Image();
image.crossOrigin = 'Anonymous'; image.crossOrigin = 'Anonymous';
if (item.minipic) { if (item.minipic) {
image.src = VITE_MEDIALIBRARY_IMAGE_URL + item.minipic; image.src = VITE_GLOB_MEDIALIBRARY_IMAGE_URL + item.minipic;
} else { } else {
image.src = image.src =
'https://m.tuniucdn.com/fb2/t1/G5/M00/44/52/Cii-s1soezyIF2UxABn76u-yKl8AAIwBgB34jAAGfwC3020871'; 'https://m.tuniucdn.com/fb2/t1/G5/M00/44/52/Cii-s1soezyIF2UxABn76u-yKl8AAIwBgB34jAAGfwC3020871';

4
src/views/demo/system/mediaLibrary/preview/Map.vue
Unescape Escape View File

@ -11,7 +11,7 @@
import * as mars3d from 'mars3d'; import * as mars3d from 'mars3d';
import * as Cesium from 'mars3d-cesium'; import * as Cesium from 'mars3d-cesium';
import { getAppEnvConfig } from '@/utils/env'; import { getAppEnvConfig } from '@/utils/env';
const { VITE_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig(); const { VITE_GLOB_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig();
const props = defineProps(['nowPreviewRecord', 'previewRecordList', 'hideOrShowTextboxFlag']); const props = defineProps(['nowPreviewRecord', 'previewRecordList', 'hideOrShowTextboxFlag']);
const emits = defineEmits(['chooseNowPreviewRecord']); const emits = defineEmits(['chooseNowPreviewRecord']);
@ -320,7 +320,7 @@
const image = new Image(); const image = new Image();
image.crossOrigin = 'Anonymous'; image.crossOrigin = 'Anonymous';
if (item.minipic) { if (item.minipic) {
image.src = VITE_MEDIALIBRARY_IMAGE_URL + item.minipic; image.src = VITE_GLOB_MEDIALIBRARY_IMAGE_URL + item.minipic;
} else { } else {
image.src = image.src =
'https://m.tuniucdn.com/fb2/t1/G5/M00/44/52/Cii-s1soezyIF2UxABn76u-yKl8AAIwBgB34jAAGfwC3020871'; 'https://m.tuniucdn.com/fb2/t1/G5/M00/44/52/Cii-s1soezyIF2UxABn76u-yKl8AAIwBgB34jAAGfwC3020871';

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

@ -12,7 +12,7 @@
transition: 'transform 0.2s', transition: 'transform 0.2s',
width: `${imageWidth}px`, width: `${imageWidth}px`,
height: `${imageHeight}px`, height: `${imageHeight}px`,
background: `url(${VITE_MEDIALIBRARY_IMAGE_URL + props.nowPreviewRecord.objectKey}) no-repeat center center`, background: `url(${VITE_GLOB_MEDIALIBRARY_IMAGE_URL + props.nowPreviewRecord.objectKey}) no-repeat center center`,
backgroundSize: 'contain', backgroundSize: 'contain',
backgroundPosition: 'center', backgroundPosition: 'center',
}" }"
@ -397,7 +397,7 @@
:class="li.id == props.nowPreviewRecord.id ? 'bottom_div_choose' : 'bottom_div'" :class="li.id == props.nowPreviewRecord.id ? 'bottom_div_choose' : 'bottom_div'"
> >
<img <img
:src="VITE_MEDIALIBRARY_IMAGE_URL + (li.minipic ? li.minipic : li.objectKey)" :src="VITE_GLOB_MEDIALIBRARY_IMAGE_URL + (li.minipic ? li.minipic : li.objectKey)"
loading="lazy" loading="lazy"
:width="60" :width="60"
:height="35" :height="35"
@ -541,7 +541,7 @@
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
import { cloneDeep } from 'lodash-es'; import { cloneDeep } from 'lodash-es';
import { getAppEnvConfig } from '@/utils/env'; import { getAppEnvConfig } from '@/utils/env';
const { VITE_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig(); const { VITE_GLOB_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig();
const { createConfirm, createMessage } = useMessage(); const { createConfirm, createMessage } = useMessage();
const props = defineProps(['nowPreviewRecord', 'previewRecordList']); const props = defineProps(['nowPreviewRecord', 'previewRecordList']);
@ -693,7 +693,7 @@
// 复制到剪贴板 // 复制到剪贴板
const copyToClipboard = async (url) => { const copyToClipboard = async (url) => {
try { try {
await navigator.clipboard.writeText(VITE_MEDIALIBRARY_IMAGE_URL + url); await navigator.clipboard.writeText(VITE_GLOB_MEDIALIBRARY_IMAGE_URL + url);
createMessage.success('图片链接已复制到剪贴板'); createMessage.success('图片链接已复制到剪贴板');
} catch (err) { } catch (err) {
createMessage.error('无法复制图片链接'); createMessage.error('无法复制图片链接');
@ -726,7 +726,7 @@
// 下载 // 下载
async function fetchAndDownloadImage(url) { async function fetchAndDownloadImage(url) {
try { try {
const response = await fetch(VITE_MEDIALIBRARY_IMAGE_URL + url, { const response = await fetch(VITE_GLOB_MEDIALIBRARY_IMAGE_URL + url, {
mode: 'cors', mode: 'cors',
}); });
if (!response.ok) { if (!response.ok) {

6
src/views/demo/system/mediaLibrary/preview/previewVideo.vue
Unescape Escape View File

@ -2,7 +2,7 @@
<div class="videoDiv"> <div class="videoDiv">
<div class="showVideo"> <div class="showVideo">
<video <video
:src="`${VITE_MEDIALIBRARY_IMAGE_URL + props.nowPreviewRecord.objectKey}`" :src="`${VITE_GLOB_MEDIALIBRARY_IMAGE_URL + props.nowPreviewRecord.objectKey}`"
class="video-player" class="video-player"
controls controls
muted muted
@ -62,7 +62,7 @@
import { Deletepic } from '@/api/demo/mediaLibrary'; import { Deletepic } from '@/api/demo/mediaLibrary';
import { getAppEnvConfig } from '@/utils/env'; import { getAppEnvConfig } from '@/utils/env';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
const { VITE_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig(); const { VITE_GLOB_MEDIALIBRARY_IMAGE_URL } = getAppEnvConfig();
const { createConfirm, createMessage } = useMessage(); const { createConfirm, createMessage } = useMessage();
const props = defineProps(['nowPreviewRecord', 'previewRecordList']); const props = defineProps(['nowPreviewRecord', 'previewRecordList']);
@ -95,7 +95,7 @@
// 下载 // 下载
async function fetchAndDownloadVideo(url) { async function fetchAndDownloadVideo(url) {
try { try {
const response = await fetch(VITE_MEDIALIBRARY_IMAGE_URL + url, { const response = await fetch(VITE_GLOB_MEDIALIBRARY_IMAGE_URL + url, {
mode: 'cors', mode: 'cors',
}); });
if (!response.ok) { if (!response.ok) {

2
types/config.d.ts vendored
Unescape Escape View File

@ -164,7 +164,7 @@ export interface GlobEnvConfig {
VITE_GLOB_APP_LOGO?: string; VITE_GLOB_APP_LOGO?: string;
// info image video // info image video
VITE_GLOB_INFO_IMAGE_URL?: string; VITE_GLOB_INFO_IMAGE_URL?: string;
VITE_MEDIALIBRARY_IMAGE_URL?: string; VITE_GLOB_MEDIALIBRARY_IMAGE_URL?: string;
VITE_GLOB_APP_MANAGEMENT_UNIT?: string; VITE_GLOB_APP_MANAGEMENT_UNIT?: string;
VITE_GLOB_APP_TECHINICAL_SUPPORT?: string; VITE_GLOB_APP_TECHINICAL_SUPPORT?: string;
VITE_GLOB_APP_VERSIONS?: string; VITE_GLOB_APP_VERSIONS?: string;

Write Preview
Loading…
Cancel
Save