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

Reviewed-on: #45
pull/69/head^2
xiaomeng 2023-11-20 05:17:23 +00:00
commit d51add73ff
2 changed files with 124 additions and 213 deletions

View File

@ -42,17 +42,9 @@
<div class="weather"> <div class="weather">
<div> <div>
<marquee behavior="" direction="" scrollamount="3"> <marquee behavior="" direction="" scrollamount="3">
<div <div class="item" v-for="(item, index) in weatherDataList" :key="index">
class="item" <img :src="require(`../../assets/image/real-time-${item.formula}.png`)
v-for="(item, index) in weatherDataList" " alt="" />
:key="index"
>
<img
:src="
require(`../../assets/image/real-time-${item.formula}.png`)
"
alt=""
/>
<span>{{ item.environmentDataId }} : </span> <span>{{ item.environmentDataId }} : </span>
<span>{{ <span>{{
item.environmentData + getTypeList(item.formula) item.environmentData + getTypeList(item.formula)
@ -68,11 +60,7 @@
<div class="e_title">温室环境数据</div> <div class="e_title">温室环境数据</div>
<div class="detail"> <div class="detail">
<!-- <div class="title_child">一号温室</div> --> <!-- <div class="title_child">一号温室</div> -->
<vue-seamless <vue-seamless class="e_content" :data="list" :class-option="defaultOption">
class="e_content"
:data="list"
:class-option="defaultOption"
>
<div class="item" v-for="(el, index) in list" :key="index"> <div class="item" v-for="(el, index) in list" :key="index">
<!-- <img :src="el.formula" alt=""> --> <!-- <img :src="el.formula" alt=""> -->
<img :src="el.img" alt="" /> <img :src="el.img" alt="" />
@ -96,10 +84,7 @@
<div class="thisWeekTemperature"> <div class="thisWeekTemperature">
<div class="e_title">本周温度统计</div> <div class="e_title">本周温度统计</div>
<div <div class="thisWeekTemperature_echart" id="thisWeekTemperature_echart"></div>
class="thisWeekTemperature_echart"
id="thisWeekTemperature_echart"
></div>
</div> </div>
</div> </div>
<div class="middle"> <div class="middle">
@ -107,48 +92,13 @@
<div class="map1"> <div class="map1">
<div class="drag_box" ref="drag_box"> <div class="drag_box" ref="drag_box">
<img class="drag_img" src="../../assets/img/map.png" alt="" /> <img class="drag_img" src="../../assets/img/map.png" alt="" />
<img <img class="axis_1" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_1" />
class="axis_1" <img class="axis_2" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_1" />
src="../../assets/img/axis1.png" <img class="axis_3" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_1" />
alt="" <img class="axis_4" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_1" />
@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 <img class="axis_7" src="../../assets/img/axis2.png" alt="" @click="handlerAxis_1" />
class="axis_2"
src="../../assets/img/axis1.png"
alt=""
@click="handlerAxis_1"
/>
<img
class="axis_3"
src="../../assets/img/axis1.png"
alt=""
@click="handlerAxis_1"
/>
<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"
/>
</div> </div>
</div> </div>
</div> </div>
@ -159,17 +109,9 @@
<div class="liveVideo_content"> <div class="liveVideo_content">
<div class="swiper-container mySwiper_video"> <div class="swiper-container mySwiper_video">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div <div class="swiper-slide swiper-slide_video" v-for="(item, index) in get_sel_eqbyid_list" :key="index">
class="swiper-slide swiper-slide_video"
v-for="(item, index) in get_sel_eqbyid_list"
:key="index"
>
<div class="monitor" :id="'monitor' + item.number"> <div class="monitor" :id="'monitor' + item.number">
<div <div ref="videoPlayer" class="video-js" :id="'video-js' + item.number"></div>
ref="videoPlayer"
class="video-js"
:id="'video-js' + item.number"
></div>
</div> </div>
<div class="c_bottom">{{ item.deviceTypeName }}</div> <div class="c_bottom">{{ item.deviceTypeName }}</div>
</div> </div>
@ -188,22 +130,13 @@
<div class="device_detail"> <div class="device_detail">
<div class="swiper_timer"> <div class="swiper_timer">
<div> <div>
<div <div class="swiper-container middle_disasterWarningAnalysis" :style="styleContainer">
class="swiper-container middle_disasterWarningAnalysis"
:style="styleContainer"
>
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div <div :class="current == index
:class="
current == index
? 'swiper-slide swiper-slide2' ? 'swiper-slide swiper-slide2'
: 'swiper-slide swiper-slide1' : 'swiper-slide swiper-slide1'
" " v-for="(item, index) in dataList" :key="index" :style="styleItem"
v-for="(item, index) in dataList" @click="getCurrent(index, item)">
:key="index"
:style="styleItem"
@click="getCurrent(index, item)"
>
{{ item.greenhouseName + "温室" }} {{ item.greenhouseName + "温室" }}
</div> </div>
</div> </div>
@ -239,47 +172,32 @@
<div class="i_content"> <div class="i_content">
<div class="i_content_item"> <div class="i_content_item">
<span>1#风机</span> <span>1#风机</span>
<span <span :style="fanStatus.status[0] == 1 ? '' : 'color:#86C2FF;'">{{ fanStatus.status[0] == 1 ? "打开" :
:style="fanStatus.status[0] == 1 ? '' : 'color:#86C2FF;'" "关闭" }}</span>
>{{ fanStatus.status[0] == 1 ? "打开" : "关闭" }}</span
>
<span class="line"></span> <span class="line"></span>
<span>2#风机</span> <span>2#风机</span>
<span <span :style="fanStatus.status[1] == 1 ? '' : 'color:#86C2FF;'">{{ fanStatus.status[1] == 1 ? "打开" :
:style="fanStatus.status[1] == 1 ? '' : 'color:#86C2FF;'" "关闭" }}</span>
>{{ fanStatus.status[1] == 1 ? "打开" : "关闭" }}</span
>
</div> </div>
<div class="line1"></div> <div class="line1"></div>
<div class="i_content_item"> <div class="i_content_item">
<span>3#风机</span> <span>3#风机</span>
<span <span :style="fanStatus.status[2] == 1 ? '' : 'color:#86C2FF;'">{{ fanStatus.status[2] == 1 ? "打开" :
:style="fanStatus.status[2] == 1 ? '' : 'color:#86C2FF;'" "关闭" }}</span>
>{{ fanStatus.status[2] == 1 ? "打开" : "关闭" }}</span
>
<span class="line"></span> <span class="line"></span>
<span>4#风机</span> <span>4#风机</span>
<span <span :style="fanStatus.status[3] == 1 ? '' : 'color:#86C2FF;'">{{ fanStatus.status[3] == 1 ? "打开" :
:style="fanStatus.status[3] == 1 ? '' : 'color:#86C2FF;'" "关闭" }}</span>
>{{ fanStatus.status[3] == 1 ? "打开" : "关闭" }}</span
>
</div> </div>
<div class="line1"></div> <div class="line1"></div>
<div class="i_content_item" style="width: 50%"> <div class="i_content_item" style="width: 50%">
<span>5#风机</span> <span>5#风机</span>
<span <span :style="fanStatus.status[4] == 1 ? '' : 'color:#86C2FF;'">{{ fanStatus.status[4] == 1 ? "打开" :
:style="fanStatus.status[4] == 1 ? '' : 'color:#86C2FF;'" "关闭" }}</span>
>{{ fanStatus.status[4] == 1 ? "打开" : "关闭" }}</span
>
<span class="line"></span> <span class="line"></span>
</div> </div>
</div> </div>
<div <div class="i_title_" style="margin-top: 0.2rem" v-for="(item, index) in statusList" :key="index">
class="i_title_"
style="margin-top: 0.2rem"
v-for="(item, index) in statusList"
:key="index"
>
<template v-if="item.open != 0"> <template v-if="item.open != 0">
<img src="../../assets/img/i_title_img.png" alt="" /> <img src="../../assets/img/i_title_img.png" alt="" />
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
@ -1222,12 +1140,10 @@ export default {
opacity: 0.9; opacity: 0.9;
text-shadow: 0.01 0.1rem 0.2rem rgba(0, 51, 103, 0.25); text-shadow: 0.01 0.1rem 0.2rem rgba(0, 51, 103, 0.25);
background: linear-gradient( background: linear-gradient(to bottom,
to bottom,
#ffffff 45%, #ffffff 45%,
#e9f8ff 90%, #e9f8ff 90%,
#77baff 100% #77baff 100%);
);
-webkit-background-clip: text; -webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
text-align: center; text-align: center;
@ -1258,12 +1174,10 @@ export default {
} }
.act { .act {
background: linear-gradient( background: linear-gradient(-35deg,
-35deg,
#56a8d5 0%, #56a8d5 0%,
rgba(0, 55, 110, 0.75) 50%, rgba(0, 55, 110, 0.75) 50%,
#56a8d5 100% #56a8d5 100%);
);
border: 1px solid rgba(122, 225, 255, 0.75); border: 1px solid rgba(122, 225, 255, 0.75);
font-size: 0.18rem; font-size: 0.18rem;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
@ -1404,8 +1318,7 @@ export default {
.weatherStation { .weatherStation {
width: 4rem; width: 4rem;
height: 0.43rem; height: 0.43rem;
background: url("../../assets/img/weatherStation.png") center background: url("../../assets/img/weatherStation.png") center no-repeat;
no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
@ -1470,8 +1383,7 @@ export default {
.e_title { .e_title {
width: 3.98rem; width: 3.98rem;
height: 0.19rem; height: 0.19rem;
background: url("../../assets/img/environmentData_bg.png") center background: url("../../assets/img/environmentData_bg.png") center no-repeat;
no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
font-size: 0.18rem; font-size: 0.18rem;
font-family: AlibabaPuHuiTiM; font-family: AlibabaPuHuiTiM;
@ -1564,15 +1476,13 @@ export default {
top: 0; top: 0;
left: 0; left: 0;
z-index: 99; z-index: 99;
-webkit-mask-image: linear-gradient( -webkit-mask-image: linear-gradient(90deg,
90deg,
transparent 22%, transparent 22%,
transparent 10%, transparent 10%,
blue 30%, blue 30%,
blue 70%, blue 70%,
transparent 75%, transparent 75%,
transparent 100% transparent 100%);
);
.map1 { .map1 {
width: 60%; width: 60%;
@ -1585,12 +1495,10 @@ export default {
// blue 80%, // blue 80%,
// transparent 100%, // transparent 100%,
// transparent 100%); // transparent 100%);
-webkit-mask-image: linear-gradient( -webkit-mask-image: linear-gradient(transparent 0%,
transparent 0%,
blue 8%, blue 8%,
blue 85%, blue 85%,
transparent 100% transparent 100%);
);
// transform: scale(0.6); // transform: scale(0.6);
position: absolute; position: absolute;
top: 50%; top: 50%;
@ -1605,23 +1513,19 @@ export default {
// top: 0.3rem; // top: 0.3rem;
// left: 0.5rem; // left: 0.5rem;
z-index: 10; z-index: 10;
-webkit-mask-image: linear-gradient( -webkit-mask-image: linear-gradient(90deg,
90deg,
transparent 4%, transparent 4%,
blue 18%, blue 18%,
blue 88%, blue 88%,
transparent 100% transparent 100%);
);
.drag_img { .drag_img {
width: 100%; width: 100%;
height: 100%; height: 100%;
-webkit-mask-image: linear-gradient( -webkit-mask-image: linear-gradient(transparent 0%,
transparent 0%,
blue 13%, blue 13%,
blue 73%, blue 73%,
transparent 97% transparent 97%);
);
} }
.axis_1 { .axis_1 {
@ -1813,17 +1717,14 @@ export default {
width: 0.74rem !important; width: 0.74rem !important;
} }
.swiper-slide1 { .swiper-slide1 {}
}
::v-deep .swiper-slide2 { ::v-deep .swiper-slide2 {
color: #ffffff !important; color: #ffffff !important;
background: linear-gradient( background: linear-gradient(-35deg,
-35deg,
#56a8d5 0%, #56a8d5 0%,
rgba(0, 55, 110, 0.75) 50%, rgba(0, 55, 110, 0.75) 50%,
#56a8d5 100% #56a8d5 100%) !important;
) !important;
border: 1px solid rgba(122, 225, 255, 0.75) !important; border: 1px solid rgba(122, 225, 255, 0.75) !important;
} }
@ -1907,8 +1808,7 @@ export default {
.i_title { .i_title {
// width: 4rem; // width: 4rem;
height: 0.5rem; height: 0.5rem;
background: url("../../assets/img/i_title_bg.png") center background: url("../../assets/img/i_title_bg.png") center no-repeat;
no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -1953,11 +1853,9 @@ export default {
>span:nth-child(6) { >span:nth-child(6) {
width: 0.66rem; width: 0.66rem;
height: 0.3rem; height: 0.3rem;
background: linear-gradient( background: linear-gradient(-35deg,
-35deg,
rgba(122, 225, 255, 0.49) 1%, rgba(122, 225, 255, 0.49) 1%,
rgba(122, 225, 255, 0.5) 100% rgba(122, 225, 255, 0.5) 100%);
);
border: 0.01rem solid rgba(122, 225, 255, 0.5); border: 0.01rem solid rgba(122, 225, 255, 0.5);
border-radius: 0.15rem; border-radius: 0.15rem;
font-size: 0.14rem; font-size: 0.14rem;
@ -1972,8 +1870,7 @@ export default {
.i_title_ { .i_title_ {
// width: 4rem; // width: 4rem;
height: 0.5rem; height: 0.5rem;
background: url("../../assets/img/i_title_bg.png") center background: url("../../assets/img/i_title_bg.png") center no-repeat;
no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -2022,11 +1919,9 @@ export default {
>span:nth-child(7) { >span:nth-child(7) {
width: 0.66rem; width: 0.66rem;
height: 0.3rem; height: 0.3rem;
background: linear-gradient( background: linear-gradient(-35deg,
-35deg,
rgba(122, 225, 255, 0.49) 1%, rgba(122, 225, 255, 0.49) 1%,
rgba(122, 225, 255, 0.5) 100% rgba(122, 225, 255, 0.5) 100%);
);
border: 0.01rem solid rgba(122, 225, 255, 0.5); border: 0.01rem solid rgba(122, 225, 255, 0.5);
border-radius: 0.15rem; border-radius: 0.15rem;
font-size: 0.14rem; font-size: 0.14rem;

View File

@ -30,10 +30,10 @@
</div> </div>
<div class="popBox" v-for="(item, index) in popContentList" :key="index"> <div class="popBox" v-for="(item, index) in popContentList" :key="index">
<template> <template>
<div class="pole_item" :class="'pole_item' + (index+1)" @click="handlerPop(item.id)"> <div class="pole_item" :style="getNamePosition(item.id)" @click="handlerPop(item.id)">
<div class="p_title"> <div class="p_title">
<img src="../../assets/img/wenshi.png" alt="" /> <img src="../../assets/img/wenshi.png" alt="" />
<span>{{ item.greenhouseName }}#温室</span> <span>{{ item.greenhouseName }}温室</span>
</div> </div>
<img class="pole1" src="../../assets/img/pole1.png" alt="" /> <img class="pole1" src="../../assets/img/pole1.png" alt="" />
</div> </div>
@ -659,6 +659,22 @@ export default {
// } // }
}, },
getNamePosition(id){
if(id == 2){
return "position: absolute;top: 10%;left: 24%;"
}else if(id == 3){
return "position: absolute;top: 61%;left: 62%;"
}else if(id == 4){
return "position: absolute;top: 1%;left: 62%;"
}else if(id == 5){
return "position: absolute;top: 29%;left: 76%;"
}else if(id == 6){
return "position: absolute;top: 22%;left: 40%;"
}else if(id == 7){
return "position: absolute;top: 41%;left: 13%;"
}
},
// //
getTypeList(val) { getTypeList(val) {
let typeList1 = []; let typeList1 = [];