From 16b7fa78346cd78bcd3aa92ec1232a01d51a87f9 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Tue, 18 Jun 2024 09:13:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionTaskMap/inspectionTaskMap.js | 44 ++++++++++++++++-- public/img/inspection.png | Bin 0 -> 4550 bytes public/img/inspection_do.png | Bin 0 -> 4543 bytes 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 public/img/inspection.png create mode 100644 public/img/inspection_do.png diff --git a/public/components/inspection/inspectionTaskMap/inspectionTaskMap.js b/public/components/inspection/inspectionTaskMap/inspectionTaskMap.js index b17a6c919..8e012fc99 100644 --- a/public/components/inspection/inspectionTaskMap/inspectionTaskMap.js +++ b/public/components/inspection/inspectionTaskMap/inspectionTaskMap.js @@ -86,15 +86,24 @@ _pos.forEach(_m => { try { let center = new TMap.LatLng(_m.lat, _m.lng); + let _markerStyle = 'myStyle'; + if(_m.state == '20200405'){ + _markerStyle = 'myStyle_red'; + } _geometriesMarker.push({ "id": _m.inspectionId, //点标记唯一标识,后续如果有删除、修改位置等操作,都需要此id - "styleId": 'myStyle', //指定样式id + "styleId": _markerStyle, //指定样式id "position": center, //点标记坐标位置 }); + let _layerStyle = 'label'; + if(_m.state == '20200405'){ + _layerStyle = 'label_red'; + } + _geometriesLabel.push({ 'id': 'label_' + _m.inspectionId, //点图形数据的标志信息 - 'styleId': 'label', //样式id + 'styleId': _layerStyle, //样式id 'position': center, //标注点位置 // 'content': _m.staffName, //标注文本 'content': _m.inspectionName @@ -112,7 +121,14 @@ "myStyle": new TMap.MarkerStyle({ "width": 25, // 点标记样式宽度(像素) "height": 35, // 点标记样式高度(像素) - "src": '/img/maper.png', //图片路径 + "src": '/img/inspection.png', //图片路径 + //焦点在图片中的像素位置,一般大头针类似形式的图片以针尖位置做为焦点,圆形点以圆心位置为焦点 + "anchor": { x: 32, y: 32 } + }), + "myStyle_red": new TMap.MarkerStyle({ + "width": 25, // 点标记样式宽度(像素) + "height": 35, // 点标记样式高度(像素) + "src": '/img/inspection_do.png', //图片路径 //焦点在图片中的像素位置,一般大头针类似形式的图片以针尖位置做为焦点,圆形点以圆心位置为焦点 "anchor": { x: 32, y: 32 } }) @@ -133,6 +149,14 @@ 'angle': 0, //文字旋转属性 'alignment': 'center', //文字水平对齐属性 'verticalAlignment': 'middle' //文字垂直对齐属性 + }), + 'label_red': new TMap.LabelStyle({ + 'color': '#CC0000', //颜色属性 + 'size': 20, //文字大小属性 + 'offset': { x: 0, y: 15 }, //文字偏移属性单位为像素 + 'angle': 0, //文字旋转属性 + 'alignment': 'center', //文字水平对齐属性 + 'verticalAlignment': 'middle' //文字垂直对齐属性 }) }, //文字标记数据 @@ -150,7 +174,14 @@ 'borderWidth': 5, //边线宽度 'borderColor': '#FFF', //边线颜色 'lineCap': 'butt' //线端头方式 - }) + }), + 'style_red': new TMap.PolylineStyle({ + 'color': '#CC0000', //线填充色 + 'width': 6, //折线宽度 + 'borderWidth': 5, //边线宽度 + 'borderColor': '#FFF', //边线颜色 + 'lineCap': 'butt' //线端头方式 + }), }, //折线数据定义 geometries: [ @@ -158,6 +189,11 @@ 'id': 'pl_1',//折线唯一标识,删除时使用 'styleId': 'style_blue',//绑定样式名 'paths': _path + }, + {//第1条线 + 'id': 'pl_2',//折线唯一标识,删除时使用 + 'styleId': 'style_red',//绑定样式名 + 'paths': _path } ] }); diff --git a/public/img/inspection.png b/public/img/inspection.png new file mode 100644 index 0000000000000000000000000000000000000000..b42838dbfa55bdb438e7130bd2b2553056f3ad92 GIT binary patch literal 4550 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 literal 0 HcmV?d00001 diff --git a/public/img/inspection_do.png b/public/img/inspection_do.png new file mode 100644 index 0000000000000000000000000000000000000000..61ea44f9c2e512d741f5f57eccdbb829850c72ee GIT binary patch literal 4543 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 literal 0 HcmV?d00001