From bd481af6bd9f89f1833c763449d609b8710f605a Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 12 Jun 2023 16:14:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E5=A7=8B=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarmHandling/index.vue  | 24 ++++++++++++++++++------
 src/views/realTimeSearch/index.vue | 24 ++++++++++++++++++------
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index 7619546..9ab8ba2 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -37,7 +37,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="日期">
+          <el-form-item label="开始日期">
             <!-- <el-date-picker
               v-model="formdata.timeVal"
               type="datetimerange"
@@ -49,14 +49,18 @@
               v-model="formdata.starttime"
               type="datetime"
               placeholder="开始日期"
-              value-format="timestamp">
+              value-format="timestamp"
+            >
             </el-date-picker>
+          </el-form-item>
+          <el-form-item label="结束日期">
             <el-date-picker
               v-model="formdata.endtime"
               type="datetime"
               placeholder="结束日期"
               value-format="timestamp"
-              class="ml10">
+              class="ml10"
+            >
             </el-date-picker>
           </el-form-item>
           <el-form-item label="告警原因" class="gjbox">
@@ -271,7 +275,11 @@ export default {
     //   new Date(new Date().toLocaleDateString()).getTime(),
     //   new Date().getTime(),
     // ]);
-    this.$set(this.formdata, "starttime", new Date(new Date().toLocaleDateString()).getTime());
+    this.$set(
+      this.formdata,
+      "starttime",
+      new Date(new Date().toLocaleDateString()).getTime()
+    );
     this.$set(this.formdata, "endtime", new Date().getTime());
     this.getSearchdy();
     this.getTableList();
@@ -361,7 +369,11 @@ export default {
     //查询
     onSubmit() {
       if (this.formdata.starttime > this.formdata.endtime) {
-        return this.$message({ showClose: true, message: "开始日期不能大于结束日期", type: "warning" });
+        return this.$message({
+          showClose: true,
+          message: "开始日期不能大于结束日期",
+          type: "warning",
+        });
       }
       this.getTableList();
     },
@@ -562,7 +574,7 @@ export default {
     padding: 16px;
     border-radius: 4px;
     .searchBox {
-      .ml10{
+      .ml10 {
         margin-left: 10px;
       }
       .el-form {
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index 343ceb8..215a57a 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -66,7 +66,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="日期">
+          <el-form-item label="开始日期">
             <!-- <el-date-picker
               v-model="formdata.timeVal"
               type="datetimerange"
@@ -78,14 +78,18 @@
               v-model="formdata.starttime"
               type="datetime"
               placeholder="开始日期"
-              value-format="timestamp">
+              value-format="timestamp"
+            >
             </el-date-picker>
+          </el-form-item>
+          <el-form-item label="结束日期">
             <el-date-picker
               v-model="formdata.endtime"
               type="datetime"
               placeholder="结束日期"
               value-format="timestamp"
-              class="ml10">
+              class="ml10"
+            >
             </el-date-picker>
           </el-form-item>
           <el-form-item>
@@ -227,7 +231,11 @@ export default {
     //   new Date(new Date().toLocaleDateString()).getTime(),
     //   new Date().getTime(),
     // ]);
-    this.$set(this.formdata, "starttime", new Date(new Date().toLocaleDateString()).getTime());
+    this.$set(
+      this.formdata,
+      "starttime",
+      new Date(new Date().toLocaleDateString()).getTime()
+    );
     this.$set(this.formdata, "endtime", new Date().getTime());
     this.getSearchdy();
   },
@@ -318,7 +326,11 @@ export default {
     //查询
     onSubmit() {
       if (this.formdata.starttime > this.formdata.endtime) {
-        return this.$message({ showClose: true, message: "开始日期不能大于结束日期", type: "warning" });
+        return this.$message({
+          showClose: true,
+          message: "开始日期不能大于结束日期",
+          type: "warning",
+        });
       }
       this.getPicData();
     },
@@ -346,7 +358,7 @@ export default {
     height: calc(100% - 32px);
     padding: 16px;
     border-radius: 4px;
-    .ml10{
+    .ml10 {
       margin-left: 10px;
     }
   }