From 95bc9d09a4157370dcdf3449b0e12c268e4c70a1 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 2 Apr 2024 10:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=86=E9=A2=91=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/parameterSetDialog.vue         | 15 +++++++---
 .../components/videoCapture.vue               | 29 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index bbb4bb8..8c8fefb 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -800,7 +800,7 @@
           </div>
         </div>
       </el-tab-pane>
-      <!-- <el-tab-pane label="网络适配器" name="13">
+      <el-tab-pane label="网络适配器" name="13">
         <div class="tabsBox">
           <el-tabs
             v-model="tabsActive"
@@ -838,6 +838,12 @@
                       disabled="disabled"
                     ></el-input>
                   </el-form-item>
+                  <el-form-item label="手机串号">
+                    <el-input
+                      v-model="inetComputer.phoneNum"
+                      disabled="disabled"
+                    ></el-input>
+                  </el-form-item>
                   <el-form-item>
                     <el-button
                       type="primary"
@@ -886,7 +892,7 @@
             </el-tab-pane>
           </el-tabs>
         </div>
-      </el-tab-pane> -->
+      </el-tab-pane>
     </el-tabs>
     <div slot="footer" class="dialog-footer">
       <el-button @click="isShow = false">取 消</el-button>
@@ -1086,6 +1092,7 @@ export default {
         subnetMask: "",
         gateway: "",
         dns: "",
+        phoneNum: "",
       },
       inetrulse: {
         ip: [{ required: true, validator: validateIPAddress, trigger: "blur" }],
@@ -1861,7 +1868,7 @@ export default {
     },
     //网络适配器
     //--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]
+    //--act=inet --flag=[Request Set Flag, default is request=0, 1: set] --rf=[Request Flag] --ip=[IP] --subnetMask=[Subnet Mask] --gateway=[Gateway] --dns
     inetSearch() {
       if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
         this.inetLoading = true;
@@ -1876,7 +1883,7 @@ export default {
           },
           {
             name: "rf",
-            value: 15,
+            value: 31,
           },
           {
             name: "ip",
diff --git a/src/views/photographicDevice/components/videoCapture.vue b/src/views/photographicDevice/components/videoCapture.vue
index f264f46..c147a49 100644
--- a/src/views/photographicDevice/components/videoCapture.vue
+++ b/src/views/photographicDevice/components/videoCapture.vue
@@ -206,6 +206,32 @@ export default {
           name: "VGA",
         },
       ], //分辨率
+      zzratiolist: [
+        {
+          id: 1,
+          name: "QVGA",
+        },
+        {
+          id: 2,
+          name: "VGA",
+        },
+        {
+          id: 3,
+          name: "480p;",
+        },
+        {
+          id: 4,
+          name: "720P",
+        },
+        {
+          id: 5,
+          name: "1080P",
+        },
+        {
+          id: 6,
+          name: "其它",
+        },
+      ], //分辨率
       selaccess: "", //选中的通道
       capturenr: {}, //查询后的内容
       setForm: {
@@ -259,7 +285,8 @@ export default {
     getRatio() {
       getResolutionRatio({ type: 1 })
         .then((res) => {
-          this.ratiolist = this.hnratiolist;
+          //this.ratiolist = this.hnratiolist;
+          this.ratiolist = this.zzratiolist;
           this.$set(this.setForm, "videoFormat", this.ratiolist[0].id);
         })
         .catch((err) => {});