diff --git a/src/api/eventPage/index.js b/src/api/eventPage/index.js index 62e2189..57ecb0e 100644 --- a/src/api/eventPage/index.js +++ b/src/api/eventPage/index.js @@ -60,11 +60,19 @@ export function similarEventsPage(id){ }) } -// +// 相似事件提交重训练 export function noAccordWith(data){ return request({ url: '/earlyWarningAudit/similar/noAccordWith', method: 'post', data }) +} + +// 取最新一条事件（预警钟） +export function limitOneMsg(){ + return request({ + url: '/earlyWarningAudit/massEvents/limitOneMsg', + method: 'get', + }) } \ No newline at end of file diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 046a54a..0d9be0a 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -610,7 +610,8 @@ color: #F59A23; } .zhongdian{ - + background: rgba(162,75,243,0.1); + color: #a24bf3; } .yiren{ color: #F954A5; diff --git a/src/components/eventPrompt/index.vue b/src/components/eventPrompt/index.vue index c6589bb..e649fa5 100644 --- a/src/components/eventPrompt/index.vue +++ b/src/components/eventPrompt/index.vue @@ -2,18 +2,33 @@
-
群体事件
-
四季花园业主反映道路噪声问题
+
{{ eventInfo.msgTypeName }}
+
{{ eventInfo.title }}
diff --git a/src/permission.js b/src/permission.js index eafdfe2..c568979 100644 --- a/src/permission.js +++ b/src/permission.js @@ -1,11 +1,3 @@ -/* - * @Descripttion: - * @version: - * @Author: JC9527 - * @Date: 2024-01-25 11:41:56 - * @LastEditors: JC9527 - * @LastEditTime: 2024-09-02 11:09:54 - */ import router from './router' import store from './store' import { Message } from 'element-ui' diff --git a/src/views/components/relevancyEventAudit.vue b/src/views/components/relevancyEventAudit.vue index 23f572d..50708a9 100644 --- a/src/views/components/relevancyEventAudit.vue +++ b/src/views/components/relevancyEventAudit.vue @@ -65,10 +65,10 @@ 查看详情 - + 不符合 - + 已标记不符合 @@ -129,20 +129,20 @@ export default { similarEventsPage(id).then(res=>{ console.log(res); this.tableData = [...res.data]; - // if(this.multipleSelection.length > 0) { - // this.tableData.map(item=>{ - // this.multipleSelection.map(itemTwo=>{ - // if(item.targetId = itemTwo) { - // this.$set(item, 'showTags', true); - // } - // }) - // }) - // } else { - // this.tableData.map(item=>{ - // // item.showTags = true; - // this.$set(item, 'showTags', false); - // }) - // } + if(this.multipleSelection.length > 0) { + this.tableData.map(item=>{ + this.multipleSelection.map(itemTwo=>{ + if(item.targetId = itemTwo) { + this.$set(item, 'showTags', true); + } + }) + }) + } else { + this.tableData.map(item=>{ + // item.showTags = true; + this.$set(item, 'showTags', false); + }) + } this.loading = false; }).catch(err=>{ this.loading = false; @@ -153,14 +153,14 @@ export default { // 标记非同一事件 sign(row){ this.tableData.map(item=>{ - if(item.targetId == row.targetId) { - item.isReport = !item.isReport; + if(item.resultId == row.resultId) { + item.showTags = !item.showTags; // console.log(item.showTags,"item.showTags"); - if(item.isReport) { - this.multipleSelection.push(row.targetId) + if(item.showTags) { + this.multipleSelection.push(row.resultId) } else { - this.multipleSelection = this.multipleSelection.filter(itemTwo => itemTwo !== row.targetId); + this.multipleSelection = this.multipleSelection.filter(itemTwo => itemTwo !== row.resultId); } } }) diff --git a/src/views/components/urgencyAudit.vue b/src/views/components/urgencyAudit.vue index b372392..18845c2 100644 --- a/src/views/components/urgencyAudit.vue +++ b/src/views/components/urgencyAudit.vue @@ -39,6 +39,13 @@ 查看标题 +
+
+
审核时间
+ ： +
+
{{ eventInfo.auditTime }}
+
预警因素
@@ -221,37 +228,32 @@ export default { this.map.getPane("mapLayer1").style.zIndex = 501; this.map.getPane("mapLayer1").style.pointerEvents = "none"; - // this.map.createPane("mapLayer2"); - // this.map.getPane("mapLayer2").style.zIndex = 501; - // this.map.getPane("mapLayer2").style.pointerEvents = "none"; - - // this.map.createPane("mapLayer3"); - // this.map.getPane("mapLayer3").style.zIndex = 501; - // this.map.getPane("mapLayer3").style.pointerEvents = "none"; - - // this.map.createPane("mapLayer4"); - // this.map.getPane("mapLayer4").style.zIndex = 501; - // this.map.getPane("mapLayer4").style.pointerEvents = "none"; - - // this.map.createPane("mapLayer5"); - // this.map.getPane("mapLayer5").style.zIndex = 501; - // this.map.getPane("mapLayer5").style.pointerEvents = "none"; - this.mapLayers.mapLayer1 = L.featureGroup().addTo(this.map); - // this.mapLayers.mapLayer2 = L.featureGroup().addTo(this.map); - // this.mapLayers.mapLayer3 = L.featureGroup().addTo(this.map); - // this.mapLayers.mapLayer4 = L.featureGroup().addTo(this.map); - // this.mapLayers.mapLayer5 = L.featureGroup().addTo(this.map); - - // this.getPosition(); }, getList(id){ this.loading = true; auditList(id).then(res=>{ this.audioInfo = {...res.data.records[0]}; if(this.audioInfo.caseLnglat) { + let iconUrl2 = require("@/assets/images/icon2.png"); // 事件有经纬度情况下 - + var myIcon2 = L.icon({ + iconUrl: iconUrl2, + iconSize: [38, 50], // 图标图像的尺寸，单位是像素。 + iconAnchor: [19, 29], // 图标 "tip" 的坐标（相对于其左上角）。图标将被对齐，使该点位于标记的地理位置。如果指定了尺寸，默认为居中，也可以在CSS中设置负的边距。 + popupAnchor: [-3, -76], // 弹出窗口（popup）的坐标，相对于图标锚点而言，将从该点打开。 + }); + let lat = this.audioInfo.caseLnglat.split(",")[1]; + let lon = this.audioInfo.caseLnglat.split(",")[0]; + let marker = L.marker( + L.latLng(lat, lon), + { icon: myIcon2 } + ) + // .addTo(this.mapLayers.mapLayer1) + this.mapLayers.mapLayer1.addLayer(marker); + const bounds = this.mapLayers.mapLayer1.getBounds(); + let center = bounds.getCenter(); + this.map.setView(center, 12); } this.loading = false; }).catch(err=>{ diff --git a/src/views/warningManage/warningAppear.vue b/src/views/warningManage/warningAppear.vue index 1348429..57a855c 100644 --- a/src/views/warningManage/warningAppear.vue +++ b/src/views/warningManage/warningAppear.vue @@ -20,7 +20,7 @@
- {{ item.title }} + {{ item.warnFactor }}
@@ -28,11 +28,11 @@
- 审核 + 审核
审核通过
-
查看详情
+
查看详情
@@ -60,6 +60,8 @@
+ +