zc

src/views/cengterMaxBox/canvasMap/index.vue

@@ -22,7 +22,8 @@
         renderer: null,
         controls: null,
         labelRenderer:null,
-        initialCameraPosition: new THREE.Vector3(0.265357272970017,1.0753467424793826,0.29965000584249346),//旋转-距离-俯角
+        // initialCameraPosition: new THREE.Vector3(0.265357272970017,1.0753467424793826,0.29965000584249346),//旋转-距离-俯角
+        initialCameraPosition: new THREE.Vector3(0.5,0.60,0.5),//旋转-距离-俯角
         /*
         {"x":0.2509298883560245,"y":1.2088432847403026,"z":0.19985043873282318}
         {"x":0.265357272970017,"y":1.0753467424793826,"z":0.29965000584249346}
@@ -30,7 +31,7 @@
         initialControlsTarget: new THREE.Vector3(0, 0, 0),
         /*本地管理数据*/
         modelBuildingList:[
-          {school:'B',	name:'5号楼',	buildId:'101093843117592833',centerValue:'101093843117592833',valueList:['101093843117592833'],alarmType:false,},
+          {school:'B',	name:'5号楼',	buildId:'101093843117592833',centerValue:'',valueList:[],alarmType:false,},
           {school:'B',	name:'6B教学楼',	buildId:'101093843117592815',centerValue:'',valueList:[],alarmType:false,},
           {school:'B',	name:'中心实验楼',	buildId:'101093843117592829',centerValue:'',valueList:[],alarmType:false,},
           {school:'B',	name:'信息工程学院教学楼',	buildId:'101093843117592812',centerValue:'101093843117592812',valueList:['101093843117592812'],alarmType:false,},
@@ -46,7 +47,7 @@
           {school:'B',	name:'北2号教学楼',	buildId:'101093843117592813',centerValue:'101093843117592813',valueList:['101093843117592813'],alarmType:false,},
           {school:'B',	name:'北3号教学楼',	buildId:'101093843117592782',centerValue:'101093843117592782',valueList:['101093843117592782'],alarmType:false,},
           {school:'B',	name:'北4号教学楼',	buildId:'101093843117592781',centerValue:'101093843117592781',valueList:['101093843117592781'],alarmType:false,},
-          {school:'B',	name:'北5号教学楼',	buildId:'101093843117592783',centerValue:'',valueList:[],alarmType:false,},
+          {school:'B',	name:'北5号教学楼',	buildId:'101093843117592783',centerValue:'101093843117592833',valueList:['101093843117592833'],alarmType:false,},
           {school:'B',	name:'北6号教学楼',	buildId:'101093843117592814',centerValue:'101093843117592814',valueList:['101093843117592814'],alarmType:false,},
           {school:'B',	name:'北7号教学楼',	buildId:'101093843117592816',centerValue:'101093843117592816',valueList:['101093843117592816'],alarmType:false,},
           {school:'B',	name:'危化品服务中心',	buildId:'101093843117592826',centerValue:'101093843117592826-03',valueList:['101093843117592826-01','101093843117592826-02','101093843117592826-03','101093843117592826-04','101093843117592826-05'],alarmType:false,},
@@ -112,14 +113,10 @@
         // alarmUrl:'/png/alarm.png',
         // noAlarmUrl:'/png/noAlarm.png',
         // 部署
-        // modelsUrlN:'/v3/largeScreen/models/xiaoQuN.glb',
-        // modelsUrlB:'/v3/largeScreen/models/xiaoQuB.glb',
-        // alarmUrl:'/v3/largeScreen/png/alarm.png',
-        // noAlarmUrl:'/v3/largeScreen/png/noAlarm.png',
-        modelsUrlN:this.judgmentNetworkReturnAddress()?'/models/xiaoQuN.glb':'/v3/largeScreen/models/xiaoQuN.glb',
-        modelsUrlB:this.judgmentNetworkReturnAddress()?'/models/xiaoQuB.glb':'/v3/largeScreen/models/xiaoQuB.glb',
-        alarmUrl:this.judgmentNetworkReturnAddress()?'/png/alarm.png':'/v3/largeScreen/png/alarm.png',
-        noAlarmUrl:this.judgmentNetworkReturnAddress()?'/png/noAlarm.png':'/v3/largeScreen/png/noAlarm.png',
+        modelsUrlN:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/models/xiaoQuN.glb':'/labAppTest/largeScreen/models/xiaoQuN.glb',
+        modelsUrlB:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/models/xiaoQuB.glb':'/labAppTest/largeScreen/models/xiaoQuB.glb',
+        alarmUrl:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/png/alarm.png':'/labAppTest/largeScreen/png/alarm.png',
+        noAlarmUrl:this.judgmentNetworkReturnAddress()?'/v3/largeScreen/png/noAlarm.png':'/labAppTest/largeScreen/png/noAlarm.png',
         //当前校区状态
         schoolType:'',
       };
