From e867fdb04ed180dbd4dc5d176cad1fc010beae8c Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 30 Aug 2023 11:15:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/parameterSetDialog.vue                | 12 ++++++------
 src/views/realTimeMonitor/index.vue                  | 11 +++++++++++
 src/views/realTimeSearch/index.vue                   |  8 ++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
index e9df46c..1779e63 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
@@ -511,7 +511,7 @@ export default {
     //采样参数查询
     // -act=sampling [0xA4 ] --flag=[Request Set Flag, default is set=1, 0: request] --rf=[Request Flag] --reqtype=[Request Type] --maintime=[Main Time] --samplecount=[Sample Count] --samplingfreq=[Sample Frequency] --heartbeat=[Heartbeat Time]
     samplingSearch() {
-      if (this.rowData.isonline) {
+      if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
         this.sampLoading = true;
         let params = [
           {
@@ -559,7 +559,7 @@ export default {
     },
     //设置采样查询
     samplingSet() {
-      if (this.rowData.isonline) {
+      if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
         this.$refs.samplingFormref.validate((valid) => {
           if (valid) {
             this.sampSetLoading = true;
@@ -615,7 +615,7 @@ export default {
     //上位机查询
     //--act=cma [0xA7] --flag=[Request Set Flag, default is set=1, 0: request] --ip=[IP Address] --cmaport=[CMA Port] --domain=[Domain]
     upperSearch() {
-      if (this.rowData.isonline) {
+      if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
         this.upperLoading = true;
         let params = [
           {
@@ -652,7 +652,7 @@ export default {
     },
     //上位机设置
     upperSet() {
-      if (this.rowData.isonline) {
+      if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
         this.upperSetLoading = true;
         let params = [
           {
@@ -690,7 +690,7 @@ export default {
     //id参数查询
     // --act=termid [0xAC] --flag=[Request Set Flag, default is set=1, 0: request] --newcmdid=[New CMD ID] --compid=[Component Id] --orgid=[Original Id]
     idSearch() {
-      if (this.rowData.isonline) {
+      if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
         this.idLoading = true;
         let params = [
           {
@@ -727,7 +727,7 @@ export default {
     },
     //id参数设置
     idSet() {
-      if (this.rowData.isonline) {
+      if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
         this.$refs.idParameterref.validate((valid) => {
           if (valid) {
             this.idSetLoading = true;
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index e75bb6b..fda959a 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -247,6 +247,9 @@
               <el-button type="primary" @click="handlehistoryPic">
                 历史图片</el-button
               >
+              <el-button type="primary" @click="handleParams">
+                参数配置</el-button
+              >
             </div>
           </div>
           <div
@@ -301,6 +304,7 @@
     <setschedule ref="setschedule_ref"></setschedule>
     <info-dialog ref="infodialog_ref"></info-dialog>
     <gps-position ref="gpsdialog_ref"></gps-position>
+    <parameterSetDialog ref="parameterSetref"></parameterSetDialog>
     <el-dialog
       class="videoDialog"
       title="配置参数"
@@ -365,6 +369,7 @@ import carouselChart from "../components/carouselChart.vue";
 import setschedule from "./components/setschedule.vue";
 import infoDialog from "./components/infoDialog.vue";
 import gpsPosition from "./components/gpsPosition.vue";
+import parameterSetDialog from "../management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue";
 export default {
   components: {
     previewContain,
@@ -372,6 +377,7 @@ export default {
     setschedule,
     infoDialog,
     gpsPosition,
+    parameterSetDialog,
   },
   data() {
     return {
@@ -1247,6 +1253,11 @@ export default {
       // sessionStorage.setItem("keyPath", " realTimeSearch");
       this.clearfun();
     },
+    //参数配置
+    handleParams() {
+      console.log(this.selectData);
+      this.$refs.parameterSetref.display(this.selectData);
+    },
     //拖拽
     dragControllerDiv() {
       var resize = document.getElementsByClassName("resize");
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index 1008fa9..70b1fe8 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -102,6 +102,13 @@
             >
             </el-date-picker>
           </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model="formdata.search"
+              placeholder="请输入设备名称"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="onSubmit">查询</el-button>
           </el-form-item>
@@ -237,6 +244,7 @@ export default {
         towerid: -1,
         channelid: -1,
         termid: -1,
+        search: "",
         // timeVal: "",
       },
       picList: [],