Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
web-project
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
海康威视
web-project
Commits
80610aeb
Commit
80610aeb
authored
Jul 18, 2024
by
王亚晖
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改地图,使登录直接进入地图
parent
1cc4ff8b
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
169 additions
and
250 deletions
+169
-250
screenDisplay.vue
src/components/screenDisplay.vue
+157
-138
screenDisplay.vue
src/views/Gis/screenDisplay.vue
+2
-102
home.vue
src/views/home.vue
+8
-9
login.vue
src/views/login/login.vue
+2
-1
No files found.
src/components/screenDisplay.vue
View file @
80610aeb
This diff is collapsed.
Click to expand it.
src/views/Gis/screenDisplay.vue
View file @
80610aeb
<
script
setup
>
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
>
...
...
@@ -30,6 +17,7 @@ body, div, p, img, span, table, tr, td {
html
,
body
{
font-family
:
"Microsoft YaHei"
;
font-size
:
16px
;
background-color
:
#033447
;
}
ul
,
li
{
list-style
:
none
;
...
...
@@ -70,92 +58,4 @@ ul, li {
background-color
:
transparent
;
cursor
:
pointer
;
}
@media
(
min-width
:
2000px
)
{
html
,
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
>
</
style
>
\ No newline at end of file
src/views/home.vue
View file @
80610aeb
...
...
@@ -86,9 +86,7 @@
:fit=
"'scale-down'"
/>
<div>
<div
class=
"div-contain-title"
style=
""
>
气象时间
</div>
<div
class=
"div-contain-text-small"
style=
"line-height: 15px;"
>
{{
showWeatherData.weatherData.gatherTime
}}
</div>
<div
class=
"div-contain-text-small"
style=
"line-height: 15px;"
>
{{showWeatherData.weatherData.gatherTime}}
</div>
</div>
</div>
</el-col>
...
...
@@ -519,12 +517,13 @@ export default defineComponent({
function
openMap
(){
const
routePath
=
'/GisHome'
;
// 要导航到的路由路径
// 打开新窗口并导航到指定路由
window
.
open
(
`
${
routePath
}
`
,
'_blank'
,
'toolbar=yes,location=yes,status=yes,menubar=yes,scrollbars=yes'
);
router
.
push
({
path
:
routePath
});
// // 打开新窗口并导航到指定路由
// window.open(
// `${routePath}`,
// '_blank',
// 'toolbar=yes,location=yes,status=yes,menubar=yes,scrollbars=yes'
// );
}
return
{
...
...
src/views/login/login.vue
View file @
80610aeb
...
...
@@ -301,7 +301,8 @@ function login() {
}
$message
.
success
(
'登录成功,正在跳转!'
);
store
.
commit
(
'setUserInfo'
,
result
.
data
);
router
.
push
({
path
:
'/Home'
});
// router.push({ path: '/Home'});
router
.
push
({
path
:
'/GisHome'
});
});
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment