bgu

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

@@ -42,6 +42,12 @@ import EventDispatchDialog from "./EventDispatchDialog/index";
 import { searchFormList } from './data';
 import request from "@/utils/request";
 
+const directionMapping = {
+  '1': '菏泽方向',
+  '2': '双向',
+  '3': '济南方向'
+}
+
 export default {
   name: 'RoadNetworkMonitoring',
   components: {
@@ -81,8 +87,11 @@ export default {
         params: this.searchData,
       }).then((result) => {
         if (result.code != 200) return Message.error(result?.msg);
-        this.data = result.rows;
         this.total = result.total;
+        result.rows.forEach(it => {
+          it.stringDirection = directionMapping[it.direction] || it.direction;
+        })
+        this.data = result.rows;
       });
     },
     onSizeChange(pageSize) {

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

@@ -1,13 +1,13 @@
 <template>
   <Dialog v-model="modelVisible" title="事件详情">
-    <div class="EventDetail" :style="{ height: (activeName == '-1' || activeName == '0') ? '380px' : '768px'}">
+    <div class="EventDetail" :style="{ height: (activeName == '-1' || activeName == '0') ? '380px' : '768px' }">
       <Form :formList="formList" :dFormData="formData" label-width="100px" />
 
       <div class="video-pic">
-        <Video style="height: 100%;" :showHeader="activeName != '-1'"/>
+        <Video style="height: 100%;" :showHeader="activeName != '-1'" />
         <Video v-if="activeName != '-1'" style="height: 100%;" />
 
-        <Carousel v-else style="flex: 1" :pictures="formData.pictures"/>
+        <Carousel v-else style="flex: 1" :pictures="formData.pictures" />
       </div>
 
       <TimeLine1 v-if="activeName == '1' || activeName == '2'" :data="timeLine1List" />
@@ -15,9 +15,10 @@
 
     </div>
     <template #footer>
-      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px;" @click.native="modelVisible = false">误报</Button>
+      <Button style="padding: 0 24px;" @click.native="onDelete">误报</Button>
       <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }" @click.native="modelVisible = false">取消</Button>
-      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px;" @click.native="modelVisible = false">确认</Button>
+      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px;"
+        @click.native="modelVisible = false">确认</Button>
     </template>
   </Dialog>
 </template>
@@ -33,6 +34,7 @@ import Video from "@screen/components/Video";
 import Carousel from "./Carousel/index.vue"
 import Button from '@screen/components/Buttons/Button.vue';
 import request from "@/utils/request";
+import { Message } from "element-ui";
 var moment = require("moment");
 
 export default {
@@ -92,7 +94,7 @@ export default {
   },
   methods: {
     getProcess() {
-      if(this.activeName == '-1' || this.activeName == '0'){
+      if (this.activeName == '-1' || this.activeName == '0') {
         this.timeLine1List = [];
         this.timeLine2List = [];
         return;
@@ -144,6 +146,31 @@ export default {
 
       })
 
+    },
+    onDelete() {
+      if (this.formData.id) {
+        this.$confirm('确定误报吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          // this.modelVisible = false;
+          //   this.$emit('queryData', true);
+          //   return;
+          request({
+            url: `/business/warning/delete`,
+            method: "post",
+            data: { id: this.formData.id }
+          }).then(result => {
+            if (result.code == 200) Message.success('成功！');
+            else Message.error(result?.msg);
+            this.modelVisible = false;
+            this.$emit('queryData', true);
+          })
+        })
+
+      }
+
     }
   }
 }

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js

