From cfc0fbb3b12319626ba027bcd33c5c7e100472db Mon Sep 17 00:00:00 2001
From: 13703816893 <l_cheny@foxmail.com>
Date: Mon, 12 Jun 2023 11:38:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarmHandling/components/historyimg.vue   |  6 +--
 src/views/alarmHandling/index.vue             | 40 +++++++++++++-----
 src/views/realTimeSearch/index.vue            | 41 ++++++++++++++-----
 3 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/src/views/alarmHandling/components/historyimg.vue b/src/views/alarmHandling/components/historyimg.vue
index 38deb96..27ed376 100644
--- a/src/views/alarmHandling/components/historyimg.vue
+++ b/src/views/alarmHandling/components/historyimg.vue
@@ -6,7 +6,7 @@
     width="1192px"
     @close="handleclose"
   >
-    <div v-loading="loading">
+    <div v-loading="loadingpic">
       <el-carousel
         :loop="false"
         :autoplay="false"
@@ -31,7 +31,7 @@ export default {
       pageSize: 10, // 每页数量
       total: 0, //总条数
       selectnr: "", //获取当前数据内容
-      loadingpic: true,
+      loadingpic: false,
     };
   },
   mounted() {},
@@ -64,8 +64,6 @@ export default {
         }).then((res) => {
           this.imglist.push(res.data.list);
           this.total = res.data.total;
-          console.log(this.imglist);
-          console.log(e);
         });
       }
     },
diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index b9393ca..7619546 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -38,13 +38,26 @@
             </el-select>
           </el-form-item>
           <el-form-item label="日期">
-            <el-date-picker
+            <!-- <el-date-picker
               v-model="formdata.timeVal"
               type="datetimerange"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               value-format="timestamp"
-            ></el-date-picker>
+            ></el-date-picker> -->
+            <el-date-picker
+              v-model="formdata.starttime"
+              type="datetime"
+              placeholder="开始日期"
+              value-format="timestamp">
+            </el-date-picker>
+            <el-date-picker
+              v-model="formdata.endtime"
+              type="datetime"
+              placeholder="结束日期"
+              value-format="timestamp"
+              class="ml10">
+            </el-date-picker>
           </el-form-item>
           <el-form-item label="告警原因" class="gjbox">
             <el-select v-model="formdata.label">
@@ -234,7 +247,7 @@ export default {
         lineId: 0,
         towerId: 0,
         label: -1,
-        timeVal: "",
+        // timeVal: "",
       },
       photoPic: "",
       tableData: [],
@@ -254,11 +267,12 @@ export default {
     };
   },
   mounted() {
-    this.$set(this.formdata, "timeVal", [
-      new Date(new Date().toLocaleDateString()).getTime(),
-      new Date().getTime(),
-    ]);
-
+    // this.$set(this.formdata, "timeVal", [
+    //   new Date(new Date().toLocaleDateString()).getTime(),
+    //   new Date().getTime(),
+    // ]);
+    this.$set(this.formdata, "starttime", new Date(new Date().toLocaleDateString()).getTime());
+    this.$set(this.formdata, "endtime", new Date().getTime());
     this.getSearchdy();
     this.getTableList();
   },
@@ -325,8 +339,8 @@ export default {
       this.loading = true;
       this.$set(this.formdata, "pageindex", this.page);
       this.$set(this.formdata, "pagesize", this.pageSize);
-      this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);
-      this.$set(this.formdata, "endtime", this.formdata.timeVal[1]);
+      // this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);
+      // this.$set(this.formdata, "endtime", this.formdata.timeVal[1]);
       getAlarmList(this.formdata)
         .then((res) => {
           this.loading = false;
@@ -346,6 +360,9 @@ export default {
     },
     //查询
     onSubmit() {
+      if (this.formdata.starttime > this.formdata.endtime) {
+        return this.$message({ showClose: true, message: "开始日期不能大于结束日期", type: "warning" });
+      }
       this.getTableList();
     },
     handleSelectionChange(val) {
@@ -545,6 +562,9 @@ export default {
     padding: 16px;
     border-radius: 4px;
     .searchBox {
+      .ml10{
+        margin-left: 10px;
+      }
       .el-form {
         .dybox {
           .el-form-item__content {
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index 953ebcc..343ceb8 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -67,13 +67,26 @@
             </el-select>
           </el-form-item>
           <el-form-item label="日期">
-            <el-date-picker
+            <!-- <el-date-picker
               v-model="formdata.timeVal"
               type="datetimerange"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               value-format="timestamp"
-            ></el-date-picker>
+            ></el-date-picker> -->
+            <el-date-picker
+              v-model="formdata.starttime"
+              type="datetime"
+              placeholder="开始日期"
+              value-format="timestamp">
+            </el-date-picker>
+            <el-date-picker
+              v-model="formdata.endtime"
+              type="datetime"
+              placeholder="结束日期"
+              value-format="timestamp"
+              class="ml10">
+            </el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="onSubmit">查询</el-button>
@@ -199,7 +212,7 @@ export default {
         towerid: "",
         channelid: "",
         termid: "",
-        timeVal: "",
+        // timeVal: "",
       },
       picList: [],
       page: 1, // 当前页数
@@ -210,10 +223,12 @@ export default {
     };
   },
   mounted() {
-    this.$set(this.formdata, "timeVal", [
-      new Date(new Date().toLocaleDateString()).getTime(),
-      new Date().getTime(),
-    ]);
+    // this.$set(this.formdata, "timeVal", [
+    //   new Date(new Date().toLocaleDateString()).getTime(),
+    //   new Date().getTime(),
+    // ]);
+    this.$set(this.formdata, "starttime", new Date(new Date().toLocaleDateString()).getTime());
+    this.$set(this.formdata, "endtime", new Date().getTime());
     this.getSearchdy();
   },
   methods: {
@@ -287,8 +302,8 @@ export default {
       this.loading = true;
       this.$set(this.formdata, "pageindex", this.page);
       this.$set(this.formdata, "pagesize", this.pageSize);
-      this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);
-      this.$set(this.formdata, "endtime", this.formdata.timeVal[1]);
+      // this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);
+      // this.$set(this.formdata, "endtime", this.formdata.timeVal[1]);
       getRealtimePhoto(this.formdata)
         .then((res) => {
           this.picList = res.data.list;
@@ -302,6 +317,9 @@ export default {
     },
     //查询
     onSubmit() {
+      if (this.formdata.starttime > this.formdata.endtime) {
+        return this.$message({ showClose: true, message: "开始日期不能大于结束日期", type: "warning" });
+      }
       this.getPicData();
     },
     //点击分页
@@ -317,7 +335,7 @@ export default {
   },
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 .realTimeSearch {
   width: calc(100% - 32px);
   height: calc(100% - 32px);
@@ -328,6 +346,9 @@ export default {
     height: calc(100% - 32px);
     padding: 16px;
     border-radius: 4px;
+    .ml10{
+      margin-left: 10px;
+    }
   }
   .pictureBox {
     display: flex;