From 239933482fd30e099ab9d038bc1a2e0164a65cb4 Mon Sep 17 00:00:00 2001 From: gjj <Ganjj@probim.com.cn> Date: Mon, 17 Mar 2025 14:41:10 +0800 Subject: [PATCH] 增加标段筛选和接口字段,调整样式,增加全局放大 --- src/views/Home.vue | 71 +++++++++++++++++++++++++---------- 1 files changed, 51 insertions(+), 20 deletions(-) diff --git a/src/views/Home.vue b/src/views/Home.vue index 24ed95c..b44eb36 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -11,7 +11,7 @@ <div class="time-info-item"> <i class="el-icon-date" style="color: #FFBF00;font-size: 20px;"></i> <div class="text-white text-[16px] ml-[4px]">工程倒计时/天</div> - <div class="text-[#FFBF00] text-[24px] font-bold ml-[28px]">175</div> + <div class="text-[#FFBF00] text-[24px] font-bold ml-[28px]">{{endDate}}</div> </div> <div class="time-line"> </div> @@ -20,21 +20,18 @@ <div class="bottom-nav"> <div class="content-wrapper mb-[20px]"> <!-- 720菜单 --> - <div class="side-menu" v-if="currentView === '720'"> + <div class="side-menu z-[100]" v-if="currentView === '720'"> <el-cascader popper-class="custom-dropdown" v-model="panoValue" :options="panoList" @change="handlePanoChange" :props="{ value: 'id',label: 'label',children: 'Children'}"> </el-cascader> </div> <!-- 主要内容区域 --> - <div class="main-content" v-loading="isLoading"> - <!-- 模型 --> - <div class="w-full h-full" v-if="currentView === 'model'"> - <iframe id="model-iframe" class="content-frame w-full h-full" src="" frameborder="0"></iframe> - </div> - <!-- 720 --> - <div :style="isFullScreen ? fullScreenStyle : 'width: 100%; height: 100%;'" v-if="currentView === '720'"> - <div id="panoviewpreview" class="pano-frame w-full h-full" :style="isFullScreen ? fullScreenPanoStyle : ''"> - </div> + <div class="main-content" :style="isFullScreen ? fullScreenStyle : ''" v-loading="isLoading"> + <!-- 模型 / 720 --> + <div class="w-full h-full" :style="isFullScreen ? fullScreenStyle : 'width: 100%; height: 100%;'" v-if="currentView === '720' || currentView === 'model'"> + <iframe id="model-iframe" class="content-frame w-full h-full" src="" frameborder="0" :style="isFullScreen ? fullScreenModelStyle : ''" v-if="currentView === 'model'"></iframe> + <div id="panoviewpreview" class="pano-frame w-full h-full" :style="isFullScreen ? fullScreenPanoStyle : ''" v-if="currentView === '720'"></div> + </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 v-for="item in panoVersionList" :key="item.value" :style="isFullScreen ? 'z-index: 100;' : ''"> @@ -45,7 +42,7 @@ </div>--> <!-- 放大镜 --> - <div class="w-[80px] h-[80px] bg-[#008C99] absolute top-[-40px] right-[-40px] rounded-[50%]" v-if="currentView === '720'" @click="handleZoomOut"> + <div class="w-[80px] h-[80px] bg-[#008C99] absolute top-[-40px] right-[-40px] rounded-[50%] z-[100]" v-if="currentView === 'model' || currentView === '720'" @click="handleZoomOut"> <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> @@ -83,7 +80,8 @@ } from "../api/home"; import { getProjectId, - getToken + getToken, + getProjectEndDate } from "../utils/getToken.js"; export default { name: 'Home', @@ -106,6 +104,7 @@ isFullScreen: false, fullScreenStyle: '', fullScreenPanoStyle: '', + fullScreenModelStyle: '', panoList: [{ value: 'zhinan', label: '指南', @@ -142,8 +141,25 @@ panoValue: [], backgroundImage: new URL('@/assets/images/backgrounds/cover_bg.png', import.meta.url).href, + endDate: 0, } }, + watch: { + projectEndDate:{ + deep: true, + handler (newVal) { + console.log('newVal', newVal) + const date = new Date(newVal); + // 获取当前日期作为Date对象 + const now = new Date(); + // 计算两个日期的差异(毫秒) + const diffTime = Math.abs(now - date); + // 将毫秒转换为天数 + const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24)); + this.endDate = diffDays + } + } + }, computed: { sectionStyle() { return { @@ -152,10 +168,19 @@ backgroundPosition: 'center center', backgroundSize: '100% 100%' } - }, + }, projectId() { return getProjectId() + }, + projectEndDate() { + return getProjectEndDate() } + }, + mounted() { + setTimeout(() => { + console.log('projectEndDate', getProjectEndDate()) + this.modelShow() + }, 1000) }, methods: { @@ -166,11 +191,15 @@ console.log('放大') this.isFullScreen = !this.isFullScreen if (this.isFullScreen) { - const clientX = document.documentElement.clientWidth || document.body.clientWidth - const clientY = document.documentElement.clientHeight || document.body.clientHeight - this.fullScreenPanoStyle = `width: 100%; height: 100%; z-index: 100; ` - this.fullScreenStyle = `width: ${clientX - 40}px; height: ${clientY - 120}px; margin:20px; position: fixed; top: 80px; left: 0;z-index: 100;background-color: #fff;overflow: hidden;` - } + const clientX = document.documentElement.clientWidth || document.body.clientWidth + const clientY = document.documentElement.clientHeight || document.body.clientHeight + this.fullScreenPanoStyle = `width: 100%; height: 100%; z-index: 100; ` + if (this.currentView === '720') { + this.fullScreenStyle = `width: ${clientX - 40}px; height: ${clientY - 120}px; margin:20px; position: fixed; top: 80px; left: 0;z-index: 100;background-color: #fff;overflow: hidden;` + } else if(this.currentView === 'model'){ + this.fullScreenModelStyle = `width: ${clientX - 40}px; height: ${clientY - 120}px; margin:20px; position: fixed; top: 80px; left: 0;z-index: 100;background-color: #fff;overflow: hidden;` + } + } }, handleChange(view) { this.isLoading = true @@ -186,6 +215,7 @@ }) } else if (view === 'project') { nextTick(() => { + removepano('krpanoSWFObject') this.sceneShow() }) } @@ -256,6 +286,7 @@ }) }, panoPreview(item, scene) { + removepano('krpanoSWFObject') const basepath = `${window.ProjectConfig.panoUrl}/Panorama${item.PbUrl}/vtour/` const xmlurl = `${basepath}tour.xml?r=${(Math.random() * 100000 + 1)}` let setting = {} @@ -353,7 +384,7 @@ display: flex; overflow: hidden; position: relative; - height: 52%; + height: 98%; } .chart-content { -- Gitblit v1.9.3