@@ -367,6 +367,9 @@ export const vehicleCondition = (keyPrefix = "dcEventAccident") => ({
           text: "辆",
         },
         type: "inputNumber",
+        options: {
+          min: 0,
+        },
         key: `${keyPrefix}.smallCar`,
       },
       {
@@ -376,6 +379,9 @@ export const vehicleCondition = (keyPrefix = "dcEventAccident") => ({
         suffix: {
           text: "辆",
         },
+        options: {
+          min: 0,
+        },
         type: "inputNumber",
         key: `${keyPrefix}.trucks`,
       },
@@ -387,6 +393,9 @@ export const vehicleCondition = (keyPrefix = "dcEventAccident") => ({
           text: "辆",
         },
         type: "inputNumber",
+        options: {
+          min: 0,
+        },
         key: `${keyPrefix}.buses`,
       },
       {
@@ -397,6 +406,9 @@ export const vehicleCondition = (keyPrefix = "dcEventAccident") => ({
           text: "辆",
         },
         type: "inputNumber",
+        options: {
+          min: 0,
+        },
         key: `${keyPrefix}.tankers`,
       },
     ],
@@ -630,23 +642,23 @@ export const trafficAccidentType = {
   options: {
     options: [
       {
-        value: "1",
+        value: "1-1",
         label: "追尾",
       },
       {
-        value: "2",
+        value: "1-2",
         label: "侧翻",
       },
       {
-        value: "3",
+        value: "1-3",
         label: "撞护栏",
       },
       {
-        value: "4",
+        value: "1-4",
         label: "自然",
       },
       {
-        value: "5",
+        value: "1-5",
         label: "其他事故",
       },
     ],

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

@@ -63,10 +63,7 @@ export const tabConfigList = [
           ...PresetFormItems.callPolicePersonPhone,
           key: "dcEventAccident.reporterPhoneNumber",
         },
-        {
+        PresetFormItems.trafficAccidentType,
-          ...PresetFormItems.trafficAccidentType,
-          key: "dcEventAccident.accidentType",
-        },
         PresetFormItems.eventLevel,
         {
           ...PresetFormItems.locationMode,

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

@@ -43,7 +43,7 @@
     </div>
 
     <!-- "详情"弹出框 -->
-    <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" :activeName="activeName" @update:value="handleClose" />
+    <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" :activeName="activeName" @update:value="handleClose" @queryData="queryData"/>
     <!-- "新增"弹出框 -->
     <FormEvent :visible="isShowAddNew" @close="onCloseAddNew" />
   </div>
@@ -180,6 +180,9 @@ export default {
         lastBtnText: text,
       };
     },
+    queryData(flag){
+      this.getData()
+    },
     getData() {
       if (this.activeName === '-1') {
         request({

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

@@ -216,13 +216,13 @@ export default {
         let gr = context.createLinearGradient(230, 0, 360, 0);
         gr.addColorStop(1, "rgba(92,197,255,0)");
         gr.addColorStop(0, "rgba(92,197,255,0.3)");
-        drawRoundRect(context, 218, 16, 134, 18, 12, gr);
+        drawRoundRect(context, 206, 16, 134, 18, 12, gr);
-        drawRoundRect(context, 218, 39, 134, 18, 12, gr);
+        drawRoundRect(context, 206, 39, 134, 18, 12, gr);
-        drawRoundRect(context, 218, 61, 134, 18, 12, gr);
+        drawRoundRect(context, 206, 61, 134, 18, 12, gr);
-        drawRoundRect(context, 218, 83, 134, 18, 12, gr);
+        drawRoundRect(context, 206, 83, 134, 18, 12, gr);
-        drawRoundRect(context, 218, 105, 134, 18, 12, gr);
+        drawRoundRect(context, 206, 105, 134, 18, 12, gr);
-        drawRoundRect(context, 218, 127, 134, 18, 12, gr);
+        drawRoundRect(context, 206, 127, 134, 18, 12, gr);
-        drawRoundRect(context, 218, 149, 134, 18, 12, gr);
+        drawRoundRect(context, 206, 149, 134, 18, 12, gr);
 
         context.lineWidth = 1; // 设置线段宽度
 

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue

@@ -26,15 +26,23 @@
         </el-table>
       </div>
     </div>
+    <!-- 分页 -->
+    <div class="footer">
+      <Pagination @current-change="getData" @size-change="onSizeChange" width="'100%'" :page-sizes="[10, 20, 30, 40, 50]"
+        :page-size="pageSize" :current-page.sync="pageNum" layout="total, sizes, prev, pager, next"
+        :total="50">
+      </Pagination>
+    </div>
   </div>
 </template>
   
 <script>
+import Pagination from "@screen/components/Pagination.vue";
 
 export default {
   name: 'IndicatorQuery',
   components: {
-
+    Pagination
   },
   data() {
     return {
@@ -199,7 +207,9 @@ export default {
         name: '2640.78m',
         address: 'K100+000-K110+000'
       },
-      ]
+      ],
+      pageSize: 10,
+      pageNum: 1
     }
   },
 
@@ -210,6 +220,12 @@ export default {
     selectItem(index) {
       this.selectIndex = index;
     },
+    getData(){
+
+    },
+    onSizeChange(){
+      
+    }
   },
   mounted() {
 
@@ -496,6 +512,13 @@ export default {
     }
 
   }
+  .footer {
+    margin-top: 15px;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 }
 
 .charts {