mt-fe-group/yudao-init
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

时间

Browse Source
This commit is contained in:
朱菊兰 2024-06-24 09:15:51 +08:00
parent b6aa6a19f4
commit 582484f6db
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.1.70:30307' # VUE_APP_BASE_API = 'http://192.168.1.70:30307'
# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
# 闫阳 # 闫阳
# VUE_APP_BASE_API = 'http://192.168.1.81:48080' # VUE_APP_BASE_API = 'http://192.168.1.81:48080'
# 徐 # 徐
@ -25,7 +25,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
# 张一丁 # 张一丁
# VUE_APP_BASE_API = 'http://192.168.4.139:48080' # VUE_APP_BASE_API = 'http://192.168.4.139:48080'
# 蔡 # 蔡
VUE_APP_BASE_API = 'http://192.168.1.54:48080' # VUE_APP_BASE_API = 'http://192.168.1.54:48080'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

9
src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
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 {

9
src/views/report/components/bmSearchBar.vue
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 {