From 5edf37db7c2bf2e145fbf57ce1f000c1b8806338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com>
Date: Fri, 19 Jan 2024 10:32:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B9=B3=E5=9D=87/=E7=9B=AE=E6=A0=87?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/page/realTime.vue | 52 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue
index b3d20b8..ef4d9cb 100644
--- a/src/views/page/realTime.vue
+++ b/src/views/page/realTime.vue
@@ -1,7 +1,8 @@
 <template>
     <div class="formula realTime">
         <!-- 生态气象站 -->
-        <div class="page-content new-data" v-if="deviceName == 30" :class="deviceName == 10 || deviceName == 30 ? 'control-page' : ''">
+        <div class="page-content new-data" v-if="deviceName == 30"
+            :class="deviceName == 10 || deviceName == 30 ? 'control-page' : ''">
 
             <div class="table-title">
                 <img src="../../assets/image/real-time.png" alt="" />
@@ -12,7 +13,7 @@
                 }}</span> -->
                 {{ list[0].updateTime ? list[0].updateTime : '' }}
             </div>
-            <div class="flex-list realTime-bottom" :class="deviceName==30?'weather':''">
+            <div class="flex-list realTime-bottom" :class="deviceName == 30 ? 'weather' : ''">
                 <div class="left-view-new">
                     <div class="list-view" v-for="item, index in list " :key="index">
                         <img :src="item.img" alt="">
