刘洋 9 månader sedan
förälder
incheckning
c75e9c053f

+ 24 - 28
src/render/components/VerticalDateRange/index.vue

@@ -1,32 +1,29 @@
 <template>
-  <div class="vertical-date-range flex items-center justify-between">
-    <div>
-      <div class="flex items-center">
-        <span class="label">开始时间:</span>
-        <date-picker
-          v-model:value="startTime"
-          placeholder="开始时间"
-          :show-time="showTimeStart"
-          :size="props.size || 'large'"
-          :locale="locale"
-          :disabled-date="disabledDateStart"
-          :show-now="false"
-        ></date-picker>
-      </div>
-      <div class="flex items-center mt-8px">
-        <span class="label">结束时间:</span>
-        <date-picker
-          v-model:value="endTime"
-          placeholder="结束时间"
-          :show-time="showTimeEnd"
-          :size="props.size || 'large'"
-          :locale="locale"
-          :disabled-date="disabledDateEnd"
-          :show-now="false"
-        ></date-picker>
-      </div>
+  <div class="vertical-date-range">
+    <div class="flex items-center">
+      <span class="label">开始时间:</span>
+      <date-picker
+        v-model:value="startTime"
+        placeholder="开始时间"
+        :show-time="showTimeStart"
+        :size="props.size || 'large'"
+        :locale="locale"
+        :disabled-date="disabledDateStart"
+        :show-now="false"
+      ></date-picker>
+    </div>
+    <div class="flex items-center mt-8px">
+      <span class="label">结束时间:</span>
+      <date-picker
+        v-model:value="endTime"
+        placeholder="结束时间"
+        :show-time="showTimeEnd"
+        :size="props.size || 'large'"
+        :locale="locale"
+        :disabled-date="disabledDateEnd"
+        :show-now="false"
+      ></date-picker>
     </div>
-    <qm-button style="height: 100%" type="primary">搜索</qm-button>
   </div>
 </template>
 <script lang="ts" name="VerticalDateRange" setup>
@@ -109,7 +106,6 @@ const disabledDateEnd = (current: any) => {
 </script>
 <style lang="less" scoped>
 .vertical-date-range {
-  width: 100%;
   span.label {
     color: @text-color2;
   }

+ 7 - 1
src/render/views/ScanManage/ImageView.vue

@@ -43,8 +43,11 @@
     <div class="info-wrap">
       <Accordion :arr="arr">
         <template #one>
-          <div class="flex accordion-body">
+          <div class="flex accordion-body items-center justify-between">
             <VerticalDateRange v-model="timeArr" />
+            <qm-button size="large" type="primary" @click="search"
+              >搜索</qm-button
+            >
           </div>
         </template>
         <template #two>
@@ -270,6 +273,9 @@ const toggleListType = (type: string, num: number) => {
     _batchList();
   }
 };
+const search = () => {
+  toggleListType(listType.value, 0);
+};
 const activeIndex = ref();
 
 const imageType = ref(dataCheckStore.imageType);