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

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js

@@ -407,6 +407,51 @@ export const _formListGz = [
       gap: "12px",
     },
   },
+  {
+    label: "审核状态:",
+    key: "auditFlags",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+    visible: (data) => {
+      if (data?.auditFlags) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    label: "审核人:",
+    key: "auditor",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+    visible: (data) => {
+      if (data?.auditor) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    label: "审核时间:",
+    key: "auditTime",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+    visible: (data) => {
+      if (data?.auditTime) {
+        return true;
+      }
+      return false;
+    },
+  },
 ]
 export const timeLine1List = [
   {

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

@@ -63,7 +63,7 @@
         @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'"
+      <Button :style="{ marginTop: '30px', backgroundColor: '#0e708b', padding: '0 24px' }"  v-if="(activeName =='-2') && (data.auditFlags =='未审核') "
               @click.native="onAudit">复核</Button>
       <Button :style="{ marginTop: '30px', backgroundColor: '#0e708b', padding: '0 24px' }"
         @click.native="modelVisible = false">取消</Button>

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js

@@ -164,6 +164,28 @@ export const searchFormList = [
       ],
     },
   },
+  {
+    label: "审核状态:",
+    key: "auditFlag",
+    type: "select",
+    options: {
+      clearable: true,
+      options: [
+        {
+          key: "0",
+          label: "未审核",
+        },
+        {
+          key: "1",
+          label: "正确",
+        },
+        {
+          key: "2",
+          label: "错误",
+        },
+      ],
+    },
+  },
   {
     label: "事件主类:",
     key: "warningType",

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue

@@ -29,8 +29,8 @@
       <RoadStateCard v-for="(item, index) in data" :key="index" v-bind="getStateCardBind(item)"
         @firstBtnClick="firstBtnClick" @lastBtnClick="onLastBtnClick" />
     </div>
-</div>  
+</div>
-</div>  
+</div>
     <!-- 分页 -->
     <div class="footer">
       <Pagination @current-change="getData" @size-change="onSizeChange" width="'100%'"
@@ -58,7 +58,14 @@ import { tabMap,searchFormList } from "./data";
 import request from "@/utils/request";
 import { Message } from "element-ui";
 import { Loading } from 'element-ui';
-import { WarningType as warningTypeMapping, WarningSubclass as warningSubclassTypeMapping, DirectionTypes as gzDirectionMapping, warningSourceMapping, warningStateMapping } from "@screen/utils/enum.js"
+import {
+  WarningType as warningTypeMapping,
+  WarningSubclass as warningSubclassTypeMapping,
+  DirectionTypes as gzDirectionMapping,
+  warningSourceMapping,
+  warningStateMapping,
+  auditType
+} from "@screen/utils/enum.js"
 
 export default {
   name: "RoadNetworkMonitoring2",
@@ -108,7 +115,7 @@ export default {
           data: { ...this.searchData }
         }).then((result) => {
           if (result.code != 200) return Message.error(result?.msg);
-          
+
           result.rows.forEach(it => {
             it.stringEventSource = it?.warningSource ? warningSourceMapping[it?.warningSource] : '';
             it.stringDirection = gzDirectionMapping[it.direction] || it.direction;
@@ -148,7 +155,7 @@ export default {
         text: "文件正在下载...",
       });
       // request.post(url, {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' })
-     
+
       request({
         url: url,//感知事件
         method: "post",
@@ -190,6 +197,9 @@ export default {
           data.stringEventState = warningStateMapping[data.warningState];
           data.stringEventType = warningTypeMapping[data.warningType];
           data.stringDirection = gzDirectionMapping[data.direction] || data.direction;
+          data.auditFlags=auditType[data.auditFlag];
+          data.auditor=data.auditor;
+          data.auditTime=data.auditTime;
           let eventInfo = await request({
               url: `/dc/system/event/eventSubclass/${id}`,
               method: "GET",
@@ -236,13 +246,14 @@ export default {
       if (dendStakeMark) {
         endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0].padStart(3,'0')}+${dendStakeMark[1].padStart(3,'0')}` : '';
       }
-      
+
       this.searchData = {
         ...this.searchData,
         warningState: data.warningState,
         warningType: data.warningType,
         warningSource: data?.warningSource || '',
         direction: data.direction,
+        auditFlag:data.auditFlag,
         startTime: daterange && daterange.length > 0 ? daterange[0] : "",
         // endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
         completeTime: daterange && daterange.length > 0 ? daterange[1] : "",

ruoyi-ui/src/views/JiHeExpressway/utils/enum.js

@@ -12,7 +12,7 @@ function arrayToDic(arr) {
   return obj;
 }
 export const WarnintType = {
-  1: "交通拥堵",   
+  1: "交通拥堵",
   2: "行人",
   3: "非机动车",
   4: "停车",
@@ -1270,6 +1270,12 @@ export const controlType = {
   },
 };
 
+export const auditType = {
+  0: "未审核",
+  1: "正确",
+  2: "错误",
+};
+
 export const boolType = {
   0: {
     text: "否",
@@ -1352,4 +1358,4 @@ export const broadcastPriority = {
   "2":"重要",
   "3":"一般",
   "4":"提示"
-}
+}