Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue

@@ -8,8 +8,8 @@
       <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" column="7" />
     </div>
     <div class="foote">
-          <Button @click.native="handleEventRelieve" style="width: 100px;">
+      <Button @click.native="handleEventRelieve" style="width: 100px;" v-if="data.eventState == '0'">
-            事件解除
+        误报
       </Button>
       <Button @click.native="goDispatch" style="width: 100px;">
         设备管控
@@ -138,30 +138,39 @@ export default {
   },
   methods: {
     handleClickTabs() { },
-    goDispatch(){
+    goDispatch() {
       this.$router.push(`/control/event/commandDispatch`);
     },
-    goStrategy(){
+    goStrategy() {
       this.$router.push(`/control/device/strategy`);
     },
     handleEventRelieve() {
 
-      this.$confirm("确定解除事件吗？", "提示", {
+      this.$confirm("确定事件误报吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          let data = new FormData();
+          // let data = new FormData();
-          data.append("eventId", this.dialogData.id);
+          // data.append("eventId", this.dialogData.id);
-          postCompleteEvent(data).then((result) => {
+          // postCompleteEvent(data).then((result) => {
-            console.log('--------',result)
+          //   console.log('--------', result)
-            if (result.code != 200) return [];
+          //   if (result.code != 200) return [];
-            this.$message.success("事件解除成功");
+          //   this.$message.success("成功");
-            this.$emit('traffic-relieve',this.data);
+          //   this.$emit('traffic-relieve', this.data);
+          // });
+          request({
+            url: `dc/system/event/${this.data.eventType}/${this.dialogData.id}`,
+            method: "delete",
+          }).then((result) => {
+            if (result.code == 200) Message.success("成功！");
+            else Message.error(result?.msg);
+
+            this.$emit('traffic-relieve', this.data);
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
   },
 };
@@ -217,13 +226,14 @@ export default {
     }
   }
 }
-  .foote{
+
+.foote {
   display: flex;
   align-items: center;
   gap: 9px;
   width: 100%;
   justify-content: flex-end;
-    margin:20px 0px -20px 0px;
+  margin: 20px 0px -20px 0px;
 
-  }
+}
 </style>

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue

@@ -153,7 +153,7 @@ export default {
   },
   watch: {
     dataRecord(e) {
-      console.log(e)
+      this.bindRecord()
     },
   },
   data() {