Commit 80610aeb authored by 王亚晖's avatar 王亚晖

修改地图,使登录直接进入地图

parent 1cc4ff8b
This diff is collapsed.
<script setup> <script setup>
import screenDisplay from '../../components/screenDisplay.vue' import screenDisplay from '../../components/screenDisplay.vue'
import { detectZoom } from '@/plugins/screen';
const m = detectZoom();
// console.log(window.screen.height, window.devicePixelRatio, m);
// if (window.screen.width * window.devicePixelRatio >= 3840) {
// document.body.style.zoom = 100 / (Number(m) / 2)
// } else if (window.screen.width * window.devicePixelRatio >= 2560 && window.screen.width * window.devicePixelRatio <= 3840) {
// document.body.style.zoom = 100 / (Number(m) / 1.33)
// } else {
// document.body.style.zoom = 100 / Number(m)
// }
if( window.screen.height * window.devicePixelRatio == 1080) {
document.body.style.zoom = 100 / Number(m);
}
</script> </script>
...@@ -30,6 +17,7 @@ body, div, p, img, span, table, tr, td { ...@@ -30,6 +17,7 @@ body, div, p, img, span, table, tr, td {
html, body { html, body {
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
font-size: 16px; font-size: 16px;
background-color: #033447;
} }
ul, li { ul, li {
list-style: none; list-style: none;
...@@ -70,92 +58,4 @@ ul, li { ...@@ -70,92 +58,4 @@ ul, li {
background-color: transparent; background-color: transparent;
cursor: pointer; cursor: pointer;
} }
@media (min-width: 2000px) { </style>
html, \ No newline at end of file
body {
font-size: 16px;
}
}
@media (min-width: 2200px) {
html,
body {
font-size: 17px;
}
.content {
min-height: 1125px !important;
}
}
@media (min-width: 2400px) {
html,
body {
font-size: 18px;
}
.content {
min-height: 1350px !important;
}
.rightLayer4Block {
height:26% !important;
margin-top:28% !important;
}
.rightLayer3Block {
margin-top: 12% !important;
}
.titleStyle p {
padding: 0.5% 5% 0 5% !important;
}
}
@media (min-width: 2600px) {
html,
body {
font-size: 19px !important;
}
.content {
min-height: 1463px;
}
.rightLayer4Block {
height:26% !important;
margin-top:30% !important;
}
}
@media (min-width: 2800px) {
html,
body {
font-size: 20px !important;
}
.content {
min-height: 1575px !important;
}
.rightLayer4Block {
height:26% !important;
margin-top:30% !important;
}
}
@media (min-width: 3000px) {
html,
body {
font-size: 26px !important;
}
.content {
min-height: 1688px !important;
}
.rightLayer4Block {
height:26% !important;
margin-top:30% !important;
}
}
@media (min-width: 3100px) {
html,
body {
font-size: 26px !important;
}
.content {
min-height: 1688px !important;
}
}
</style>
...@@ -86,9 +86,7 @@ ...@@ -86,9 +86,7 @@
:fit="'scale-down'" /> :fit="'scale-down'" />
<div> <div>
<div class="div-contain-title" style="">气象时间</div> <div class="div-contain-title" style="">气象时间</div>
<div class="div-contain-text-small" style="line-height: 15px;">{{ <div class="div-contain-text-small" style="line-height: 15px;">{{showWeatherData.weatherData.gatherTime}}</div>
showWeatherData.weatherData.gatherTime
}}</div>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -519,12 +517,13 @@ export default defineComponent({ ...@@ -519,12 +517,13 @@ export default defineComponent({
function openMap(){ function openMap(){
const routePath = '/GisHome'; // 要导航到的路由路径 const routePath = '/GisHome'; // 要导航到的路由路径
// 打开新窗口并导航到指定路由 router.push({ path: routePath});
window.open( // // 打开新窗口并导航到指定路由
`${routePath}`, // window.open(
'_blank', // `${routePath}`,
'toolbar=yes,location=yes,status=yes,menubar=yes,scrollbars=yes' // '_blank',
); // 'toolbar=yes,location=yes,status=yes,menubar=yes,scrollbars=yes'
// );
} }
return { return {
......
...@@ -301,7 +301,8 @@ function login() { ...@@ -301,7 +301,8 @@ function login() {
} }
$message.success('登录成功,正在跳转!'); $message.success('登录成功,正在跳转!');
store.commit('setUserInfo', result.data); store.commit('setUserInfo', result.data);
router.push({ path: '/Home'}); // router.push({ path: '/Home'});
router.push({ path: '/GisHome'});
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment