From 5c26aaf55463580a2de7163ba16b2eba941d0f9c Mon Sep 17 00:00:00 2001
From: tanghaolin <1723298894@qq.com>
Date: 星期二, 01 十一月 2022 15:57:44 +0800
Subject: [PATCH] 修改地图 展示
---
map/index.wxss | 102 +++++++++++++++++---
monitor/station/index.wxml | 5
map/index.js | 69 +++++++------
map/index.wxml | 98 ++++++++----------
4 files changed, 171 insertions(+), 103 deletions(-)
diff --git a/map/index.js b/map/index.js
index c5a0934..e2366a4 100644
--- a/map/index.js
+++ b/map/index.js
@@ -39,6 +39,7 @@
stationID: '', //娉电珯id
modalName: '', //妯℃�佹鎶撶姸鎬�
stationIDs: [], //鎵�鏈夋车绔檌d闆嗗悎
+ allMarkersID:[],//鎵�鏈夌殑markesID闆嗗悎
link_box: false, //璧勪骇銆佺洃鎺с�乥im璺宠浆鏉℃樉/闅�
tuceng_active: false, //鍥惧眰鎸夐挳鏄剧ず闅愯棌
marker_layer: {
@@ -123,7 +124,7 @@
})
},
//鑾峰彇鍦板浘灞曠ず鐨勫熀鏈俊鎭�
- getMapInfo: function () {
+ getMapInfo () {
var that = this;
wx.showLoading({
title: '鍔犺浇涓�...'
@@ -133,7 +134,7 @@
url: Constant.BASE_SERVER_URL + "Map/ObjectMapInfo/Mobile/GetByKindAndPurposeUnderCorp@V1.0",
method: 'GET',
data: {
- CorpID: this.data.currentCorpID,
+ CorpID: that.data.currentCorpID,
Kind:"楂樺痉",
Purpose:"瀹氫綅"
},
@@ -148,9 +149,9 @@
content: '閫氳澶辫触',
})
}, //璇锋眰澶辫触
- success: function (res) {
+ success: (res)=> {
wx.hideLoading();
- console.log(res.data,150)
+ // console.log(res.data,150)
var result = res.data;
if (result.Code != 0) {
wx.showModal({
@@ -159,18 +160,18 @@
});
return;
}
- // wx.showToast({
- // title: '鍔犺浇鎴愬姛',
- // icon: "success",
- // duration: 1000
- // });
- //console.log(result)
let allDMA = []
let allProduct = []
let allFlowMeter = []
let allPressMeter = []
let allStation = []
- result.Data.forEach((item)=>{
+ let allMarkersID = []
+ for( let i = 0;i<result.Data.length;i++){
+ let item = result.Data[i]
+ let index = i
+ item.currentIndex = index
+ allMarkersID.push(item.ObjectID);
+
if(item.ObjectType == "娉电珯"){
item.Position = JSON.parse(item.Position)
allStation.push(item)
@@ -191,8 +192,9 @@
allProduct.push(item)
}
}
- })
- // console.log(allDMA,allProduct,174)
+ }
+
+ // console.log(allDMA,allProduct,174)
var DMA = [];
var DmaArea = [];
@@ -237,15 +239,14 @@
}
for (var i = 0; i < allStation.length; i++) {
var item = allStation[i];
- console.log(item,24)
- var mark = {};
- var callout = {};
+ let mark = {};
+ let customCallout = {};
mark.longitude = item.Position.Point.X;
mark.latitude = item.Position.Point.Y;
mark.title = item.ObjectName;
- stationIDs.push("1575029532937818112");
- mark.id = +item.ObjectID ;
+ stationIDs.push(item.ObjectID);
+ mark.id = +item.currentIndex ;
mark.content = item.Position.Address;
mark.width = 32;
mark.height = 32;
@@ -253,13 +254,17 @@
mark.zIndex = 10;
mark.markerInfo = item
mark.markerType = 'Station'
- callout.content = item.ObjectName;
- callout.display = 'ALWAYS';
- callout.padding = 5;
- callout.borderRadius = 10;
- callout.borderWidth = 1;
- callout.borderColor = '#999';
- mark.callout = callout;
+ customCallout.anchorY= -3
+ customCallout.anchorX= 0,
+ customCallout.display= 'ALWAYS'
+
+ // customCallout.content = item.ObjectName;
+ // customCallout.display = 'ALWAYS';
+ // customCallout.padding = 5;
+ // customCallout.borderRadius = 10;
+ // customCallout.borderWidth = 1;
+ // customCallout.borderColor = '#999';
+ mark.customCallout = customCallout;
markers.push(mark);
Station.push(mark);
@@ -280,7 +285,7 @@
mark.latitude = item.Position.Point.Y;
mark.title = item.ObjectName;
- mark.id = parseInt(item.ObjectID);
+ mark.id = parseInt(item.currentIndex);
mark.content = item.Position.Address;
mark.width = 32;
mark.height = 32;
@@ -310,12 +315,11 @@
var item = allPressMeter[i];
var mark = {};
var callout = {};
-
mark.longitude = item.Position.Point.X;
mark.latitude = item.Position.Point.Y;
mark.title = item.ObjectName;
- mark.id = parseInt(item.ObjectID);
+ mark.id = item.currentIndex;
mark.content = item.Position.Address;
mark.width = 32;
mark.height = 32;
@@ -348,19 +352,22 @@
'mapInfo.markers': markers,
'mapInfo.pointsList': pointsList,
stationIDs: stationIDs,
+ allMarkersID: allMarkersID,
'mapInfo.marker.Station': Station,
'mapInfo.marker.QualityMeter': QualityMeter,
'mapInfo.marker.FlowMeter': FlowMeter,
'mapInfo.marker.PressMeter': PressMeter,
'mapInfo.marker.DmaArea': DmaArea,
});
-
+ console.log(that.data.mapInfo.markers,375)
+ console.log(allMarkersID,"allMarkersID")
//浣挎墍鏈夌殑鏍囪閮藉湪瑙嗛噹涓�
// that.setIncludePoints();
//鑾峰彇宸ュ崟
// that.getRepairFormList()
}
+
});
},
getRepairFormList: function () {
@@ -506,14 +513,14 @@
}
}
for (var i = 0; i < markers.length; i++) {
- if (markers[i].markerInfo.ObjectType == '娉电珯' && id == markers[i].id) {
+ if (markers[i].markerInfo.ObjectType == '娉电珯' && id == that.data.allMarkersID[markers[i].id]) {
markerTipInfo = markers[i];
markerTipInfo.markerInfo.Records = Record
that.setData({
markerTipInfo: markerTipInfo
})
break;
- } else if (id == markers[i].id) {
+ } else if (id == that.data.allMarkersID[markers[i].id]) {
// console.log("ddd")
markerTipInfo = markers[i];
// console.log(markerTipInfo)
diff --git a/map/index.wxml b/map/index.wxml
index 015475f..c041c17 100644
--- a/map/index.wxml
+++ b/map/index.wxml
@@ -1,31 +1,40 @@
<view style="position: relative;height:100vh;overflow:hidden;">
<!-- 鎼滅储妗� -->
- <view class="map_search {{animationSearchBar}} {{isShowMapLayer?'layer_Show':'layer_hiden'}}"
- style="left: 0rpx;top: 40rpx;height: 110rpx;width: 95%;margin: 0rpx 20rpx 0rpx 20rpx;">
+ <view class="map_search {{animationSearchBar}} {{isShowMapLayer?'layer_Show':'layer_hiden'}}" style="left: 0rpx;top: 40rpx;height: 110rpx;width: 95%;margin: 0rpx 20rpx 0rpx 20rpx;">
<text bindtap="onScan" style="font-size: 48rpx;margin-left: 20rpx;" class="cuIcon-scan text-gray"></text>
- <input type='text' placeholder='璇疯緭鍏ラ渶瑕佹煡璇㈢殑鍐呭' value="{{searchKeyWrd}}" bindinput='inputKeyWrd'
- bindconfirm='confirmSearch' />
+ <input type='text' placeholder='璇疯緭鍏ラ渶瑕佹煡璇㈢殑鍐呭' value="{{searchKeyWrd}}" bindinput='inputKeyWrd' bindconfirm='confirmSearch' />
<text style="font-size: 48rpx;margin-right: 20rpx;" class='cuIcon-search text-gray'></text>
<view class="map_list" style="left:3rem;top:110rpx;" wx:if="{{isShowsearchMarkList}}">
- <view bindtap="tapMapSearchItem" hover-class="hovers" data-id="{{searchMarkItem.id}}"
- data-longitude="{{searchMarkItem.longitude}}" data-latitude="{{searchMarkItem.latitude}}"
- wx:for-items="{{searchMarkList}}" wx:for-item="searchMarkItem" wx:for-index="searchList_index" wx:key="id">
+ <view bindtap="tapMapSearchItem" hover-class="hovers" data-id="{{searchMarkItem.id}}" data-longitude="{{searchMarkItem.longitude}}" data-latitude="{{searchMarkItem.latitude}}" wx:for-items="{{searchMarkList}}" wx:for-item="searchMarkItem" wx:for-index="searchList_index" wx:key="id">
{{searchMarkItem.title}}
</view>
</view>
</view>
<!-- 鍦板浘 -->
- <map id="{{mapId}}" style="width: 100vw; height: 100vh;" latitude="{{mapInfo.mapCenterLatitude}}"
- longitude="{{mapInfo.mapCenterLongitude}}" show-location="{{mapInfo.showLocation}}"
- enable-zoom="{{mapInfo.enableZoom}}" scale="{{mapInfo.scale}}" enable-3D="{{mapInfo.map3D}}"
- enable-overlooking="{{mapInfo.overlooking}}" enable-scroll="{{mapInfo.enableScroll}}"
- enable-traffic="{{mapInfo.traffic}}" enable-satellite="{{mapInfo.satellite}}" enable-building="true"
- markers="{{mapInfo.markers}}" polygons="{{mapInfo.DMA}}" bindmarkertap="tapMapMark" bindcallouttap="tapMapMark"
- bindregionchange="mapViewChange" bindtap="mapClick" bindupdated="onUpdate">
+ <map id="{{mapId}}" style="width: 100vw; height: 100vh;" latitude="{{mapInfo.mapCenterLatitude}}" longitude="{{mapInfo.mapCenterLongitude}}" show-location="{{mapInfo.showLocation}}" enable-zoom="{{mapInfo.enableZoom}}" scale="{{mapInfo.scale}}" enable-3D="{{mapInfo.map3D}}" enable-overlooking="{{mapInfo.overlooking}}" enable-scroll="{{mapInfo.enableScroll}}" enable-traffic="{{mapInfo.traffic}}" enable-satellite="{{mapInfo.satellite}}" enable-building="true" markers="{{mapInfo.markers}}" polygons="{{mapInfo.DMA}}" bindmarkertap="tapMapMark" bindcallouttap="tapMapMark" bindregionchange="mapViewChange" bindtap="mapClick" bindupdated="onUpdate">
+
+ <cover-view slot="callout">
+ <block wx:for="{{mapInfo.markers}}" wx:for-item="item" wx:for-index="item.markerInfo.currentIndex" wx:key="item.markerInfo. currentIndex">
+ <cover-view class="customCallout" marker-id="{{item.markerInfo.currentIndex}}">
+ <cover-view class="tooltipWrap">
+ <cover-view class="record_content">
+ <cover-view>{{item.title}}</cover-view>
+ </cover-view>
+ <cover-view style="width:100%;display: flex;justify-content: space-between;padding: 5px 5px;box-sizing: border-box;">
+ <cover-view>鍑哄彛鐬椂娴侀噺</cover-view>
+ <cover-view class="pointType runStatusInBimOpen"></cover-view>
+ </cover-view>
+ <cover-view class="MpInBimPanel">
+ <cover-view class="signalInBimValue">0</cover-view>
+ <cover-view class="signalInBimUnit">m鲁/h</cover-view>
+ </cover-view>
+ </cover-view>
+ </cover-view>
+ </block>
+ </cover-view>
</map>
<!-- 鍙充晶鍔熻兘鍖哄煙 -->
- <div class="right_btn {{isShowMapLayer && isShowRightBtn?'layer_Show':'layer_hiden'}}"
- style="top:14vh;z-index:0;right:20rpx;">
+ <div class="right_btn {{isShowMapLayer && isShowRightBtn?'layer_Show':'layer_hiden'}}" style="top:14vh;z-index:0;right:20rpx;">
<div bindtap="xianShiTuCeng" data-target="DrawerModalR">
<div class="tuceng">
<image src="/images/map/tuceng.png" alt="鍥惧眰"></image>
@@ -56,8 +65,7 @@
</view>
<view wx:if="{{markerTipInfo.markerType!='gongdan'}}">
<view wx:if="{{markerTipInfo.markerInfo.Records.length>0}}">
- <view data-id="{{Records.ID}}" data-name="{{Records.SignalList[0].Name}}" data-unit="{{Records.SignalList[0].UnitValue}}" bindtap="gotoSinglePointPage" class="record_tr"
- wx:for="{{markerTipInfo.markerInfo.Records}}" wx:key="index" wx:for-item="Records">
+ <view data-id="{{Records.ID}}" data-name="{{Records.SignalList[0].Name}}" data-unit="{{Records.SignalList[0].UnitValue}}" bindtap="gotoSinglePointPage" class="record_tr" wx:for="{{markerTipInfo.markerInfo.Records}}" wx:key="index" wx:for-item="Records">
<view class="name">{{Records.SignalList[0].Name?Records.SignalList[0].Name:''}}</view>
<view class="value">{{Records.SignalList[0].DataValue}}</view>
<view class="unit">{{Records.SignalList[0].UnitValue?Records.SignalList[0].UnitValue:''}}</view>
@@ -67,20 +75,16 @@
鏆傛棤鐩戞帶鏁版嵁
</view>
<view wx:if="{{link_box}}" class="block_list_url">
- <view bindtap="tapOpenStationMonitorPageInList" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}"
- data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
+ <view bindtap="tapOpenStationMonitorPageInList" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}" data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
<icon class="iconfont icon-jiankong"></icon> <span style="padding-left:10px;padding-right:10px;">鐩戞帶</span>
</view>
- <view bindtap="tapOpenProductInStationPageInList" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}"
- data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
+ <view bindtap="tapOpenProductInStationPageInList" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}" data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
<icon class="iconfont icon-zichan"></icon> <span style="padding-left:10px;padding-right:10px;">璧勪骇</span>
</view>
- <view bindtap="tapOpenStationBimPageInList" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}"
- data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
+ <view bindtap="tapOpenStationBimPageInList" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}" data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
<icon class="iconfont icon-BIM"></icon> <span style="padding-left:10px;padding-right:10px;">妯″瀷</span>
</view>
- <view bindtap="tapOpenReportForm" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}"
- data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
+ <view bindtap="tapOpenReportForm" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}" data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
<icon class="iconfont icon-liebiao2"></icon> <span style="padding-left:10px;padding-right:10px;">鎶ヨ〃</span>
</view>
</view>
@@ -128,8 +132,7 @@
<!-- 鍥惧眰鏄剧ず -->
<view class="cu-list grid col-3 {{gridBorder?'':'no-border'}}">
<!-- 宸ュ崟 -->
- <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="RepairForm"
- data-show="{{marker_layer.RepairForm}}">
+ <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="RepairForm" data-show="{{marker_layer.RepairForm}}">
<view class="cu-avatar xl radius" style="background: #ffffff;width: 100%;height: 140rpx;">
<image wx:if="{{marker_layer.RepairForm}}" src="/images/map/gongdan_blue.png" style="width:60%;height:60%">
</image>
@@ -141,8 +144,7 @@
<text style="margin-top:unset;">宸ュ崟</text>
</view>
<!-- 鍘嬪姏璁� -->
- <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="PressMeter"
- data-show="{{marker_layer.PressMeter}}">
+ <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="PressMeter" data-show="{{marker_layer.PressMeter}}">
<view class="cu-avatar xl radius" style="background: #ffffff;width: 100%;height: 140rpx;">
<image wx:if="{{marker_layer.PressMeter}}" src="/images/map/press_blue.png" style="width:60%;height:60%">
</image>
@@ -154,8 +156,7 @@
<text style="margin-top:unset;">鍘嬪姏璁�</text>
</view>
<!-- 娴侀噺璁� -->
- <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="FlowMeter"
- data-show="{{marker_layer.FlowMeter}}">
+ <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="FlowMeter" data-show="{{marker_layer.FlowMeter}}">
<view class="cu-avatar xl radius" style="background: #ffffff;width: 100%;height: 140rpx;">
<image wx:if="{{marker_layer.FlowMeter}}" src="/images/map/flow_blue.png" style="width:60%;height:60%">
</image>
@@ -167,14 +168,11 @@
<text style="margin-top:unset;">娴侀噺璁�</text>
</view>
<!-- 姘磋川浠� -->
- <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="QualityMeter"
- data-show="{{marker_layer.QualityMeter}}">
+ <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="QualityMeter" data-show="{{marker_layer.QualityMeter}}">
<view class="cu-avatar xl radius" style="background: #ffffff;width: 100%;height: 140rpx;">
- <image wx:if="{{marker_layer.QualityMeter}}" src="/images/map/shuizhiyi_blue.png"
- style="width:60%;height:60%">
+ <image wx:if="{{marker_layer.QualityMeter}}" src="/images/map/shuizhiyi_blue.png" style="width:60%;height:60%">
</image>
- <image wx:if="{{!marker_layer.QualityMeter}}" src="/images/map/shuizhiyi_gray.png"
- style="width:60%;height:60%">
+ <image wx:if="{{!marker_layer.QualityMeter}}" src="/images/map/shuizhiyi_gray.png" style="width:60%;height:60%">
</image>
<view class="cu-tag badge" style="top:22rpx;margin-top:unset;">
{{mapInfo.marker.QualityMeter.length>0?mapInfo.marker.QualityMeter.length:0}}</view>
@@ -182,8 +180,7 @@
<text style="margin-top:unset;">姘磋川浠�</text>
</view>
<!-- 娉电珯 -->
- <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="Station"
- data-show="{{marker_layer.Station}}">
+ <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="Station" data-show="{{marker_layer.Station}}">
<view class="cu-avatar xl radius" style="background: #ffffff;width: 100%;height: 140rpx;">
<image wx:if="{{marker_layer.Station}}" src="/images/map/pump_blue.png" style="width:60%;height:60%">
</image>
@@ -195,13 +192,10 @@
<text style="margin-top:unset;">娉电珯</text>
</view>
<!-- DMA鍒嗗尯 -->
- <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="DmaArea"
- data-show="{{marker_layer.DmaArea}}">
+ <view class="cu-item" bindtap="showMarkerLayer" style="padding:unset" data-type="DmaArea" data-show="{{marker_layer.DmaArea}}">
<view class="cu-avatar xl radius" style="background: #ffffff;width: 100%;height: 140rpx;">
- <image wx:if="{{marker_layer.DmaArea}}" src="/images/map/DMAarea_blue.png" style="width:60%;height:60%"
- alt="DMA"></image>
- <image wx:if="{{!marker_layer.DmaArea}}" src="/images/map/DMAarea_gray.png" style="width:60%;height:60%"
- alt="DMA"></image>
+ <image wx:if="{{marker_layer.DmaArea}}" src="/images/map/DMAarea_blue.png" style="width:60%;height:60%" alt="DMA"></image>
+ <image wx:if="{{!marker_layer.DmaArea}}" src="/images/map/DMAarea_gray.png" style="width:60%;height:60%" alt="DMA"></image>
<view class="cu-tag badge" style="top:22rpx;margin-top:unset;">
{{mapInfo.marker.DmaArea.length>0?mapInfo.marker.DmaArea.length:0}}</view>
</view>
@@ -214,8 +208,7 @@
</view>
<view class="cu-list grid col-3 {{gridBorder?'':'no-border'}}">
<!-- 2D骞抽潰鍥� -->
- <view class="cu-item {{mapType == '2D'?'map_active':''}}" style="padding:unset" bindtap="changeMapType"
- data-type="2D">
+ <view class="cu-item {{mapType == '2D'?'map_active':''}}" style="padding:unset" bindtap="changeMapType" data-type="2D">
<view class="cu-avatar xl radius" style="background: #ffffff;width: 100%;height: 140rpx;">
<image src="/images/map/2d.png" style="width:60%;height:60%">
</image>
@@ -223,8 +216,7 @@
<text style="margin-top:unset;">2D骞抽潰鍥�</text>
</view>
<!-- 3D淇鍥� -->
- <view class="cu-item {{mapType == '3D'?'map_active':''}}" style="padding:unset" bindtap="changeMapType"
- data-type="3D">
+ <view class="cu-item {{mapType == '3D'?'map_active':''}}" style="padding:unset" bindtap="changeMapType" data-type="3D">
<view class="cu-avatar xl radius" style="background: #ffffff;width: 100%;height: 140rpx;">
<image src="/images/map/3d.png" style="width:60%;height:60%">
</image>
@@ -232,8 +224,7 @@
<text style="margin-top:unset;">3D淇鍥�</text>
</view>
<!-- 鍗槦鍥� -->
- <view class="cu-item {{mapType == 'satellite'?'map_active':''}}" style="padding:unset" bindtap="changeMapType"
- data-type="satellite">
+ <view class="cu-item {{mapType == 'satellite'?'map_active':''}}" style="padding:unset" bindtap="changeMapType" data-type="satellite">
<view class="cu-avatar xl radius" style="background: #ffffff;width: 100%;height: 140rpx;">
<image src="/images/map/weixing.png" style="width:60%;height:60%">
</image>
@@ -265,8 +256,7 @@
</movable-view>
</movable-area> -->
- <view class="drawerBox" style="bottom:{{drawerMenuMoveData.bottom}}rpx;display: none;" bindtouchstart="drawerTouchStart"
- bindtouchend="drawerTouchEnd" bindtouchmove="drawerTouchMove">
+ <view class="drawerBox" style="bottom:{{drawerMenuMoveData.bottom}}rpx;display: none;" bindtouchstart="drawerTouchStart" bindtouchend="drawerTouchEnd" bindtouchmove="drawerTouchMove">
<view class="cu-card case no-card shadow drawerBody" style="height:{{drawerMenuMoveData.height}}rpx;">
<view style="width: 100%;display: flex;justify-content: center;align-items: center;">
<text class="cuIcon-{{drawerMenuMoveData.icon}} text-grey text-xxl"></text>
diff --git a/map/index.wxss b/map/index.wxss
index 4e26a33..041372d 100644
--- a/map/index.wxss
+++ b/map/index.wxss
@@ -522,16 +522,6 @@
border: 0px;
}
-.customCallout {
- box-sizing: border-box;
- background-color: #fff;
- border: 1px solid #ccc;
- border-radius: 5px;
- padding: 5px;
- justify-content: center;
- align-items: center;
-}
-
.content {
display: flex;
font-size: 12px;
@@ -708,11 +698,91 @@
width: 15%;
height: 100%;
}
-.load_mark{
- position: absolute;
- height: 378rpx;
- top: 0;
- width: 100%;
- opacity: 0.5;
+.load_mark {
+ position: absolute;
+ height: 378rpx;
+ top: 0;
+ width: 100%;
+ opacity: 0.5;
+
+}
+
+.customCallout {
+ position: relative;
+ box-sizing: border-box;
+ width: 125px;
+ height: 70px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+ border-radius: 10%;
+ background: rgba(0, 0, 0, 0.6);
+ color: white;
+ border: 2px solid #16b5cb;
+ padding: 5px;
+ font-size: 10px;
+}
+
+.icon {
+ width: 16px;
+ height: 16px;
+}
+
+.content {
+ flex: 0 1 auto;
+ margin: 0 10px;
+ font-size: 14px;
+ text-align: left;
+}
+
+.record_content {
+ display: flex;
+ width: 100%;
+ margin: 0 5px;
+ font-size: 12px;
+ text-align: left;
+ justify-content: flex-start;
+ align-items: center;
+}
+
+.tooltipWrap {
+ display: flex;
+ height: 100%;
+ width: 100%;
+ border-radius: 10px;
+ box-sizing: content-box;
+ flex-direction: column;
+}
+
+.runStatusInBimOpen {
+ background-color: #1E90FF;
+}
+
+.pointType {
+ width: 12px;
+ height: 12px;
+ border-radius: 50%;
+ display: inline-grid;
+ float: right;
+}
+
+.signalInBimValue {
+ background-color: #41b9ee;
+ min-width: 50px;
+ min-height: 18px;
+ display: inline-flex;
+ padding-right: 5px;
+ text-align: right;
+ cursor: pointer;
+ margin-right: 2px;
+ margin-left: 5px;
+ align-items: center;
+ justify-content: center;
+}
+
+.signalInBimUnit {
+ padding-left: 4px;
+ display: inline-block;
}
\ No newline at end of file
diff --git a/monitor/station/index.wxml b/monitor/station/index.wxml
index cf516c9..6ec800c 100644
--- a/monitor/station/index.wxml
+++ b/monitor/station/index.wxml
@@ -28,11 +28,12 @@
</view>
<view class="y_c_list">
<icon class="iconfont icon-taishu"></icon>
- <view class="kpiText">杩愯鍙版暟:<text>{{kpiParas.runNnumber}}/{{machineList.length}}</text></view>
+ <view class="kpiText" wx:if="{{kpiParas.runNnumber>0}}">杩愯鍙版暟:<text>{{kpiParas.runNnumber}}/{{machineList.length}}</text></view>
+ <view class="kpiText" wx:else>杩愯鍙版暟:<text>鏃�</text></view>
</view>
<view class="y_c_list">
<icon class="iconfont icon-guzhang"></icon>
- <view class="kpiText"><text>鏁呴殰:({{kpiParas.alarmNumber}})</text></view>
+ <view class="kpiText"><text>鏁呴殰:({{kpiParas.alarmNumber>0?kpiParas.alarmNumber:'鏃�'}})</text></view>
</view>
<view class="y_c_list">
<view class="operation_model" style="width: 103px;height: 36px;" bindtap="handlCloseOrOpenCtrl">
--
Gitblit v1.9.3