From aaffac585ce62b38fdb0e613367d38fc844eec8a Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Tue, 4 Mar 2025 11:30:06 +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 --- .../aInspectionTaskMap.html | 3 + .../aInspectionTaskMap/aInspectionTaskMap.js | 210 ++++++++++++++++++ .../adminPointTaskDetail.html | 141 ++++++++++++ .../adminPointTaskDetail.js | 92 ++++++++ .../adminRouteTask/adminRouteTask.html | 6 +- .../adminRouteTask/adminRouteTask.js | 39 ++-- .../aInspectionPlanDetail.html | 12 +- 7 files changed, 474 insertions(+), 29 deletions(-) create mode 100644 public/components/inspection/aInspectionTaskMap/aInspectionTaskMap.html create mode 100644 public/components/inspection/aInspectionTaskMap/aInspectionTaskMap.js create mode 100644 public/components/inspection/adminPointTaskDetail/adminPointTaskDetail.html create mode 100644 public/components/inspection/adminPointTaskDetail/adminPointTaskDetail.js diff --git a/public/components/inspection/aInspectionTaskMap/aInspectionTaskMap.html b/public/components/inspection/aInspectionTaskMap/aInspectionTaskMap.html new file mode 100644 index 000000000..a1c64bb53 --- /dev/null +++ b/public/components/inspection/aInspectionTaskMap/aInspectionTaskMap.html @@ -0,0 +1,3 @@ +
+
+
\ No newline at end of file diff --git a/public/components/inspection/aInspectionTaskMap/aInspectionTaskMap.js b/public/components/inspection/aInspectionTaskMap/aInspectionTaskMap.js new file mode 100644 index 000000000..c17abe819 --- /dev/null +++ b/public/components/inspection/aInspectionTaskMap/aInspectionTaskMap.js @@ -0,0 +1,210 @@ +/** +业主详情页面 + **/ +(function (vc) { + vc.extends({ + data: { + aInspectionTaskMapInfo: { + datas: [], + map: {} + + } + }, + _initMethod: function () { + + }, + _initEvent: function () { + vc.on('aInspectionTaskMap', 'initMap', function (_data) { + $that._queryAInspectionTaskMap(_data); + }); + vc.on('aInspectionTaskMap', 'switch', function (_data) { + $that._queryAInspectionTaskMap(_data); + }); + }, + methods: { + + _queryAInspectionTaskMap: function (_route) { + let param = { + params: { + taskId: _route.taskId, + page: 1, + row: 1000 + } + }; + //发送get请求 + vc.http.apiGet('/inspection.queryAdminInspectionTaskDetail', + param, + function (json) { + let _json = JSON.parse(json); + $that.aInspectionTaskMapInfo.data = _json.data; + + $that.initAInspectionTaskMap(_json.data); + + }, + function () { + console.log('请求失败处理'); + } + ); + }, + initAInspectionTaskMap: function (_pos) { + let _lng = 116.307484; + let _lat = 39.984120; + // _pos.forEach(_m => { + // let _latLon = wgs84togcj02(_m.lng,_m.lat); + + // }); + + if (!_pos || _pos.length < 1) { + return; + } + _pos.forEach(_p => { + if (_p.lat) { + _lat = _p.lat; + _lng = _p.lng; + } + }); + + if($that.aInspectionTaskMapInfo.map && $that.aInspectionTaskMapInfo.map.hasOwnProperty('height')){ + $that.aInspectionTaskMapInfo.map.destroy(); + } + + + let center = new TMap.LatLng(_lat, _lng) + //定义map变量，调用 TMap.Map() 构造函数创建地图 + let map = new TMap.Map(document.getElementById('aInspectionTaskMap'), { + center: center,//设置地图中心点坐标 + zoom: 18, //设置地图缩放级别 + baseMap: { //底图设置（参数为：VectorBaseMap对象） + type: 'vector', //类型：失量底图 + features: ['base', 'building2d', 'point'] + //仅渲染：道路及底面(base) + 2d建筑物(building2d)，以达到隐藏文字的效果 + } + }); + $that.aInspectionTaskMapInfo.map = map; + $that._addTaskPointMachine(_pos); + }, + _addTaskPointMachine: function (_pos) { + let _geometriesMarker = []; + let _geometriesLabel = []; + let _path = []; + + _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": _markerStyle, //指定样式id + "position": center, //点标记坐标位置 + }); + + let _layerStyle = 'label'; + if(_m.state == '20200405'){ + _layerStyle = 'label_red'; + } + + _geometriesLabel.push({ + 'id': 'label_' + _m.inspectionId, //点图形数据的标志信息 + 'styleId': _layerStyle, //样式id + 'position': center, //标注点位置 + // 'content': _m.staffName, //标注文本 + 'content': _m.inspectionName + }); + _path.push(center); + } catch (e) { + + } + }); + let markerLayer = new TMap.MultiMarker({ + map: $that.aInspectionTaskMapInfo.map, //指定地图容器 + //样式定义 + styles: { + //创建一个styleId为"myStyle"的样式（styles的子属性名即为styleId） + "myStyle": new TMap.MarkerStyle({ + "width": 25, // 点标记样式宽度（像素） + "height": 35, // 点标记样式高度（像素） + "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 } + }) + }, + //点标记数据数组 + geometries: _geometriesMarker + }); + + let label = new TMap.MultiLabel({ + id: 'label-layer', + map: $that.aInspectionTaskMapInfo.map, //设置折线图层显示到哪个地图实例中 + //文字标记样式 + styles: { + 'label': new TMap.LabelStyle({ + 'color': '#3777FF', //颜色属性 + 'size': 20, //文字大小属性 + 'offset': { x: 0, y: 15 }, //文字偏移属性单位为像素 + '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' //文字垂直对齐属性 + }) + }, + //文字标记数据 + geometries: _geometriesLabel + }); + + let polylineLayer = new TMap.MultiPolyline({ + id: 'polyline-layer', //图层唯一标识 + map: $that.aInspectionTaskMapInfo.map,//设置折线图层显示到哪个地图实例中 + //折线样式定义 + styles: { + 'style_blue': new TMap.PolylineStyle({ + 'color': '#3777FF', //线填充色 + 'width': 6, //折线宽度 + 'borderWidth': 5, //边线宽度 + 'borderColor': '#FFF', //边线颜色 + 'lineCap': 'butt' //线端头方式 + }), + 'style_red': new TMap.PolylineStyle({ + 'color': '#CC0000', //线填充色 + 'width': 6, //折线宽度 + 'borderWidth': 5, //边线宽度 + 'borderColor': '#FFF', //边线颜色 + 'lineCap': 'butt' //线端头方式 + }), + }, + //折线数据定义 + geometries: [ + {//第1条线 + 'id': 'pl_1',//折线唯一标识，删除时使用 + 'styleId': 'style_blue',//绑定样式名 + 'paths': _path + }, + {//第1条线 + 'id': 'pl_2',//折线唯一标识，删除时使用 + 'styleId': 'style_red',//绑定样式名 + 'paths': _path + } + ] + }); + } + + + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/components/inspection/adminPointTaskDetail/adminPointTaskDetail.html b/public/components/inspection/adminPointTaskDetail/adminPointTaskDetail.html new file mode 100644 index 000000000..d2ef464e4 --- /dev/null +++ b/public/components/inspection/adminPointTaskDetail/adminPointTaskDetail.html @@ -0,0 +1,141 @@ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + 		+ + +
+ + + + 		+ + + + + + + + + + + + + + + + + + + +
{{inspectionTask.taskDetailId}}{{inspectionTask.inspectionName}}{{inspectionTask.inspectionPlanName}}{{inspectionTask.routeName}}{{inspectionTask.planInsTime}}
{{inspectionTask.planEndTime}} + 		{{inspectionTask.pointStartTime}}
{{inspectionTask.pointEndTime}} + 		{{inspectionTask.inspectionTime ? inspectionTask.inspectionTime : + '-'}} + + {{inspectionTask.inspectionStateName ? inspectionTask.inspectionStateName : '-'}} + {{inspectionTask.inspectionStateName ? + inspectionTask.inspectionStateName : '-'}} + {{inspectionTask.planUserName}}{{inspectionTask.actUserName ? inspectionTask.actUserName : '-'}} + {{inspectionTask.signTypeName}}{{inspectionTask.taskStateName}} + {{inspectionTask.stateName}} + {{inspectionTask.stateName}} + {{inspectionTask.description ? inspectionTask.description : '-'}} + + + + + {{inspectionTask.createTime}}
+ +
+
+ +
+
+ +
+
+
+
\ No newline at end of file diff --git a/public/components/inspection/adminPointTaskDetail/adminPointTaskDetail.js b/public/components/inspection/adminPointTaskDetail/adminPointTaskDetail.js new file mode 100644 index 000000000..805e2147d --- /dev/null +++ b/public/components/inspection/adminPointTaskDetail/adminPointTaskDetail.js @@ -0,0 +1,92 @@ +/** + 入驻小区 + **/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + adminPointTaskDetailInfo: { + details: [], + inspectionId: '', + inspectionRouteId:'', + taskId:'', + roomNum: '', + allOweFeeAmount: '0', + planUserName:'', + inspectionStartTime:'', + inspectionEndTime:'', + } + }, + _initMethod: function () { + }, + _initEvent: function () { + vc.on('adminPointTaskDetail', 'switch', function (_data) { + $that.adminPointTaskDetailInfo.inspectionId = _data.inspectionId; + $that.adminPointTaskDetailInfo.taskId = _data.taskId; + $that.adminPointTaskDetailInfo.inspectionRouteId = _data.inspectionRouteId; + $that._loadAdminPointTaskDetailData(DEFAULT_PAGE, DEFAULT_ROWS); + setTimeout(function(){ + $that._initTaskDetailDate(); + },1000) + }); + vc.on('adminPointTaskDetail', 'paginationPlus', 'page_event', + function (_currentPage) { + $that._loadAdminPointTaskDetailData(_currentPage, DEFAULT_ROWS); + }); + vc.on('adminPointTaskDetail', 'notify', function (_data) { + $that._loadAdminPointTaskDetailData(DEFAULT_PAGE, DEFAULT_ROWS); + }) + }, + methods: { + _initTaskDetailDate:function(){ + vc.initDate('pointDetailStartTime',function(_value){ + $that.adminPointTaskDetailInfo.inspectionStartTime = _value; + }); + vc.initDate('pointDetailEndTime',function(_value){ + $that.adminPointTaskDetailInfo.inspectionEndTime = _value; + }) + }, + _loadAdminPointTaskDetailData: function (_page, _row) { + let param = { + params: { + inspectionId: $that.adminPointTaskDetailInfo.inspectionId, + inspectionRouteId: $that.adminPointTaskDetailInfo.inspectionRouteId, + taskId: $that.adminPointTaskDetailInfo.taskId, + planUserName: $that.adminPointTaskDetailInfo.planUserName, + inspectionStartTime: $that.adminPointTaskDetailInfo.inspectionStartTime, + inspectionEndTime: $that.adminPointTaskDetailInfo.inspectionEndTime, + page: _page, + row: _row + } + }; + //发送get请求 + vc.http.apiGet('/inspectionTaskDetail.listAdminInspectionTaskDetails', + param, + function (json) { + let _json = JSON.parse(json); + $that.adminPointTaskDetailInfo.details = _json.inspectionTaskDetails; + vc.emit('adminPointTaskDetail', 'paginationPlus', 'init', { + total: _json.records, + dataCount: _json.total, + currentPage: _page + }); + }, + function () { + console.log('请求失败处理'); + } + ); + }, + //查询 + _qureyAdminPointTaskDetail: function () { + $that._loadAdminPointTaskDetailData(DEFAULT_PAGE, DEFAULT_ROWS); + }, + //重置 + _resetAdminPointTaskDetail: function () { + $that.adminPointTaskDetailInfo.roomNum = ""; + $that._loadAdminPointTaskDetailData(DEFAULT_PAGE, DEFAULT_ROWS); + }, + + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/components/inspection/adminRouteTask/adminRouteTask.html b/public/components/inspection/adminRouteTask/adminRouteTask.html index 57d7d729b..3329fae67 100644 --- a/public/components/inspection/adminRouteTask/adminRouteTask.html +++ b/public/components/inspection/adminRouteTask/adminRouteTask.html @@ -3,8 +3,8 @@
- +
diff --git a/public/components/inspection/adminRouteTask/adminRouteTask.js b/public/components/inspection/adminRouteTask/adminRouteTask.js index de664dce4..33510bd0c 100644 --- a/public/components/inspection/adminRouteTask/adminRouteTask.js +++ b/public/components/inspection/adminRouteTask/adminRouteTask.js @@ -6,7 +6,7 @@ var DEFAULT_ROWS = 10; vc.extends({ data: { - routeTaskInfo: { + adminRouteTaskInfo: { tasks: [], taskId:'', inspectionRouteId:'', @@ -15,37 +15,36 @@ _initMethod: function () { }, _initEvent: function () { - vc.on('routeTask', 'switch', function (_data) { - $that.routeTaskInfo.inspectionRouteId = _data.inspectionRouteId; - $that._loadRouteTaskData(DEFAULT_PAGE, DEFAULT_ROWS); + vc.on('adminRouteTask', 'switch', function (_data) { + $that.adminRouteTaskInfo.inspectionRouteId = _data.inspectionRouteId; + $that._loadAdminRouteTaskData(DEFAULT_PAGE, DEFAULT_ROWS); }); - vc.on('routeTask', 'paginationPlus', 'page_event', + vc.on('adminRouteTask', 'paginationPlus', 'page_event', function (_currentPage) { - $that._loadRouteTaskData(_currentPage, DEFAULT_ROWS); + $that._loadAdminRouteTaskData(_currentPage, DEFAULT_ROWS); }); - vc.on('routeTask', 'notify', function (_data) { - $that._loadRouteTaskData(DEFAULT_PAGE, DEFAULT_ROWS); + vc.on('adminRouteTask', 'notify', function (_data) { + $that._loadAdminRouteTaskData(DEFAULT_PAGE, DEFAULT_ROWS); }) }, methods: { - _loadRouteTaskData: function (_page, _row) { + _loadAdminRouteTaskData: function (_page, _row) { let param = { params: { - communityId: vc.getCurrentCommunity().communityId, - inspectionRouteId: $that.routeTaskInfo.inspectionRouteId, + inspectionRouteId: $that.adminRouteTaskInfo.inspectionRouteId, page: _page, row: _row } }; //发送get请求 - vc.http.apiGet('/inspection.queryRouteInspectionTask', + vc.http.apiGet('/inspection.queryAdminRouteInspectionTask', param, function (json) { let _json = JSON.parse(json); - $that.routeTaskInfo.tasks = _json.data; + $that.adminRouteTaskInfo.tasks = _json.data; if(_json.data && _json.data.length>0){ - $that._switchRouteTask(_json.data[0]); + $that._switchAdminRouteTask(_json.data[0]); } }, function () { @@ -54,16 +53,16 @@ ); }, //查询 - _qureyRouteTask: function () { - $that._loadRouteTaskData(DEFAULT_PAGE, DEFAULT_ROWS); + _qureyAdminRouteTask: function () { + $that._loadAdminRouteTaskData(DEFAULT_PAGE, DEFAULT_ROWS); }, - _switchRouteTask:function(_task){ - $that.routeTaskInfo.taskId = _task.taskId; - $that.routeTaskInfo.inspectionRouteId = _task.inspectionRouteId; + _switchAdminRouteTask:function(_task){ + $that.adminRouteTaskInfo.taskId = _task.taskId; + $that.adminRouteTaskInfo.inspectionRouteId = _task.inspectionRouteId; setTimeout(function(){ - vc.emit('inspectionTaskMap','initMap',{ + vc.emit('aInspectionTaskMap', 'initMap',{ taskId:_task.taskId, inspectionRouteId:_task.inspectionRouteId }) diff --git a/public/pages/inspection/aInspectionPlanDetail/aInspectionPlanDetail.html b/public/pages/inspection/aInspectionPlanDetail/aInspectionPlanDetail.html index e57eddbea..cfe96cb22 100644 --- a/public/pages/inspection/aInspectionPlanDetail/aInspectionPlanDetail.html +++ b/public/pages/inspection/aInspectionPlanDetail/aInspectionPlanDetail.html @@ -128,8 +128,8 @@
  • - +
    • @@ -149,10 +149,10 @@
    - + +
    + +