bug fix

src/components/element/BaseForm.vue

@@ -95,7 +95,8 @@ import {
   ElCol,
   ElCollapseTransition,
 } from 'element-plus'
-import { RangePicker } from 'ant-design-vue'
+// import { RangePicker } from 'ant-design-vue'
+import RangePicker from '@/components/element/BaseTimeRangePicker.vue'
 import CustomBlock from '@/components/common/CustomBlock.vue'
 import BaseSelect from '@/components/element/BaseSelect.vue'
 import BaseCheckBox from '@/components/element/BaseCheckBox.vue'

src/components/element/BaseTimeRangePicker.vue

@@ -0,0 +1,44 @@
+<template>
+  <range-picker
+    v-bind="attrs"
+    v-model="time"
+    :open="timePickerShow"
+    :show-time="showTime"
+    value-format="YYYYMMDDHHmmss"
+    :placeholder="['开始时间', '结束时间']"
+    :locale="locale"
+    :size="props.size || 'large'"
+    :allow-empty="[true, true]"
+    @ok="handleOkChange"
+    @open-change="handleOpenChange"
+    @calendar-change="handleCalendarChange"
+  ></range-picker>
+</template>
+<script lang="ts" name="BaseTimeRangePicker" setup>
+import { RangePicker } from 'ant-design-vue'
+import locale from 'ant-design-vue/es/date-picker/locale/zh_CN'
+import dayjs from 'dayjs'
+import { ref, computed, useSlots, useAttrs, onMounted } from 'vue'
+import useVModel from '@/hooks/useVModel'
+const showTime = { defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('23:59:59', 'HH:mm:ss')] }
+const props = defineProps<{ modelValue: any; size: string }>()
+const time = useVModel(props)
+const attrs = useAttrs()
+const timePickerShow = ref(false)
+const handleOkChange = () => {
+  timePickerShow.value = false
+}
+const handleOpenChange = (status: boolean) => {
+  timePickerShow.value = !!status
+}
+const handleCalendarChange = (values: any) => {
+  time.value = values
+}
+// const disabledDate = (current: any) => {
+//   if (!time.value[0] && !time.value[1]) {
+//     return false
+//   } else {
+//   }
+// }
+</script>
+<style lang="scss" scoped></style>

src/hooks/useTableCheck.ts

@@ -138,9 +138,9 @@ const useTableCheck = <T extends TableDataType<InputDataType>>(
   /** 表格选中 */
   // const onCurrentChange = (row: RowType<T>) => {
   const onCurrentChange = (row: any) => {
-    if (!isMult?.value) {
-      current.value = row
-    }
+    // if (!isMult?.value) {
+    current.value = row
+    // }
   }
 
   /** 表格行双击 */

src/modules/analysis/view-marked-detail/index.vue

@@ -102,7 +102,7 @@
               height="100%"
               :data="tableData"
               :columns="columns"
-              :highlight-current-row="!isMult"
+              :highlight-current-row="true"
               :cell-style="{ padding: '6px 0' }"
               :memory-column="true"
               @current-change="onCurrentChange"

src/modules/marking/inquiry/index.vue

@@ -353,22 +353,17 @@ const items = computed<EpFormItem[]>(() => [
     slotType: 'dateTime',
     prop: 'time',
     slot: {
-      // startPlaceholder: '开始时间',
-      // endPlaceholder: '结束时间',
-      // clearable: true,
-      // type: 'datetimerange',
+      // showTime: { defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('23:59:59', 'HH:mm:ss')] },
       // valueFormat: 'YYYYMMDDHHmmss',
-      showTime: { defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('23:59:59', 'HH:mm:ss')] },
-      valueFormat: 'YYYYMMDDHHmmss',
-      placeholder: ['开始时间', '结束时间'],
-      locale: locale,
-      size: 'large',
-      allowEmpty: [true, true],
-      open: timePickerShow.value,
-      onOk: handleOkChange,
-      onOpenChange: handleOpenChange,
-      onCalendarChange: handleCalendarChange,
-      disabledDate: disabledDate,
+      // placeholder: ['开始时间', '结束时间'],
+      // locale: locale,
+      // size: 'large',
+      // allowEmpty: [true, true],
+      // open: timePickerShow.value,
+      // onOk: handleOkChange,
+      // onOpenChange: handleOpenChange,
+      // onCalendarChange: handleCalendarChange,
+      // disabledDate: disabledDate,
     },
   }),
   FourRow({

src/modules/marking/mark/index.vue

@@ -54,18 +54,8 @@
             @load="imgLoaded"
           />
         </div>
-        <!-- <div ref="imgWrap" class="img-wrap scroll-auto flex-1 p-base" :class="{ 'text-center': center }">
-          <img
-            ref="paperImg"
-            :src="currentTask.dataUrl"
-            alt=""
-            class="paper-img"
-            :style="{ 'background-color': frontColor, maxWidth: '100%' }"
-            @load="imgLoaded"
-          />
-        </div> -->
         <scoring-panel-with-confirm
-          v-if="currentTask && dataUrl"
+          v-if="currentTask && dataUrl && !imgLoading"
           :id="currentTask?.taskId"
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
@@ -75,13 +65,6 @@
           @submit="onSubmit"
         ></scoring-panel-with-confirm>
       </div>
-      <!-- <remark-box
-        ref="remarkBoxRef"
-        v-model="remarkModalVisible"
-        @task-change="historyTaskChange"
-        @back="historyBack"
-        @close="historyClose"
-      ></remark-box> -->
       <remark-box
         v-if="remarkModalVisible"
         ref="remarkBoxRef"