diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
index c71f23d..19db76c 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
@@ -197,14 +197,14 @@ export default {
       activeName: "1", //选项卡
       accesslist: [], //通道选择器
       colorlist: [
-        {
-          name: "黑白",
-          id: 0,
-        },
         {
           name: "彩色",
           id: 1,
         },
+        {
+          name: "黑白",
+          id: 0,
+        },
       ], //色彩选择器
       ratiolist: [], //图像分辨率
       selaccess: "", //选中的通道
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
index ea8de9d..f581dc6 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
@@ -33,7 +33,11 @@
       </el-tab-pane> -->
       <el-tab-pane label="采样参数" name="2">
         <div class="tabsBox">
-          <el-tabs v-model="tabsActive" type="card" @tab-click="handleClick">
+          <el-tabs
+            v-model="tabsActive"
+            type="card"
+            @tab-click="samphandleClick"
+          >
             <el-tab-pane label="查询实际参数" name="first">
               <div class="queryParam">
                 <el-form
@@ -111,34 +115,36 @@
       </el-tab-pane>
       <el-tab-pane label="上位机信息" name="3">
         <div class="tabsBox">
-          <el-tabs v-model="tabsActive" type="card">
+          <el-tabs v-model="tabsActive" type="card" @tab-click="uphandleClick">
             <el-tab-pane label="查询实际参数" name="first">
               <div class="queryParam">
                 <el-form
-                  :model="deviceTimeForm"
+                  :model="upperComputer"
                   label-position="right"
                   label-width="124px"
                 >
                   <el-form-item label="IP地址">
                     <el-input
-                      v-model="deviceTimeForm.zztime"
+                      v-model="upperComputer.ip"
                       disabled="disabled"
                     ></el-input>
                   </el-form-item>
                   <el-form-item label="端口号">
                     <el-input
-                      v-model="deviceTimeForm.newzztime"
+                      v-model="upperComputer.port"
                       disabled="disabled"
                     ></el-input>
                   </el-form-item>
                   <el-form-item label="域名">
                     <el-input
-                      v-model="deviceTimeForm.newzztime"
+                      v-model="upperComputer.domain"
                       disabled="disabled"
                     ></el-input>
                   </el-form-item>
                   <el-form-item>
-                    <el-button type="primary">查询</el-button>
+                    <el-button type="primary" @click="upperSearch"
+                      >查询</el-button
+                    >
                   </el-form-item>
                 </el-form>
               </div>
@@ -146,21 +152,21 @@
             <el-tab-pane label="设置参数" name="second">
               <div class="queryParam">
                 <el-form
-                  :model="deviceTimeForm"
+                  :model="upperComputer"
                   label-position="right"
                   label-width="124px"
                 >
                   <el-form-item label="IP地址">
-                    <el-input v-model="deviceTimeForm.zztime"></el-input>
+                    <el-input v-model="upperComputer.ip"></el-input>
                   </el-form-item>
                   <el-form-item label="端口号">
-                    <el-input v-model="deviceTimeForm.newzztime"></el-input>
+                    <el-input v-model="upperComputer.port"></el-input>
                   </el-form-item>
                   <el-form-item label="域名">
-                    <el-input v-model="deviceTimeForm.newzztime"></el-input>
+                    <el-input v-model="upperComputer.domain"></el-input>
                   </el-form-item>
                   <el-form-item>
-                    <el-button type="primary">设置</el-button>
+                    <el-button type="primary" @click="upperSet">设置</el-button>
                   </el-form-item>
                 </el-form>
               </div>
@@ -170,34 +176,34 @@
       </el-tab-pane>
       <el-tab-pane label="ID参数" name="4">
         <div class="tabsBox">
-          <el-tabs v-model="tabsActive" type="card">
+          <el-tabs v-model="tabsActive" type="card" @tab-click="idhandleClick">
             <el-tab-pane label="查询实际参数" name="first">
               <div class="queryParam">
                 <el-form
-                  :model="deviceTimeForm"
+                  :model="idParameter"
                   label-position="right"
                   label-width="124px"
                 >
                   <el-form-item label="CMD_ID">
                     <el-input
-                      v-model="deviceTimeForm.zztime"
+                      v-model="idParameter.newcmdid"
                       disabled="disabled"
                     ></el-input>
                   </el-form-item>
                   <el-form-item label="杆塔ID">
                     <el-input
-                      v-model="deviceTimeForm.newzztime"
+                      v-model="idParameter.compid"
                       disabled="disabled"
                     ></el-input>
                   </el-form-item>
                   <el-form-item label="原始ID">
                     <el-input
-                      v-model="deviceTimeForm.newzztime"
+                      v-model="idParameter.orgid"
                       disabled="disabled"
                     ></el-input>
                   </el-form-item>
                   <el-form-item>
-                    <el-button type="primary">查询</el-button>
+                    <el-button type="primary" @click="idSearch">查询</el-button>
                   </el-form-item>
                 </el-form>
               </div>
@@ -205,24 +211,24 @@
             <el-tab-pane label="设置参数" name="second">
               <div class="queryParam">
                 <el-form
-                  :model="deviceTimeForm"
+                  :model="idParameter"
                   label-position="right"
                   label-width="124px"
                 >
                   <el-form-item label="CMD_ID">
-                    <el-input v-model="deviceTimeForm.zztime"></el-input>
+                    <el-input v-model="idParameter.newcmdid"></el-input>
                   </el-form-item>
                   <el-form-item label="杆塔ID">
-                    <el-input v-model="deviceTimeForm.newzztime"></el-input>
+                    <el-input v-model="idParameter.compid"></el-input>
                   </el-form-item>
                   <el-form-item label="原始ID">
                     <el-input
-                      v-model="deviceTimeForm.newzztime"
+                      v-model="idParameter.orgid"
                       disabled="disabled"
                     ></el-input>
                   </el-form-item>
                   <el-form-item>
-                    <el-button type="primary">设置</el-button>
+                    <el-button type="primary" @click="idSet">设置</el-button>
                   </el-form-item>
                 </el-form>
               </div>
@@ -232,13 +238,13 @@
       </el-tab-pane>
       <el-tab-pane label="图像采集参数" name="5">
         <div class="tabsBox">
-          <imageCapture ref="imageCaptureref"></imageCapture>
+          <imageCapture ref="imageCaptureref" :rowdata="rowData"></imageCapture>
         </div>
       </el-tab-pane>
 
       <el-tab-pane label="视频采集参数" name="6">
         <div class="tabsBox">
-          <videoCapture ref="videoCaptureref"></videoCapture>
+          <videoCapture ref="videoCaptureref" :rowdata="rowData"></videoCapture>
         </div>
       </el-tab-pane>
       <el-tab-pane label="装置运行状态报" name="7">
@@ -377,7 +383,18 @@ export default {
           { required: true, message: "请输入心跳周期", trigger: "blur" },
         ],
       },
