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

pc-master #262

Merged
xiaomeng merged 3 commits from pc-master into portal 2025-07-08 07:29:51 +00:00
Conversation 0 Commits 3 Files Changed 17 +71 -68
9 changed files with 71 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 33c745a019 - Show all commits

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 MiB

After

Width:  |  Height:  |  Size: 13 MiB

BIN
src/assets/img/map2.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 994 KiB

BIN
src/assets/img/map3.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 MiB

After

Width:  |  Height:  |  Size: 4.9 MiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 MiB

After

Width:  |  Height:  |  Size: 2.9 MiB

BIN
src/assets/img/map9.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB

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

@ -148,8 +148,8 @@
<div class="map" :class="`map1-${limitUserId}`">
<div class="map1">
<!-- 丽水 -->
<div class="drag_box" ref="drag_box" v-show="limitUserId == 1">
<img class="drag_img" src="../../assets/img/map.png" alt="" />
<div class="drag_box" ref="drag_box" v-if="limitUserId == 1">
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map.png" alt="" />
<img class="axis_1" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_1" />
<img 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" />
@ -159,8 +159,8 @@
<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">
<img class="drag_img" src="../../assets/img/map1.png" alt="" />
<div class="drag_box2" ref="drag_box2" v-if="limitUserId == 2">
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map1.png" alt="" />
<img class="axis_init" :class="'axis_' + (index + 8)" src="../../assets/img/axis1.png"
:style="'left:' + (44.5 + index * 4.1) + '%'" alt="" @click="handlerAxis_2" v-for="(i, index) in 10"
:key="index + '_1'" />
@ -176,8 +176,8 @@
" alt="" @click="handlerAxis_2" v-for="(i, index1) in 24" :key="index1 + '_2'" />
</div>
<!-- 石门 -->
<div class="drag_box5" ref="drag_box5" v-show="limitUserId == 5">
<img class="drag_img" src="../../assets/img/map2.png" alt="" />
<div class="drag_box5" ref="drag_box5" v-if="limitUserId == 5">
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map2.jpg" alt="" />
<img class="axis_shimen" src="../../assets/img/axis2.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen1" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen2" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
@ -185,8 +185,8 @@
<img class="axis_shimen4" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
</div>
<!-- 大冶鑫 -->
<div class="drag_box7" ref="drag_box7" v-show="limitUserId == 7">
<img class="drag_img" src="../../assets/img/map3.jpg" alt="" />
<div class="drag_box7" ref="drag_box7" v-if="limitUserId == 7">
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map3.jpg" alt="" />
<img class="axis_shimen" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen1" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen2" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
@ -195,8 +195,8 @@
<img class="axis_shimen5" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
</div>
<!-- 大冶鑫 -->
<div class="drag_box8" ref="drag_box8" v-show="limitUserId == 8">
<img class="drag_img" src="../../assets/img/map4.png" alt="" />
<div class="drag_box8" ref="drag_box8" v-if="limitUserId == 8">
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map4.jpg" alt="" />
<img class="axis_shimen" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen1" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen2" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
@ -207,7 +207,7 @@
<img class="axis_shimen7" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
</div>
<!-- 甘井设施农业 -->
<div class="drag_box9" ref="drag_box9" v-show="limitUserId == 9">
<div class="drag_box9" ref="drag_box9" v-if="limitUserId == 9">
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E7%94%98%E4%BA%95%E6%9D%91%E5%A4%A7%E6%95%B0%E6%8D%AE/%E5%80%BE%E6%96%9C%E5%9B%BE.png" alt="" />
<img class="axis_shimen" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen1" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
@ -223,8 +223,8 @@
</div>
</div>
<!-- 丽水凤鸣共富葡萄 -->
<div class="drag_box10" ref="drag_box10" v-show="limitUserId == 10">
<img class="drag_img" src="../../assets/img/map6.jpg" alt="" />
<div class="drag_box10" ref="drag_box10" v-if="limitUserId == 10">
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map6.jpg" alt="" />
<img class="axis_shimen" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen1" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen2" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
@ -235,19 +235,19 @@
<img class="axis_shimen7" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
</div>
<!-- 镇海欣丰农场 -->
<div class="drag_box11" ref="drag_box11" v-show="limitUserId == 11">
<img class="drag_img" src="../../assets/img/map7.png" alt="" />
<div class="drag_box11" ref="drag_box11" v-if="limitUserId == 11">
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map7.jpg" alt="" />
<img class="axis_shimen" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
</div>
<!-- 金山吕港草莓 -->
<div class="drag_box12" ref="drag_box12" v-show="limitUserId == 12">
<img class="drag_img" src="../../assets/img/map8.png" alt="" />
<div class="drag_box12" ref="drag_box12" v-if="limitUserId == 12">
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map8.png" alt="" />
<img class="axis_shimen" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen1" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
<img class="axis_shimen2" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
</div>
<!-- 长兴前卫柑桔新优品种扩繁基地 -->
<div class="drag_box13" ref="drag_box13" v-show="limitUserId == 13">
<div class="drag_box13" ref="drag_box13" v-if="limitUserId == 13">
<div class="map-13" id="map-13"></div>
<!-- <img class="drag_img" src="../../assets/img/map9.jpg" alt="" />
<img class="axis_shimen" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
@ -878,7 +878,7 @@ export default {
} else if (limitUserId == 9) {
// 左侧上部气象站charts
this.get_weather_echart_data(2023120613270131);
// this.get_weather_echart_data(2023120613270131);
this.get_thisWeekTemperature_echart_data(2023120613270131);
this.get_environmentData(2024070113400048);
this.get_readControl_getState(2024070113400048);
@ -1275,38 +1275,44 @@ export default {
// id == 5 石门;
// id == 5 大冶鑫;
this.limitUserId = (res.data.data.filter(el => el.id == 2 || el.id == 1 || el.id == 5 || el.id == 7 || el.id == 8 || el.id == 9 || el.id == 10 || el.id == 11|| el.id == 12|| el.id == 13))[0].id;
if (this.limitUserId == 1) {
this.drag_boxHandler();
this.dataInit(userId, this.limitUserId);
} else if (this.limitUserId == 2) {
this.drag_boxHandler1();
this.dataInit(userId, this.limitUserId);
} else if (this.limitUserId == 5) {
this.drag_boxHandler5();
this.dataInit(userId, this.limitUserId);
} else if (this.limitUserId == 7) {
this.drag_boxHandler7();
this.dataInit(userId, this.limitUserId);
} else if (this.limitUserId == 8) {
this.drag_boxHandler8();
this.dataInit(userId, this.limitUserId);
} else if (this.limitUserId == 9) {
this.drag_boxHandler9();
this.dataInit(userId, this.limitUserId);
} else if (this.limitUserId == 10) {
this.drag_boxHandler10();
this.dataInit(userId, this.limitUserId);
} else if (this.limitUserId == 11) {
this.drag_boxHandler11();
this.dataInit(userId, this.limitUserId);
}else if (this.limitUserId == 12) {
this.drag_boxHandler12();
this.dataInit(userId, this.limitUserId);
}else if (this.limitUserId == 13) {
if (this.limitUserId != 13) {
// this.drag_boxHandler13();
setTimeout(() => {
this.drag_boxHandler(this.limitUserId);
}, 10);
this.dataInit(userId, this.limitUserId);
}else{
this.dataInit(userId, this.limitUserId);
}
// if (this.limitUserId == 1) {
// this.drag_boxHandler();
// this.dataInit(userId, this.limitUserId);
// } else if (this.limitUserId == 2) {
// this.drag_boxHandler1();
// this.dataInit(userId, this.limitUserId);
// } else if (this.limitUserId == 5) {
// this.drag_boxHandler5();
// this.dataInit(userId, this.limitUserId);
// } else if (this.limitUserId == 7) {
// this.drag_boxHandler7();
// this.dataInit(userId, this.limitUserId);
// } else if (this.limitUserId == 8) {
// this.drag_boxHandler8();
// this.dataInit(userId, this.limitUserId);
// } else if (this.limitUserId == 9) {
// this.drag_boxHandler9();
// this.dataInit(userId, this.limitUserId);
// } else if (this.limitUserId == 10) {
// this.drag_boxHandler10();
// this.dataInit(userId, this.limitUserId);
// } else if (this.limitUserId == 11) {
// this.drag_boxHandler11();
// this.dataInit(userId, this.limitUserId);
// }else if (this.limitUserId == 12) {
// this.drag_boxHandler12();
// this.dataInit(userId, this.limitUserId);
// }else
}
});
@ -1533,9 +1539,9 @@ window.open("http://localhost:8080/");
},
drag_boxHandler() {
let demo = this.$refs.drag_box;
demo = document.querySelector(".drag_box"); //待拖拽元素
drag_boxHandler(id) {
let demo = this.$refs[`drag_box${id}`];
demo = document.querySelector(`.drag_box${id}`); //待拖拽元素
let canMove = false; //拖拽状态
let x = 0,
y = 0; //鼠标位置
@ -1602,8 +1608,8 @@ window.open("http://localhost:8080/");
},
drag_boxHandler1() {
let demo = this.$refs.drag_box1;
demo = document.querySelector(".drag_box1"); //待拖拽元素
let demo = this.$refs.drag_box2;
demo = document.querySelector(".drag_box2"); //待拖拽元素
let canMove = false; //拖拽状态
let x = 0,
y = 0; //鼠标位置
@ -2195,7 +2201,7 @@ window.open("http://localhost:8080/");
top: -2px;
left: 0;
z-index: 9999;
background: url('../../assets/img/map2.jpg') center no-repeat;
background: url('https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map2.jpg') center no-repeat;
background-size: 100% 100%;
}
@ -2668,7 +2674,7 @@ window.open("http://localhost:8080/");
transform: translate(-50%, -50%);
overflow: hidden;
.drag_box1 {
.drag_box2 {
width: 100%;
height: 100%;
position: absolute;

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

@ -23,7 +23,7 @@
<div class="map">
<div class="map1">
<div class="drag_box1" ref="drag_box1">
<img class="drag_img" src="../../assets/img/map.png" alt="" />
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map.png" alt="" />
<div class="pole_item pole_item_4">
<div class="p_title">
<img src="../../assets/img/wenshi.png" alt="" />
@ -97,7 +97,7 @@
<div class="map">
<div class="map1">
<div class="drag_box2" ref="drag_box2">
<img class="drag_img" src="../../assets/img/map1.png" alt="" />
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map1.png" alt="" />
<div class="popBox" v-for="(item, index) in popContentList1" :key="index + '_1'">
<template>
<div class="pole_item" :style="'top:' +
@ -230,7 +230,7 @@
<div class="map">
<div class="map1">
<div class="drag_box5" ref="drag_box5">
<img class="drag_img" src="../../assets/img/map2.png" alt="" />
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map2.jpg" alt="" />
<div class="popBox" v-for="(item, index) in popContentList" :key="index">
<template>
<div class="pole_item" :style="getTopOrLeft5(item.id)" @click="handlerPop(item.id)">
@ -294,7 +294,7 @@
<div class="map">
<div class="map1">
<div class="drag_box7" ref="drag_box7">
<img class="drag_img" src="../../assets/img/map3.jpg" alt="" />
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map3.jpg" alt="" />
<div class="popBox" v-for="(item, index) in popContentList" :key="index">
<template>
<div class="pole_item" :style="getTopOrLeft7(item.id)" @click="handlerPop(item.id)">
@ -357,7 +357,7 @@
<div class="map">
<div class="map1">
<div class="drag_box8" ref="drag_box8">
<img class="drag_img" src="../../assets/img/map4.png" alt="" />
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map4.jpg" alt="" />
<div class="popBox">
<template>
<div class="pole_item" :style="getTopOrLeft8(8)">
@ -514,7 +514,7 @@
<div class="map">
<div class="map1">
<div class="drag_box10" ref="drag_box10">
<img class="drag_img" src="../../assets/img/map6.jpg" alt="" />
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map6.jpg" alt="" />
<div class="popBox">
<div class="pole_item" style="top:78.5%;left:40.5%;z-index:1;" @click="toHttp">
<div class="p_title">
@ -593,9 +593,7 @@
<div class="map">
<div class="map1">
<div class="drag_box11" ref="drag_box11">
<img class="drag_img" src="../../assets/img/map7.png" alt="" />
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map7.jpg" alt="" />
<div class="popBox" v-for="(item, index) in popContentList" :key="index">
<template>
<div class="pole_item" :style="getTopOrLeft11(item.id)" @click="handlerPop(item.id)">
@ -658,7 +656,7 @@
<div class="map">
<div class="map1">
<div class="drag_box12" ref="drag_box12">
<img class="drag_img" src="../../assets/img/map8.png" alt="" />
<img class="drag_img" src="https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map8.png" alt="" />
<div class="popBox">
<div class="pole_item" style="top:33.5%;left:48.5%;z-index:1;">
<div class="p_title">
@ -1322,7 +1320,6 @@ export default {
this.autoPlay = JSON.parse(localStorage.getItem("autoPlay"));
if (this.autoPlay) {
clearInterval(this.timer2) && this.timer2;
console.log(this.limitUserId);
var num=this.listNumber.find(item => item.id == that.limitUserId).num
var maxNum=num?num:0
this.timer2 = setInterval(() => {
@ -1330,7 +1327,7 @@ export default {
if (that.popContentCurrent > maxNum) {
that.popContentCurrent = 1;
}
console.log( that.popContentCurrent);
}, 3000);
}

2
src/views/page/largeScreen3.vue
View File

@ -980,7 +980,7 @@ size: new AMap.Size(70, 86), // 原始大小，如果不是原始大小，可以
top: -2px;
left: 0;
z-index: 9999;
background: url('../../assets/img/map2.jpg') center no-repeat;
background: url('https://lihemix.oss-cn-hangzhou.aliyuncs.com/%E5%A4%A7%E6%95%B0%E6%8D%AE/map2.jpg') center no-repeat;
background-size: 100% 100%;
}