From 38b708b4a343de17a9bc4bb0ee907133112e3d6a Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 18 Mar 2024 14:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api/index.js                        |   8 ++
 src/views/homePage/index.vue                  |   3 +-
 .../components/faultInfomation.vue            | 107 +++++++++++++++---
 vue.config.js                                 |   6 +-
 4 files changed, 106 insertions(+), 18 deletions(-)

diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index c8c14bd..6fc1f75 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -785,3 +785,11 @@ export function getTermFaultsApi(data) {
     data,
   });
 }
+//导出数据故障信息报
+export function getTermFaultsExcel() {
+  return request({
+    url: "/xymanager/getTermFaultsExcel",
+    method: "get",
+    responseType: "blob",
+  });
+}
diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index 2040000..9efb97b 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -195,7 +195,8 @@ export default {
     //导出
     handleExport(val) {
       console.log(val);
-      window.location.href = "/api/api/getOnlineTerminalListExcel?type=" + val;
+      window.location.href =
+        "/api/xymanager/getOnlineTerminalListExcel?type=" + val;
     },
     // 隐患数量统计
     changedate() {
diff --git a/src/views/photographicDevice/components/faultInfomation.vue b/src/views/photographicDevice/components/faultInfomation.vue
index e7ac2f7..89616bf 100644
--- a/src/views/photographicDevice/components/faultInfomation.vue
+++ b/src/views/photographicDevice/components/faultInfomation.vue
@@ -9,8 +9,10 @@
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
+          @change="changestartdate"
           v-model="formdata.starttime"
           type="datetime"
+          :picker-options="pickerOptions"
           placeholder="开始日期"
           value-format="timestamp"
         >
@@ -18,9 +20,10 @@
       </el-form-item>
       <el-form-item label="结束日期">
         <el-date-picker
+          @change="changeenddate"
           v-model="formdata.endtime"
           type="datetime"
-          default-time="23:59:59"
+          :picker-options="pickerOptions"
           placeholder="结束日期"
           value-format="timestamp"
           class="ml10"
@@ -29,7 +32,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit">查询</el-button>
-        <el-button type="primary">导出</el-button>
+        <el-button type="primary" @click="exportFault">导出</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -49,7 +52,13 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="fault_time"
+        prop="cmdid"
+        label="装置编号"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="faultTime"
         label="采集时间"
         min-width="120"
         show-overflow-tooltip
@@ -74,12 +83,12 @@
       </el-pagination>
     </div>
     <div slot="footer" class="dialog-footer">
-      <el-button @click="isShow = false">取 消</el-button>
+      <el-button @click="hide">取 消</el-button>
     </div>
   </el-dialog>
 </template>
 <script>
-import { getTermFaultsApi } from "@/utils/api/index";
+import { getTermFaultsApi, getTermFaultsExcelApi } from "@/utils/api/index";
 export default {
   data() {
     return {
@@ -91,17 +100,77 @@ export default {
       page: 1, // 当前页数
       pageSize: 10, // 每页数量
       total: 0, //总条数
+      pickerOptions: {
+        disabledDate(date) {
+          return date.getTime() > Date.now(); // 禁用大于今天的日期
+        },
+      },
     };
   },
-  mounted() {
-    this.$set(
-      this.formdata,
-      "starttime",
-      new Date(new Date().toLocaleDateString()).getTime()
-    );
-    this.$set(this.formdata, "endtime", new Date().getTime());
+  watch: {
+    endtime(newVal) {
+      if (newVal) {
+        const date = new Date(newVal);
+        date.setHours(23);
+        date.setMinutes(59);
+        date.setSeconds(59);
+        this.formdata.endtime = date;
+      }
+    },
   },
+  created() {},
+  mounted() {},
   methods: {
+    getTime() {
+      const thirtyDaysAgo = new Date();
+      thirtyDaysAgo.setHours(0); // 设置小时为23
+      thirtyDaysAgo.setMinutes(0); // 设置分钟为59
+      thirtyDaysAgo.setSeconds(0); // 设置秒数为59
+      this.$set(
+        this.formdata,
+        "starttime",
+        new Date(thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30))
+      );
+      console.log(this.formdata.starttime);
+      const currentDate = new Date(); // 获取当前时间
+      currentDate.setHours(23); // 设置小时为23
+      currentDate.setMinutes(59); // 设置分钟为59
+      currentDate.setSeconds(59); // 设置秒数为59
+      this.$set(this.formdata, "endtime", currentDate);
+      this.getfaultinfo();
+    },
+    changestartdate(val) {
+      console.log(val);
+      if (val == null) {
+        console.log(new Date());
+        const startDate = new Date();
+        startDate.setHours(0); // 设置小时为23
+        startDate.setMinutes(0); // 设置分钟为59
+        startDate.setSeconds(0); // 设置秒数为59
+        this.formdata.starttime = startDate;
+        console.log(this.formdata.starttime);
+      } else {
+        this.formdata.starttime = val;
+      }
+    },
+    //结束日期
+    changeenddate(val) {
+      if (val == null) {
+        console.log(new Date());
+        const endDate = new Date();
+        endDate.setHours(23); // 设置小时为23
+        endDate.setMinutes(59); // 设置分钟为59
+        endDate.setSeconds(59); // 设置秒数为59
+        this.formdata.endtime = endDate;
+        console.log(this.formdata.endtime);
+      } else {
+        val.setHours(23); // 设置小时为23
+        val.setMinutes(59); // 设置分钟为59
+        val.setSeconds(59); // 设置秒数为59
+        this.formdata.endtime = val;
+        console.log(val);
+      }
+    },
     //查询
     onSubmit() {
       if (this.formdata.starttime > this.formdata.endtime) {
@@ -114,17 +183,26 @@ export default {
       }
       this.getfaultinfo();
     },
+    //导出
+    exportFault() {
+      window.location.href =
+        "/api/getTermFaultsExcel?termid=" + this.rowInfo.id;
+    },
     //获取数据
     getfaultinfo() {
       this.loading = true;
       getTermFaultsApi({
         termid: this.rowInfo.id,
+        starttime: this.formdata.starttime,
+        endtime: this.formdata.endtime,
         pageindex: this.page,
         pagesize: this.pageSize,
       }).then((res) => {
         this.listData = res.data.list;
         this.total = res.data.total;
-        this.loading = false;
+        this.$nextTick(() => {
+          this.loading = false;
+        });
       });
     },
     //点击分页
@@ -141,10 +219,11 @@ export default {
       console.log(row);
       this.rowInfo = row;
       this.isShow = true;
-      this.getfaultinfo();
+      this.getTime();
     },
     hide() {
       this.isShow = false;
+      this.formdata = {};
     },
   },
 };
diff --git a/vue.config.js b/vue.config.js
index 2da1869..721a298 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,12 +22,12 @@ module.exports = defineConfig({
       "/api": {
         //表示拦截以/api开头的请求路径
         //target: "http://47.96.238.157:8093", //阿里云服务器环境
-        target: "http://180.166.218.222:40080", //dell
-        //target: "http://192.168.50.7:8094", //liu 本机ip
+        //target: "http://180.166.218.222:40080", //dell
+        target: "http://192.168.50.7:8094", //liu 本机ip
         // target: "http://192.168.50.42:81", //东视
         changOrigin: true, //是否开启跨域
         pathRewrite: {
-          "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+          "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
         },
       },
     },