dedsudiyu 6 hónapja
szülő
commit
5356c7d4d8

+ 7 - 2
src/views/components/headComponent.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="headComponent">
     <img class="logo-img" src="@/assets/ZDimages/logo.png">
-    <p class="title-p">西北农林科技大学科研温室{{title}}</p>
+    <p class="title-p">西北农林科技大学科研温室{{headData.name}}环境感知监测中心</p>
     <p class="time-p">{{timeData}}</p>
   </div>
 </template>
@@ -12,9 +12,14 @@
   } from "@/api/index";
   export default {
     name: 'headComponent',
+    props: {
+      headData: {
+        name:'',
+      }
+    },
     data () {
       return {
-        title:'1区环境感知监测中心',
+        title:'',
         dateData:'',
         weekData:'',
         timeData:'',

+ 1 - 0
src/views/components/mapComponent.vue

@@ -110,6 +110,7 @@
           codeData[item.split('=')[0]] = item.split('=')[1]
         })
         let list = getFloorMap(codeData.floorId)
+        this.$parent.setMapName(list.floorName);
         this.dashboardsResearchUsage(list,type);
       },
       //供父类调用-房间详情展示

+ 84 - 71
src/views/home.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="home" v-if="showPage">
-    <headComponent></headComponent>
+    <headComponent :headData="headData"></headComponent>
     <div class="home-page" v-show="pageType == 1">
       <div class="top-max-big-box">
         <videoComponent ref="videoComponent"></videoComponent>
@@ -13,17 +13,17 @@
       </div>
     </div>
     <mediaAnnouncementComponent v-if="pageType == 2"
-      :mediaAnnouncementComponentData="mediaAnnouncementComponentData"
-      ref="mediaAnnouncementComponent">
+                                :mediaAnnouncementComponentData="mediaAnnouncementComponentData"
+                                ref="mediaAnnouncementComponent">
     </mediaAnnouncementComponent>
   </div>
 </template>
 <script>
-  import { login } from "@/api/login";
-  import { loginYiLi } from "@/api/yiLi";
-  import { getConfigByType  } from "@/api/index";
-  import { setToken,setTokenYiLi } from '@/utils/auth'
-  import { Encrypt,Decrypt} from '@/utils/secret'
+  import { login } from '@/api/login'
+  import { loginYiLi } from '@/api/yiLi'
+  import { getConfigByType } from '@/api/index'
+  import { setToken, setTokenYiLi } from '@/utils/auth'
+  import { Encrypt, Decrypt } from '@/utils/secret'
   //首页组件
   import headComponent from './components/headComponent.vue'
   import videoComponent from './components/videoComponent.vue'
@@ -33,6 +33,7 @@
   import subComponent from './components/subComponent.vue'
   //通知公告
   import mediaAnnouncementComponent from './components/mediaAnnouncementComponent.vue'
