From 65b3ead3590cf5067324c446b8f7c816e4f5ee37 Mon Sep 17 00:00:00 2001
From: gjj <Ganjj@probim.com.cn>
Date: Wed, 26 Feb 2025 10:39:35 +0800
Subject: [PATCH] 全景图等资源替换
---
src/assets/images/backgrounds/zoomin.png | 0
public/config.js | 6 +++---
src/views/Home.vue | 12 +++++++-----
src/views/EquipmentView.vue | 12 ++++++------
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/public/config.js b/public/config.js
index b94395c..09095d9 100644
--- a/public/config.js
+++ b/public/config.js
@@ -2,7 +2,7 @@
* @Author: gjj Ganjj@probim.com.cn
* @Date: 2025-02-14 14:32:17
* @LastEditors: gjj Ganjj@probim.com.cn
- * @LastEditTime: 2025-02-25 17:44:02
+ * @LastEditTime: 2025-02-26 10:34:59
* @FilePath: \北京交通大学\public\config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -13,7 +13,7 @@
modelUrl: '//dev.vothing.com/scenemanagerVothing/#/', // 模型预览地址
panoUrl: 'http://8.140.54.245:5000', // 全景预览地址
panoBaseUrl: 'http://8.140.54.245:5000', // 全景图及文档接口
- modelUrl: 'http://8.140.54.245:5010/#/modelNewShareLoad/7d242691-e6b2-4fbc-b4df-687883eb1a4c/db0ba482-4eb0-4488-aa3f-10066a85ae7a', // 模型预览地址
- sceneUrl: 'http://59.64.5.216:9980/#/Home/sceneManagementDetail?shareUrlToken=0C7E4A1E4A9BB7DC9BBDEE6ACFA9B4963972FB01200DF887F404CC7D12A4EF4EF74F69D40F29B08CA2B41A97016084CC5D71C1FFDCDE331EAF8FA0DB7C9708193D65FAAA1A707BBA88B2F459AA065C82', // 场景地址
+ modelUrl: 'http://8.140.54.245:5010/#/Home/sceneManagementDetail?shareUrlToken=69E38706C533C52C84A9F864785953A2AB834465D303010594EF3531C3AE64EE121F5C12AFB6E145D2F72023B59D3999249F65A61D9E4F11F3CD4667FA621262CC361AC0176055077A4C26B78B014EEB', // 模型预览地址
+ sceneUrl: 'http://resources.vothing.com/mp4/12.mp4', // 场景地址
projectId: '7d242691-e6b2-4fbc-b4df-687883eb1a4c', // 项目id
}
\ No newline at end of file
diff --git a/src/assets/images/backgrounds/zoomin.png b/src/assets/images/backgrounds/zoomin.png
new file mode 100644
index 0000000..44b023b
--- /dev/null
+++ b/src/assets/images/backgrounds/zoomin.png
Binary files differ
diff --git a/src/views/EquipmentView.vue b/src/views/EquipmentView.vue
index b036fd5..44315d3 100644
--- a/src/views/EquipmentView.vue
+++ b/src/views/EquipmentView.vue
@@ -236,14 +236,14 @@
},
},
data: [{
- value: 20,
+ value: 81.5,
name: '主隧洞掘进',
itemStyle: {
color: '#00FFFF'
}
},
{
- value: 80,
+ value: 18.5,
name: '',
itemStyle: {
color: 'transparent'
@@ -259,7 +259,7 @@
id: 'lixianChartBox',
name: '总离线',
value: 5,
- percentage: 81.5,
+ percentage: 33,
options: {
tooltip: {
trigger: 'item',
@@ -320,14 +320,14 @@
},
},
data: [{
- value: 20,
+ value: 33,
name: '主隧洞掘进',
itemStyle: {
color: '#00FFFF'
}
},
{
- value: 80,
+ value: 77,
name: '',
itemStyle: {
color: 'transparent'
@@ -343,7 +343,7 @@
id: 'baojingChartBox',
name: '总报警',
value: 0,
- percentage: 81.5,
+ percentage: 20,
options: {
tooltip: {
trigger: 'item',
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 5b8a6d0..24ed95c 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -36,23 +36,23 @@
<div id="panoviewpreview" class="pano-frame w-full h-full" :style="isFullScreen ? fullScreenPanoStyle : ''">
</div>
<!-- 720全景图版本选择 -->
- <div class="w-full h-[120px] bg-[rgba(19,40,64,0.8)] absolute bottom-0 left-0 right-0 flex items-center py-[10px]" :style="isFullScreen ? 'z-index: 100; height:' : ''" v-if="currentView === '720'">
+ <!--<div class="w-full h-[120px] bg-[rgba(19,40,64,0.8)] absolute bottom-0 left-0 right-0 flex items-center py-[10px]" :style="isFullScreen ? 'z-index: 100; height:' : ''" v-if="currentView === '720'">
<div v-for="item in panoVersionList" :key="item.value" :style="isFullScreen ? 'z-index: 100;' : ''">
<div class="w-[160px] h-[100px] mr-[10px] ml-[10px] cursor-pointer border-[1px] border-[#3068A5] rounded-[2px]" @click="panoPreview(panoObj, item)">
<img :src="getItemImg(item)" alt="全景图" class="w-full h-full" />
</div>
</div>
- </div>
+ </div>-->
<!-- 放大镜 -->
<div class="w-[80px] h-[80px] bg-[#008C99] absolute top-[-40px] right-[-40px] rounded-[50%]" v-if="currentView === '720'" @click="handleZoomOut">
- <img src="../assets/images/backgrounds/zoomout.png" alt="放大" class="w-[16px] h-[16px] mt-[50px] ml-[15px] cursor-pointer" v-if="isFullScreen" />
+ <img src="../assets/images/backgrounds/zoomin.png" alt="放大" class="w-[16px] h-[16px] mt-[50px] ml-[15px] cursor-pointer" v-if="isFullScreen" />
<img src="../assets/images/backgrounds/zoomout.png" alt="缩小" class="w-[16px] h-[16px] mt-[50px] ml-[15px] cursor-pointer" v-else />
</div>
</div>
<!-- 项目 -->
<div class="w-full h-full" v-if="currentView === 'project'">
- <iframe id="scene-iframe" class="scene-frame w-full h-full" src="" frameborder="0"></iframe>
+ <iframe id="scene-iframe" frameborder='0' allowfullscreen class="scene-frame w-full h-full"></iframe>
</div>
</div>
@@ -210,7 +210,8 @@
const projectId = this.projectId
let ifrSrc = ''
console.log('模型中查看')
- ifrSrc = `${window.ProjectConfig.modelUrl}?token=${token}&projectId=${projectId}&isPreview=1&edit=false`
+ // ifrSrc = `${window.ProjectConfig.modelUrl}?token=${token}&projectId=${projectId}&isPreview=1&edit=false`
+ ifrSrc = window.ProjectConfig.modelUrl
iframe.src = ifrSrc
console.log('加载iframe地址', ifrSrc)
this.isLoading = false
@@ -280,6 +281,7 @@
let ifrSrc = ''
ifrSrc = window.ProjectConfig.sceneUrl
iframe.src = ifrSrc
+ this.isLoading = false
},
mounted() {
this.isLoading = true
--
Gitblit v1.9.3