.env.dev

@@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
 
 # 芋道管理系统/开发环境
 # 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'
 # 徐
@@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 # 张一丁
 # 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
 

src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue

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

src/views/report/components/bmSearchBar.vue

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