@@ -502,7 +503,7 @@ export default {
         this.deviceName = store.equipmentList[this.indexs - 1].deviceName
         this.deviceState = store.equipmentList[this.indexs - 1].deviceState
         // this.getTime()
-        console.log(store.equipmentList[this.indexs - 1].deviceName,this.indexs - 1,77);
+        console.log(store.equipmentList[this.indexs - 1].deviceName, this.indexs - 1, 77);
         setTimeout(() => {
             that.dataInit();
             that.timer && clearInterval(that.timer)
@@ -855,24 +856,25 @@ export default {
                                     //         name = '2#平均' + el.environmentDataId
                                     //     }
                                     // } else {
-                                    //     name = el.equipmentNumber + '#' + el.environmentDataId
+                                    //     if (el.targetValue == 1) {
+                                    //         name = el.equipmentNumber + '#目标' + el.environmentDataId
+                                    //     } else {
+                                    //         name = el.equipmentNumber + '#' + el.environmentDataId
+                                    //     }
                                     // }
-                                    if (el.equipmentNumber == 0) {
-
-                                        name = '1#平均' + el.environmentDataId
-
-                                    } else if (el.equipmentNumber == 15) {
-
-                                        name = '2#平均' + el.environmentDataId
-
+                                    if (el.targetValue == 1) {
+                                        name = '目标' + el.environmentDataId
                                     } else {
-                                        if (el.targetValue == 1) {
-                                            name = el.equipmentNumber + '#目标' + el.environmentDataId
+                                        if (el.equipmentNumber == 0) {
+                                            name = '1#平均' + el.environmentDataId
+                                        } else if (el.equipmentNumber == 15) {
+                                            name = '2#平均' + el.environmentDataId
                                         } else {
                                             name = el.equipmentNumber + '#' + el.environmentDataId
                                         }
                                     }
 
+
                                     this.list.push({
                                         ...el,
                                         name: name,
@@ -942,17 +944,13 @@ export default {
                                         num = el.environmentData + el1.unit
                                     }
                                     //    }
-                                    if (el.equipmentNumber == 0) {
-
-                                        name = '1#平均' + el.environmentDataId
-
-                                    } else if (el.equipmentNumber == 15) {
-
-                                        name = '2#平均' + el.environmentDataId
-
+                                    if (el.targetValue == 1) {
+                                        name = '目标' + el.environmentDataId
                                     } else {
-                                        if (el.targetValue == 1) {
-                                            name = el.equipmentNumber + '#目标' + el.environmentDataId
+                                        if (el.equipmentNumber == 0) {
+                                            name = '1#平均' + el.environmentDataId
+                                        } else if (el.equipmentNumber == 15) {
+                                            name = '2#平均' + el.environmentDataId
                                         } else {
                                             name = el.equipmentNumber + '#' + el.environmentDataId
                                         }
@@ -1038,20 +1036,20 @@ export default {
             } else if (this.deviceName == 30) {
                 this.api.getControlRtDatastation(formData).then(res => {
                     this.controlList = []
-                    this.list=[]
+                    this.list = []
                     if (res.data.code == 200) {
                         res.data.data.forEach((el, index) => {
                             list.forEach((el1, index1) => {
                                 if (el.formula == el1.value) {
                                     // console.log(el1);
                                     var num = 0
-                                    var name=''
+                                    var name = ''
                                     if (el.equipmentStart == 0) {
                                         num = '故障'
                                     } else {
                                         num = el.environmentData + el1.unit
                                     }
-                                
+
                                     this.list.push({
                                         ...el,
                                         name: el.environmentDataId,
-- 
2.40.1


From 7f7dd72f0ddb94c285313a27b6ac71f607fb47e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com>
Date: Fri, 19 Jan 2024 15:04:11 +0800
Subject: [PATCH 2/3] 1

---
 src/views/page/intrinsicParameter.vue | 28 ++++++++++++++++++++++++
 src/views/page/parameterSet.vue       | 31 +++------------------------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/views/page/intrinsicParameter.vue b/src/views/page/intrinsicParameter.vue
index 0fafe61..f81a1a4 100644
--- a/src/views/page/intrinsicParameter.vue
+++ b/src/views/page/intrinsicParameter.vue
@@ -482,12 +482,30 @@
                  type="text" placeholder="0">
             </div>
         </div>
+     <el-dialog title="请输入密码" class="vrcode-model confirm-psw" top="30vh" :append-to-body="true" :visible.sync="warnModel"
+            width="700px">
+            <div class="vrcode-model-title vrcode-model-title-282">请输入密码</div>
+            <div class="warning-model" style="padding: 0 30px;">
+                <div class="flex-view border-none">
+                    <div class="input-main">
+                        <div>密码:</div>
+                        <input type="text" v-model="modelPassword">
+                    </div>
+                </div>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="modelClose">取 消</el-button>
+                <el-button type="success" @click="modelConfirm">确 认</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 <script>
 export default {
     data() {
         return {
+    warnModel: true,
+            modelPassword:'',
             sensorType: '',
             typeList1: [{ label: '平均1#土壤湿度', value: 0 },
             { label: '1#土壤湿度', value: 1 },
@@ -525,6 +543,16 @@ export default {
         }
     },
     methods: {
+                modelClose(){
+            this.$router.go(-1); // 返回前一页
+        },
+modelConfirm(){
+        if(this.modelPassword=='230509'){
+            this.warnModel=false
+        }else{
+            this.$message('密码错误');
+        }
+},
           //失去焦点 计算公式 x/10
           blurChange10(code, el) {
             var store = this.$store.state
diff --git a/src/views/page/parameterSet.vue b/src/views/page/parameterSet.vue
index 68f91c5..c39f9ed 100644
--- a/src/views/page/parameterSet.vue
+++ b/src/views/page/parameterSet.vue
@@ -584,22 +584,7 @@
                 </el-dropdown>
             </div>
         </div>
-        <el-dialog title="请输入密码" class="vrcode-model confirm-psw" top="30vh" :append-to-body="true" :visible.sync="warnModel"
-            width="700px">
-            <div class="vrcode-model-title vrcode-model-title-282">请输入密码</div>
-            <div class="warning-model" style="padding: 0 30px;">
-                <div class="flex-view border-none">
-                    <div class="input-main">
-                        <div>密码:</div>
-                        <input type="text" v-model="modelPassword">
-                    </div>
-                </div>
-            </div>
-            <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="modelClose">取 消</el-button>
-                <el-button type="success" @click="modelConfirm">确 认</el-button>
-            </span>
-        </el-dialog>
+   
 
     </div>
 </template>
@@ -607,8 +592,7 @@
 export default {
     data() {
         return {
-            warnModel: true,
-            modelPassword:'',
+        
             sensorType: '',
             typeList1: [
                 { label: '1#平均空气温度', value: 1 },
@@ -655,16 +639,7 @@ export default {
         }
     },
     methods: {
-        modelClose(){
-            this.$router.go(-1); // 返回前一页
-        },
-modelConfirm(){
-        if(this.modelPassword=='230509'){
-            this.warnModel=false
-        }else{
-            this.$message('密码错误');
-        }
-},
+
         getData1(data) {
             var name = ''
             this.typeList1.forEach((el, index) => {
-- 
2.40.1


From b11a94f59a58b3383b95befdc282f0cbdf5aca15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com>
Date: Mon, 22 Jan 2024 10:52:04 +0800
Subject: [PATCH 3/3] 1

---
 src/views/page/parameterSet.vue | 59 +++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/views/page/parameterSet.vue b/src/views/page/parameterSet.vue
index c39f9ed..6264393 100644
--- a/src/views/page/parameterSet.vue
+++ b/src/views/page/parameterSet.vue
@@ -556,7 +556,7 @@
             </div>
         </div>
 
-        <div class="flex-view shrink-none border-none">
+        <div class="flex-view shrink-none">
             <div class="input-sel input-sel-w180">
                 <span>轴流风机: 目标温度选择</span>
                 <el-dropdown @command="handleCommand3($event, 21741)">
@@ -584,7 +584,62 @@
                 </el-dropdown>
             </div>
         </div>
-   
+        <div class="flex-view shrink-none border-none">
+            <div class="input-sel input-sel-w180">
+                <span>内保温1:目标温度选择</span>
+                <el-dropdown @command="handleCommand3($event, 21773)">
+                    <div class="el-dropdown-link">
+                        <input v-model="inputDataNew[21773]" type="text" class="input-input" placeholder="无">
+                        <div class="arrow"><img src="../../assets/image/arrow.png" alt=""></div>
+                    </div>
+                    <el-dropdown-menu class="input-menu-180" slot="dropdown">
+                        <el-dropdown-item v-for="item, index in typeList3" :key="index" :command="item.value">{{
+                            item.label }}</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+            </div>
+            <div class="input-sel input-sel-w180">
+                <span>温度选择</span>
+                <el-dropdown @command="handleCommand1($event, 21772)">
+                    <div class="el-dropdown-link">
+                        <input v-model="inputDataNew[21772]" type="text" class="input-input" placeholder="无">
+                        <div class="arrow"><img src="../../assets/image/arrow.png" alt=""></div>
+                    </div>
+                    <el-dropdown-menu class="input-menu-180" slot="dropdown">
+                        <el-dropdown-item v-for="item, index in typeList1" :key="index" :command="item.value">{{
+                            item.label }}</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+            </div>
+        </div>
+        <div class="flex-view shrink-none">
+            <div class="input-sel input-sel-w180">
+                <span>内保温2:目标温度选择</span>
+                <el-dropdown @command="handleCommand3($event, 21775)">
+                    <div class="el-dropdown-link">
+                        <input v-model="inputDataNew[21775]" type="text" class="input-input" placeholder="无">
+                        <div class="arrow"><img src="../../assets/image/arrow.png" alt=""></div>
+                    </div>
+                    <el-dropdown-menu class="input-menu-180" slot="dropdown">
+                        <el-dropdown-item v-for="item, index in typeList3" :key="index" :command="item.value">{{
+                            item.label }}</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+            </div>
+            <div class="input-sel input-sel-w180">
+                <span>温度选择</span>
+                <el-dropdown @command="handleCommand1($event, 21774)">
+                    <div class="el-dropdown-link">
+                        <input v-model="inputDataNew[21774]" type="text" class="input-input" placeholder="无">
+                        <div class="arrow"><img src="../../assets/image/arrow.png" alt=""></div>
+                    </div>
+                    <el-dropdown-menu class="input-menu-180" slot="dropdown">
+                        <el-dropdown-item v-for="item, index in typeList1" :key="index" :command="item.value">{{
+                            item.label }}</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+            </div>
+        </div>
 
     </div>
 </template>
-- 
2.40.1