Merge branch 'dev-statics'

3 years ago · 546ffd579f
2 changed files with 4 additions and 4 deletions
--- a/src/views/modules/shequzhili/statics/cEvent.vue
+++ b/src/views/modules/shequzhili/statics/cEvent.vue
@ -15,14 +15,14 @@
        <el-form-item label="时间范围"
                      prop="startDate">
          <el-date-picker v-model="timeRange"
-                          type="daterange"
+                          type="datetimerange"
                          clearable
                          size="small"
                          :picker-options="pickerOptions"
                          range-separator="至"
                          start-placeholder="选择日期"
                          end-placeholder="选择日期"
-                          value-format="yyyyMMdd">
+                          value-format="yyyyMMddHHmmss">
          </el-date-picker>
        </el-form-item>
        <el-form-item>
--- a/src/views/modules/shequzhili/statics/gridEvent.vue
+++ b/src/views/modules/shequzhili/statics/gridEvent.vue
@ -19,14 +19,14 @@
        <el-form-item label="时间范围"
                      prop="startDate">
          <el-date-picker v-model="timeRange"
-                          type="daterange"
+                          type="datetimerange"
                          clearable
                          size="small"
                          :picker-options="pickerOptions"
                          range-separator="至"
                          start-placeholder="选择日期"
                          end-placeholder="选择日期"
-                          value-format="yyyyMMdd">
+                          value-format="yyyyMMddHHmmss">
          </el-date-picker>
        </el-form-item>
        <el-form-item>