Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2024-08-13 17:48:18 +08:00
commit 327be0f7da
2 changed files with 7 additions and 6 deletions

View File

@ -38,9 +38,9 @@
<el-date-picker <el-date-picker
v-model="dateValue" v-model="dateValue"
type="datetimerange" type="datetimerange"
range-separator="" :range-separator="$t('baseForm:daterange:rangeSeparator')"
start-placeholder="开始日期" :start-placeholder="$t('imageInspect:daterange:startPlaceholder')"
end-placeholder="结束日期" :end-placeholder="$t('imageInspect:daterange:endPlaceholder')"
:default-time="['00:00:00', '23:59:59']" :default-time="['00:00:00', '23:59:59']"
> >
</el-date-picker> </el-date-picker>

View File

@ -83,8 +83,9 @@
v-model="datetimerange" v-model="datetimerange"
type="datetimerange" type="datetimerange"
:default-time="['00:00:00', '23:59:59']" :default-time="['00:00:00', '23:59:59']"
:start-placeholder="$t('trials:loginLog:table:beginTime')" :range-separator="$t('baseForm:daterange:rangeSeparator')"
:end-placeholder="$t('trials:loginLog:table:endTime')" :start-placeholder="$t('imageInspect:daterange:startPlaceholder')"
:end-placeholder="$t('imageInspect:daterange:endPlaceholder')"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@change="handleDatetimeChange" @change="handleDatetimeChange"
/> />