From fafe2704a3ff3095f3c7cf02461b4972c0d1f643 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Thu, 25 Aug 2022 09:33:54 +0800
Subject: [PATCH] =?UTF-8?q?3d=E5=BA=93=E6=88=BFbug=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E9=97=A8=E7=B1=BB=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/category/SettingForm.vue |  5 ++--
 .../warehouse3D/archivesStorage/index.vue     | 26 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/views/components/category/SettingForm.vue b/src/views/components/category/SettingForm.vue
index 602a1dc..97310e9 100644
--- a/src/views/components/category/SettingForm.vue
+++ b/src/views/components/category/SettingForm.vue
@@ -288,10 +288,9 @@ export default {
         this.form.dictionaryConfigId.id = null
       }
       // 字段类型为数字型，且默认著录类型为数字框不可更改
-      if (this.form.isDataType === 2) {
+      if (this.form.isDataType === 2 && this.form.isInputClass !== 'number') {
         this.form.isInputClass = 'number'
-        this.dictionaryData = []
-        this.$message.error('字段类型为数字型，且默认著录类型为数字框')
+        this.$message.error('字段类型为数字型，默认著录类型为数字框且不能修改')
       }
     },
     // 显示长度 input.value>200,则自动勾选上“显示一整行”
diff --git a/src/views/storeManage/warehouse3D/archivesStorage/index.vue b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
index b5ea241..566533b 100644
--- a/src/views/storeManage/warehouse3D/archivesStorage/index.vue
+++ b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
@@ -5,46 +5,46 @@
       <div class="left-3d">
         <iframe id="myIframe" ref="myIframe" name="iframeMap" class="iframe_box" src="/webA/index.html" frameborder="0" scrolling="no" />
         <ul class="msg-list">
-          <li v-show="topDisplayData.DAK_DIV_TOP_001.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_001.curstatus === '0' }">
+          <li v-show="topDisplayData.DAK_DIV_TOP_001.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_001.curstatus === '1' }">
             <svg-icon icon-class="temperature" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_001.curValue }}</span>
-              <p class="msg-list-unit">温度{{ topDisplayData.DAK_DIV_TOP_001.unit }}</p>
+              <p class="msg-list-unit">温度 {{ topDisplayData.DAK_DIV_TOP_001.unit }}</p>
             </div>
           </li>
-          <li v-show="topDisplayData.DAK_DIV_TOP_002.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_002.curstatus === '0' }">
+          <li v-show="topDisplayData.DAK_DIV_TOP_002.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_002.curstatus === '1' }">
             <svg-icon icon-class="shidu" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_002.curValue }}</span>
-              <p class="msg-list-unit">湿度{{ topDisplayData.DAK_DIV_TOP_002.unit }}</p>
+              <p class="msg-list-unit">湿度 {{ topDisplayData.DAK_DIV_TOP_002.unit }}</p>
             </div>
           </li>
-          <li v-show="topDisplayData.DAK_DIV_TOP_003.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_003.curstatus === '0' }">
+          <li v-show="topDisplayData.DAK_DIV_TOP_003.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_003.curstatus === '1' }">
             <svg-icon icon-class="co2" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_003.curValue }}</span>
-              <p class="msg-list-unit">CO2{{ topDisplayData.DAK_DIV_TOP_003.unit }}</p>
+              <p class="msg-list-unit">CO2 {{ topDisplayData.DAK_DIV_TOP_003.unit }}</p>
             </div>
           </li>
-          <li v-show="topDisplayData.DAK_DIV_TOP_004.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_004.curstatus === '0' }">
+          <li v-show="topDisplayData.DAK_DIV_TOP_004.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_004.curstatus === '1' }">
             <svg-icon icon-class="voc" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_004.curValue }}</span>
-              <p class="msg-list-unit">VOC{{ topDisplayData.DAK_DIV_TOP_004.unit }}</p>
+              <p class="msg-list-unit">VOC {{ topDisplayData.DAK_DIV_TOP_004.unit }}</p>
             </div>
           </li>
-          <li v-show="topDisplayData.DAK_DIV_TOP_005.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_005.curstatus === '0' }" class="msg-pm">
+          <li v-show="topDisplayData.DAK_DIV_TOP_005.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_005.curstatus === '1' }" class="msg-pm">
             <svg-icon icon-class="pm25" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_005.curValue }}</span>
-              <p class="msg-list-unit">PM2.5{{ topDisplayData.DAK_DIV_TOP_005.unit }}</p>
+              <p class="msg-list-unit">PM2.5 {{ topDisplayData.DAK_DIV_TOP_005.unit }}</p>
             </div>
           </li>
-          <li v-show="topDisplayData.DAK_DIV_TOP_006.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_006.curstatus === '0' }" class="msg-pm">
-            <svg-icon icon-class="PM10" class-name="msg-list-svg" />
+          <li v-show="topDisplayData.DAK_DIV_TOP_006.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_006.curstatus === '1' }" class="msg-pm">
+            <svg-icon icon-class="pm10" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_006.curValue }}</span>
-              <p class="msg-list-unit">PM10{{ topDisplayData.DAK_DIV_TOP_006.unit }}</p>
+              <p class="msg-list-unit">PM10 {{ topDisplayData.DAK_DIV_TOP_006.unit }}</p>
             </div>
           </li>
         </ul>