Merge remote-tracking branch 'guAn_client/master'

src/views/modules_guAn/dashboardparam/DashParamModal.vue

@@ -49,14 +49,14 @@
             </a-select>
         </a-form-model-item>
 
-        <a-form-model-item
+        <!-- <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           prop="records"
           v-if="model.iflog=='Y'"
           label="获取历史记录条数">
           <a-input-number placeholder="获取历史记录条数" v-model="model.records" />
-        </a-form-model-item>
+        </a-form-model-item> -->
 
         <a-form-model-item
           :labelCol="labelCol"

src/views/modules_guAn/dashboardparam/index.vue

@@ -125,11 +125,11 @@
               }
             }
           },
-          {
-            title: '获取历史记录条数',
-            align: "left",
-            dataIndex: 'records',
-          },
+          // {
+          //   title: '获取历史记录条数',
+          //   align: "left",
+          //   dataIndex: 'records',
+          // },
           {
             title: '获取历史记录时长(H)',
             align: "left",

src/views/modules_guAn/visualization/modules/EquipmentInfo.vue

@@ -123,11 +123,11 @@ export default {
       // 起始温度
       startT: '',
       // 辐照强度
-      irradiation: '1000.0',
+      irradiation: '0',
       // 吹风
       // 时间
       // 辐照强度设定
-      targetF: '1120',
+      targetF: '0',
       // 辐射强度起始
       startF: '',
       // 湿度

src/views/modules_guAn/visualization/modules/ModeInfo.vue

@@ -6,7 +6,7 @@
         <div class="itemHead">温度</div>
         <div class="item">
           <div id="demo1">温度：{{template}}</div>
-          <div>输出：{{outputT}}</div>
+          <div>输出：{{outputT}}%</div>
         </div>
         <div class="item">
           <div id="demo1">升温
@@ -93,7 +93,7 @@ export default {
       // 温度输出
       outputT: '',
       // 升温/降温(0升温，1降温，3啥也不是)
-      statusT: 3,
+      statusT: 1,
       // 目标温度
       targetT: '',
       // 斜率设定（温度）
@@ -113,7 +113,7 @@ export default {
       // 湿度输出
       outputH: '',
       // 加湿/除湿(0加湿，1除湿，3啥也不是)
-      statusH: 3,
+      statusH: 1,
       // 目标湿度
       targetH: '',
       // 起始湿度
@@ -145,14 +145,21 @@ export default {
           this.template = this.dataList[i].Value
         }
         if (this.dataList[i].Name == '温度输出率') {
-          this.outputT = this.dataList[i].Value
-          if (this.outputT >0 && this.outputT <100) {
+          this.outputT = (this.dataList[i].Value * 100).toFixed(0)
+          // if (this.outputT >0 && this.outputT <100) {
+          //   this.statusT = 0
+          // }
+          // if (this.outputT >-100 && this.outputT <0) {
+          //   this.statusT = 1
+          // }else{
+          //   this.statusT = 3
+          // }
+        }
+        if (this.dataList[i].Name == '升温') {
+          if (this.dataList[i].Value == 1) {
             this.statusT = 0
-          }
-          if (this.outputT >-100 && this.outputT <0) {
-            this.statusT = 1
           }else{
-            this.statusT = 3
+            this.statusT = 1
           }
         }
         if (this.dataList[i].Name == '温度设定值') {
@@ -170,14 +177,21 @@ export default {
           this.humidity = this.dataList[i].Value
         }
         if (this.dataList[i].Name == '湿度输出率') {
-          this.outputH = this.dataList[i].Value
-          if (this.outputH >0 && this.outputH <100) {
+          this.outputH = (this.dataList[i].Value * 100).toFixed(0)
+          // if (this.outputH >0 && this.outputH <100) {
+          //   this.statusH = 0
+          // }
+          // if (this.outputH >-100 && this.outputH <0) {
+          //   this.statusH = 1
+          // }else{
+          //   this.statusH = 3
+          // }
+        }
+        if (this.dataList[i].Name == '加湿') {
+          if (this.dataList[i].Value == 1) {
             this.statusH = 0
-          }
-          if (this.outputH >-100 && this.outputH <0) {
-            this.statusH = 1
           }else{
-            this.statusH = 3
+            this.statusH = 1
           }
         }
         if (this.dataList[i].Name == '湿度设定值') {