bug

ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue

@@ -165,7 +165,7 @@ export default {
 
   .dialog-content {
     padding: 9px 21px 27px 21px;
-    max-height: 90vh;
+    max-height: 75vh;
     overflow-y: auto;
   }
 

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js

@@ -230,7 +230,7 @@ export const eventMap = {
         iconClass: "el-icon-loading",
       });
     }
-    const data = await getPerceiveEventList()
+    const data = await getPerceiveEventList({warningState: 1})
       .then(async (data) => {
         await delay(600);
         return data;

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js

@@ -297,12 +297,12 @@ export function getEventTopicList(eventType) {
  * 感知事件根据类型获取
  * @param {number} eventType
  */
-export function getPerceiveEventList() {
+export function getPerceiveEventList(data = {}) {
   return new Promise((resolve, reject) => {
     request({
       url: `/perceivedEvents/warning/perceivedEventsList`,
       method: "POST",
-      data: {},
+      data: {...data},
     })
       .then(({ code, rows }) => {
         if (code != 200) {

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

@@ -39,9 +39,9 @@
 
         </div>
         <template #footer>
-            <Button style="padding: 0 24px;" @click.native="submitTable">确认</Button>
             <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }" @click.native="modelVisible = false">
                 取消</Button>
+            <Button style="padding: 0 24px;" @click.native="submitTable">确认</Button>
         </template>
     </Dialog>
 </template>
@@ -235,7 +235,8 @@ export default {
     display: flex;
     gap: 9px;
     width: 836px;
-    height: 768px;
+    // height: 768px;
+    min-height: 500px;
     margin-top: 20px;
     flex-direction: column;
 

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

@@ -47,9 +47,9 @@
 
         </div>
         <template #footer>
-            <Button style="padding: 0 24px;" @click.native="submitTable">确认</Button>
             <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }" @click.native="modelVisible = false">
                 取消</Button>
+            <Button style="padding: 0 24px;" @click.native="submitTable">确认</Button>
         </template>
     </Dialog>
 </template>
@@ -276,7 +276,8 @@ export default {
     display: flex;
     gap: 9px;
     width: 836px;
-    height: 768px;
+    min-height: 500px;
+    // height: 768px;
     flex-direction: column;
 
     .video-pic {

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

@@ -8,13 +8,13 @@
       <Transition name="fade">
         <Form class="form" ref="FormConfigRef" :formList="formConfig.list" v-bind="getFormOptions" labelWidth="120px" />
       </Transition>
-
-      <div class="footer">
-        <Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">保存</Button>
-        <Button style="background: #C9C9C9;padding:0 24px;"
-          @click.native="modelVisible = false, submitting = false">取消</Button>
-      </div>
     </div>
+
+    <template #footer>
+      <Button style="background: #C9C9C9;padding:0 24px;"
+        @click.native="modelVisible = false, submitting = false">取消</Button>
+      <Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">保存</Button>
+    </template>
   </Dialog>
 </template>
 
@@ -195,7 +195,7 @@ export default {
           Message.error("提交失败");
         }).finally(() => {
           this.submitting = false;
-          this.$emit('queryData',true);
+          this.$emit('queryData', true);
         })
 
       })
@@ -219,7 +219,7 @@ export default {
 .EventDetailDialog {
   gap: 9px;
   width: 1050px;
-  height: 810px;
+  // height: 810px;
   display: flex;
   flex-direction: column;
 

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

@@ -151,8 +151,8 @@ export default {
       dateTime: "2024",
       direction: "1",
       dataList: [],
-      selectIndex: 2,
-      selectId: 2,
+      selectIndex: 1,
+      selectId: 1,
       reset: false,
       type: "year",
       chart1List: [],
@@ -216,8 +216,8 @@ export default {
       this.direction = "1";
       this.type = "year";
       this.dateTime = "2024";
-      this.selectId = 2;
-      this.selectIndex = 2;
+      this.selectId = 1;
+      this.selectIndex = 1;
       this.reset = true;
       this.searchQuery();
     },