Merge remote-tracking branch 'origin/develop' into develop

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue

@@ -63,6 +63,8 @@
         @click.native="onEnd">终止</Button>
       <Button :loading="submitLoading"  v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent']) && (activeName == '-1' || activeName == '0')" style="margin-top: 30px;padding: 0 24px"
         @click.native="onDelete">解除</Button>
+      <Button :style="{ marginTop: '30px', backgroundColor: '#0e708b', padding: '0 24px' }"  v-if="activeName =='-2'"
+              @click.native="onAudit">复核</Button>
       <Button :style="{ marginTop: '30px', backgroundColor: '#0e708b', padding: '0 24px' }"
         @click.native="modelVisible = false">取消</Button>
       <template v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent','home:notice:disposeEvent'])">
@@ -439,6 +441,55 @@ export default {
         }
       }
     },
+
+    onAudit() {
+           console.log(55555555);
+          if (this.formList[this.formList.length - 1].key !== 'auditFlag') {
+            this.formList.push({
+              label: "审核结果:",
+              key: "auditFlag",
+              type: "RadioGroup",
+              isAlone: true,
+              required: true,
+              options: {
+                activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+                options: [
+                  {
+                    key: "1",
+                    label: "正确",
+                  },
+                  {
+                    key: "2",
+                    label: "错误",
+                  }
+                ],
+              },
+            })
+          } else {
+            this.$refs.FormConfigRef.validate()
+              .then((result) => {
+                this.submitLoading = true;
+                request({
+                  url: `/perceivedEvents/warning/updateWarningAuditFlag`,
+                  method: "post",
+                  data: {
+                    id: this.formData.id,
+                    auditFlag: result.auditFlag
+                  },
+                }).then((result) => {
+                  if (result.code == 200) Message.success("成功");
+                  else Message.error(result?.msg);
+                  this.modelVisible = false;
+                  this.$emit("queryData", true);
+                  //触发全局监听事件
+                  this.$root.$emit('refresh-event');
+                  this.submitLoading = false;
+                });
+              })
+              .catch((err) => {
+              });
+          }
+    },
     onSubmit() {
       let reData = {
         id: this.formData.id,