Merge remote-tracking branch 'origin/master'

plus-ui-ts/src/views/index.vue

@@ -96,7 +96,7 @@
           <el-select style="width: 100px" v-model="queryParams.level" clearable placeholder="事件等级">
             <el-option v-for="dict in event_level" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
-          <el-input v-model="queryParams.ext2.lx" style="width: 110px; margin-left: 10px" placeholder="事件类型" />
+          <el-input v-model="queryParams.params.lx" style="width: 110px; margin-left: 10px" placeholder="事件类型" />
           <el-date-picker
             v-model="queryParams.dateRange"
             style="margin-left: 10px"
@@ -110,7 +110,7 @@
           />
         </div>
         <div style="margin-top: 10px">
-          <el-input v-model="queryParams.addr" style="width: 210px" placeholder="输入地点关键词" :suffix-icon="Search" />
+          <el-input v-model="queryParams.params.key" style="width: 210px" placeholder="输入地点关键词" :suffix-icon="Search" />
           <div style="margin-left: 10px">
             <el-button color="#1890FF" style="color: #fff" @click="getList">查询</el-button>
             <el-button @click="resetQuery">重置</el-button>
@@ -304,14 +304,12 @@ const queryParams = ref({
   pageNum: 1,
   pageSize: 15,
   level: undefined,
-  ext2: {
-    lx: undefined
-  },
   dateRange: undefined,
-  addr: undefined,
   params: {
-    beginTime: '',
-    endTime: ''
+    lx: undefined,
+    key: undefined,
+    beginCreateTime: '',
+    endCreateTime: ''
   }
 });
 const dialog = reactive({
@@ -437,11 +435,11 @@ onMounted(() => {
 const getList = async () => {
   const { dateRange } = queryParams.value;
   if (dateRange && dateRange.length) {
-    queryParams.value.params.beginTime = dateRange[0];
-    queryParams.value.params.endTime = dateRange[1];
+    queryParams.value.params.beginCreateTime = dateRange[0];
+    queryParams.value.params.endCreateTime = dateRange[1];
   } else {
-    queryParams.value.params.beginTime = undefined;
-    queryParams.value.params.endTime = undefined;
+    queryParams.value.params.beginCreateTime = undefined;
+    queryParams.value.params.endCreateTime = undefined;
   }
   const res = await listEvent(queryParams.value);
   eventList.value = res.rows.map((item: any) => ({
@@ -471,8 +469,10 @@ const resetQuery = () => {
     dateRange: undefined,
     addr: undefined,
     params: {
-      beginTime: '',
-      endTime: ''
+      lx: undefined,
+      key: undefined,
+      beginTime: undefined,
+      endTime: undefined
     }
   };
   getList();