From 999f6238af7e804cb0840382d720ee9384874536 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 20 Dec 2024 10:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E5=8F=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  17 +-
 src/views/iceWeather/components/leftTree.vue  |   2 +-
 src/views/iceWeather/icing/index.vue          |  61 +++++
 src/views/iceWeather/weather/index.vue        | 211 ++++++++++++++----
 .../components/alarmButton.vue                |   6 +-
 .../components/cableButton.vue                |   6 +-
 .../components/parameterArea.vue              | 103 ++++++++-
 .../ptzDevice/components/setTime.vue          |   8 +-
 .../components/ptzDevice/ptzDraw.vue          |  16 +-
 .../setChannel/setChannelDialog.vue           |   2 +-
 .../components/takePicButton.vue              |   6 +-
 .../components/takeTimePicButton.vue          |   6 +-
 .../components/takeVideoButton.vue            |   6 +-
 .../photostatis/components/ipDialog.vue       |  41 ++--
 .../globalTools/components/termsAdd.vue       |  23 ++
 15 files changed, 426 insertions(+), 88 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 300b784..26f0c9f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="app">
+  <div id="app" :class="mobelH == 1 ? 'zoomclass' : ''">
     <router-view></router-view>
   </div>
 </template>
@@ -9,8 +9,13 @@ import { mapActions } from "vuex";
 
 export default {
   name: "App",
+  data() {
+    return { mobelH: 0 };
+  },
   mounted() {
+    this.isMobile2();
     let goUrl = this.isMobile();
+
     if (goUrl === 1) {
       this.$confirm(
         "您正在使用手机访问本站，可能无法获得最佳浏览体验， 即将跳转到手机端...",
@@ -84,6 +89,13 @@ export default {
       let goUrl = flag ? 1 : 0;
       return goUrl;
     },
+    isMobile2() {
+      let flag = navigator.userAgent.match(
+        /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
+      );
+      // localStorage.setItem('isiphone',flag)
+      this.mobelH = flag ? 1 : 0;
+    },
   },
   watch: {
     "$route.path": {
@@ -101,4 +113,7 @@ export default {
   width: 80% !important;
   max-width: 450px;
 }
+.zoomclass {
+  zoom: 0.6;
+}
 </style>
diff --git a/src/views/iceWeather/components/leftTree.vue b/src/views/iceWeather/components/leftTree.vue
index 0a0d44e..9ae6df8 100644
--- a/src/views/iceWeather/components/leftTree.vue
+++ b/src/views/iceWeather/components/leftTree.vue
@@ -207,7 +207,7 @@ export default {
 </script>
 <style lang="less">
 .leftTreeBox {
-  width: 200px;
+  width: 260px;
   display: flex;
   flex-direction: column;
   padding: 16px 0;
diff --git a/src/views/iceWeather/icing/index.vue b/src/views/iceWeather/icing/index.vue
index 0b9ed65..b6a7932 100644
--- a/src/views/iceWeather/icing/index.vue
+++ b/src/views/iceWeather/icing/index.vue
@@ -55,6 +55,9 @@
                   >
                 </el-form-item>
               </el-form>
+              <el-button type="primary" @click="collectice" class="iceClass"
+                >采集数据</el-button
+              >
             </div>
             <div class="childTableShowBox" v-if="!echartsShow">
               <el-table
@@ -986,6 +989,7 @@ import {
   leadpullsListJoggle,
   exportJoggle,
 } from "@/utils/api/iceApi";
+import { getTermStatus, setTermCamera } from "@/utils/api/index";
 export default {
   name: "icing",
   components: {
@@ -1104,6 +1108,56 @@ export default {
         this.termalFlag = true;
       }
     },
+    //采集数据
+    collectice() {
+      getTermStatus({ termId: this.paramsData.id }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          let params = [
+            {
+              name: "act",
+              value: "reqdata",
+            },
+            {
+              name: "reqType",
+              value: "34",
+            },
+            {
+              name: "startTime",
+              value: 0,
+            },
+            {
+              name: "endTime",
+              value: 0,
+            },
+          ];
+          this.setTermFn(params);
+        } else {
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "装置下线，发送指令失败",
+            type: "error",
+          });
+        }
+      });
+    },
+    setTermFn(val) {
+      setTermCamera({
+        termId: this.paramsData.id,
+        list: val,
+      })
+        .then((res) => {
+          console.log(res);
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "命令已下发",
+            type: "success",
+          });
+        })
+        .catch((err) => {});
+    },
     //覆冰数数据
     getIcingData(data) {
       console.log(data);
@@ -1515,6 +1569,13 @@ export default {
     // }
     .childBox {
       height: calc(100% - 0px);
+      .searchBox {
+        display: flex;
+        justify-content: space-between;
+        .iceClass {
+          margin-bottom: 18px;
+        }
+      }
       .childTableShowBox {
         height: calc(100% - 91px);
       }
diff --git a/src/views/iceWeather/weather/index.vue b/src/views/iceWeather/weather/index.vue
index fc76208..949dcdd 100644
--- a/src/views/iceWeather/weather/index.vue
+++ b/src/views/iceWeather/weather/index.vue
@@ -49,9 +49,15 @@
               </el-table-column>
               <el-table-column label="温度(℃)">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.lastWeathers !== null">{{
-                    scope.row.lastWeathers.airTemperature.toFixed(1)
-                  }}</span>
+                  <span
+                    v-if="
+                      scope.row.lastWeathers !== null &&
+                      scope.row.lastWeathers.airTemperature != 255
+                    "
+                    >{{
+                      scope.row.lastWeathers.airTemperature.toFixed(1)
+                    }}</span
+                  >
                   <span v-else> - </span>
                 </template>
               </el-table-column>
@@ -72,9 +78,13 @@
               </el-table-column>
               <el-table-column prop="precipitation" label="10分钟降雨量(mm)">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.lastWeathers !== null">{{
-                    scope.row.lastWeathers.precipitation.toFixed(1)
-                  }}</span>
+                  <span
+                    v-if="
+                      scope.row.lastWeathers !== null &&
+                      scope.row.lastWeathers.precipitation != 255
+                    "
+                    >{{ scope.row.lastWeathers.precipitation.toFixed(1) }}</span
+                  >
                   <span v-else> - </span>
                 </template>
               </el-table-column>
@@ -127,42 +137,68 @@
               </el-table-column>
               <el-table-column prop="avgWindSpeed10min" label="10分钟平均风速">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.lastWeathers !== null">{{
-                    scope.row.lastWeathers.avgWindSpeed10min.toFixed(1)
-                  }}</span>
+                  <span
+                    v-if="
+                      scope.row.lastWeathers !== null &&
+                      scope.row.lastWeathers.avgWindSpeed10min != 255
+                    "
+                    >{{
+                      scope.row.lastWeathers.avgWindSpeed10min.toFixed(1)
+                    }}</span
+                  >
                   <span v-else> - </span>
                 </template>
               </el-table-column>
               <el-table-column prop="avgWindDir10min" label="10分钟平均风向">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.lastWeathers !== null">{{
