update

src/views/bigScreen/home/components/SensorStatus.vue

@@ -1,8 +1,11 @@
 <template>
   <div class="item">
     <div class="title">
-      <span class="name">传感器状况<span class="number" style="padding-left:10px;">{{ total }}</span></span>
-      <span class="detail" @click="linkTo">详情>></span>
+      <span class="name">
+        <span>传感器状况</span>
+        <!-- <span class="number" style="padding-left:10px;">{{ total }}</span> -->
+      </span>
+      <!-- <span class="detail" @click="linkTo">详情>></span> -->
     </div>
     <div class="container">
       <div v-if="status" id="sensor-status-chart" />
@@ -160,7 +163,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .container{
-    height: 15vh !important;
+    height: 20vh !important;
     // min-height: 164px;
     #sensor-status-chart{
         width: 95%;

src/views/bigScreen/home/components/SensorWarningInfo.vue

@@ -4,7 +4,7 @@
       <span class="name">报警记录</span>
       <span class="number">{{ total }}</span>
     </div>
-    <div class="container">
+    <div class="container" :style="height?'height:'+height:''">
       <vueSeamlessScroll ref="seamlessScroll" :data="items" :class-option="defaultOption">
         <table>
           <tr class="report-title">
@@ -32,6 +32,12 @@ export default {
   components: {
     vueSeamlessScroll
   },
+  props: {
+    height: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       defaultOption: {

src/views/bigScreen/home/index.vue

@@ -10,8 +10,8 @@
     </div>
     <div class="side-right">
       <sensor-status ref="sensor-status" />
-      <sensor-warning-statistics ref="sensor-warning-statistics" />
-      <sensor-warning-info ref="sensor-warning-info" />
+      <!-- <sensor-warning-statistics ref="sensor-warning-statistics" /> -->
+      <sensor-warning-info ref="sensor-warning-info" height="60vh !important" />
     </div>
   </div>
 </template>
@@ -23,7 +23,7 @@ import { parseTime } from '@/utils'
 import { goafhdangerstatis } from '@/api/goaf/dangerApi'
 import {
   SensorStatus,
-  SensorWarningStatistics,
+  // SensorWarningStatistics,
   SensorWarningInfo,
   Map,
   SensorStatusCircle,
@@ -34,7 +34,7 @@ export default {
   name: 'Home',
   components: {
     SensorStatus,
-    SensorWarningStatistics,
+    // SensorWarningStatistics,
     SensorWarningInfo,
     Map,
     SensorStatusCircle,

src/views/iiot/equipment/components/DeviceModel.vue

@@ -161,8 +161,8 @@ export default {
       const sensorCat = this.sensorCats.filter(
         (item) => item.sensorTypeId === this.formData.goafDevTypeId
       )[0]
-      this.formData.goafDevTypename = sensorCat.sensorTypeName
-      this.formData.ocId = sensorCat.ocId
+      this.formData.goafDevTypename = sensorCat?.sensorTypeName
+      if (sensorCat) this.formData.ocId = sensorCat?.ocId
       this.$refs[formName].validate((valid) => {
         if (valid) {
           switch (this.actionType) {

src/views/iiot/sensor/components/DeviceModel.vue

@@ -229,8 +229,8 @@ export default {
       const sensorCat = this.sensorCats.filter(
         (item) => item.sensorTypeId === this.formData.goafDevTypeId
       )[0]
-      this.formData.goafDevTypename = sensorCat.sensorTypeName
-      this.formData.ocId = sensorCat.ocId
+      this.formData.goafDevTypename = sensorCat?.sensorTypeName
+      if (sensorCat) this.formData.ocId = sensorCat?.ocId
       this.$refs[formName].validate((valid) => {
         if (valid) {
           switch (this.actionType) {