Merge pull request 'pc-master' (#256) from pc-master into portal

Reviewed-on: #256
This commit is contained in:
xiaomeng 2025-06-23 07:13:47 +00:00
commit 8d5d8ffbe8
2 changed files with 18 additions and 4 deletions

View File

@ -27,11 +27,11 @@
</div> </div>
<div class="time" v-if="time"> {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}</div> <div class="time" v-if="time"> {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}</div>
</div> </div>
<!-- <el-button <el-button
@click="changeLanguage()" @click="changeLanguage()"
> >
{{ currentLanguage === 'zh' ? 'EN' : '中' }} {{ currentLanguage === 'zh' ? 'EN' : '中' }}
</el-button> --> </el-button>
<div class="login-out" @click="loginOut"></div> <div class="login-out" @click="loginOut"></div>
</div> </div>
</div> </div>

View File

@ -430,6 +430,8 @@
<div class="map"> <div class="map">
<div class="map1"> <div class="map1">
<div class="drag_box9" ref="drag_box9"> <div class="drag_box9" ref="drag_box9">
<div class="url-btn" @click="to8080">
</div>
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E7%94%98%E4%BA%95%E6%9D%91%E5%A4%A7%E6%95%B0%E6%8D%AE/%E5%80%BE%E6%96%9C%E5%9B%BE.png" alt="" /> <img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E7%94%98%E4%BA%95%E6%9D%91%E5%A4%A7%E6%95%B0%E6%8D%AE/%E5%80%BE%E6%96%9C%E5%9B%BE.png" alt="" />
<!-- <div class="popBox" v-for="(item, index) in popContentList" :key="index"> <!-- <div class="popBox" v-for="(item, index) in popContentList" :key="index">
<template> <template>
@ -1367,7 +1369,9 @@ export default {
const formattedDate = `${year}.${month}.${day}`; const formattedDate = `${year}.${month}.${day}`;
return formattedDate; return formattedDate;
}, },
to8080(){
window.open("http://localhost:8080/");
},
cancelHandler() { cancelHandler() {
this.popContentCurrent = -1; this.popContentCurrent = -1;
let that = this; let that = this;
@ -2074,7 +2078,7 @@ demo.onwheel = function(e) {
.drag_box12, .drag_box12,
.drag_box13 { .drag_box13 {
width: 100%; width: 100%;
height:auto; height:auto;
position: absolute; position: absolute;
left: 50%; left: 50%;
@ -2088,6 +2092,16 @@ demo.onwheel = function(e) {
transparent 100% transparent 100%
); );
.url-btn{
width: 1.4rem;height: .35rem;
// background: rgba(255,255,255,0.3);
position: absolute;
top: 28.5%;
left:17.5%;
z-index: 99;
cursor: pointer;
transform: rotate(-32deg);
}
.drag_img { .drag_img {
width: 100%; width: 100%;
height: auto; height: auto;