From 0117821a72f31e5479362b15b9ec4af5f02dd727 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 8 May 2024 13:44:21 +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/components/Sidebar.vue                    |  9 ++--
 src/main.js                                   |  1 +
 .../components/imageCapture.vue               |  7 ++-
 .../components/parameterSetDialog.vue         | 24 +++++----
 .../components/videoCapture.vue               |  5 +-
 .../components/carouselChart.vue              |  4 +-
 .../components/parameterArea.vue              |  2 +-
 .../components/setChannelDialog.vue           | 53 +++++++++++++++++--
 .../components/setschedule.vue                |  2 +-
 .../reportData/equipmentStatus/index.vue      | 30 +++++------
 .../components/blindMenuPermiss.vue           |  2 +-
 vue.config.js                                 |  4 +-
 12 files changed, 98 insertions(+), 45 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 2be7300..5dbcdfe 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -142,10 +142,10 @@ export default {
               index: "/roleManagement",
               title: "角色管理",
             },
-            // {
-            //   index: "/menuManagement",
-            //   title: "菜单功能管理",
-            // },
+            {
+              index: "/menuManagement",
+              title: "菜单功能管理",
+            },
             {
               index: "/deviceUpgrade",
               title: "升级管理",
@@ -219,6 +219,7 @@ export default {
             "cameraChannel",
             "photographicDevice",
             "devicePhotoSchedule",
+            "reportData",
           ].includes(index)
         ) {
           // 如果包含杆塔或线路信息，则添加到资产管理子菜单
diff --git a/src/main.js b/src/main.js
index c1f7aa6..7515aa4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,6 +30,7 @@ import VueLazyload from "vue-lazyload";
 //注册插件
 Vue.use(VueLazyload, {
   error: require("./assets/img/nodatapic2.jpg"),
+  listenEvents: [ 'scroll', 'wheel', 'mousewheel', 'resize', 'animationend', 'transitionend', 'touchmove' ]
 });
 /* 引入公共js*/
 import common from "@/utils/common/common.js";
diff --git a/src/views/photographicDevice/components/imageCapture.vue b/src/views/photographicDevice/components/imageCapture.vue
index 5febbdb..3ca2db9 100644
--- a/src/views/photographicDevice/components/imageCapture.vue
+++ b/src/views/photographicDevice/components/imageCapture.vue
@@ -91,7 +91,7 @@
           >查询</el-button
         >
         <p class="looktime" v-if="lookTime && showLookTime">
-          {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+          {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
         </p>
         <!-- <el-button
           class="searchImage"
@@ -940,7 +940,8 @@ export default {
         .then((res) => {
           console.log(res);
           this.requestid = res.data.requestId;
-          this.lookTime = res.data.date;
+          this.showLookTime = false;
+         // this.lookTime = res.data.date;
           //this.getinfo1();
           clearInterval(this.timer);
           this.timer = window.setInterval(() => {
@@ -969,6 +970,8 @@ export default {
               message: "信息已更新",
               type: "success",
             });
+            this.lookTime =res.data.requestTime ;
+            
             this.showLookTime = true;
           } else if (this.i > 9) {
             window.clearInterval(this.timer);
diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index 8b8fbb4..749a3a3 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -75,7 +75,7 @@
                 >设置</el-button
               >
               <p class="looktime" v-if="lookTime && showLookTime">
-                {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
               </p>
             </el-form-item>
           </el-form>
@@ -127,7 +127,7 @@
                       >查询</el-button
                     >
                     <p class="looktime" v-if="lookTime && showLookTime">
-                      {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                      {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
                     </p>
                   </el-form-item>
                 </el-form>
@@ -208,7 +208,7 @@
                       >查询</el-button
                     >
                     <p class="looktime" v-if="lookTime && showLookTime">
-                      {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                      {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
                     </p>
                   </el-form-item>
                 </el-form>
@@ -270,7 +270,7 @@
                       >查询</el-button
                     >
                     <p class="looktime" v-if="lookTime && showLookTime">
-                      {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                      {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
                     </p>
                   </el-form-item>
                 </el-form>
@@ -307,7 +307,7 @@
                       >查询</el-button
                     >
                     <p class="looktime" v-if="lookTime && showLookTime">
-                      {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                      {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
                     </p>
                   </el-form-item>
                 </el-form>
@@ -459,7 +459,7 @@
                       >查询</el-button
                     >
                     <p class="looktime" v-if="lookTime && showLookTime">
-                      {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                      {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
                     </p>
                   </el-form-item>
                 </el-form>
@@ -594,7 +594,7 @@
                       >查询</el-button
                     >
                     <p class="looktime" v-if="lookTime && showLookTime">
-                      {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                      {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
                     </p>
                   </el-form-item>
                 </el-form>
@@ -853,7 +853,7 @@
                   >查询</el-button
                 >
                 <p class="looktime" v-if="lookTime && showLookTime">
-                  {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                  {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
                 </p>
               </el-form-item>
             </el-form>
@@ -908,7 +908,7 @@
                       >查询</el-button
                     >
                     <p class="looktime" v-if="lookTime && showLookTime">
-                      {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                      {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
                     </p>
                   </el-form-item>
                 </el-form>
@@ -1956,8 +1956,9 @@ export default {
         .then((res) => {
           console.log(res);
           this.requestid = res.data.requestId;
+          this.showLookTime = false;
           //this.getinfo1();
-          this.lookTime = res.data.date;
+          //this.lookTime = res.data.date;
           clearInterval(this.timer);
           this.timer = window.setInterval(() => {
             this.getinfo();
@@ -2136,7 +2137,10 @@ export default {
               message: "信息已更新",
               type: "success",
             });
+            this.lookTime =res.data.requestTime
+
             this.showLookTime = true;
+           
           } else if (this.i > 9) {
             window.clearInterval(this.timer);
             this.timer = null;
diff --git a/src/views/photographicDevice/components/videoCapture.vue b/src/views/photographicDevice/components/videoCapture.vue
index c147a49..de2a48b 100644
--- a/src/views/photographicDevice/components/videoCapture.vue
+++ b/src/views/photographicDevice/components/videoCapture.vue
@@ -82,7 +82,7 @@
           >查询</el-button
         >
         <p class="looktime" v-if="lookTime && showLookTime">
-          {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+          {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
         </p>
       </div>
     </el-tab-pane>
@@ -381,7 +381,7 @@ export default {
         .then((res) => {
           console.log(res);
           this.requestid = res.data.requestId;
-          this.lookTime = res.data.date;
+          this.showLookTime = false;
           //this.getinfo1();
 
           clearInterval(this.timer);
@@ -415,6 +415,7 @@ export default {
               message: "信息已更新",
               type: "success",
             });
+            this.lookTime =res.data.requestTime;
             this.showLookTime = true;
           } else if (this.i > 9) {
             window.clearInterval(this.timer);
diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue
index 842696b..7f15a70 100644
--- a/src/views/realTimeMonitor/components/carouselChart.vue
+++ b/src/views/realTimeMonitor/components/carouselChart.vue
@@ -166,11 +166,11 @@
             </div>
           </div>
         </div>
-        <div class="arrow leftArrow" @click="smallLeftClick">
+        <div class="arrow leftArrow" @click.stop="smallLeftClick">
           <i class="el-icon-arrow-left"></i>
         </div>
         <div class="arrow rightArrow">
-          <i class="el-icon-arrow-right" @click="smallRightClick"></i>
+          <i class="el-icon-arrow-right" @click.stop="smallRightClick"></i>
         </div>
       </div>
     </div>
diff --git a/src/views/realTimeMonitor/components/parameterArea.vue b/src/views/realTimeMonitor/components/parameterArea.vue
index 0c56d2a..c56ad4c 100644
--- a/src/views/realTimeMonitor/components/parameterArea.vue
+++ b/src/views/realTimeMonitor/components/parameterArea.vue
@@ -398,7 +398,7 @@ export default {
           console.log(this.channelListOption);
           this.channelfocalOpyion = res.data.list; //焦距通道
           console.log("我是获取通道接口之后的通道",this.channelListOption[0].channelid)
-          this.selectChannelValue = Number(localStorage.getItem("channelId")); //默认选中所有通道;
+          this.selectChannelValue = Number(localStorage.getItem("channelId"))==0?-1:Number(localStorage.getItem("channelId")); //默认选中所有通道;
           this.$store.commit("channelId", this.selectChannelValue); //通道保存在vuex中
           this.$store.commit("channelIdList", res.data.list); //将通道保存在vuex中
           this.$parent.getPhotoList(
diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue
index e4f779c..98717b7 100644
--- a/src/views/realTimeMonitor/components/setChannelDialog.vue
+++ b/src/views/realTimeMonitor/components/setChannelDialog.vue
@@ -86,6 +86,21 @@
             <el-input v-model="channelForm.videoDuration"></el-input>
             <span class="infoSpan">(秒)</span>
           </el-form-item>
+          <el-form-item label="曝光补偿" class="comclass">
+            <el-select
+              v-model="channelForm.compensationVal"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in compensationOptions"
+                :key="item.value"
+                :label="item.name "
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+         
         </div>
 
        
@@ -327,7 +342,7 @@ export default {
   {  
     "name": "HDR",  
     "id": 18,  
-    "chName": "高动态范围"  
+    "chName": "HDR"  
   }  
 ],
       roteOptions: [
@@ -407,6 +422,25 @@ export default {
           label: "1920X1080",
         },
       ],
+      compensationOptions:[{ name:-4,
+        value:-4},
+        { name:-3,
+        value:-3},
+        { name:-2,
+        value:-2},
+        { name:-1,
+        value:-1},
+        { name:0,
+        value:0},
+        { name:1,
+        value:1},
+        { name:2,
+        value:2},
+        { name:3,
+        value:3},
+        { name:4,
+        value:4},
+      ],
       requestid: "",
       searchNum: 0,
       searchTimer: null,
@@ -432,7 +466,7 @@ export default {
       getChannelListJoggle({ termid: this.areaData.id })
         .then((res) => {
           this.channelList = res.data.list;
-          if(Number(localStorage.getItem("channelId"))==1||Number(localStorage.getItem("channelId"))==-1){
+          if(Number(localStorage.getItem("channelId"))==1||Number(localStorage.getItem("channelId"))==-1||Number(localStorage.getItem("channelId"))==0){
             this.channelForm.selectChannel = this.channelList[0].channelid;
           }else{
             this.channelForm.selectChannel = Number(localStorage.getItem("channelId"));
@@ -449,8 +483,8 @@ export default {
       console.log(val, "是否选中");
       if (val) {
         this.bgflag = true;
-        this.channelForm.bgsj = "";
-        this.channelForm.iso = "";
+        // this.channelForm.bgsj = "";
+        // this.channelForm.iso = "";
       } else {
         this.bgflag = false;
       }
@@ -536,7 +570,7 @@ export default {
             },
             {
               name: "configs",
-              value: 20,
+              value: 21,
             },
             // {
             //   name: "resolutionCX",
@@ -687,6 +721,10 @@ export default {
             { name: "name20", value: "zoomRatio" },
             { name: "value20", value: this.channelForm.zoomVal },
             { name: "type20", value: 0 },
+             //compensation
+             { name: "name21", value: "compensation" },
+            { name: "value21", value: this.channelForm.compensationVal },
+            { name: "type21", value: 0 },
           ];
           console.log(params);
           this.setTermFn(params);
@@ -845,6 +883,7 @@ export default {
             //   resultContent.hdrMode == 1 ? true : false;
             // this.channelForm.ywchecked =
             //   resultContent.nightMode == 1 ? true : false;
+            this.channelForm.compensationVal = resultContent.compensation;
             this.channelForm.aival = resultContent.recognization;
             this.channelForm.roteval = resultContent.orientation;
             this.channelForm.rtosd = resultContent.osd.rightTop!="null"?resultContent.osd.rightTop:"";
@@ -935,6 +974,7 @@ export default {
       this.channelForm.bgsj = "";
       this.channelForm.iso = "";
       this.channelForm.scene="";
+      this.channelForm.compensationVal="";
       // this.channelForm.hdrchecked = "";
       // this.channelForm.ywchecked = "";
       this.channelForm.rtosd = "";
@@ -1071,6 +1111,9 @@ export default {
       //   }
       // }
     }
+    .comclass{
+      margin-left: 8px;
+    }
   }
   .dialog-footer {
     .el-button--default,
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index 05bdf2e..9985499 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -308,7 +308,7 @@ export default {
           console.log("wwww",Number(localStorage.getItem("channelId")))
           this.channelList = res.data.list;
           this.timeChannelList = res.data.list;
-          if(Number(localStorage.getItem("channelId"))==1||Number(localStorage.getItem("channelId"))==-1){
+          if(Number(localStorage.getItem("channelId"))==1||Number(localStorage.getItem("channelId"))==-1||Number(localStorage.getItem("channelId"))==0){
             this.timeChannel = this.channelList[0].channelid;
           this.selectChannel = this.channelList[0].channelid;
           }else{
diff --git a/src/views/reportData/equipmentStatus/index.vue b/src/views/reportData/equipmentStatus/index.vue
index 77e222c..c5057f8 100644
--- a/src/views/reportData/equipmentStatus/index.vue
+++ b/src/views/reportData/equipmentStatus/index.vue
@@ -96,7 +96,7 @@
         stripe
         style="width: 100%"
         :height="tableheight"
-        fit
+        
       >
         <template slot="empty">
           <el-empty :image-size="160" description="暂无数据"></el-empty>
@@ -151,13 +151,13 @@
         <el-table-column prop="photoInfo.lastPhotoTime" label="最后图片上送时间"  min-width="140"> </el-table-column>
 
 
-        <el-table-column prop="" label="最新基本信息采集时间"  min-width="140"> </el-table-column>
-        <el-table-column prop="" label="装置名称"> </el-table-column>
-        <el-table-column prop="" label="装置型号"> </el-table-column>
-        <el-table-column prop="" label="装置版本号"> </el-table-column>
-        <el-table-column prop="" label="生产厂家"> </el-table-column>
-        <el-table-column prop="" label="生产日期"> </el-table-column>
-        <el-table-column prop="" label="出厂编号"> </el-table-column>
+        <el-table-column prop="lastInfo.updateTimeStr" label="最新基本信息采集时间"  min-width="140"> </el-table-column>
+        <el-table-column prop="lastInfo.equipName" label="装置名称" min-width="150"> </el-table-column>
+        <el-table-column prop="lastInfo.model" label="装置型号" min-width="120"> </el-table-column>
+        <el-table-column prop="lastInfo.version" label="装置版本号"> </el-table-column>
+        <el-table-column prop="lastInfo.bsManu" label="生产厂家" min-width="120" show-overflow-tooltip> </el-table-column>
+        <el-table-column prop="lastInfo.productionDate" label="生产日期" min-width="140"> </el-table-column>
+        <el-table-column prop="lastInfo.bsId" label="出厂编号" min-width="150"> </el-table-column>
 
         <el-table-column prop="workingStatus.wsUpdateTime" label="最新工作状态采集时间"  min-width="140">
           <template slot-scope="scope">
@@ -170,13 +170,13 @@
                  )
            }}</template
        > </el-table-column>
-        <el-table-column prop="batteryVoltage" label="电源电压"> </el-table-column>
-        <el-table-column prop="opTemperature" label="工作温度"> </el-table-column>
-        <el-table-column prop="batteryCapacity" label="电池电量"> </el-table-column>
-        <el-table-column prop="floatingCharge" label="浮充状态"> </el-table-column>
-        <el-table-column prop="totalWorkingTime" label="工作总时间"> </el-table-column>
-        <el-table-column prop="workingTime" label="连续工作时间"> </el-table-column>
-        <el-table-column prop="connectionState" label="网络连接状态"> </el-table-column>
+        <el-table-column prop="workingStatus.batteryVoltage" label="电源电压"> </el-table-column>
+        <el-table-column prop="workingStatus.opTemperature" label="工作温度"> </el-table-column>
+        <el-table-column prop="workingStatus.batteryCapacity" label="电池电量"> </el-table-column>
+        <el-table-column prop="workingStatus.floatingCharge" label="浮充状态"> </el-table-column>
+        <el-table-column prop="workingStatus.totalWorkingTime" label="工作总时间"> </el-table-column>
+        <el-table-column prop="workingStatus.workingTime" label="连续工作时间"> </el-table-column>
+        <el-table-column prop="workingStatus.connectionState" label="网络连接状态"> </el-table-column>
 
 
         <el-table-column prop="workingStatus.wsUpdateTime" label="最新运行状态采集时间"  min-width="140">
diff --git a/src/views/system/roleManagement/components/blindMenuPermiss.vue b/src/views/system/roleManagement/components/blindMenuPermiss.vue
index 0b903b7..98535b3 100644
--- a/src/views/system/roleManagement/components/blindMenuPermiss.vue
+++ b/src/views/system/roleManagement/components/blindMenuPermiss.vue
@@ -188,7 +188,7 @@ export default {
 <style lang="less">
 .blindMenuDialog {
   .treeBoxList {
-    height: 520px;
+    height: 550px;
     overflow: auto;
     display: flex;
     justify-content: space-between;
diff --git a/vue.config.js b/vue.config.js
index b547eaa..71925e6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -21,10 +21,10 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-        target: "http://localhost:8080", // 使用本地端口，这个端口是 PuTTY SSH 隧道映射的本地端口
+        //target: "http://localhost:8080", // 使用本地端口，这个端口是 PuTTY SSH 隧道映射的本地端口
         //target: "http://192.168.1.190:8080", //liu 本机ip  需要去掉/Api
         //target: "http://192.168.50.7:8093", //liu 本机ip  需要去掉/Api
-        //target: "http://192.168.111.211:80", //东视
+        target: "http://61.169.135.146:40080/", //东视
         changOrigin: true, //是否开启跨域
         pathRewrite: {
           "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的