xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-master #250

Merged
xiaomeng merged 13 commits from pc-master into portal 2025-06-11 01:58:21 +00:00
Conversation 0 Commits 13 Files Changed 12 +94 -88
6 changed files with 94 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 559b995af9 - Show all commits

BIN
src/assets/img/logo-test.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 227 KiB

BIN
src/assets/img/map-test.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 MiB

BIN
src/assets/img/map.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 MiB

After

Width:  |  Height:  |  Size: 637 KiB

10
src/views/index.vue
View File

@ -2,10 +2,12 @@
<div class="index">
<div class="header">
<div class="header-left">
<img class="logo-img" src="../assets/image/logo-img.png" alt="">
<img class="logo-img" v-if="limitUserId.find(item => item.id == 1)" style="width:54px;border-radius: 50%;height:54px;" src="../assets/img/logo-test.jpg" alt="">
<img class="logo-img" v-else src="../assets/image/logo-img.png" alt="">
<img class="logo-bg" src="../assets/image/logo.png" alt="">
<div class="logo-title" v-if="mainData">
{{mainData.projectName}}
{{(limitUserId.find(item => item.id == 1))?'宏盛农业':mainData.projectName}}
<!-- {{mainData.projectName}} -->
</div>
</div>
@ -22,7 +24,9 @@
<div class="header-right" v-if="userInfo">
<img src="../assets/image/avatar.png" alt="">
<div class="user-data">
<div class="name">欢迎，{{ userInfo.nickName }}</div>
<div class="name">欢迎，{{(limitUserId.find(item => item.id == 1))?'杭州宏盛农业设施有限公司':userInfo.nickName}}
<!-- {{ userInfo.nickName }} -->
</div>
<div class="time" v-if="time"> {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}</div>
</div>
<div class="login-out" @click="loginOut"></div>

56
src/views/page/largeScreen.vue
View File

