zc

src/views/components/components/alarmComponent.vue

@@ -12,7 +12,7 @@
               <div class="colorType" :class="alarmData.status==1?'idle-color':(alarmData.status==2?'use-color':(alarmData.status==3?'maintenance-color':''))">
                 <p>{{alarmData.status==1?'空闲':(alarmData.status==2?'使用':(alarmData.status==3?'维修':''))}}</p>
               </div>
-              <p class="roomName">{{alarmData.roomNumName}}</p>
+              <p class="roomName">{{alarmData.alarmData.buildName?alarmData.alarmData.buildName:''}} {{alarmData.alarmData.floorName?alarmData.alarmData.floorName:''}} {{alarmData.roomNumName}}</p>
             </div>
             <div class="img-box">
               <img src="@/assets/ZDimages/icon_bjsj_tk@1x.png">
@@ -80,6 +80,7 @@
     },
     mounted(){
       this.openAlarm();
+      console.log('alarmData',this.alarmData);
     },
     methods:{
       openAlarm(){

src/views/components/components/titleComponent.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="titleComponent">
     <p class="title-left">{{titleData.name}}</p>
-    <img src="@/assets/ZDimages/icon_jg@1x.png">
+    <!--<img src="@/assets/ZDimages/icon_jg@1x.png">-->
     <p class="title-right">{{titleData.text}}</p>
   </div>
 </template>

src/views/components/facilityUtilizationRate.vue

@@ -27,7 +27,8 @@
       return {
         titleData: {
           name: '设施使用率及状态统计',
-          text: 'Facility utilization rate and status statistics'
+          // text: 'Facility utilization rate and status statistics'
+          text: ''
         },
         data1: {
           name: '温室',

src/views/components/headComponent.vue

@@ -7,7 +7,7 @@
     </div>
     <p class="time-p">{{timeData}}</p>
     <div class="weather-box">
-      <img class="weather-img" src="@/assets/ZDimages/icon_bjsj_tk@1x.png">
+      <img class="weather-img" src="@/assets/ZDimages/icon）dp_dw@1x.png">
       <p class="weather-p-1">{{weatherData.cityName}}</p>
       <svg-icon class="weather-svg" :icon-class="weatherData.iconUrl" v-if="weatherData.iconUrl"/>
       <p class="weather-p-2">{{weatherData.textDay}}</p>

src/views/components/overviewOfFacilityData.vue

@@ -31,7 +31,8 @@
       return {
         titleData:{
           name:'设施数据概览',
-          text:'Overview of facility data',
+          // text:'Overview of facility data',
+          text:'',
         },
         optionsData:[],
         maxNum:0,

src/views/components/personnelEntryRecord.vue

@@ -30,7 +30,8 @@
       return {
         titleData:{
           name:'人员进入记录',
-          text:'Personnel enter the record',
+          // text:'Personnel enter the record',
+          text:'',
         },
         todayTotal:'',
         totalNumber:'',

src/views/components/scientificResearchProject.vue

@@ -26,7 +26,8 @@
       return {
         titleData: {
           name: '科研项目情况概览',
-          text: 'Overview of scientific research projects'
+          // text: 'Overview of scientific research projects'
+          text: ''
         },
         eChartsData1: null,
         eChartsData2: null,

src/views/components/videoSurveillance.vue

@@ -28,7 +28,8 @@
       return {
         titleData:{
           name:'实时视频监控',
-          text:'Real-time video surveillance',
+          // text:'Real-time video surveillance',
+          text:'',
         },
         videoTimer:null,
         videoSwitchTime:30000,