Ver código fonte

[Feat 0000] 智慧球详情添加部分字段

houzekong 7 meses atrás
pai
commit
8d41f6018a

+ 60 - 19
src/views/vent/monitorManager/deviceMonitor/components/device/modal/firemon.modal.vue

@@ -27,36 +27,35 @@
               <SvgIcon class="icon-style" name="coval" style="width: 62px; height: 38px; margin-top: 10px" />
             </div>
             <div class="item-container">
-              <div class="title">一氧化碳</div>
-              <div class="value"
-                >{{ posMonitor.coValue !== undefined && posMonitor.coValue !== null ? posMonitor.coValue : '-' }} <span>ppm</span>
-              </div>
+              <div class="title">距停采线距离</div>
+              <div class="value">{{ get(posMonitor, 'initStopLine') }} <span>m</span> </div>
             </div>
           </div>
           <div class="top-item">
             <div class="icon">
-              <SvgIcon class="icon-style" name="o2val" style="width: 76px; height: 50px" />
+              <SvgIcon class="icon-style" name="coval" style="width: 62px; height: 38px; margin-top: 10px" />
             </div>
             <div class="item-container">
               <div class="title">氧气</div>
-              <div class="value">{{ posMonitor.o2Value !== undefined && posMonitor.o2Value !== null ? posMonitor.o2Value : '-' }} <span>%</span></div>
+              <div class="value">{{ get(posMonitor, 'o2Value') }} <span>%</span> </div>
             </div>
           </div>
           <div class="top-item warning-box">
             <div class="icon">
-              <SvgIcon class="icon-style" size="42" name="alarm-warning" style="margin-top: 5px" />
+              <SvgIcon class="icon-style" size="42" name="link" style="margin-top: 5px" />
             </div>
             <div class="item-container">
-              <div class="title">风险等级</div>
-              <div
-                :class="{
-                  value1: posMonitor['syswarnLevel_str'] == '绿色预警',
-                  value2: posMonitor['syswarnLevel_str'] == '黄色预警',
-                  value3: posMonitor['syswarnLevel_str'] == '红色预警',
-                }"
-              >
-                {{ posMonitor['syswarnLevel_str'] || '-' }}
-              </div>
+              <div class="title">氧气值状态名称</div>
+              <div class="warning-value">{{ get(posMonitor, 'o2ValueStateName') }}</div>
+            </div>
+          </div>
+          <div class="top-item">
+            <div class="icon">
+              <SvgIcon class="icon-style" name="coval" style="width: 62px; height: 38px; margin-top: 10px" />
+            </div>
+            <div class="item-container">
+              <div class="title">一氧化碳</div>
+              <div class="value">{{ get(posMonitor, 'coValue') }} <span>%</span> </div>
             </div>
           </div>
           <div class="top-item warning-box">
@@ -64,8 +63,44 @@
               <SvgIcon class="icon-style" size="42" name="link" style="margin-top: 5px" />
             </div>
             <div class="item-container">
-              <div class="title">连接状态</div>
-              <div class="warning-value">{{ posMonitor['netStatus'] == 1 ? '连接' : '未连接' }}</div>
+              <div class="title">一氧化碳值状态名称</div>
+              <div class="warning-value">{{ get(posMonitor, 'coValueStateName') }}</div>
+            </div>
+          </div>
+          <div class="top-item">
+            <div class="icon">
+              <SvgIcon class="icon-style" name="coval" style="width: 62px; height: 38px; margin-top: 10px" />
+            </div>
+            <div class="item-container">
+              <div class="title">温度值 </div>
+              <div class="value">{{ get(posMonitor, 'tempValue') }} <span>%</span> </div>
+            </div>
+          </div>
+          <div class="top-item warning-box">
+            <div class="icon">
+              <SvgIcon class="icon-style" size="42" name="link" style="margin-top: 5px" />
+            </div>
+            <div class="item-container">
+              <div class="title">温度值状态名称</div>
+              <div class="warning-value">{{ get(posMonitor, 'tempValueStateName') }}</div>
+            </div>
+          </div>
+          <div class="top-item">
+            <div class="icon">
+              <SvgIcon class="icon-style" name="coval" style="width: 62px; height: 38px; margin-top: 10px" />
+            </div>
+            <div class="item-container">
+              <div class="title">设备电量值</div>
+              <div class="value">{{ get(posMonitor, 'quantity') }} <span>%</span> </div>
+            </div>
+          </div>
+          <div class="top-item warning-box">
+            <div class="icon">
+              <SvgIcon class="icon-style" size="42" name="link" style="margin-top: 5px" />
+            </div>
+            <div class="item-container">
+              <div class="title">设备电量状态名称</div>
+              <div class="warning-value">{{ get(posMonitor, 'quantityValueStateName') }}</div>
             </div>
           </div>
         </div>
@@ -105,6 +140,7 @@
   import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
   import { chartsColumnList } from '../device.data';
   import { listdays, getHistoryData } from '../device.api';
+  import { isNil } from 'lodash-es';
 
   export default defineComponent({
     components: { BasicModal, BarAndLine, SvgIcon },
@@ -228,6 +264,10 @@
         }
       }
 
+      function get(object, path) {
+        return isNil(object[path]) ? '-' : object[path];
+      }
+
       watch(
         [() => props.dataSource, () => props.activeID],
         ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
@@ -265,6 +305,7 @@
         posList,
         chartsColumns,
         xAxisPropType,
+        get,
       };
     },
   });