projects/mescc/zhp #60

Merged
juzi merged 2 commits from projects/mescc/zhp into projects/mescc/develop 2024-06-24 09:50:08 +08:00
3 changed files with 17 additions and 2 deletions
Showing only changes of commit 0c2221b373 - Show all commits

View File

@ -20,7 +20,7 @@
<el-form-item v-show="form.type === 0" label="时间" prop="dayTime"> <el-form-item v-show="form.type === 0" label="时间" prop="dayTime">
<el-date-picker <el-date-picker
size="small" size="small"
clearable :clearable="false"
v-model="form.dayTime" v-model="form.dayTime"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
@ -32,6 +32,7 @@
<el-form-item v-show="form.type === 1" label="时间" prop="weekTime"> <el-form-item v-show="form.type === 1" label="时间" prop="weekTime">
<el-date-picker <el-date-picker
v-model="form.weekTime" v-model="form.weekTime"
:clearable="false"
type="week" type="week"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择周" placeholder="选择周"
@ -43,6 +44,7 @@
<el-form-item v-show="form.type === 2" label="时间" prop="monthTime"> <el-form-item v-show="form.type === 2" label="时间" prop="monthTime">
<el-date-picker <el-date-picker
v-model="form.monthTime" v-model="form.monthTime"
:clearable="false"
type="month" type="month"
placeholder="选择月份" placeholder="选择月份"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -53,6 +55,7 @@
<el-form-item v-show="form.type === 3" label="时间" prop="yearTime"> <el-form-item v-show="form.type === 3" label="时间" prop="yearTime">
<el-date-picker <el-date-picker
v-model="form.yearTime" v-model="form.yearTime"
:clearable="false"
type="year" type="year"
placeholder="选择年份" placeholder="选择年份"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -116,6 +119,10 @@ export default {
break; break;
} }
params.type = this.form.type; params.type = this.form.type;
if (!params.startDate) {
this.$message.warning("时间不能为空");
return;
}
if (val === "search") { if (val === "search") {
this.$emit("getSearch", params); this.$emit("getSearch", params);
} else { } else {

View File

@ -19,7 +19,7 @@
<el-form-item v-show="form.type === 0" label="时间" prop="dayTime"> <el-form-item v-show="form.type === 0" label="时间" prop="dayTime">
<el-date-picker <el-date-picker
size="small" size="small"
clearable :clearable="false"
v-model="form.dayTime" v-model="form.dayTime"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
@ -31,6 +31,7 @@
<el-form-item v-show="form.type === 1" label="时间" prop="weekTime"> <el-form-item v-show="form.type === 1" label="时间" prop="weekTime">
<el-date-picker <el-date-picker
v-model="form.weekTime" v-model="form.weekTime"
:clearable="false"
type="week" type="week"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择周" placeholder="选择周"
@ -42,6 +43,7 @@
<el-form-item v-show="form.type === 2" label="时间" prop="monthTime"> <el-form-item v-show="form.type === 2" label="时间" prop="monthTime">
<el-date-picker <el-date-picker
v-model="form.monthTime" v-model="form.monthTime"
:clearable="false"
type="month" type="month"
placeholder="选择月份" placeholder="选择月份"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -52,6 +54,7 @@
<el-form-item v-show="form.type === 3" label="时间" prop="yearTime"> <el-form-item v-show="form.type === 3" label="时间" prop="yearTime">
<el-date-picker <el-date-picker
v-model="form.yearTime" v-model="form.yearTime"
:clearable="false"
type="year" type="year"
placeholder="选择年份" placeholder="选择年份"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -138,6 +141,10 @@ export default {
break; break;
} }
params.type = this.form.type; params.type = this.form.type;
if (!params.startDate) {
this.$message.warning("时间不能为空");
return;
}
if (val === "search") { if (val === "search") {
this.$emit("getSearch", params); this.$emit("getSearch", params);
} else { } else {

View File

@ -254,6 +254,7 @@ export default {
data: [], data: [],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
barGap: "100%",
label: { label: {
show: true, show: true,
position: "top", position: "top",