@@ -142,7 +139,7 @@
         // 初始化场景
         this.scene = new THREE.Scene();
         //场景背景色
-        this.scene.background = new THREE.Color(0x101F38);
+        this.scene.background = new THREE.Color(0x020716);
         // 初始化渲染器
         this.renderer = new THREE.WebGLRenderer({ antialias: true });
         // 主渲染器尺寸设置
@@ -177,8 +174,9 @@
         // 添加灯光
         const ambientLight = new THREE.AmbientLight(0xffffff, 0.5);
         this.scene.add(ambientLight);
+
         const directionalLight = new THREE.DirectionalLight(0xffffff, 0.8);
-        directionalLight.position.set(0, 5, 5);
+        directionalLight.position.set(-1.5, 2, -1.5);
         this.scene.add(directionalLight);
 
         // 启动动画循环

src/views/cengterMaxBox/comprehensiveData/index.vue

@@ -69,6 +69,8 @@
           textAlign: configData.textAlign,
           style: configData.style
         },
+        // 定时器
+        echartsTimer:null,
 
       }
     },
@@ -77,6 +79,7 @@
     },
     mounted() {
       this.getList();
+      this.timeFunction();
     },
     methods: {
       getList(){
@@ -106,7 +109,23 @@
             style: configData.style
           })
         })
-      }
+      },
+      //时间定时器
+      timeFunction(){
+        let self = this;
+        this.echartsTimer = window.setInterval(showTime, 180000);
+        function showTime() {
+          self.getList();
+        }
+      },
+    },
+    beforeDestroy() {
+      //清除定时器
+      window.clearInterval(this.echartsTimer);
+    },
+    destroyed() {
+      //清除定时器
+      window.clearInterval(this.echartsTimer);
     }
   }
 </script>

src/views/demo6.vue