-                    scope.row.lastWeathers.avgWindDir10min
-                  }}</span>
+                  <span
+                    v-if="
+                      scope.row.lastWeathers !== null &&
+                      scope.row.lastWeathers.avgWindDir10min != 255
+                    "
+                    >{{ scope.row.lastWeathers.avgWindDir10min }}</span
+                  >
                   <span v-else> - </span>
                 </template>
               </el-table-column>
 
               <el-table-column prop="maxWindSpeed" label="最大风速(m/s)">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.lastWeathers !== null">{{
-                    scope.row.lastWeathers.maxWindSpeed.toFixed(1)
-                  }}</span>
+                  <span
+                    v-if="
+                      scope.row.lastWeathers !== null &&
+                      scope.row.lastWeathers.maxWindSpeed != 255
+                    "
+                    >{{ scope.row.lastWeathers.maxWindSpeed.toFixed(1) }}</span
+                  >
                   <span v-else> - </span>
                 </template>
               </el-table-column>
               <el-table-column prop="extremeWindSpeed" label="极大风速(m/s)">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.lastWeathers !== null">{{
-                    scope.row.lastWeathers.extremeWindSpeed.toFixed(1)
-                  }}</span>
+                  <span
+                    v-if="
+                      scope.row.lastWeathers !== null &&
+                      scope.row.lastWeathers.extremeWindSpeed != 255
+                    "
+                    >{{
+                      scope.row.lastWeathers.extremeWindSpeed.toFixed(1)
+                    }}</span
+                  >
                   <span v-else> - </span>
                 </template>
               </el-table-column>
               <el-table-column prop="maxWindSpeed" label="标准风速(m/s)">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.lastWeathers !== null">{{