+
   export default {
     name: 'home',
     components: {
@@ -42,108 +43,120 @@
       usageRateComponent,
       mapComponent,
       subComponent,
-      mediaAnnouncementComponent,
+      mediaAnnouncementComponent
     },
-    data () {
+    data() {
       return {
         //页面开关
-        showPage:false,
+        showPage: false,
         //展示状态
-        pageType:1,
-        mediaAnnouncementComponentData:null,
+        pageType: 1,
+        headData: {
+          name: ''
+        },
+        mediaAnnouncementComponentData: null
       }
     },
-    created(){
+    created() {
 
     },
-    mounted(){
-      this.login();
-      this.getToken();
+    mounted() {
+      this.login()
     },
-    methods:{
-      login(){
+    methods: {
+      login() {
+        let self = this
         Promise.all([
           this.getToken(),
-          this.getTokenYiLi(),
-          this.getExploitConfig()
-        ]).then((result)=>{
-          this.$set(this,'showPage',true);
-        }).catch((error) => {})
+          this.getTokenYiLi()
+        ]).then((result) => {
+            setTimeout(function() {
+              self.getExploitConfig()
+            },500)
+        }).catch((error) => {
+        })
       },
       //获取token
-      getToken(){
+      getToken() {
         login().then(res1 => {
           setToken(res1.data.token)
-        });
+        })
       },
       //获取YiLi-token
-      getTokenYiLi(){
+      getTokenYiLi() {
         loginYiLi().then(res2 => {
-          setTokenYiLi(res2.access_token);
-        });
+          setTokenYiLi(res2.access_token)
+        })
       },
       //获取开发配置
-      getExploitConfig(){
+      getExploitConfig() {
         getConfigByType({ category: 2, configType: 5 }).then(response => {
           let obj = JSON.parse(response.data.configValue)
           //判定http或者https
-          let urlText = window.location.href.split('://')[0]+'://';
+          let urlText = window.location.href.split('://')[0] + '://'
           let outerNet = window.location.href.indexOf(obj.ipIdentify) == -1//true外网 false 内网
-          if(outerNet){//外网
+          if (outerNet) {//外网
             //MQTT地址
-            localStorage.setItem('mqttUrl','wss://'+Decrypt(obj.mqttExtranetUrl))
+            localStorage.setItem('mqttUrl', 'wss://' + Decrypt(obj.mqttExtranetUrl))
             //MQTT账号
-            localStorage.setItem('mqttUser',Decrypt(obj.mqttExtranetUser))
+            localStorage.setItem('mqttUser', Decrypt(obj.mqttExtranetUser))
             //MQTT密码
-            localStorage.setItem('mqttPassword',Decrypt(obj.mqttExtranetPassword))
+            localStorage.setItem('mqttPassword', Decrypt(obj.mqttExtranetPassword))
             //文件浏览环境
-            localStorage.setItem('fileBrowseEnvironment',window.location.href.split('://')[0]+'://'+Decrypt(obj.fileBrowseEnvironmentExtranet))
-          }else{
+            localStorage.setItem('fileBrowseEnvironment', window.location.href.split('://')[0] + '://' + Decrypt(obj.fileBrowseEnvironmentExtranet))
+          } else {
             //MQTT地址
-            localStorage.setItem('mqttUrl','ws://'+Decrypt(obj.mqttIntranetUrl))
+            localStorage.setItem('mqttUrl', 'ws://' + Decrypt(obj.mqttIntranetUrl))
             //MQTT账号
-            localStorage.setItem('mqttUser',Decrypt(obj.mqttIntranetUser))
+            localStorage.setItem('mqttUser', Decrypt(obj.mqttIntranetUser))
             //MQTT密码
-            localStorage.setItem('mqttPassword',Decrypt(obj.mqttIntranetPassword))
+            localStorage.setItem('mqttPassword', Decrypt(obj.mqttIntranetPassword))
             //文件浏览环境
-            localStorage.setItem('fileBrowseEnvironment',window.location.href.split('://')[0]+'://'+Decrypt(obj.fileBrowseEnvironment))
+            localStorage.setItem('fileBrowseEnvironment', window.location.href.split('://')[0] + '://' + Decrypt(obj.fileBrowseEnvironment))
           }
-        });
+          this.$set(this, 'showPage', true)
+        })
       },
       //通知组件数据给予
-      setNoticeData(item,type){
-        let self = this;
-        if(type == 1){
-          this.$set(this,'pageType',1);
-        }if(type == 2){
-          this.$set(this,'mediaAnnouncementComponentData',item);
+      setNoticeData(item, type) {
+        let self = this
+        if (type == 1) {
+          this.$set(this, 'pageType', 1)
+        }
+        if (type == 2) {
+          this.$set(this, 'mediaAnnouncementComponentData', item)
           setTimeout(function() {
             //获取报警信息
-            self.$set(self,'pageType',2);
-          },500)
-        }if(type == 3){
-          this.$set(this,'pageType',2);
+            self.$set(self, 'pageType', 2)
+          }, 500)
+        }
+        if (type == 3) {
+          this.$set(this, 'pageType', 2)
         }
       },
+      //head数据MAP名称给予
+      setMapName(name) {
+        this.$set(this.headData, 'name', name)
+      },
       //房间组件数据给予
-      setRoomData(item){
-        this.$refs.subComponent.getSubData(item);
+      setRoomData(item) {
+        this.$refs.subComponent.getSubData(item)
       },
       //视频组件数据给予
-      setVideoData(item){
-        this.$refs.videoComponent.initialize(item);
+      setVideoData(item) {
+        this.$refs.videoComponent.initialize(item)
       },
       //实验室详情开启
-      setSubInfoType(){
-        this.$refs.mapComponent.subInfoTypeFunction();
+      setSubInfoType() {
+        this.$refs.mapComponent.subInfoTypeFunction()
       },
       // 关闭map组件报警
-      setOffAlarm(){
-        this.$refs.mapComponent.offAlarm();
-      },
-      setOffSubAlarm(){
-        this.$refs.subComponent.setOffAlarm();
+      setOffAlarm() {
+        this.$refs.mapComponent.offAlarm()
       },
+      setOffSubAlarm() {
+        this.$refs.subComponent.setOffAlarm()
+      }
     },
     beforeDestroy() {
 
@@ -154,18 +167,18 @@
   }
 </script>
 <style scoped lang="scss">
-  .home{
-    height:100%;
+  .home {
+    height: 100%;
     background: no-repeat;
     background-color: #002055;
-    .home-page{
-      height:100%;
-      .top-max-big-box{
-        height:543px;
+    .home-page {
+      height: 100%;
+      .top-max-big-box {
+        height: 543px;
         display: flex;
       }
-      .bottom-max-big-box{
-        height:467px;
+      .bottom-max-big-box {
+        height: 467px;
         display: flex;
       }
     }