@@ -238,7 +238,7 @@
       //模型加载
       loadModel() {
         const loader = new GLTFLoader();
-        loader.load('/models/xiaoQuN.glb', (gltf) => {
+        loader.load('/models/xiaoQuB.glb', (gltf) => {
           const model = gltf.scene;
           this.scene.add(model);
 

src/views/home.vue

@@ -200,81 +200,81 @@
         alarmPropsData:{},
         //校区模型关系
         schoolModelList:[
-          {school:'B',	name:'5号楼',	buildId:'101093843117592833',},
-          {school:'B',	name:'6B教学楼',	buildId:'101093843117592815',},
-          {school:'B',	name:'中心实验楼',	buildId:'101093843117592829',},
-          {school:'B',	name:'信息工程学院教学楼',	buildId:'101093843117592812',},
-          {school:'B',	name:'养虫楼',	buildId:'101093843117592805',},
-          {school:'B',	name:'农业机械实验室平房',	buildId:'101093843117592807',},
-          {school:'B',	name:'农药研究所',	buildId:'101093843117592804',},
-          {school:'B',	name:'动物中心B座',	buildId:'101093843117592785',},
-          {school:'B',	name:'动物中心实验楼A',	buildId:'101093843117592765',},
-          {school:'B',	name:'动物中心实验楼B',	buildId:'101093843117592764',},
-          {school:'B',	name:'动物科技学院楼',	buildId:'101093843117592831',},
-          {school:'B',	name:'动科楼',	buildId:'101093843117592832',},
-          {school:'B',	name:'北1号教学楼',	buildId:'101093843117592802',},
-          {school:'B',	name:'北2号教学楼',	buildId:'101093843117592813',},
-          {school:'B',	name:'北3号教学楼',	buildId:'101093843117592782',},
-          {school:'B',	name:'北4号教学楼',	buildId:'101093843117592781',},
-          {school:'B',	name:'北5号教学楼',	buildId:'101093843117592783',},
-          {school:'B',	name:'北6号教学楼',	buildId:'101093843117592814',},
-          {school:'B',	name:'北7号教学楼',	buildId:'101093843117592816',},
-          {school:'B',	name:'危化品服务中心',	buildId:'101093843117592826',},
-          {school:'B',	name:'原农一站办公楼',	buildId:'101093843117592811',},
-          {school:'B',	name:'工程训练中心楼',	buildId:'101093843117592808',},
-          {school:'B',	name:'教学办公楼',	buildId:'101093843117592806',},
-          {school:'B',	name:'未知实验室	',buildId:'1855791848753147906',},
-          {school:'B',	name:'机械及液压实验室平房',	buildId:'101093843117592810',},
-          {school:'B',	name:'机电锻铸车间',	buildId:'101093843117592809',},
-          {school:'B',	name:'水利与建筑工程学院',	buildId:'101093843117592788',},
-          {school:'B',	name:'水利与建筑工程学院A',	buildId:'101093843117592766',},
-          {school:'B',	name:'水利与建筑工程学院B',	buildId:'101093843117592768',},
-          {school:'B',	name:'水利与建筑工程学院C',	buildId:'101093843117592769',},
-          {school:'B',	name:'水利与建筑工程学院D',	buildId:'101093843117592767',},
-          {school:'B',	name:'水工厅', buildId:'1871736666456633346',},
-          {school:'B',	name:'水工水力学实验大厅', buildId:'1871729400227606529',},
-          {school:'B',	name:'理科综合实验楼A',	buildId:'101093843117592774',},
-          {school:'B',	name:'理科综合实验楼B',	buildId:'101093843117592779',},
-          {school:'B',	name:'理科综合实验楼C',	buildId:'101093843117592775',},
-          {school:'B',	name:'理科综合实验楼D',	buildId:'101093843117592776',},
-          {school:'B',	name:'理科综合实验楼E',	buildId:'101093843117592780',},
-          {school:'B',	name:'老昆虫博物馆',	buildId:'101093843117592786',},
-          {school:'B',	name:'食品楼',	buildId:'101093843117592789',},
-          {school:'B',	name:'食品楼A',	buildId:'101093843117592771',},
-          {school:'B',	name:'食品楼B',	buildId:'101093843117592770',},
-          {school:'B',	name:'食品楼C',	buildId:'101093843117592772',},
-          {school:'B',	name:'食品楼D',	buildId:'101093843117592773',},
-          {school:'N',	name:'农科楼(农学院)',	buildId:'101084081109864872',},
-          {school:'N',	name:'农科楼(园艺学院)',	buildId:'101084081109864874',},
-          {school:'N',	name:'农科楼(植物保护学院)',	buildId:'101084081109864873',},
-          {school:'N',	name:'农科楼(资源环境学院)',	buildId:'101093843117592803',},
-          {school:'N',	name:'农科院子校教学楼（初中）',	buildId:'101093843117592823',},
-          {school:'N',	name:'南2号教学楼',	buildId:'101093843117592817',},
-          {school:'N',	name:'南3号教学楼',	buildId:'101093843117592820',},
-          {school:'N',	name:'南校子校楼',	buildId:'101093843117592800',},
-          {school:'N',	name:'南校水保楼',	buildId:'101093843117592801',},
-          {school:'N',	name:'家畜生物学重点实验室楼',	buildId:'101093843117592787',},
-          {school:'N',	name:'木艺坊',	buildId:'101093843117592819',},
-          {school:'N',	name:'林学院实验楼',	buildId:'101093843117592818',},
-          {school:'N',	name:'科研主楼',	buildId:'101093843117592784',},
-          {school:'N',	name:'科研楼',	buildId:'101093843117592822',},
-          {school:'N',	name:'经管园林楼（文科楼）A',	buildId:'101093843117592777',},
-          {school:'N',	name:'经管园林楼（文科楼）C',	buildId:'101093843117592778',},
-          {school:'N',	name:'草业与草原楼',	buildId:'101093843117592825',},
-          {school:'N',	name:'进学院实验楼',	buildId:'101093843117592821',},
-          {school:'旱研院校区',	name:'农一站科研楼',	buildId:'101093843117592827',},
-          {school:'旱研院校区',	name:'农机一站平房',	buildId:'101093843117592828',},
-          {school:'校外',	name:'农三站科研办公楼',	buildId:'101093843117592790',},
-          {school:'校外',	name:'器材楼',	buildId:'101093843117592792',},
-          {school:'水保所校区',	name:'人工降雨实验大厅',	buildId:'101093843117592793',},
-          {school:'水保所校区',	name:'南校区农科楼',	buildId:'101093843117592799',},
-          {school:'水保所校区',	name:'国家重点实验室西楼',	buildId:'101093843117592798',},
-          {school:'水保所校区',	name:'水保所人工干旱环境气候室工程',	buildId:'101093843117592795',},
-          {school:'水保所校区',	name:'水保所国家重点实验室楼',	buildId:'101093843117592794',},
-          {school:'水保所校区',	name:'水保所科研大楼',	buildId:'101093843117592797',},
-          {school:'水保所校区',	name:'水保所西区科研楼',	buildId:'101093843117592796',},
-          {school:'老附中校区',	name:'附中实验楼',	buildId:'101093843117592830',},
-          {school:'老附中校区',	name:'附中教学楼',	buildId:'101093843117592791',},
+          // {school:'B',	name:'5号楼',	buildId:'101093843117592833',buildIdList:[],},
+          {school:'B',	name:'6B教学楼',	buildId:'101093843117592815',buildIdList:[],},
+          {school:'B',	name:'中心实验楼',	buildId:'101093843117592829',buildIdList:[],},
+          {school:'B',	name:'信息工程学院教学楼',	buildId:'101093843117592812',buildIdList:[],},
+          {school:'B',	name:'养虫楼',	buildId:'101093843117592805',buildIdList:[],},
+          {school:'B',	name:'农业机械实验室平房',	buildId:'101093843117592807',buildIdList:[],},
+          {school:'B',	name:'农药研究所',	buildId:'101093843117592804',buildIdList:[],},
+          {school:'B',	name:'动物中心B座',	buildId:'101093843117592785',buildIdList:[],},
+          {school:'B',	name:'动物中心实验楼A',	buildId:'101093843117592765',buildIdList:[],},
+          {school:'B',	name:'动物中心实验楼B',	buildId:'101093843117592764',buildIdList:[],},
+          {school:'B',	name:'动物科技学院楼',	buildId:'101093843117592831',buildIdList:[],},
+          {school:'B',	name:'动科楼',	buildId:'101093843117592832',buildIdList:[],},
+          {school:'B',	name:'北1号教学楼',	buildId:'101093843117592802',buildIdList:[],},
+          {school:'B',	name:'北2号教学楼',	buildId:'101093843117592813',buildIdList:[],},
+          {school:'B',	name:'北3号教学楼',	buildId:'101093843117592782',buildIdList:[],},
+          {school:'B',	name:'北4号教学楼',	buildId:'101093843117592781',buildIdList:[],},
+          {school:'B',	name:'北5号教学楼',	buildId:'101093843117592783',buildIdList:['101093843117592783','101093843117592833'],},
+          {school:'B',	name:'北6号教学楼',	buildId:'101093843117592814',buildIdList:[],},
+          {school:'B',	name:'北7号教学楼',	buildId:'101093843117592816',buildIdList:[],},
+          {school:'B',	name:'危化品服务中心',	buildId:'101093843117592826',buildIdList:[],},
+          // {school:'B',	name:'原农一站办公楼',	buildId:'101093843117592811',buildIdList:[],},
+          // {school:'B',	name:'工程训练中心楼',	buildId:'101093843117592808',buildIdList:[],},
+          // {school:'B',	name:'教学办公楼',	buildId:'101093843117592806',buildIdList:[],},
+          // {school:'B',	name:'未知实验室	',buildId:'1855791848753147906',buildIdList:[],},
+          // {school:'B',	name:'机械及液压实验室平房',	buildId:'101093843117592810',buildIdList:[],},
+          {school:'B',	name:'机电锻铸车间',	buildId:'101093843117592809',buildIdList:['101093843117592809','101093843117592811','101093843117592808','101093843117592806','1855791848753147906','101093843117592810'],},
+          // {school:'B',	name:'水利与建筑工程学院',	buildId:'101093843117592788',buildIdList:[],},
+          // {school:'B',	name:'水利与建筑工程学院A',	buildId:'101093843117592766',buildIdList:[],},
+          // {school:'B',	name:'水利与建筑工程学院B',	buildId:'101093843117592768',buildIdList:[],},
+          // {school:'B',	name:'水利与建筑工程学院C',	buildId:'101093843117592769',buildIdList:[],},
+          // {school:'B',	name:'水利与建筑工程学院D',	buildId:'101093843117592767',buildIdList:[],},
+          {school:'B',	name:'水工厅', buildId:'1871736666456633346',buildIdList:['1871736666456633346','101093843117592788','101093843117592766','101093843117592768','101093843117592769','101093843117592767'],},
+          {school:'B',	name:'水工水力学实验大厅', buildId:'1871729400227606529',buildIdList:[],},
+          {school:'B',	name:'理科综合实验楼A',	buildId:'101093843117592774',buildIdList:['101093843117592774','101093843117592779','101093843117592775','101093843117592776','101093843117592780'],},
+          // {school:'B',	name:'理科综合实验楼B',	buildId:'101093843117592779',buildIdList:[],},
+          // {school:'B',	name:'理科综合实验楼C',	buildId:'101093843117592775',buildIdList:[],},
+          // {school:'B',	name:'理科综合实验楼D',	buildId:'101093843117592776',buildIdList:[],},
+          // {school:'B',	name:'理科综合实验楼E',	buildId:'101093843117592780',buildIdList:[],},
+          {school:'B',	name:'老昆虫博物馆',	buildId:'101093843117592786',buildIdList:[],},
+          {school:'B',	name:'食品楼',	buildId:'101093843117592789',buildIdList:['101093843117592789','101093843117592771','101093843117592770','101093843117592772','101093843117592773'],},
+          // {school:'B',	name:'食品楼A',	buildId:'101093843117592771',buildIdList:[],},
+          // {school:'B',	name:'食品楼B',	buildId:'101093843117592770',buildIdList:[],},
+          // {school:'B',	name:'食品楼C',	buildId:'101093843117592772',buildIdList:[],},
+          // {school:'B',	name:'食品楼D',	buildId:'101093843117592773',buildIdList:[],},
+          {school:'N',	name:'农科楼(农学院)',	buildId:'101084081109864872',buildIdList:['101084081109864872','101084081109864874','101084081109864873','101093843117592803'],},
+          // {school:'N',	name:'农科楼(园艺学院)',	buildId:'101084081109864874',buildIdList:[],},
+          // {school:'N',	name:'农科楼(植物保护学院)',	buildId:'101084081109864873',buildIdList:[],},
+          // {school:'N',	name:'农科楼(资源环境学院)',	buildId:'101093843117592803',buildIdList:[],},
+          {school:'N',	name:'农科院子校教学楼（初中）',	buildId:'101093843117592823',buildIdList:[],},
+          {school:'N',	name:'南2号教学楼',	buildId:'101093843117592817',buildIdList:[],},
+          {school:'N',	name:'南3号教学楼',	buildId:'101093843117592820',buildIdList:[],},
+          {school:'N',	name:'南校子校楼',	buildId:'101093843117592800',buildIdList:[],},
+          {school:'N',	name:'南校水保楼',	buildId:'101093843117592801',buildIdList:[],},
+          {school:'N',	name:'家畜生物学重点实验室楼',	buildId:'101093843117592787',buildIdList:[],},
+          {school:'N',	name:'木艺坊',	buildId:'101093843117592819',buildIdList:[],},
+          {school:'N',	name:'林学院实验楼',	buildId:'101093843117592818',buildIdList:[],},
+          {school:'N',	name:'科研主楼',	buildId:'101093843117592784',buildIdList:[],},
+          {school:'N',	name:'科研楼',	buildId:'101093843117592822',buildIdList:[],},
+          {school:'N',	name:'经管园林楼（文科楼）A',	buildId:'101093843117592777',buildIdList:[],},
+          {school:'N',	name:'经管园林楼（文科楼）C',	buildId:'101093843117592778',buildIdList:[],},
+          {school:'N',	name:'草业与草原楼',	buildId:'101093843117592825',buildIdList:[],},
+          {school:'N',	name:'进学院实验楼',	buildId:'101093843117592821',buildIdList:[],},
+          {school:'旱研院校区',	name:'农一站科研楼',	buildId:'101093843117592827',buildIdList:[],},
+          {school:'旱研院校区',	name:'农机一站平房',	buildId:'101093843117592828',buildIdList:[],},
+          {school:'校外',	name:'农三站科研办公楼',	buildId:'101093843117592790',buildIdList:[],},
+          {school:'校外',	name:'器材楼',	buildId:'101093843117592792',buildIdList:[],},
+          {school:'水保所校区',	name:'人工降雨实验大厅',	buildId:'101093843117592793',buildIdList:[],},
+          {school:'水保所校区',	name:'南校区农科楼',	buildId:'101093843117592799',buildIdList:[],},
+          {school:'水保所校区',	name:'国家重点实验室西楼',	buildId:'101093843117592798',buildIdList:[],},
+          {school:'水保所校区',	name:'水保所人工干旱环境气候室工程',	buildId:'101093843117592795',buildIdList:[],},
+          {school:'水保所校区',	name:'水保所国家重点实验室楼',	buildId:'101093843117592794',buildIdList:[],},
+          {school:'水保所校区',	name:'水保所科研大楼',	buildId:'101093843117592797',buildIdList:[],},
+          {school:'水保所校区',	name:'水保所西区科研楼',	buildId:'101093843117592796',buildIdList:[],},
+          {school:'老附中校区',	name:'附中实验楼',	buildId:'101093843117592830',buildIdList:[],},
+          {school:'老附中校区',	name:'附中教学楼',	buildId:'101093843117592791',buildIdList:[],},
         ],
         //最新报警文字
         alarmTitle:'',
@@ -508,6 +508,16 @@
               item.alarmText = item.riskPlanName.split('预案');
               item.alarmText = item.alarmText[0].split('预警');
               item.alarmText = item.alarmText[0]+'预警';
+              //修正楼栋ID用于匹配本地数据
+              self.schoolModelList.forEach((minItem)=>{
+                if(minItem.buildIdList[0]){
+                  minItem.buildIdList.forEach((minItemMin)=>{
+                    if(item.buildId == minItemMin){
+                      item.buildId = minItem.buildId;
+                    }
+                  })
+                }
+              })
             })
             //报警提示title信息
             this.$set(this,'alarmTitle',response.data[response.data.length-1].alarmText);
@@ -889,7 +899,7 @@
     position: absolute;
     width:5927px;
     height: 2160px;
-    top:3px;
+    top:300px;
     left:2760px;
     overflow: hidden;
     .map-box{