From f7d9b0dbb8d2fe472d25d6bbc30a6892787ad6e4 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 18 Oct 2024 15:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0devtype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/parameterSetDialog.vue         | 62 +++++++++++++++++++
 src/views/photographicDevice/index.vue        |  1 +
 2 files changed, 63 insertions(+)

diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index 1289b5a..bb736ee 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -95,6 +95,17 @@
                   label-position="right"
                   label-width="152px"
                 >
+                  <el-form-item label="选择设备类型">
+                    <el-select v-model="devtype" placeholder="请选择">
+                      <el-option
+                        v-for="item in devOptions"
+                        :key="item.id"
+                        :label="item.label"
+                        :value="item.id"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
                   <el-form-item label="采集时间周期（分钟）">
                     <el-input
                       v-model="samplingForm.mainTime"
@@ -144,6 +155,17 @@
                   ref="samplingFormref"
                   :rules="samplingrules"
                 >
+                  <el-form-item label="选择设备类型">
+                    <el-select v-model="devtype" placeholder="请选择">
+                      <el-option
+                        v-for="item in devOptions"
+                        :key="item.id"
+                        :label="item.label"
+                        :value="item.id"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
                   <el-form-item label="采集时间周期（分钟）">
                     <el-input v-model="samplingForm.mainTime"></el-input>
                   </el-form-item>
@@ -1193,6 +1215,22 @@ export default {
       },
       inetLoading: false,
       inetSetLoading: false,
+
+      devtype: 1,
+      devOptions: [
+        {
+          id: 1,
+          label: "微拍",
+        },
+        {
+          id: 2,
+          label: "覆冰拉力",
+        },
+        {
+          id: 3,
+          label: "微气象",
+        },
+      ],
     };
   },
   mounted() {},
@@ -1417,6 +1455,7 @@ export default {
     samplingSearch() {
       if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
         this.sampLoading = true;
+        console.log("查询采样参数", this.rowData);
         let params = [
           {
             name: "act",
@@ -1451,6 +1490,17 @@ export default {
             value: "",
           },
         ];
+        if (this.devtype == 2) {
+          params.push({
+            name: "reqtype",
+            value: "34",
+          });
+        } else if (this.devtype == 3) {
+          params.push({
+            name: "reqtype",
+            value: "1",
+          });
+        }
         this.setTermFn(params);
       } else {
         this.$message({
@@ -1501,6 +1551,18 @@ export default {
                 value: this.samplingForm.heartbeatTime,
               },
             ];
+            if (this.devtype == 2) {
+              params.push({
+                name: "reqtype",
+                value: "34",
+              });
+            } else if (this.devtype == 3) {
+              params.push({
+                name: "reqtype",
+                value: "1",
+              });
+            }
+
             this.setTermFn(params);
           } else {
             console.log("error submit!!");
diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue
index fbbd669..033800a 100644
--- a/src/views/photographicDevice/index.vue
+++ b/src/views/photographicDevice/index.vue
@@ -169,6 +169,7 @@
               <span v-if="scope.row.devType == 2">覆冰拉力</span>
               <span v-if="scope.row.devType == 3">微气象</span>
               <span v-if="scope.row.devType == 23">覆冰和微气象</span>
+              <span v-if="scope.row.devType == 123">微拍、覆冰、微气象</span>
             </template>
           </el-table-column>
           <el-table-column