diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index 626dfa7..bbb4bb8 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -800,6 +800,93 @@
           </div>
         </div>
       </el-tab-pane>
+      <!-- <el-tab-pane label="网络适配器" name="13">
+        <div class="tabsBox">
+          <el-tabs
+            v-model="tabsActive"
+            type="card"
+            @tab-click="inethandleClick"
+          >
+            <el-tab-pane label="查询参数" name="first">
+              <div class="queryParam">
+                <el-form
+                  :model="inetComputer"
+                  label-position="right"
+                  label-width="124px"
+                >
+                  <el-form-item label="IP地址">
+                    <el-input
+                      v-model="inetComputer.ipStr"
+                      disabled="disabled"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="子网掩码">
+                    <el-input
+                      v-model="inetComputer.subnetMask"
+                      disabled="disabled"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="网关">
+                    <el-input
+                      v-model="inetComputer.gateway"
+                      disabled="disabled"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="DNS服务器">
+                    <el-input
+                      v-model="inetComputer.dns"
+                      disabled="disabled"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      @click="inetSearch"
+                      :loading="inetLoading"
+                      >查询</el-button
+                    >
+                    <p class="looktime" v-if="lookTime && showLookTime">
+                      {{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
+                    </p>
+                  </el-form-item>
+                </el-form>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="设置参数" name="second">
+              <div class="queryParam">
+                <el-form
+                  :model="inetComputer"
+                  label-position="right"
+                  label-width="124px"
+                  ref="inetFormref"
+                  :rules="inetrulse"
+                >
+                  <el-form-item label="IP" prop="ip">
+                    <el-input v-model="inetComputer.ip"></el-input>
+                  </el-form-item>
+                  <el-form-item label="子网掩码" prop="port">
+                    <el-input v-model="inetComputer.subnetMask"></el-input>
+                  </el-form-item>
+                  <el-form-item label="网关">
+                    <el-input v-model="inetComputer.gateway"></el-input>
+                  </el-form-item>
+                  <el-form-item label="DNS服务器">
+                    <el-input v-model="inetComputer.dns"></el-input>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      @click="inetSet"
+                      :loading="inetSetLoading"
+                      >设置</el-button
+                    >
+                  </el-form-item>
+                </el-form>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-tab-pane> -->
     </el-tabs>
     <div slot="footer" class="dialog-footer">
       <el-button @click="isShow = false">取 消</el-button>
@@ -992,6 +1079,20 @@ export default {
         ],
       },
       upOptions: [],
+      //网络适配器
+      //上位机信息
+      inetComputer: {
+        ip: "",
+        subnetMask: "",
+        gateway: "",
+        dns: "",
+      },
+      inetrulse: {
+        ip: [{ required: true, validator: validateIPAddress, trigger: "blur" }],
+        port: [{ required: true, message: "请输入端口号", trigger: "blur" }],
+      },
+      inetLoading: false,
+      inetSetLoading: false,
     };
   },
   mounted() {},
@@ -1132,6 +1233,14 @@ export default {
       this.i = 0;
       this.timer = null;
     },
+    //上位机重置数据
+    inethandleClick() {
+      this.inetComputer = {};
+      this.lookTime = "";
+      clearInterval(this.timer);
+      this.i = 0;
+      this.timer = null;
+    },
     //id重置数据
     idhandleClick() {
       this.idParameter = {};
@@ -1750,7 +1859,100 @@ export default {
         })
         .catch((err) => {});
     },
-
+    //网络适配器
+    //--act=cma [0xA7] --flag=[Request Set Flag, default is set=1, 0: request] --ip=[IP Address] --cmaport=[CMA Port] --domain=[Domain]
+    //--act=inet --flag=[Request Set Flag, default is request=0, 1: set] --rf=[Request Flag] --ip=[IP] --subnetMask=[Subnet Mask] --gateway=[Gateway]
+    inetSearch() {
+      if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
+        this.inetLoading = true;
+        let params = [
+          {
+            name: "act",
+            value: "inet",
+          },
+          {
+            name: "flag",
+            value: 0,
+          },
+          {
+            name: "rf",
+            value: 15,
+          },
+          {
+            name: "ip",
+            value: "",
+          },
+          {
+            name: "subnetMask",
+            value: "",
+          },
+          {
+            name: "gateway",
+            value: "",
+          },
+          {
+            name: "dns",
+            value: "",
+          },
+        ];
+        this.setTermFn(params);
+      } else {
+        this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "装置下线，发送指令失败",
+          type: "error",
+        });
+      }
+    },
+    //网络适配器设置
+    inetSet() {
+      if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
+        this.$refs.inetFormref.validate((valid) => {
+          console.log(valid);
+          if (valid) {
+            this.inetSetLoading = true;
+            let params = [
+              {
+                name: "act",
+                value: "cma",
+              },
+              {
+                name: "flag",
+                value: 1,
+              },
+              {
+                name: "rf",
+                value: 255,
+              },
+              {
+                name: "ip",
+                value: this.inetComputer.ip,
+              },
+              {
+                name: "subnetMask",
+                value: this.inetComputer.subnetMask,
+              },
+              {
+                name: "gateway",
+                value: this.inetComputer.gateway,
+              },
+            ];
+            this.setTermFn(params);
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
+        });
+      } else {
+        this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "装置下线，发送指令失败",
+          type: "error",
+        });
+      }
+    },
     getinfo() {
       getTermCameraRequest({ requestid: this.requestid })
         .then((res) => {
@@ -1764,6 +1966,8 @@ export default {
             this.sampSetLoading = false;
             this.upperLoading = false;
             this.upperSetLoading = false;
+            this.inetLoading = false;
+            this.inetSetLoading = false;
             this.idLoading = false;
             this.idSetLoading = false;
             this.statusLoading = false;
@@ -1786,6 +1990,8 @@ export default {
             this.samplingForm = JSON.parse(res.data.data);
             //ip地址解析开始
             this.upperComputer = JSON.parse(res.data.data);
+            //网络适配器结果
+            this.inetComputer = JSON.parse(res.data.data);
             //修改cmdid
             this.idParameter = JSON.parse(res.data.data);
             this.waterForm = JSON.parse(res.data.data);
@@ -1835,6 +2041,8 @@ export default {
             this.sampSetLoading = false;
             this.upperLoading = false;
             this.upperSetLoading = false;
+            this.inetLoading = false;
+            this.inetSetLoading = false;
             this.idLoading = false;
             this.idSetLoading = false;
             this.statusLoading = false;
@@ -1967,6 +2175,7 @@ export default {
       this.samplingForm = {};
       this.deviceTimeForm = {};
       this.upperComputer = {};
+      this.inetComputer = {};
       this.idParameter = {};
       this.zjidParameter = {};
       this.gpsForm = {};
@@ -1982,6 +2191,8 @@ export default {
       this.sampSetLoading = false;
       this.upperLoading = false;
       this.upperSetLoading = false;
+      this.inetLoading = false;
+      this.inetSetLoading = false;
       this.idLoading = false;
       this.idSetLoading = false;
       this.statusLoading = false;