-                    scope.row.lastWeathers.standardWindSpeed.toFixed(1)
-                  }}</span>
+                  <span
+                    v-if="
+                      scope.row.lastWeathers !== null &&
+                      scope.row.lastWeathers.standardWindSpeed != 255
+                    "
+                    >{{
+                      scope.row.lastWeathers.standardWindSpeed.toFixed(1)
+                    }}</span
+                  >
                   <span v-else> - </span>
                 </template>
               </el-table-column>
@@ -220,6 +256,13 @@
                   <el-button type="primary" @click="onSubmit">查询</el-button>
                 </el-form-item>
               </el-form>
+
+              <el-button
+                type="primary"
+                @click="collectWeather"
+                class="weathClass"
+                >采集数据</el-button
+              >
             </div>
             <div class="termalBox">
               <p>
@@ -290,21 +333,19 @@
                 </el-table-column>
                 <el-table-column label="温度(℃)">
                   <template slot-scope="scope">
-                    <span v-if="scope.row !== null">{{
-                      scope.row.airTemperature.toFixed(1)
-                    }}</span>
+                    <span
+                      v-if="
+                        scope.row !== null && scope.row.airTemperature != 255
+                      "
+                      >{{ scope.row.airTemperature.toFixed(1) }}</span
+                    >
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="humidity" label="湿度(%RH)">
                   <template slot-scope="scope">
                     <span v-if="scope.row !== null"
-                      ><span
-                        v-if="
-                          scope.row.humidity != 65535 &&
-                          scope.row.humidity != 255
-                        "
-                      >
+                      ><span v-if="scope.row.humidity != 255">
                         {{ scope.row.humidity.toFixed(1) }}</span
                       ><span v-else> - </span></span
                     >
@@ -313,9 +354,12 @@
                 </el-table-column>
                 <el-table-column prop="precipitation" label="10分钟降雨量(mm)">
                   <template slot-scope="scope">
-                    <span v-if="scope.row !== null">{{
-                      scope.row.precipitation.toFixed(1)
-                    }}</span>
+                    <span
+                      v-if="
+                        scope.row !== null && scope.row.precipitation != 255
+                      "
+                      >{{ scope.row.precipitation.toFixed(1) }}</span
+                    >
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
@@ -364,42 +408,55 @@
                   label="10分钟平均风速"
                 >
                   <template slot-scope="scope">
-                    <span v-if="scope.row !== null">{{
-                      scope.row.avgWindSpeed10min.toFixed(1)
-                    }}</span>
+                    <span
+                      v-if="
+                        scope.row !== null && scope.row.avgWindSpeed10min != 255
+                      "
+                      >{{ scope.row.avgWindSpeed10min.toFixed(1) }}</span
+                    >
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="avgWindDir10min" label="10分钟平均风向">
                   <template slot-scope="scope">
-                    <span v-if="scope.row !== null">{{
-                      scope.row.avgWindDir10min
-                    }}</span>
+                    <span
+                      v-if="
+                        scope.row !== null && scope.row.avgWindDir10min != 255
+                      "
+                      >{{ scope.row.avgWindDir10min }}</span
+                    >
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
 
                 <el-table-column prop="maxWindSpeed" label="最大风速(m/s)">
                   <template slot-scope="scope">
-                    <span v-if="scope.row !== null">{{
-                      scope.row.maxWindSpeed.toFixed(1)
-                    }}</span>
+                    <span
+                      v-if="scope.row !== null && scope.row.maxWindSpeed != 255"
+                      >{{ scope.row.maxWindSpeed.toFixed(1) }}</span
+                    >
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="extremeWindSpeed" label="极大风速(m/s)">
                   <template slot-scope="scope">