-
+      //上位机信息
+      upperComputer: {
+        ip: "",
+        port: "",
+        domain: "",
+      },
+      //id参数
+      idParameter: {
+        newcmdid: "",
+        compid: "",
+        orgid: "",
+      },
       runStatusForm: {},
       gpsForm: {}, //gps位置
       tabsActive: "first",
@@ -410,97 +427,270 @@ export default {
     searchTime() {},
     //装置时间设置
     setTime() {},
-    //重置数据
-    handleClick() {
+    //采样参数重置数据
+    samphandleClick() {
       this.samplingForm = {};
     },
+    //上位机重置数据
+    uphandleClick() {
+      this.upperComputer = {};
+    },
+    //id重置数据
+    idhandleClick() {
+      this.idParameter = {};
+    },
     //采样参数查询
     // -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() {
-      let params = [
-        {
-          name: "act",
-          value: "sampling",
-        },
-        {
-          name: "flag",
-          value: 0,
-        },
-        {
-          name: "rf",
-          value: 15,
-        },
-        {
-          name: "reqtype",
-          value: "0xA4",
-        },
-        {
-          name: "maintime",
-          value: "",
-        },
-        {
-          name: "samplecount",
-          value: "",
-        },
-        {
-          name: "samplingfreq",
-          value: "",
-        },
-        {
-          name: "heartbeat",
-          value: "",
-        },
-      ];
-      this.setTermFn(params);
+      if (this.rowData.isonline) {
+        let params = [
+          {
+            name: "act",
+            value: "sampling",
+          },
+          {
+            name: "flag",
+            value: 0,
+          },
+          {
+            name: "rf",
+            value: 15,
+          },
+          {
+            name: "reqtype",
+            value: "0xA4",
+          },
+          {
+            name: "maintime",
+            value: "",
+          },
+          {
+            name: "samplecount",
+            value: "",
+          },
+          {
+            name: "samplingfreq",
+            value: "",
+          },
+          {
+            name: "heartbeat",
+            value: "",
+          },
+        ];
+        this.setTermFn(params);
+      } else {
+        this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "装置下线，发送指令失败",
+          type: "error",
+        });
+      }
     },