@ -118,7 +118,7 @@
<img class="axis_4" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_1" />
<img class="axis_5" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_1" />
<img class="axis_6" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_1" />
<img class="axis_7" src="../../assets/img/axis2.png" alt="" @click="handlerAxis_1" />
<!-- <img class="axis_7" src="../../assets/img/axis2.png" alt="" @click="handlerAxis_1" /> -->
</div>
<!-- 东北 -->
<div class="drag_box1" ref="drag_box1" v-show="limitUserId == 2">
@ -3026,57 +3026,63 @@ export default {
}
.axis_1 {
width: 0.7rem;
height: 0.86rem;
width: 0.4rem;
height: 0.5rem;
position: absolute;
top: 5%;
left: 22%;
top: 77%;
left: 11%;
z-index: 99;
cursor: pointer;
}
.axis_2 {
width: 0.7rem;
height: 0.86rem;
width: 0.4rem;
height: 0.5rem;
position: absolute;
top: 23%;
left: 41%;
top: 69%;
left: 25%;
z-index: 99;
cursor: pointer;
}
.axis_3 {
width: 0.7rem;
height: 0.86rem;
width: 0.4rem;
height: 0.5rem;
position: absolute;
top: 43%;
left: 15%;
top: 59%;
left: 41%;
z-index: 99;
cursor: pointer;
}
.axis_4 {
width: 0.7rem;
height: 0.86rem;
width: 0.4rem;
height: 0.5rem;
position: absolute;
top: 3%;
left: 64%;
top: 46%;
left:61%;
z-index: 99;
cursor: pointer;
}
.axis_5 {
width: 0.7rem;
height: 0.86rem;
width: 0.4rem;
height: 0.5rem;
position: absolute;
top: 29%;
left: 78%;
top: 36%;
left: 76%;
z-index: 99;
cursor: pointer;
}
.axis_6 {
width: 0.7rem;
height: 0.86rem;
width: 0.4rem;
height: 0.5rem;
position: absolute;
top: 63%;
left: 65%;
top: 27%;
left: 87%;
z-index: 99;
cursor: pointer;
}
.axis_7 {

116
src/views/page/largeScreen1.vue
View File

@ -24,13 +24,7 @@
<div class="map1">
<div class="drag_box1" ref="drag_box1">
<img class="drag_img" src="../../assets/img/map.png" alt="" />
<div class="pole_item pole_item_4">
<div class="p_title">
<img src="../../assets/img/wenshi.png" alt="" />
<span>控制中心</span>
</div>
<img class="pole1" src="../../assets/img/pole1.png" alt="" />
</div>
<div class="popBox" v-for="(item, index) in popContentList" :key="index">
<template>
<div class="pole_item" :style="getNamePosition(item.id)" @click="handlerPop(item.id)">
@ -44,7 +38,7 @@
<!-- 弹框 -->
<template>
<div class="pop_content" :style="getTopOrLeft(item.id)"
<div class="pop_content" :style="getTopOrLeft1_1(item.id)"
v-show="popContentCurrent == item.id ? true : false">
<img class="close_img" src="../../assets/img/close.png" alt="" @click="cancelHandler" />
<div class="p_video">
@ -961,19 +955,19 @@ export default {
});
},
getTopOrLeft(id) {
if (id == 2) {
return "top:46%;left:46%;transform: translate(-50%,-50%);";
} else if (id == 5) {
return "top:53%;left:47%;transform: translate(-50%,-50%);";
} else if (id == 6) {
return "top:46%;left:51%;transform: translate(-50%,-50%);";
} else if (id == 4) {
return "top:50%;left:62%;transform: translate(-50%,-50%);";
getTopOrLeft1_1(id) {
if (id == 1) {
return "top: 68%;left: 6%;transform: translate(54%,-50%);";
}else if (id == 2) {
return "top: 60%;left: 20%;transform: translate(54%,-50%);";
} else if (id == 3) {
return "top:50%;left:62%;transform: translate(-50%,-50%);";
} else if (id == 1) {
return "top:50%;left:35%;transform: translate(-50%,-50%);";
return "top: 51%;left: 36%;transform: translate(54%,-40%);";
} else if (id == 4) {
return "top: 38%;left: 56%;transform: translate(54%,0);";
} else if (id == 5) {
return "top: 27%;left: 71%;transform: translate(-20%,20%);";
} else if (id == 6) {
return "top: 19%;left: 81%;transform: translate(-20%,20%);";
}
},
@ -1249,17 +1243,17 @@ export default {
},
getNamePosition(id) {
if (id == 1) {
return "position: absolute;top: 41%;left: 13%;";
return "position: absolute;top: 68%;left: 6%;";
} else if (id == 2) {
return "position: absolute;top: 10%;left: 24%;";
return "position: absolute;top: 60%;left: 20%;";
} else if (id == 3) {
return "position: absolute;top: 22%;left: 40%;";
return "position: absolute;top: 51%;left: 36%;";
} else if (id == 4) {
return "position: absolute;top: 29%;left: 76%;";
return "position: absolute;top: 38%;left: 56%;";
} else if (id == 5) {
return "position: absolute;top: 61%;left: 62%;";
return "position: absolute;top: 27%;left: 71%;";
} else if (id == 6) {
return "position: absolute;top: 1%;left: 62%;";
return "position: absolute;top: 19%;left: 81%;";
}
},
@ -2571,26 +2565,28 @@ export default {
}
.pop_content {
width: 5.38rem;
height: 6.92rem;
width: 3.5rem;
height: 5.05rem;
background: url("../../assets/img/pop_bg.png") center no-repeat;
background-size: 100% 100%;
overflow: hidden;
position: absolute;
// top: 17%;
// left: 23%;
z-index: 999999;
// top: 2rem;
// left: 2rem;
.close_img {
width: 0.2rem;
height: 0.2rem;
position: absolute;
top: 0;
right: 0;
}
.p_video {
width: 4.9rem;
height: 2.8rem;
margin: 0.2rem auto 0;
width: 90%;
height: 1.82rem;
margin: 0.1rem auto 0;
>img {
width: 100%;
@ -2600,18 +2596,18 @@ export default {
.text {
width: 100%;
height: 0.6rem;
font-size: 0.28rem;
height: 0.4rem;
font-size: 0.2rem;
font-family: AlimamaShuHeiTi-Bold;
font-weight: bold;
color: #f3fdff;
line-height: 0.6rem;
line-height: 0.4rem;
box-sizing: border-box;
padding-left: 0.3rem;
padding-left: 0.2rem;
}
.line {
width: 4.9rem;
width: 90%;
height: 0.01rem;
background: #51d4fa;
opacity: 0.5;
@ -2620,10 +2616,11 @@ export default {
.detail {
width: 100%;
height: 0.7rem;
height: 0.45rem;
display: flex;
align-items: center;
justify-content: space-evenly;
padding: 0 0.15rem;
.d_item {
height: 0.3rem;
@ -2632,18 +2629,18 @@ export default {
border-radius: 0.02rem;
display: flex;
justify-content: center;
align-items: center;
// align-items: center;
box-sizing: border-box;
padding: 0 0.1rem 0 0.1rem;
padding: 0.05rem 0.05rem;
>img {
width: 0.18rem;
height: 0.18rem;
width: 0.2rem;
height: 0.2rem;
margin-right: 0.05rem;
}
>span {
font-size: 0.16rem;
font-size: 0.13rem;
font-family: MicrosoftYaHei;
font-weight: 400;
color: #d9effd;
@ -2652,8 +2649,8 @@ export default {
}
.grow {
width: 4rem;
height: 0.4rem;
width: 2.5rem;
height: 0.3rem;
background: url("../../assets/img/grow_bg.png") center no-repeat;
background-size: 100% 100%;
margin: 0 auto;
@ -2662,20 +2659,20 @@ export default {
align-items: center;
>img {
width: 0.22rem;
width: 0.18rem;
height: 0.18rem;
margin-right: 0.1rem;
margin-right: 0.05rem;
}
>span:nth-child(2) {
font-size: 0.16rem;
font-size: 0.13rem;
font-family: MicrosoftYaHei;
font-weight: 400;
color: #ffffff;
}
>span:nth-child(3) {
font-size: 0.16rem;
font-size: 0.13rem;
font-family: MicrosoftYaHei;
font-weight: 400;
color: #36ffd2;
@ -2684,9 +2681,9 @@ export default {
.icon_item {
width: 100%;
height: calc(100% - 5rem);
height: calc(100% - 3.22rem);
box-sizing: border-box;
padding: 0.3rem 0.2rem;
padding: 0.1rem 0.15rem;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
@ -2694,14 +2691,14 @@ export default {
.icon_item_child {
width: 33.33%;
height: 50%;
height: 33.33%;
display: flex;
margin-bottom: 0.1rem;
margin-bottom: 0.05rem;
>img {
width: 0.6rem;
height: 0.53rem;
margin-right: 0.1rem;
width: 0.4rem;
height: 0.4rem;
margin-right: 0.05rem;
}
>div {
@ -2709,18 +2706,17 @@ export default {
flex-direction: column;
>span:nth-child(1) {
font-size: 0.14rem;
font-size: 0.12rem;
font-family: MicrosoftYaHei;
font-weight: bold;
color: #86d9ff;
}
>span:nth-child(2) {
font-size: 0.2rem;
font-size: 0.15rem;
font-family: AlibabaPuHuiTiB;
font-weight: bold;
color: #ffffff;
margin-top: 0.02rem;
}
}
}