样式修改
This commit is contained in:
parent
7f034d317b
commit
4eea49358c
|
|
@ -601,7 +601,18 @@
|
||||||
},
|
},
|
||||||
tojk(item,index){
|
tojk(item,index){
|
||||||
let items = item.deployCode.split('-')
|
let items = item.deployCode.split('-')
|
||||||
uni.openEmbeddedMiniProgram({ appId: 'wxf2b3a0262975d8c2', path: '/pages/live/live?accessToken=' + this.token +'&deviceSerial=' + items[0] + '&channelNo=' + items[1]})
|
var obj = {
|
||||||
|
url: "https://m.ilhzn.cn/#/pages/cameraView/ysyCamera",
|
||||||
|
deployDes: item.deployDes + '-' + '',
|
||||||
|
ysToken: this.token,
|
||||||
|
deviceIotUrl: item.deviceUrl
|
||||||
|
};
|
||||||
|
const queryString = Object.keys(obj).map((key) =>
|
||||||
|
`${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join("&");
|
||||||
|
const webviewUrl = `/packDetail1/pages/device/index4?${queryString}`;
|
||||||
|
uni.navigateTo({
|
||||||
|
url: webviewUrl
|
||||||
|
});
|
||||||
},
|
},
|
||||||
changetab(index){
|
changetab(index){
|
||||||
this.isActive = index
|
this.isActive = index
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
<view class="padding text-center margin-top">
|
<view class="padding text-center margin-top">
|
||||||
<button class="login-btn block bg-blue lg round" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">获取手机号登录</button>
|
<button class="login-btn block bg-blue lg round" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">获取手机号登录</button>
|
||||||
<view class="botbq">
|
<view class="botbq">
|
||||||
版权所有@河津市农业农村局
|
版权所有@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view> -->
|
</view> -->
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,9 @@
|
||||||
title: '加载中'
|
title: '加载中'
|
||||||
});
|
});
|
||||||
this.List = []
|
this.List = []
|
||||||
this.$http.get('/applet/survDeviceDeploy/list',{params:params}).then(res =>{
|
this.$http.get('/applet/survDeviceDeploy/list', {
|
||||||
|
params: params
|
||||||
|
}).then(res => {
|
||||||
if (res.data.code == 0) {
|
if (res.data.code == 0) {
|
||||||
var data = res.data.data
|
var data = res.data.data
|
||||||
this.List = this.List.concat(data)
|
this.List = this.List.concat(data)
|
||||||
|
|
@ -154,7 +156,9 @@
|
||||||
let params = {}
|
let params = {}
|
||||||
params.pageNo = this.pageNo
|
params.pageNo = this.pageNo
|
||||||
params.pageSize = this.pageSize
|
params.pageSize = this.pageSize
|
||||||
this.$http.get('/applet/survDeviceDeploy/list',{params:params}).then(res =>{
|
this.$http.get('/applet/survDeviceDeploy/list', {
|
||||||
|
params: params
|
||||||
|
}).then(res => {
|
||||||
if (res.data.code == 0) {
|
if (res.data.code == 0) {
|
||||||
var data = res.data.data
|
var data = res.data.data
|
||||||
this.List = this.List.concat(data)
|
this.List = this.List.concat(data)
|
||||||
|
|
@ -185,7 +189,8 @@
|
||||||
ysToken: this.token,
|
ysToken: this.token,
|
||||||
deviceIotUrl: item[0]
|
deviceIotUrl: item[0]
|
||||||
};
|
};
|
||||||
const queryString = Object.keys(obj).map((key) => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join("&");
|
const queryString = Object.keys(obj).map((key) =>
|
||||||
|
`${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join("&");
|
||||||
const webviewUrl = `/packDetail1/pages/device/index4?${queryString}`;
|
const webviewUrl = `/packDetail1/pages/device/index4?${queryString}`;
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: webviewUrl
|
url: webviewUrl
|
||||||
|
|
@ -200,23 +205,28 @@
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.container {
|
.container {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bgimg {
|
.bgimg {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 2135rpx;
|
height: 2135rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item_jklist {
|
.item_jklist {
|
||||||
padding: 0rpx 20rpx 0rpx;
|
padding: 0rpx 20rpx 0rpx;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
margin-bottom: 15rpx;
|
margin-bottom: 15rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item_jklist {
|
.item_jklist {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.itembox_top {
|
.itembox_top {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
@ -225,20 +235,24 @@
|
||||||
padding: 20rpx 0;
|
padding: 20rpx 0;
|
||||||
color: #8b95ea;
|
color: #8b95ea;
|
||||||
}
|
}
|
||||||
|
|
||||||
.top_box {
|
.top_box {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.top_box image {
|
.top_box image {
|
||||||
width: 38rpx;
|
width: 38rpx;
|
||||||
height: 40rpx;
|
height: 40rpx;
|
||||||
margin-right: 14rpx;
|
margin-right: 14rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bot_box {
|
.bot_box {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bot_left {
|
.bot_left {
|
||||||
width: 48%;
|
width: 48%;
|
||||||
border: 4rpx solid #f0f0f0;
|
border: 4rpx solid #f0f0f0;
|
||||||
|
|
@ -246,6 +260,7 @@
|
||||||
// margin-top: 30rpx;
|
// margin-top: 30rpx;
|
||||||
// box-shadow: 5px 5px 5px #0000001a;
|
// box-shadow: 5px 5px 5px #0000001a;
|
||||||
}
|
}
|
||||||
|
|
||||||
// .bot_left:first-child{
|
// .bot_left:first-child{
|
||||||
// margin-top: 12rpx;
|
// margin-top: 12rpx;
|
||||||
// }
|
// }
|
||||||
|
|
@ -256,10 +271,12 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 214rpx;
|
height: 214rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.botleft_top image {
|
.botleft_top image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.botleft_bot {
|
.botleft_bot {
|
||||||
padding: 16rpx 0;
|
padding: 16rpx 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -269,52 +286,62 @@
|
||||||
color: #414141;
|
color: #414141;
|
||||||
border-bottom: 2rpx solid #f0f0f0;
|
border-bottom: 2rpx solid #f0f0f0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.botleft_bot image {
|
.botleft_bot image {
|
||||||
width: 36rpx;
|
width: 36rpx;
|
||||||
height: 40rpx;
|
height: 40rpx;
|
||||||
margin-right: 18rpx;
|
margin-right: 18rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item_jklist1 {
|
.item_jklist1 {
|
||||||
margin-top: 20rpx;
|
margin-top: 20rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bot_box1 {
|
.bot_box1 {
|
||||||
height: 464rpx;
|
height: 464rpx;
|
||||||
border-top-left-radius: 28rpx;
|
border-top-left-radius: 28rpx;
|
||||||
border-top-right-radius: 28rpx;
|
border-top-right-radius: 28rpx;
|
||||||
box-shadow: 5px 5px 5px #0000001a;
|
box-shadow: 5px 5px 5px #0000001a;
|
||||||
}
|
}
|
||||||
|
|
||||||
.botleft_top1 {
|
.botleft_top1 {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
border-top-left-radius: 28rpx;
|
border-top-left-radius: 28rpx;
|
||||||
border-top-right-radius: 28rpx;
|
border-top-right-radius: 28rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.botleft_top1 image {
|
.botleft_top1 image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
border-top-left-radius: 28rpx;
|
border-top-left-radius: 28rpx;
|
||||||
border-top-right-radius: 28rpx;
|
border-top-right-radius: 28rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.load {
|
.load {
|
||||||
height: 100rpx;
|
height: 100rpx;
|
||||||
line-height: 100rpx;
|
line-height: 100rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #c6c6c6;
|
color: #c6c6c6;
|
||||||
}
|
}
|
||||||
|
|
||||||
.zwsj {
|
.zwsj {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
padding: 60% 170rpx 0;
|
padding: 60% 170rpx 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.inzwsj {
|
.inzwsj {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.zwsjimg {
|
.zwsjimg {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 224rpx;
|
height: 224rpx;
|
||||||
margin-bottom: 37rpx;
|
margin-bottom: 37rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.zwsjtext {
|
.zwsjtext {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="container">
|
<view class="container">
|
||||||
<!-- <image src="../../static/zddt.jpg" mode="" class="bgimg" @click="todetail()"></image> -->
|
<!-- <image src="../../static/zddt.jpg" mode="" class="bgimg" @click="todetail()"></image> -->
|
||||||
<map id="map" style="width: 100%; height:2000rpx;" scale="13" :markers="markers" longitude="110.628279"
|
<map id="map" style="width: 100%; height:2000rpx;" scale="13" :markers="markers" longitude="111.436625"
|
||||||
latitude="35.546105" show-location @markertap="markertap" @callouttap="callouttap">
|
latitude="36.771975" show-location @markertap="markertap" @callouttap="callouttap">
|
||||||
<cover-view slot="callout">
|
<cover-view slot="callout">
|
||||||
<cover-view v-for="(item,index) in markers" :key="index" class="customCallout" :marker-id="item.id">
|
<cover-view v-for="(item,index) in markers" :key="index" class="customCallout" :marker-id="item.id">
|
||||||
<cover-image class="imgs" src="@/static/zhandian_icon_xuqin_title.png"
|
<cover-image class="imgs" src="@/static/zhandian_icon_xuqin_title.png"
|
||||||
|
|
@ -19,33 +19,21 @@
|
||||||
</cover-view>
|
</cover-view>
|
||||||
</map>
|
</map>
|
||||||
<view class="zdxq">
|
<view class="zdxq">
|
||||||
<view class="zdxqitem" @click="switch1Change">
|
|
||||||
<image src="../../static/zhandian_sahchong_dingwei.png" mode=""></image>
|
|
||||||
<view class="textss">
|
|
||||||
联网式太阳能杀虫灯
|
|
||||||
</view>
|
|
||||||
<view class="crildon" :style="!isscd?'background:#00ff37':'background: #ccc;'"></view>
|
|
||||||
</view>
|
|
||||||
<view class="zdxqitem" @click="switch2Change">
|
<view class="zdxqitem" @click="switch2Change">
|
||||||
<image src="../../static/zhandian_xuqin_dingwei.png" mode=""></image>
|
<image src="../../static/zhandian_xuqin_dingwei.png" mode=""></image>
|
||||||
<view class="textss">
|
<view class="textss">
|
||||||
畜禽养殖污染监测站
|
团柏河典型小流域监测站
|
||||||
</view>
|
</view>
|
||||||
<view class="crildon" :style="!issscd?'background:#00ff37':'background: #ccc;'"></view>
|
<view class="crildon" :style="!issscd?'background:#00ff37':'background: #ccc;'"></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="zdxqitem" @click="switch3Change">
|
<view class="zdxqitem" @click="switch3Change">
|
||||||
<image src="../../static/zhandian_nongtian_dingwei.png" mode=""></image>
|
<image src="../../static/zhandian_nongtian_dingwei.png" mode=""></image>
|
||||||
<view class="textss">
|
<view class="textss">
|
||||||
农田面源污染监测站
|
对竹河典型小流域监测站
|
||||||
</view>
|
</view>
|
||||||
<view class="crildon" :style="!isssscd?'background:#00ff37':'background: #ccc;'"></view>
|
<view class="crildon" :style="!isssscd?'background:#00ff37':'background: #ccc;'"></view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="switchs" :defaultSwitch="isscd">-->
|
|
||||||
<!-- <selectSwitch @change="switch1Change" :defaultSwitch="isscd" checked_bj_color="#13ce66"/>-->
|
|
||||||
<!-- <switch style="margin-right: 10rpx;" :checked="isscd" @change="switch1Change" />-->
|
|
||||||
<!-- <!– 显示/隐藏杀虫灯 –>-->
|
|
||||||
<!-- </view>-->
|
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -130,7 +118,9 @@
|
||||||
title: '加载中'
|
title: '加载中'
|
||||||
});
|
});
|
||||||
this.$http.get('/applet/survStationInfo/stationMap').then(res => {
|
this.$http.get('/applet/survStationInfo/stationMap').then(res => {
|
||||||
this.stationlist = [...res.data.data.pestlight, ...res.data.data.cusLocation, ...res.data.data.stationInfo]
|
this.stationlist = [...res.data.data.pestlight, ...res.data.data.cusLocation, ...res.data.data
|
||||||
|
.stationInfo
|
||||||
|
]
|
||||||
this.stationlist.forEach((item, index) => {
|
this.stationlist.forEach((item, index) => {
|
||||||
item.id = index;
|
item.id = index;
|
||||||
if (item.inType == 'pestlight') {
|
if (item.inType == 'pestlight') {
|
||||||
|
|
@ -244,54 +234,6 @@
|
||||||
todetails(item) {
|
todetails(item) {
|
||||||
console.log(item, '还是个然后')
|
console.log(item, '还是个然后')
|
||||||
},
|
},
|
||||||
switch1Change() {
|
|
||||||
this.isscd = !this.isscd;
|
|
||||||
let index = 0;
|
|
||||||
if (!this.isscd) {
|
|
||||||
this.pestlightMarker = [];
|
|
||||||
this.timerSet = setInterval(() => {
|
|
||||||
for (let i = 0; i < 50 && index < this.pestlight.length; i++) {
|
|
||||||
const item = this.pestlight[index];
|
|
||||||
item.iconPath = '/static/zhandian_sahchong_dingwei.png';
|
|
||||||
item.latitude = Number(item.latitude);
|
|
||||||
item.longitude = Number(item.longitude);
|
|
||||||
item.width = 15;
|
|
||||||
item.height = 20;
|
|
||||||
// 创建符合 markers 格式的对象
|
|
||||||
const markerItem = {
|
|
||||||
id: item.id,
|
|
||||||
iconPath: item.iconPath,
|
|
||||||
latitude: item.latitude,
|
|
||||||
longitude: item.longitude,
|
|
||||||
width: item.width,
|
|
||||||
height: item.height,
|
|
||||||
customCallout: {
|
|
||||||
anchorY: 0, // Y轴偏移量
|
|
||||||
anchorX: 0, // X轴偏移量
|
|
||||||
display: 'ALWAYS' // 一直展示
|
|
||||||
},
|
|
||||||
// stationType: item.stationType,
|
|
||||||
inType: item.inType,
|
|
||||||
stationName: item.stationName,
|
|
||||||
stationCode: item.stationCode,
|
|
||||||
joinCluster: false // 是否参与点聚合
|
|
||||||
};
|
|
||||||
this.markers.push(markerItem);
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
// this.markers = this.markers.concat(aa);
|
|
||||||
if (index >= this.pestlight.length) {
|
|
||||||
clearInterval(this.timerSet);
|
|
||||||
}
|
|
||||||
}, 1000);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
clearInterval(this.timerSet);
|
|
||||||
this.markers = this.markers.filter((item)=>{
|
|
||||||
return item.inType !== 'pestlight'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
},
|
|
||||||
qiyeChange() {
|
qiyeChange() {
|
||||||
for (let i = 0; i < this.cusLocation.length; i++) {
|
for (let i = 0; i < this.cusLocation.length; i++) {
|
||||||
const item = this.cusLocation[i];
|
const item = this.cusLocation[i];
|
||||||
|
|
@ -471,7 +413,7 @@
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: #FFFFFF;
|
color: #FFFFFF;
|
||||||
text-shadow: 0rpx 1rpx 0rpx rgba(4, 49, 52, 0.55);
|
text-shadow: 0rpx 1rpx 0rpx rgba(4, 49, 52, 0.55);
|
||||||
width: 299rpx;
|
width: 359rpx;
|
||||||
background: rgba(0, 0, 0, 0.52);
|
background: rgba(0, 0, 0, 0.52);
|
||||||
border: 1px solid #4B677C;
|
border: 1px solid #4B677C;
|
||||||
border-radius: 6rpx;
|
border-radius: 6rpx;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue