优化

src/views/realTimeMonitor/components/carouselChart.vue

@@ -145,6 +145,7 @@
                       : item.channelName
                   }}</span
                 >
+                <span v-if="item.presetId !== ''"> -- {{ item.presetId }}</span>
                 <span class="alarmSpan" v-if="item.isAlarm == 1">(已告警)</span>
               </p>
             </div>

src/views/realTimeMonitor/components/ptzDevice/ptzDraw.vue

@@ -97,7 +97,7 @@
           <!-- <el-button type="primary" icon="el-icon-c-scale-to-original"
             >开启雨刷</el-button
           > -->
-          <el-button type="primary" icon="el-icon-sunny">镜头除雾</el-button>
+
           <el-button
             type="primary"
             icon="el-icon-mobile-phone"
@@ -106,7 +106,23 @@
           >
         </div>
         <div class="presetList">
-          <h3>预置位</h3>
+          <div class="titleHead">
+            <h3>预置位</h3>
+            <div class="presetBox">
+              <el-input
+                clearable
+                v-model="inputpresetValue"
+                placeholder="请输入0-255的数字"
+              ></el-input>
+              <el-button
+                @click="handleDyPreset"
+                type="primary"
+                :disabled="inputpresetValue == ''"
+                >调用预置位</el-button
+              >
+            </div>
+          </div>
+
           <div class="presetTable">
             <el-table
               :data="tableData"
@@ -261,6 +277,7 @@ export default {
         name: "",
         presetVal: 0,
       },
+      inputpresetValue: "", //调用预置位
       tableData: [],
       statusTimer: null,
       statusNum: 0,
@@ -582,6 +599,19 @@ export default {
         })
         .catch((err) => {});
     },
+    //手动调用预置位
+    handleDyPreset() {
+      if (this.areaData.protocol == "65281") {
+        console.log("安徽规约");
+        this.fucType = 1;
+      } else {
+        console.log("其它规约规约");
+        this.fucType = 2;
+      }
+      // this.fucType = 1;
+      this.presetNum = this.inputpresetValue;
+      this.termstatusFun();
+    },
     //获取设备状态
     termstatusFun() {
       // act=cameractrl --cmdid=XYYFV11-HENA-0003 --channel=1 --preset=0 --ctrl=2
@@ -936,12 +966,35 @@ export default {
     .presetList {
       height: calc(100% - 390px);
       margin-top: 12px;
-      h3 {
+      .titleHead {
-        font-size: 14px;
+        display: flex;
-        font-weight: bold;
+        align-items: center;
+        height: 32px;
+        margin-bottom: 12px;
+        h3 {
+          font-size: 14px;
+          font-weight: bold;
+          margin-right: 8px;
+          margin-bottom: 0px;
+        }
+        .presetBox {
+          display: flex;
+          align-items: center;
+          .el-input {
+            width: 140px;
+            .el-input__inner {
+              padding-right: 12px;
+            }
+          }
+          .el-button {
+            margin-left: 8px;
+            margin-bottom: 0px;
+          }
+        }
       }
+
       .presetTable {
-        height: calc(100% - 26px);
+        height: calc(100% - 38px);
         .el-table--border {
           border-bottom: 1px solid #ebeef5;
         }