bug

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

@@ -262,9 +262,10 @@ export const laneOccupancy = {
 
 export const eventSources = {
   label: "事件源:",
-  key: "eventSources",
+  key: "eventSource",
   type: "select",
   options: {
+    clearable: true,
     options: [
       {
         key: "1",

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

@@ -173,6 +173,9 @@ export default {
         //   eventType: Number(this.index) + 1,
         //   stakeMark: (stakeMark && stakeMark[0] != null) ? ((stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '') : '',
         // })
+        // this.modelVisible = false;
+        // this.submitting = false;
+        // this.$emit('queryData',true)
         // return;
 
         request({
@@ -181,6 +184,7 @@ export default {
           data: {
             ...formData,
             eventType: Number(this.index) + 1,
+            eventState: 0,
             stakeMark: (stakeMark && stakeMark[0] != null) ? ((stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '') : '',
           }
         }).then((result) => {
@@ -191,6 +195,7 @@ export default {
           Message.error("提交失败");
         }).finally(() => {
           this.submitting = false;
+          this.$emit('queryData',true);
         })
 
       })

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

@@ -58,6 +58,7 @@ export const gjSearchFormList = [
     key: "warningSource",
     type: "select",
     options: {
+      clearable: true,
       options: [
         {
           key: "1",
@@ -113,6 +114,7 @@ export const gjSearchFormList = [
     required: false,
     type: "datePicker",
     options: {
+      style: 'width: 250px',
       type: "datetimerange",
       format: "yyyy-MM-dd HH:mm:ss",
       valueFormat: "yyyy-MM-dd HH:mm:ss",
@@ -123,25 +125,16 @@ export const gjSearchFormList = [
     label: "桩号:",
     required: false,
   },
-  // merge(cloneDeep(PresetFormItems.station), {
-  //   options: {
-  //     options: [
-  //       {
-  //         key: "endStakeMark[0]",
-  //       },
-  //       {
-  //         key: "endStakeMark[1]",
-  //       },
-  //     ],
-  //   },
-  //   label: "结束桩号:",
-  //   required: false,
-  // }),
 ];
 
 export const gzSearchFormList = [
   PresetFormItems.eventSources,
-  PresetFormItems.eventType,
+  merge(PresetFormItems.eventType, {
+    options: {
+      clearable: true,
+    },
+  }),
+  // PresetFormItems.eventType,
   {
     label: "方向:",
     key: "direction",

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

@@ -5,7 +5,7 @@
     <!-- 搜索栏 -->
     <div class="filter">
       <div>
-        <ButtonGradient @click="onAddNew" v-if="activeName != '1' && activeName != '2'">
+        <ButtonGradient @click="onAddNew" v-if="activeName == '0'">
           <template #prefix>
             <img src="./images/insert.svg" />
           </template>
@@ -43,9 +43,10 @@
     </div>
 
     <!-- "详情"弹出框 -->
-    <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" :activeName="activeName" @update:value="handleClose" @queryData="queryData"/>
+    <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" :activeName="activeName"
+      @update:value="handleClose" @queryData="queryData" />
     <!-- "新增"弹出框 -->
-    <FormEvent :visible="isShowAddNew" @close="onCloseAddNew" />
+    <FormEvent :visible="isShowAddNew" @close="onCloseAddNew" @queryData="queryData" />
   </div>
 </template>
 
@@ -176,7 +177,7 @@ export default {
         lastBtnText: text,
       };
     },
-    queryData(flag){
+    queryData(flag) {
       this.getData()
     },
     getData() {
@@ -353,7 +354,7 @@ export default {
       this.searchData = {
         ...this.searchData,
         eventType: data.eventType,
-        eventSources: data.eventSources,
+        eventSource: data.eventSource,
         warningSource: data?.warningSource || '',
         direction: data.direction,
         startTime: daterange && daterange.length > 0 ? daterange[0] : "",