Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master

pull/66/head
孙萌 2023-12-09 18:06:08 +08:00
commit 5e8787d5e2
2 changed files with 172 additions and 63 deletions

View File

@ -102,9 +102,13 @@
</div> </div>
<div class="drag_box1" ref="drag_box1" v-show="limitUserId == 2"> <div class="drag_box1" ref="drag_box1" v-show="limitUserId == 2">
<img class="drag_img" src="../../assets/img/map1.png" alt="" /> <img class="drag_img" src="../../assets/img/map1.png" alt="" />
<img class="axis_init" :class="'axis_' + (index + 8)" src="../../assets/img/axis1.png" :style="'left:' + (48.5 + index * 4.1) + '%'" alt="" @click="handlerAxis_2" v-for="(i,index) in 10" :key="index + '_1'"/> <img class="axis_init" :class="'axis_' + (index + 8)" src="../../assets/img/axis1.png"
:style="'left:' + (48.5 + index * 4.1) + '%'" alt="" @click="handlerAxis_2" v-for="(i, index) in 10"
:key="index + '_1'" />
<img class="axis_init1" :class="'axis_' + (index1 + 17)" src="../../assets/img/axis1.png" :style="'top:' + (22 + index1 * 0.105) + '%' + ';' + 'left:' + (5 + index1 * 3.3) + '%' + ';'" alt="" @click="handlerAxis_2" v-for="(i,index1) in 25" :key="index1 + '_2'"/> <img class="axis_init1" :class="'axis_' + (index1 + 17)" src="../../assets/img/axis1.png"
:style="'top:' + (22 + index1 * 0.105) + '%' + ';' + 'left:' + (5 + index1 * 3.3) + '%' + ';'" alt=""
@click="handlerAxis_2" v-for="(i, index1) in 25" :key="index1 + '_2'" />
</div> </div>
</div> </div>
</div> </div>
@ -138,12 +142,12 @@
<div> <div>
<div class="swiper-container middle_disasterWarningAnalysis" :style="styleContainer"> <div class="swiper-container middle_disasterWarningAnalysis" :style="styleContainer">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div :class="current == index <div :class="(limitUserId == 1 ? current : current1) == 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" :key="index" :style="styleItem"
@click="getCurrent(index, item)"> @click="getCurrent(index, item)">
{{ item.greenhouseName + "温室" }} {{ item.greenhouseName + (limitUserId == 1 ? "温室" : '') }}
</div> </div>
</div> </div>
</div> </div>
@ -158,7 +162,9 @@
</div> </div>
<div class="device_content scroll"> <div class="device_content scroll">
<div class="content_item">
<!-- 丽水 -->
<div class="content_item" v-if="limitUserId == 1">
<div class="i_title" v-if="fanStatus.open != 0"> <div class="i_title" v-if="fanStatus.open != 0">
<img src="../../assets/img/i_title_img.png" alt="" /> <img src="../../assets/img/i_title_img.png" alt="" />
<span>风机</span> <span>风机</span>
@ -224,6 +230,30 @@
</template> </template>
</div> </div>
</div> </div>
<!-- 东北 -->
<div class="content_item" v-if="limitUserId == 2" style="margin-top: 0.05rem;">
<div v-for="(item,index) in fiveControlList" :key="index" style="margin-bottom: 0.15rem;">
<div class="i_title" v-if="item.controlState != 0">
<img src="../../assets/img/i_title_img.png" alt="" />
<span>{{ item.title }}</span>
<span class="line"></span>
<span>{{item.controlState == 1 ? "自动控制" : "手机控制"}}</span>
<span class="line"></span>
<i class="progress" v-if="Number(item.progress) == ''">{{ item.progress }}%</i>
<span>菜单</span>
</div>
<div class="i_title" v-else>
<img src="../../assets/img/i_title_img.png" alt="" />
<span>{{ item.title }}</span>
<span class="line"></span>
<span>无效</span>
<span class="line"></span>
<span>菜单</span>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -269,6 +299,7 @@ export default {
content_item_current: -1, content_item_current: -1,
current: 5, current: 5,
current1: 1,
dataList: [ dataList: [
// "", "", "", "", "", "" // "", "", "", "", "", ""
@ -680,12 +711,56 @@ export default {
}, },
], ],
limitUserId:'' limitUserId: '',
//
fiveControlList: [{
title: '加温水泵',
controlState: 0,
num: '1000',
close_btn: false
},
{
title: '地热风机',
controlState: 0,
num: '1002',
close_btn: false
},
{
title: '上风口',
controlState: 0,
num: '1004',
close_btn: true,
progress_num: '1006',
progress: ''
},
{
title: '下风口',
controlState: 0,
num: '1007',
close_btn: true,
progress_num: '1009',
progress: ''
},
{
title: '卷被',
controlState: 0,
num: '1010',
close_btn: true
},
{
title: '除雪',
controlState: 0,
num: '1013',
close_btn: false
},
]
}; };
}, },
mounted() { mounted() {
this.login(); this.login();
@ -700,7 +775,7 @@ export default {
}, },
methods: { methods: {
// id // id
dataInit(userid) { dataInit(userid, limitUserId) {
this.api.Bigdata_getAllControl(userid).then((res) => { this.api.Bigdata_getAllControl(userid).then((res) => {
// console.log('id', res); // console.log('id', res);
this.dataList = res.data.data; this.dataList = res.data.data;
@ -722,11 +797,22 @@ export default {
// this.get_environmentData(el.deviceId) // this.get_environmentData(el.deviceId)
// this.get_readControl_getState(el.deviceId) // this.get_readControl_getState(el.deviceId)
}); });
this.get_weather_echart_data(2023042214250027); if (limitUserId == 1) {
this.get_thisWeekTemperature_echart_data(2023042214250027); //
this.get_environmentData(2023042214250027); this.get_weather_echart_data(2023042214250027);
this.get_readControl_getState(2023042214250027); this.get_thisWeekTemperature_echart_data(2023042214250027);
this.getWeatherData(2023042214250027); this.get_environmentData(2023042214250027);
this.get_readControl_getState(2023042214250027);
this.getWeatherData(2023042214250027);
} else if (limitUserId == 2) {
//
this.get_weather_echart_data(2023112911050004);
this.get_thisWeekTemperature_echart_data(2023112911050004);
this.get_environmentData(2023112911050004);
this.get_readControl_getState(2023112911050004);
this.getWeatherData(2023112911050004);
}
} }
}); });
}, },
@ -858,7 +944,6 @@ export default {
}, 100); }, 100);
} }
}); });
// console.log(this.get_sel_eqbyid_list);
}); });
}, },
@ -907,8 +992,16 @@ export default {
this.statusList.push(statusData); this.statusList.push(statusData);
} }
// console.log(this.statusList); // console.log(this.statusList);
//
this.fiveControlList.forEach(el => {
el.controlState = res.data.data[el.num];
if(el.progress_num){
el.progress = res.data.data[el.progress_num];
}
})
} }
}); });0
}, },
// //
@ -949,7 +1042,7 @@ export default {
// }) // })
let userInfo = JSON.parse(localStorage.getItem("userInfo")); let userInfo = JSON.parse(localStorage.getItem("userInfo"));
this.dataInit(userInfo.userid); //this.dataInit(userInfo.userid);
this.get_sel_eqbyid(userInfo.userid); this.get_sel_eqbyid(userInfo.userid);
// id // id
@ -967,14 +1060,16 @@ export default {
}, },
// id // id
get_user_getjurisdiction(userId){ get_user_getjurisdiction(userId) {
this.api.user_getjurisdiction(userId).then(res=>{ this.api.user_getjurisdiction(userId).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.limitUserId = res.data.data[0].id; this.limitUserId = res.data.data[0].id;
if(this.limitUserId == 1){ if (this.limitUserId == 1) {
this.drag_boxHandler(); this.drag_boxHandler();
}else if(this.limitUserId == 2){ this.dataInit(userId, this.limitUserId);
} else if (this.limitUserId == 2) {
this.drag_boxHandler1(); this.drag_boxHandler1();
this.dataInit(userId, this.limitUserId);
} }
} }
}) })
@ -1048,8 +1143,10 @@ export default {
getCurrent(index, item) { getCurrent(index, item) {
this.current = index; this.current = index;
this.current1 = index;
// console.log(item,'00000000000000'); // console.log(item,'00000000000000');
this.get_readControl_getState(item.deviceId); // this.get_readControl_getState(item.deviceId);
this.get_readControl_getState(2023112911050004);
}, },
drag_boxHandler() { drag_boxHandler() {
@ -1500,6 +1597,7 @@ export default {
width: 3.98rem; width: 3.98rem;
height: 3.08rem; height: 3.08rem;
overflow: hidden; overflow: hidden;
padding-top: 0.15rem;
.title_child { .title_child {
width: 100%; width: 100%;
@ -1604,7 +1702,7 @@ export default {
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
overflow: hidden; overflow: hidden;
.drag_box1{ .drag_box1 {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
@ -1626,7 +1724,7 @@ export default {
transparent 97%); transparent 97%);
} }
.axis_init{ .axis_init {
width: 0.4rem; width: 0.4rem;
height: 0.5rem; height: 0.5rem;
position: absolute; position: absolute;
@ -1634,13 +1732,14 @@ export default {
z-index: 99; z-index: 99;
} }
.axis_init1{ .axis_init1 {
width: 0.4rem; width: 0.4rem;
height: 0.5rem; height: 0.5rem;
position: absolute; position: absolute;
z-index: 99; z-index: 99;
} }
} }
.drag_box { .drag_box {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -1985,7 +2084,17 @@ export default {
// margin-right: 0.47rem; // margin-right: 0.47rem;
// } // }
>span:nth-child(6) { .progress{
width: 18%;
font-size: 0.14rem;
font-style: normal;
font-family: MicrosoftYaHei;
font-weight: 400;
color: #7ae1ff;
margin-right: 0.47rem;
}
>span:nth-child(6),>span:nth-child(7) {
width: 0.66rem; width: 0.66rem;
height: 0.3rem; height: 0.3rem;
background: linear-gradient(-35deg, background: linear-gradient(-35deg,
@ -2119,5 +2228,4 @@ export default {
} }
} }
} }
} }</style>
</style>

View File

@ -119,7 +119,7 @@
<div class="p_video"> <div class="p_video">
<img :src="item.greenhouseImage" alt="" /> <img :src="item.greenhouseImage" alt="" />
</div> </div>
<div class="text">温室{{ item.greenhouseName }}#</div> <div class="text">{{ item.greenhouseName }}</div>
<div class="line"></div> <div class="line"></div>
<div class="detail"> <div class="detail">
<div class="d_item"> <div class="d_item">
@ -175,7 +175,7 @@
<div class="p_video"> <div class="p_video">
<img :src="item.greenhouseImage" alt="" /> <img :src="item.greenhouseImage" alt="" />
</div> </div>
<div class="text">温室{{ item.greenhouseName }}#</div> <div class="text">{{ item.greenhouseName }}</div>
<div class="line"></div> <div class="line"></div>
<div class="detail"> <div class="detail">
<div class="d_item"> <div class="d_item">
@ -699,7 +699,7 @@ export default {
getTopOrLeft1(id) { getTopOrLeft1(id) {
for(let i = 0; i < 26;i++){ for(let i = 0; i < 26;i++){
if(id == (i + 1)){ if(id == (i + 1)){
return `top:34%;left:${(74 - i * 3) < 15 ? 15 : (74 - i * 3)}%;transform: translate(-50%,-50%);`; return `top:40%;left:${(74 - i * 3) < 15 ? 15 : (74 - i * 3)}%;transform: translate(-50%,-50%);`;
} }
} }
// if (id == 1) { // if (id == 1) {
@ -792,11 +792,12 @@ export default {
// }) // })
let userInfo = JSON.parse(localStorage.getItem("userInfo")); let userInfo = JSON.parse(localStorage.getItem("userInfo"));
this.dataInit(userInfo.userid);
// id // id
this.get_user_getjurisdiction(userInfo.userid) this.get_user_getjurisdiction(userInfo.userid)
this.dataInit(userInfo.userid);
let that = this; let that = this;
this.autoPlay = JSON.parse(localStorage.getItem("autoPlay")); this.autoPlay = JSON.parse(localStorage.getItem("autoPlay"));
if (this.autoPlay == false) { if (this.autoPlay == false) {
@ -1244,8 +1245,8 @@ export default {
} }
.pop_content1 { .pop_content1 {
width: 2.5rem; width: 3.5rem;
height: 3rem; height: 4.55rem;
background: url("../../assets/img/pop_bg.png") center no-repeat; background: url("../../assets/img/pop_bg.png") center no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
overflow: hidden; overflow: hidden;
@ -1264,7 +1265,7 @@ export default {
.p_video { .p_video {
width: 90%; width: 90%;
height: 1.2rem; height: 1.82rem;
margin: 0.1rem auto 0; margin: 0.1rem auto 0;
>img { >img {
@ -1275,18 +1276,18 @@ export default {
.text { .text {
width: 100%; width: 100%;
height: 0.3rem; height: 0.4rem;
font-size: 0.15rem; font-size: 0.2rem;
font-family: AlimamaShuHeiTi-Bold; font-family: AlimamaShuHeiTi-Bold;
font-weight: bold; font-weight: bold;
color: #f3fdff; color: #f3fdff;
line-height: 0.3rem; line-height: 0.4rem;
box-sizing: border-box; box-sizing: border-box;
padding-left: 0.15rem; padding-left: 0.2rem;
} }
.line { .line {
width: 2.2rem; width: 90%;
height: 0.01rem; height: 0.01rem;
background: #51d4fa; background: #51d4fa;
opacity: 0.5; opacity: 0.5;
@ -1295,31 +1296,31 @@ export default {
.detail { .detail {
width: 100%; width: 100%;
height: 0.3rem; height: 0.45rem;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-evenly; justify-content: space-evenly;
padding: 0 0.15rem; padding: 0 0.15rem;
.d_item { .d_item {
height: 0.2rem; height: 0.3rem;
background: rgba(81, 212, 250, 0.15); background: rgba(81, 212, 250, 0.15);
border: 0.01rem solid rgba(106, 222, 255, 0.4); border: 0.01rem solid rgba(106, 222, 255, 0.4);
border-radius: 0.02rem; border-radius: 0.02rem;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; // align-items: center;
box-sizing: border-box; box-sizing: border-box;
padding: 0 0.05rem; padding: 0.05rem 0.05rem;
>img { >img {
width: 0.1rem; width: 0.2rem;
height: 0.1rem; height: 0.2rem;
margin-right: 0.05rem; margin-right: 0.05rem;
} }
>span { >span {
font-size: 0.12rem; font-size: 0.13rem;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
font-weight: 400; font-weight: 400;
color: #d9effd; color: #d9effd;
@ -1329,7 +1330,7 @@ export default {
.grow { .grow {
width: 2.5rem; width: 2.5rem;
height: 0.2rem; height: 0.3rem;
background: url("../../assets/img/grow_bg.png") center no-repeat; background: url("../../assets/img/grow_bg.png") center no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
margin: 0 auto; margin: 0 auto;
@ -1338,20 +1339,20 @@ export default {
align-items: center; align-items: center;
>img { >img {
width: 0.15rem; width: 0.18rem;
height: 0.15rem; height: 0.18rem;
margin-right: 0.05rem; margin-right: 0.05rem;
} }
>span:nth-child(2) { >span:nth-child(2) {
font-size: 0.12rem; font-size: 0.13rem;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
font-weight: 400; font-weight: 400;
color: #ffffff; color: #ffffff;
} }
>span:nth-child(3) { >span:nth-child(3) {
font-size: 0.12rem; font-size: 0.13rem;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
font-weight: 400; font-weight: 400;
color: #36ffd2; color: #36ffd2;
@ -1359,8 +1360,8 @@ export default {
} }
.icon_item { .icon_item {
width: 95%; width: 100%;
height: calc(100% - 2.22rem); height: calc(100% - 3.22rem);
box-sizing: border-box; box-sizing: border-box;
padding: 0.1rem 0.15rem; padding: 0.1rem 0.15rem;
display: flex; display: flex;
@ -1369,14 +1370,14 @@ export default {
overflow: auto; overflow: auto;
.icon_item_child { .icon_item_child {
width: 50%; width: 33.33%;
height: 45%; height: 33.33%;
display: flex; display: flex;
margin-bottom: 0.05rem; margin-bottom: 0.05rem;
> img { > img {
width: 0.28rem; width: 0.4rem;
height: 0.28rem; height: 0.4rem;
margin-right: 0.05rem; margin-right: 0.05rem;
} }
@ -1385,14 +1386,14 @@ export default {
flex-direction: column; flex-direction: column;
> span:nth-child(1) { > span:nth-child(1) {
font-size: 0.1rem; font-size: 0.12rem;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
font-weight: bold; font-weight: bold;
color: #86d9ff; color: #86d9ff;
} }
> span:nth-child(2) { > span:nth-child(2) {
font-size: 0.11rem; font-size: 0.15rem;
font-family: AlibabaPuHuiTiB; font-family: AlibabaPuHuiTiB;
font-weight: bold; font-weight: bold;
color: #ffffff; color: #ffffff;