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

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

@@ -2,7 +2,7 @@
   <!-- 事件弹窗 - 通用 -->
   <Dialog v-model="modelVisible" style="z-index: 2050;"  title="事件详情" width="950px" :top="(activeName == '1' || activeName == '2')?'1%':'8%'">
     <div class="EventDetail" >
-    
+
       <Form ref="FormConfigRef" :formList="formList" v-model="data" label-width="110px" />
 
       <!-- 视频组件 -->
@@ -37,7 +37,7 @@
             :showHeader="false"
           />
           <span>济南方向</span></div>
-         <div class="item"> 
+         <div class="item">
           <Video
             class="item-video"
             :pileNum="data.stakeMark"
@@ -49,7 +49,7 @@
       <TimeLine1 style="width: 100%;" v-if="activeName == '1' || activeName == '2'" :data="timeLine1List" />
       <TimeLine2 style="width: 100%;height:160px;" v-if="activeName == '1' || activeName == '2'" :data="timeLine2List" />
     </div>
-    
+
     <!-- 确认弹窗 -->
     <EventPlanDialog :visible="isShowDialog" :info="info" :eventFormData="data" :activeName="activeName"
       @reInitData="() => {
@@ -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'])">
@@ -145,7 +147,7 @@ export default {
       default: () => { },
     },
   },
- 
+
   data() {
     return {
       data: {},
@@ -184,20 +186,20 @@ export default {
           this.getProcess();
           if(this.activeName === '-1' || this.activeName === '-2' ){
             _formListGz[4].options.options = WarningSubclassOptions[this.formData.warningType];
-         
+
             this.formList = [..._formListGz]
             let _data = _.cloneDeep(this.formData)
             _data.direction=DirectionTypes[_data.direction]
             _data.roadName = '济菏高速'
             _data.duration = getDuration(_data.warningTime);
-            
+
             if(_data.lane){
               _data.lane =_data.lane.toString().split(",") || []
             } else if(_data.lang){
               _data.lane =_data.lang.toString().split(",") || []
             }
             if(_data.warningSource === 2){
-              
+
               request({
                 url: `/business/warning/video/${_data.id}`,
                 method:'get'
@@ -298,7 +300,7 @@ export default {
             }
             item.controlResult = _result
           }
-          
+
           _resList.push({
             id: item.processId,
             time: item.operationTime
@@ -337,7 +339,7 @@ export default {
               this.modelVisible = false;
               this.$emit("queryData", true);
               //触发全局监听事件
-              this.$root.$emit('refresh-event');  
+              this.$root.$emit('refresh-event');
               this.$root.$emit('delete-event');
             });
       })
@@ -432,13 +434,62 @@ export default {
               this.$emit("queryData", true);
               //触发全局监听事件
 
-              this.$root.$emit('refresh-event');  
+              this.$root.$emit('refresh-event');
               this.$root.$emit('delete-event');
             });
           })
         }
       }
     },
+
+    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,
@@ -470,10 +521,10 @@ export default {
           this.$root.$emit('delete-event');
           const self = this;
           setTimeout(() => {
-            self.$router.push(`/control/event/commandDispatch?eventId=${self.formData.id}`);  
+            self.$router.push(`/control/event/commandDispatch?eventId=${self.formData.id}`);
           }, 300);
           this.submitLoading = false
-          
+
         });
       } else if (this.activeName == '0') {
         this.submitLoading = true
@@ -490,7 +541,7 @@ export default {
           this.$root.$emit('refresh-event');
           const self = this;
           setTimeout(() => {
-            self.$router.push(`/control/event/commandDispatch?eventId=${self.formData.id}`);  
+            self.$router.push(`/control/event/commandDispatch?eventId=${self.formData.id}`);
           }, 300);
           this.submitLoading = false
         });
@@ -501,7 +552,7 @@ export default {
           this.$router.push(`/control/event/commandDispatch?eventId=${eventId}`);
           // this.$router.push(`/control/event/commandDispatch`);
         })
-        
+
       }
 
     },