2 Commit-ok 225a796d1c ... d656776469

Szerző SHA1 Üzenet Dátum
  hum d656776469 feat: 水位时间关系图改为曲线图 1 éve
  hum de74665c3f feat: 数据查询中时间选择到‘日’即可,无需精确选择到具体“时分秒’ 1 éve

+ 3 - 3
ruoyi-ui/src/views/analysis/water-flow/index.vue

@@ -11,12 +11,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="设站日期">
+              <el-form-item label="选择日期">
                 <el-date-picker
                   v-model="dateRange"
                   @change="dateRangeChangeHandler"
                   value-format="yyyy-MM-dd hh:mm:ss"
-                  type="datetimerange"
+                  type="daterange"
                   range-separator="-"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
@@ -60,7 +60,7 @@ import Table from './table'
 const initDateRange = () => {
   const start = new Date();
   const end = new Date();
-  start.setHours(start.getHours() - 3);
+  start.setDate(start.getDate() - 1);
   return [parseTime(start), parseTime(end)];
 }
 

+ 1 - 1
ruoyi-ui/src/views/analysis/water-time/chart.vue

@@ -122,7 +122,7 @@ export default {
                 }
               }
             },
-            smooth: false,
+            smooth: true,
             type: 'line',
             data: seriesData,
             animations: false,

+ 6 - 6
ruoyi-ui/src/views/analysis/water-time/index.vue

@@ -23,12 +23,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="设站日期">
+              <el-form-item label="选择日期">
                 <el-date-picker
                   v-model="dateRange"
                   @change="dateRangeChangeHandler"
                   value-format="yyyy-MM-dd hh:mm:ss"
-                  type="datetimerange"
+                  type="daterange"
                   range-separator="-"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
@@ -74,16 +74,16 @@ const initDateRangeByType = (type) => {
   const end = new Date();
   switch (type) {
     case 1:
-      start.setHours(start.getHours() - 3);
+      start.setDate(start.getDate() - 1);
       return [parseTime(start), parseTime(end)];
     case 2:
-      start.setHours(start.getHours() - 6);
+      start.setDate(start.getDate() - 2);
       return [parseTime(start), parseTime(end)];
     case 3:
-      start.setHours(start.getHours() - 12);
+      start.setDate(start.getDate() - 3);
       return [parseTime(start), parseTime(end)];
     case 4:
-      start.setHours(start.getHours() - 24);
+      start.setDate(start.getDate() - 4);
       return [parseTime(start), parseTime(end)];
     case 5:
       start.setMonth(start.getMonth() - 1);