-                    <span v-if="scope.row !== null">{{
-                      scope.row.extremeWindSpeed.toFixed(1)
-                    }}</span>
+                    <span
+                      v-if="
+                        scope.row !== null && scope.row.extremeWindSpeed != 255
+                      "
+                      >{{ scope.row.extremeWindSpeed.toFixed(1) }}</span
+                    >
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="maxWindSpeed" label="标准风速(m/s)">
                   <template slot-scope="scope">
-                    <span v-if="scope.row !== null">{{
-                      scope.row.standardWindSpeed.toFixed(1)
-                    }}</span>
+                    <span
+                      v-if="
+                        scope.row !== null && scope.row.standardWindSpeed != 255
+                      "
+                      >{{ scope.row.standardWindSpeed.toFixed(1) }}</span
+                    >
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
@@ -431,6 +488,7 @@
 <script>
 import leftTree from "../components/leftTree";
 import { weatherJoggle, weatherListJoggle } from "@/utils/api/iceApi";
+import { getTermStatus, setTermCamera } from "@/utils/api/index";
 export default {
   name: "weather",
   components: {
@@ -627,6 +685,56 @@ export default {
     onSubmit() {
       this.getchildWeatherData(this.childParma);
     },
+    //采集数据
+    collectWeather() {
+      getTermStatus({ termId: this.childMsg.id }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          let params = [
+            {
+              name: "act",
+              value: "reqdata",
+            },
+            {
+              name: "reqType",
+              value: "1",
+            },
+            {
+              name: "startTime",
+              value: 0,
+            },
+            {
+              name: "endTime",
+              value: 0,
+            },
+          ];
+          this.setTermFn(params);
+        } else {
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "装置下线，发送指令失败",
+            type: "error",
+          });
+        }
+      });
+    },
+    setTermFn(val) {
+      setTermCamera({
+        termId: this.childMsg.id,
+        list: val,
+      })
+        .then((res) => {
+          console.log(res);
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "命令已下发",
+            type: "success",
+          });
+        })
+        .catch((err) => {});
+    },
     getchildWeatherData(row) {
       this.loading = true;
       this.childMsg = row;
@@ -922,6 +1030,13 @@ export default {
     }
     .childBox {
       height: 100%;
+      .searchBox {
+        display: flex;
+        justify-content: space-between;
+        .weathClass {
+          margin-bottom: 18px;
+        }
+      }
       .chartClass {
         height: 450px;
         width: 100%;
diff --git a/src/views/realTimeMonitor/components/alarmButton.vue b/src/views/realTimeMonitor/components/alarmButton.vue
index 915f322..d472147 100644
--- a/src/views/realTimeMonitor/components/alarmButton.vue
+++ b/src/views/realTimeMonitor/components/alarmButton.vue
@@ -5,7 +5,11 @@
       <el-button type="primary">
         声光报警<i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
-      <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
+      <el-dropdown-menu
+        slot="dropdown"
+        class="gpsdropStyle"
+        :append-to-body="false"
+      >
         <el-dropdown-item command="open">开启</el-dropdown-item>
         <el-dropdown-item command="close">关闭</el-dropdown-item>
       </el-dropdown-menu>
diff --git a/src/views/realTimeMonitor/components/cableButton.vue b/src/views/realTimeMonitor/components/cableButton.vue
index de1a7c2..43d403d 100644
--- a/src/views/realTimeMonitor/components/cableButton.vue
+++ b/src/views/realTimeMonitor/components/cableButton.vue
@@ -5,7 +5,11 @@
       <el-button type="primary">
         线缆显示<i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
-      <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
+      <el-dropdown-menu
+        slot="dropdown"
+        class="gpsdropStyle"
+        :append-to-body="false"
+      >
         <el-dropdown-item command="open">开启</el-dropdown-item>
         <el-dropdown-item command="close">关闭</el-dropdown-item>
       </el-dropdown-menu>
diff --git a/src/views/realTimeMonitor/components/parameterArea.vue b/src/views/realTimeMonitor/components/parameterArea.vue
index 3ba289e..ee2b79e 100644
--- a/src/views/realTimeMonitor/components/parameterArea.vue
+++ b/src/views/realTimeMonitor/components/parameterArea.vue
@@ -72,7 +72,11 @@
           <el-button type="primary">
             GPS开关<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
-          <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
+          <el-dropdown-menu
+            slot="dropdown"
+            class="gpsdropStyle"
+            :append-to-body="false"
+          >
             <el-dropdown-item command="open">开启GPS</el-dropdown-item>
             <el-dropdown-item command="close">关闭GPS</el-dropdown-item>
           </el-dropdown-menu>
@@ -115,7 +119,11 @@
           <el-button type="primary">
             数据查询<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
-          <el-dropdown-menu slot="dropdown" class="picdropStyle">
+          <el-dropdown-menu
+            slot="dropdown"
+            class="picdropStyle"
+            :append-to-body="false"
+          >
             <el-dropdown-item command="info">基本信息</el-dropdown-item>
             <el-dropdown-item command="workStatus">工作状态</el-dropdown-item>
             <el-dropdown-item command="runStatus">运行状态</el-dropdown-item>
@@ -124,8 +132,32 @@
           </el-dropdown-menu>
         </el-dropdown>
         <ptzDevice v-if="areaData.hasPan == 1"></ptzDevice>
+        <!-- 请求覆冰数据和微气象数据 -->
+
+        <el-dropdown
+          class="dropgps"
+          trigger="click"
+          @command="handleiceAndweather"
+          v-if="
+            areaData.hasPan == 1 &&
+            areaData.devType !== undefined &&
+            (areaData.devType.includes('2') || areaData.devType.includes('3'))
+          "
+        >
+          <el-button type="primary">
+            采集数据<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu
+            slot="dropdown"
+            class="gpsdropStyle"
+            :append-to-body="false"
+          >
+            <el-dropdown-item command="weather">微气象</el-dropdown-item>
+            <el-dropdown-item command="ice">覆冰</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
       </div>
-      <div class="setfocalLength" v-if="areaData.protocol == '65286'">
+      <div class="setfocalLength" v-if="areaData.devType == '65286'">
         <h3>焦距调节</h3>
         <div class="selectChannel">
           <span class="labelname">选择通道</span>
@@ -196,6 +228,7 @@ import {
   getChannelByTermidJoggle,
   updateTermCamera,
   getTermStatus,
+  setTermCamera,
   addFavorList,
   setTermGPSJoggle,
 } from "@/utils/api/index";
@@ -277,7 +310,7 @@ export default {
     console.log("asdsaddddddddddddddddddddddddd", this.roleUser);
     this.btnShowList = JSON.parse(localStorage.getItem("btnPermission"));
     this.menuShowList = JSON.parse(localStorage.getItem("menuPermission"));
-
+    console.log("aaaaaaaaa,", this.areaData.devType);
     console.log(this.btnShowList, this.menuShowList);
   },
   mounted() {
@@ -476,6 +509,68 @@ export default {
         }
       });
     },
+    //获取覆冰和微气象数据
+
+    handleiceAndweather(command) {
+      switch (command) {
+        case "weather": //开启
+          this.changeweathIce("1", this.areaData.id);
+          break;
+        case "ice": //关闭
+          this.changeweathIce("34", this.areaData.id);
+          break;
+      }
+    },
+    changeweathIce(val, cmdid) {
+      console.log(val, cmdid);
+      getTermStatus({ termId: cmdid }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          let params = [
+            {
+              name: "act",
+              value: "reqdata",
+            },
+            {
+              name: "reqType",
+              value: val,
+            },
+            {
+              name: "startTime",
+              value: 0,
+            },
+            {
+              name: "endTime",
+              value: 0,
+            },
+          ];
+          this.setTermFn(params);
+        } else {
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "装置下线，发送指令失败",
+            type: "error",
+          });
+        }
+      });
+    },
+    setTermFn(val) {
+      setTermCamera({
+        termId: this.areaData.id,
+        list: val,
+      })
+        .then((res) => {
+          console.log(res);
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "命令已下发",
+            type: "success",
+          });
+        })
+        .catch((err) => {});
+    },
     //历史图片跳转
     handlehistoryPic() {
       console.log(this.areaData);
diff --git a/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue b/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue
index d0dc10a..188b8d7 100644
--- a/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue
+++ b/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue
@@ -61,10 +61,10 @@
 
               <el-input
                 v-if="
-                  deviceData.protocol == '65283' &&
-                  deviceData.protocol == '65285' &&
-                  deviceData.protocol == '65290' &&
-                  deviceData.protocol == '65298'
+                  deviceData.protocol != '65283' &&
+                  deviceData.protocol != '65285' &&
+                  deviceData.protocol != '65290' &&
+                  deviceData.protocol != '65298'
                 "
                 v-model="selectedValues[index]"
                 placeholder="请输入"
diff --git a/src/views/realTimeMonitor/components/ptzDevice/ptzDraw.vue b/src/views/realTimeMonitor/components/ptzDevice/ptzDraw.vue
index cd30e4a..d457f34 100644
--- a/src/views/realTimeMonitor/components/ptzDevice/ptzDraw.vue
+++ b/src/views/realTimeMonitor/components/ptzDevice/ptzDraw.vue
@@ -204,11 +204,13 @@
             filterable
           >
             <el-option
-              v-for="n in 255"
-              :key="n"
-              :label="n"
-              :value="n"
-            ></el-option>
+              v-for="n in 256"
+              :key="n - 1"
+              :label="n - 1"
+              :value="n - 1"
+            >
+              {{ n - 1 }}
+            </el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -257,7 +259,7 @@ export default {
       prestDialogShow: false, //保存预置位弹窗
       presetform: {
         name: "",
-        presetVal: 1,
+        presetVal: 0,
       },
       tableData: [],
       statusTimer: null,
@@ -277,7 +279,7 @@ export default {
       takePicShow: false,
       takepicform: {
         selectChannelValue: 1,
-        presetVal: 1,
+        presetVal: 0,
       },
       deviceTimer: null, //装置循环获取
       deviceNum: 1, //循环次数
diff --git a/src/views/realTimeMonitor/components/setChannel/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannel/setChannelDialog.vue
index 7b5a1f5..8c4c262 100644
--- a/src/views/realTimeMonitor/components/setChannel/setChannelDialog.vue
+++ b/src/views/realTimeMonitor/components/setChannel/setChannelDialog.vue
@@ -1187,7 +1187,7 @@ export default {
           configResult.push({ name: `name${index}`, value: `ldrEnabled` });
         } else if (key == "zdbgchecked") {
           configResult.push({ name: `name${index}`, value: `autoExposure` });
-        } else if (key == "bgsi") {
+        } else if (key == "bgsj") {
           configResult.push({ name: `name${index}`, value: `exposureTime` });
         } else if (key == "expsTimeUs") {
           configResult.push({ name: `name${index}`, value: `expsTimeUs` });
diff --git a/src/views/realTimeMonitor/components/takePicButton.vue b/src/views/realTimeMonitor/components/takePicButton.vue
index 3a7dfad..97e39e3 100644
--- a/src/views/realTimeMonitor/components/takePicButton.vue
+++ b/src/views/realTimeMonitor/components/takePicButton.vue
@@ -6,7 +6,11 @@
     <el-button type="primary" :loading="picLoading">
       主动拍照<i class="el-icon-arrow-down el-icon--right"></i>
     </el-button>
-    <el-dropdown-menu slot="dropdown" class="picdropStyle">
+    <el-dropdown-menu
+      slot="dropdown"
+      class="picdropStyle"
+      :append-to-body="false"
+    >
       <el-dropdown-item
         :command="item.channelid"
         v-for="(item, index) in channelIdList"
diff --git a/src/views/realTimeMonitor/components/takeTimePicButton.vue b/src/views/realTimeMonitor/components/takeTimePicButton.vue
index fead2c1..e32058d 100644
--- a/src/views/realTimeMonitor/components/takeTimePicButton.vue
+++ b/src/views/realTimeMonitor/components/takeTimePicButton.vue
@@ -7,7 +7,11 @@
       <el-button type="primary" :loading="picLoading">
         指定时间拍照<i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
-      <el-dropdown-menu slot="dropdown" class="picdropStyle">
+      <el-dropdown-menu
+        slot="dropdown"
+        class="picdropStyle"
+        :append-to-body="false"
+      >
         <el-dropdown-item
           :command="item.channelid"
           v-for="(item, index) in channelIdList"
diff --git a/src/views/realTimeMonitor/components/takeVideoButton.vue b/src/views/realTimeMonitor/components/takeVideoButton.vue
index ebc8ad8..d328028 100644
--- a/src/views/realTimeMonitor/components/takeVideoButton.vue
+++ b/src/views/realTimeMonitor/components/takeVideoButton.vue
@@ -7,7 +7,11 @@
       <el-button type="primary" :loading="picLoading">
         主动录像<i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
-      <el-dropdown-menu slot="dropdown" class="picdropStyle">
+      <el-dropdown-menu
+        slot="dropdown"
+        class="picdropStyle"
+        :append-to-body="false"
+      >
         <el-dropdown-item
           :command="item.channelid"
           v-for="(item, index) in channelIdList"
diff --git a/src/views/reportData/photostatis/components/ipDialog.vue b/src/views/reportData/photostatis/components/ipDialog.vue
index 5c4b5fd..c8ac2d7 100644
--- a/src/views/reportData/photostatis/components/ipDialog.vue
+++ b/src/views/reportData/photostatis/components/ipDialog.vue
@@ -29,8 +29,16 @@
             {{ scope.$index + 1 }}
           </template>
         </el-table-column>
-
-        <el-table-column label="心跳时间" prop="heartbeatTime">
+        <el-table-column label="心跳服务器时间" prop="heartbeatTime">
+          <template slot-scope="scope">
+            {{
+              scope.row.createTime == null || scope.row.createTime == 0
+                ? ""
+                : scope.row.createTime
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="心跳报文时间" prop="heartbeatTime">
           <template slot-scope="scope">
             {{
               scope.row.heartbeatTime == null || scope.row.heartbeatTime == 0
@@ -44,20 +52,19 @@
         <el-table-column label="IP" prop="heartbeatIp"> </el-table-column>
         <el-table-column label="端口" prop="heartbeatPort"> </el-table-column>
       </el-table>
-      
     </div>
     <div class="pageNation">
-        <el-pagination
-          @current-change="handleCurrentChange"
-          @size-change="handleSizeChange"
-          :current-page="page"
-          :page-size="pageSize"
-          layout="sizes, prev, pager, next, jumper,total"
-          :total="total"
-          background
-        >
-        </el-pagination>
-      </div>
+      <el-pagination
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        :current-page="page"
+        :page-size="pageSize"
+        layout="sizes, prev, pager, next, jumper,total"
+        :total="total"
+        background
+      >
+      </el-pagination>
+    </div>
     <div slot="footer" class="dialog-footer">
       <el-button @click="isShow = false">关 闭</el-button>
     </div>
@@ -109,8 +116,8 @@ export default {
     hide() {
       this.isShow = false;
     },
-     //点击分页
-     handleCurrentChange(val) {
+    //点击分页
+    handleCurrentChange(val) {
       this.page = val;
       this.getIPList();
     },
@@ -140,7 +147,7 @@ export default {
     }
   }
   .ipContain {
-    height:calc(100% - 32px);
+    height: calc(100% - 32px);
     .el-table {
       color: #000;
       thead {
diff --git a/src/views/system/globalTools/components/termsAdd.vue b/src/views/system/globalTools/components/termsAdd.vue
index a80eb7c..e628541 100644
--- a/src/views/system/globalTools/components/termsAdd.vue
+++ b/src/views/system/globalTools/components/termsAdd.vue
@@ -70,6 +70,18 @@
                 </el-select>
               </el-form-item>
             </div>
+            <div class="dyxl">
+              <el-form-item label="云台选择" class="dybox">
+                <el-select v-model="formdata.hasPan" placeholder="请选择">
+                  <el-option
+                    v-for="item in hasPanOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </div>
             <el-form-item label="装置编号(一行一个)" class="termClass">
               <el-input
                 type="textarea"
@@ -108,6 +120,16 @@ export default {
         channel: 2,
         cmdidArr: "",
       },
+      hasPanOptions: [
+        {
+          id: 0,
+          name: "否",
+        },
+        {
+          id: 1,
+          name: "是",
+        },
+      ], //是否云台
       dyOptions: [], //电压数据
       xlOptions: [], //线路数据
       protocolOptions: [], //规约数据
@@ -307,6 +329,7 @@ export default {
         cmdidList: this.cmdidArrList,
         lineId: this.formdata.lineId,
         protocol: this.formdata.protocol,
+        hasPan: this.formdata.hasPan,
       };
       console.log(params);
       importTermsApi(params)