+    //设置采样查询
     samplingSet() {
-      this.$refs.samplingFormref.validate((valid) => {
-        if (valid) {
-          console.log("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-          console.log(this.samplingForm);
-          console.log("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-          let params = [
-            {
-              name: "act",
-              value: "sampling",
-            },
-            {
-              name: "flag",
-              value: 1,
-            },
-            {
-              name: "rf",
-              value: 15,
-            },
-            {
-              name: "reqtype",
-              value: "0xA4",
-            },
-            {
-              name: "maintime",
-              value: this.samplingForm.mainTime,
-            },
-            {
-              name: "samplecount",
-              value: this.samplingForm.sampleCount,
-            },
-            {
-              name: "samplingfreq",
-              value: this.samplingForm.sampleFrequency,
-            },
-            {
-              name: "heartbeat",
-              value: this.samplingForm.heartbeatTime,
-            },
-          ];
-          this.setTermFn(params);
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
+      if (this.rowData.isonline) {
+        this.$refs.samplingFormref.validate((valid) => {
+          if (valid) {
+            console.log("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+            console.log(this.samplingForm);
+            console.log("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+            let params = [
+              {
+                name: "act",
+                value: "sampling",
+              },
+              {
+                name: "flag",
+                value: 1,
+              },
+              {
+                name: "rf",
+                value: 15,
+              },
+              {
+                name: "reqtype",
+                value: "0xA4",
+              },
+              {
+                name: "maintime",
+                value: this.samplingForm.mainTime,
+              },
+              {
+                name: "samplecount",
+                value: this.samplingForm.sampleCount,
+              },
+              {
+                name: "samplingfreq",
+                value: this.samplingForm.sampleFrequency,
+              },
+              {
+                name: "heartbeat",
+                value: this.samplingForm.heartbeatTime,
+              },
+            ];
+            this.setTermFn(params);
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      } else {
+        this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "装置下线，发送指令失败",
+          type: "error",
+        });
+      }
+    },
+    //上位机查询
+    //--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) {
+        let params = [
+          {
+            name: "act",
+            value: "cma",
+          },
+          {
+            name: "flag",
+            value: 0,
+          },
+
+          {
+            name: "ip",
+            value: "",
+          },
+          {
+            name: "cmaport",
+            value: "",
+          },
+          {
+            name: "domain",
+            value: "",
+          },
+        ];
+        this.setTermFn(params);
+      } else {
+        this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "装置下线，发送指令失败",
+          type: "error",
+        });
+      }
+    },
+    //上位机设置
+    upperSet() {
+      if (this.rowData.isonline) {
+        let params = [
+          {
+            name: "act",
+            value: "cma",
+          },
+          {
+            name: "flag",
+            value: 1,
+          },
+
+          {
+            name: "ip",
+            value: this.upperComputer.ip,
+          },
+          {
+            name: "cmaport",
+            value: this.upperComputer.port,
+          },
+          {
+            name: "domain",
+            value: this.upperComputer.domain,
+          },
+        ];
+        this.setTermFn(params);
+      } else {
+        this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "装置下线，发送指令失败",
+          type: "error",
+        });
+      }
+    },
+    //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) {
+        let params = [
+          {
+            name: "act",
+            value: "termid",
+          },
+          {
+            name: "flag",
+            value: 0,
+          },
+
+          {
+            name: "newcmdid",
+            value: "",
+          },
+          {
+            name: "compid",
+            value: "",
+          },
+          {
+            name: "orgid",
+            value: "",
+          },
+        ];
+        this.setTermFn(params);
+      } else {
+        this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "装置下线，发送指令失败",
+          type: "error",
+        });
+      }
+    },
+    //id参数设置
+    idSet() {
+      if (this.rowData.isonline) {
+        let params = [
+          {
+            name: "act",
+            value: "termid",
+          },
+          {
+            name: "flag",
+            value: 1,
+          },
+          {
+            name: "newcmdid",
+            value: this.idParameter.newcmdid,
+          },
+          {
+            name: "compid",
+            value: this.idParameter.compid,
+          },
+          {
+            name: "orgid",
+            value: this.idParameter.orgid,
+          },
+        ];
+        this.setTermFn(params);
+      } else {
+        this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "装置下线，发送指令失败",
+          type: "error",
+        });
+      }
     },
     //装置状态报
+    //--act=runningstatus [0xEA] --cmdid=[CMD_ID]
     runstatusSearch() {
       let params = [
         {
@@ -534,6 +724,8 @@ export default {
             // && res.data.result == 255
             console.log(JSON.parse(res.data.data));
             this.samplingForm = JSON.parse(res.data.data);
+            this.upperComputer = JSON.parse(res.data.data);
+            this.idParameter = JSON.parse(res.data.data);
             this.i = 0;
             this.$message({
               duration: 1500,