From 7cae1278a1c055c3d930d7c350687c306ffbfa7f Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 18 Jul 2024 09:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                                      | 2 +-
 src/views/realTimeMonitor/components/setChannelDialog.vue | 5 +++--
 src/views/reportData/equipmentStatus/index.vue            | 1 +
 src/views/reportData/index.vue                            | 2 --
 src/views/reportData/photostatis/index.vue                | 3 ++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index a0b6cfb..42d71e5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,7 +8,7 @@ const service = axios.create({
   // baseURL: '',
   // timeout: 5000
   baseURL: "api", //把原来的项目地址，改成api，解决跨域问题
-  timeout: 30000,
+  timeout: 60000,
 });
 
 service.interceptors.request.use((config) => {
diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue
index a63fc48..e008ea7 100644
--- a/src/views/realTimeMonitor/components/setChannelDialog.vue
+++ b/src/views/realTimeMonitor/components/setChannelDialog.vue
@@ -285,6 +285,7 @@ export default {
         lbosd: "",
         rbosd: "",
         templateVal: 2,
+        compensationVal: 0,
       },
       bgflag: false,
       modelOptions: [
@@ -1030,7 +1031,7 @@ export default {
               this.channelForm.bgsj = "";
               this.channelForm.iso = "";
               this.channelForm.modelVal = "";
-              this.channelForm.compensationVal = "";
+              this.channelForm.compensationVal = 0;
               // this.channelForm.hdrchecked = "";
               // this.channelForm.ywchecked = "";
               this.channelForm.rtosd = "";
@@ -1086,7 +1087,7 @@ export default {
       this.channelForm.bgsj = "";
       this.channelForm.iso = "";
       this.channelForm.modelVal = "";
-      this.channelForm.compensationVal = "";
+      this.channelForm.compensationVal = 0;
       // this.channelForm.hdrchecked = "";
       // this.channelForm.ywchecked = "";
       this.channelForm.rtosd = "";
diff --git a/src/views/reportData/equipmentStatus/index.vue b/src/views/reportData/equipmentStatus/index.vue
index 3293dfb..8245860 100644
--- a/src/views/reportData/equipmentStatus/index.vue
+++ b/src/views/reportData/equipmentStatus/index.vue
@@ -464,6 +464,7 @@ export default {
       console.log(this.formdata);
       this.termLoading = true;
       let params = {
+        dataFlag: "GPSOCB", //全要
         start: this.formdata.starttime / 1000,
         end: this.formdata.endtime / 1000,
         pageNum: this.page,
diff --git a/src/views/reportData/index.vue b/src/views/reportData/index.vue
index 4b9a42c..9cfa637 100644
--- a/src/views/reportData/index.vue
+++ b/src/views/reportData/index.vue
@@ -26,8 +26,6 @@
         </span>
         <equipmentStatus ref="equipmentStatusRef"></equipmentStatus
       ></el-tab-pane>
-      <!-- <el-tab-pane label="角色管理">角色管理</el-tab-pane>
-      <el-tab-pane label="定时任务补偿">定时任务补偿</el-tab-pane> -->
     </el-tabs>
   </div>
 </template>
diff --git a/src/views/reportData/photostatis/index.vue b/src/views/reportData/photostatis/index.vue
index cdc4497..27bbab0 100644
--- a/src/views/reportData/photostatis/index.vue
+++ b/src/views/reportData/photostatis/index.vue
@@ -425,6 +425,7 @@ export default {
       console.log(this.formdata);
       this.photoLoading = true;
       let params = {
+        dataFlag: "PS", //只要photoInfo信息
         start: this.formdata.starttime / 1000,
         end: this.formdata.endtime / 1000,
         pageNum: this.page,
@@ -473,7 +474,7 @@ export default {
     //每页条数
     handleSizeChange(val) {
       this.pageSize = val;
-      this.getPhotoFun();
+      //this.getPhotoFun();
     },
     //点击装置查看历史图片
     handleShowPhoto(row) {