dedsudiyu 1 ay önce
ebeveyn
işleme
2262ea6d94

BIN
src/assets/ZDimages/img_bg_spjk.png


+ 8 - 8
src/views/cengterMaxBox/canvasMap/index.vue

@@ -108,20 +108,20 @@
           {school:'老附中校区',	name:'附中教学楼',	buildId:'101093843117592791',centerValue:'',valueList:[],alarmType:false,},
         ],
         // 本地
-        // modelsUrlN:'/models/xiaoQuN.glb',
-        // modelsUrlB:'/models/xiaoQuB.glb',
-        // alarmUrl:'/png/alarm.png',
-        // noAlarmUrl:'/png/noAlarm.png',
+        modelsUrlN:'/models/xiaoQuN.glb',
+        modelsUrlB:'/models/xiaoQuB.glb',
+        alarmUrl:'/png/alarm.png',
+        noAlarmUrl:'/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',
         // 线上部署
-        modelsUrlN:'/largeScreen/models/xiaoQuN.glb',
-        modelsUrlB:'/largeScreen/models/xiaoQuB.glb',
-        alarmUrl:'/largeScreen/png/alarm.png',
-        noAlarmUrl:'/largeScreen/png/noAlarm.png',
+        // modelsUrlN:'/largeScreen/models/xiaoQuN.glb',
+        // modelsUrlB:'/largeScreen/models/xiaoQuB.glb',
+        // alarmUrl:'/largeScreen/png/alarm.png',
+        // noAlarmUrl:'/largeScreen/png/noAlarm.png',
         //当前校区状态
         schoolType:'',
       };

+ 78 - 22
src/views/cengterMaxBox/secondaryCollegeUnitLaboratoryStatistics/index.vue

@@ -18,6 +18,11 @@
         echartsBox:null,
         // 定时器
         echartsTimer:null,
+        minTimer:null,
+        //数据
+        dataList:[],
+        numIndex:0,
+        maxNum: 0,
       }
     },
     created () {
@@ -30,30 +35,81 @@
     methods: {
       getList(){
         laboratorySubRelInfoLabStateStatisticsAll().then(response => {
-          let obj = {
-            nameList:[],
-            dataListA : [],
-            dataListB : [],
-            dataListC : [],
-            dataListD : [],
-            dataListE : [],
-          };
-          const maxNum = response.data.labLevelVOList[0].levelOneCount + response.data.labLevelVOList[0].levelTwoCount + response.data.labLevelVOList[0].levelThreeCount + response.data.labLevelVOList[0].levelFourCount
-          response.data.labLevelVOList.forEach((item)=>{
-            let num = item.levelOneCount+item.levelTwoCount+item.levelThreeCount+item.levelFourCount
-            obj.nameList.push(item.deptName)
-            obj.dataListA.push(item.levelOneCount)
-            obj.dataListB.push(item.levelTwoCount)
-            obj.dataListC.push(item.levelThreeCount)
-            obj.dataListD.push(item.levelFourCount)
-            obj.dataListE.push({
-              name:num,
-              value:maxNum-num
-            })
-          })
-          this.eChartsMethod(obj);
+          this.$set(this,'numIndex',0);
+          this.$set(this,'maxNum',response.data.labLevelVOList.length-1);
+          this.$set(this,'dataList',response.data.labLevelVOList);
+          this.minTimeFunction();
+          // let obj = {
+          //   nameList:[],
+          //   dataListA : [],
+          //   dataListB : [],
+          //   dataListC : [],
+          //   dataListD : [],
+          //   dataListE : [],
+          // };
+          // const maxNum = response.data.labLevelVOList[0].levelOneCount + response.data.labLevelVOList[0].levelTwoCount + response.data.labLevelVOList[0].levelThreeCount + response.data.labLevelVOList[0].levelFourCount
+          // response.data.labLevelVOList.forEach((item)=>{
+          //   let num = item.levelOneCount+item.levelTwoCount+item.levelThreeCount+item.levelFourCount
+          //   obj.nameList.push(item.deptName)
+          //   obj.dataListA.push(item.levelOneCount)
+          //   obj.dataListB.push(item.levelTwoCount)
+          //   obj.dataListC.push(item.levelThreeCount)
+          //   obj.dataListD.push(item.levelFourCount)
+          //   obj.dataListE.push({
+          //     name:num,
+          //     value:maxNum-num
+          //   })
+          // })
+          // this.eChartsMethod(obj);
         })
       },
+      minTimeFunction(){
+        let self = this;
+        showTime();
+        if(!this.minTimer){
+          this.minTimer = window.setInterval(showTime, 10000);
+        }
+        function showTime() {
+          if(self.dataList[0]){
+            let newList = [];
+            for(let i=0;i<5;i++){
+              if(self.dataList[self.numIndex]){
+                newList.push(self.dataList[self.numIndex])
+                if(self.numIndex<self.maxNum){
+                  self.numIndex++;
+                }else{
+                  self.numIndex=0;
+                  break
+                }
+              }
+            }
+            let obj = {
+              nameList:[],
+              dataListA : [],
+              dataListB : [],
+              dataListC : [],
+              dataListD : [],
+              dataListE : [],
+            };
+            if(newList[0]){
+              const maxNum = newList[0].levelOneCount + newList[0].levelTwoCount + newList[0].levelThreeCount + newList[0].levelFourCount
+              newList.forEach((item)=>{
+                let num = item.levelOneCount+item.levelTwoCount+item.levelThreeCount+item.levelFourCount
+                obj.nameList.push(item.deptName)
+                obj.dataListA.push(item.levelOneCount)
+                obj.dataListB.push(item.levelTwoCount)
+                obj.dataListC.push(item.levelThreeCount)
+                obj.dataListD.push(item.levelFourCount)
+                obj.dataListE.push({
+                  name:num,
+                  value:maxNum-num
+                })
+              })
+              self.eChartsMethod(obj);
+            }
+          }
+        }
+      },
       eChartsMethod(obj){
         let option = {
           title: {

+ 3 - 3
src/views/cengterMaxBox/statisticalAnalysisOfHazardousChemicals/index.vue

@@ -148,7 +148,7 @@
         let data = []
 
         const color = [
-          '#155AD0',
+          '#00F7FF',
           '#008CFF'
         ]
         payload.data.x.forEach((item, index) => {
@@ -309,7 +309,7 @@
         let data = []
 
         const color = [
-          '#155AD0',
+          '#00F7FF',
           '#008CFF'
         ]
         payload.data.x.forEach((item, index) => {
@@ -524,7 +524,7 @@
             background-color: #008CFF;
           }
           .color2 {
-            background-color: #155AD0;
+            background-color: #00F7FF;
           }
         }
       }

+ 5 - 3
src/views/cengterMaxBox/videoSurveillance/index.vue

@@ -44,7 +44,8 @@
 </script>
 <style scoped lang="scss">
   .videoSurveillance-index{
-    width:5527px;
+    /*width:5527px;*/
+    width:5700px;
     height: 1700px;
     display: flex;
     /*background-color: red;*/
@@ -52,10 +53,11 @@
       width:845px;
       /*background-color: #2f54eb;*/
       overflow: hidden;
-      margin-left:30px;
+      /*margin-left:30px;*/
     }
     .center-max-big-box{
-      width:3102px;
+      /*width:3102px;*/
+      width:3240px;
       /*background-color: #8a6d3b;*/
       overflow: hidden;
     }

+ 87 - 27
src/views/cengterMaxBox/videoSurveillance/pageComponent/videoComponent.vue

@@ -13,8 +13,9 @@
       <!--<p class="name-p" style="margin-left:10px;">人</p>-->
     </div>
     <div class="video-max-big-box">
-      <H5PlayerVideo style="margin:140px 0 0 113px;"
-                     v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>
+      <div class="video-for-box" v-for="(item,index) in videoList" :key="index" >
+        <H5PlayerVideo :videoProps="item" style="margin:40px 20px 23px;"></H5PlayerVideo>
+      </div>
       <!--<img v-if="!videoList[0]" class="null-img" src="@/assets/ZDimages/null-data-1.png">-->
     </div>
     <div class="pagination-max-box">
@@ -49,9 +50,9 @@
         floorUserNum:null,
         //视频
         // width:685,
-        width:910,
+        width:930,
         // height:350,
-        height:512,
+        height:580,
         videoType:false,
         videoList:[],
         videoTotal:0,
@@ -125,26 +126,73 @@
         let self = this;
         self.$set(self, 'videoType', false);
         self.$set(self, 'videoList', []);
-        iotCameraFindByCondition(this.videoQueryParams).then(response => {
-          let list = [];
-          for(let i=0;i<response.data.records.length;i++){
-            list.push(
-              {
-                width: this.width, //(宽度:非必传-默认600)
-                height: this.height, //(高度:非必传-默认338)
-                url: response.data.records[i].streamUrl,
-                cameraIndexCode: response.data.records[i].deviceNo,
-              }
-            )
-          }
-          this.$set(this,'videoList',list)
-          this.$set(this,'videoTotal',response.data.total);
-          this.$nextTick(()=>{
-            setTimeout(function(){
-              self.$set(self, 'videoType', true);
-            },1000);
-          })
-        });
+        // iotCameraFindByCondition(this.videoQueryParams).then(response => {
+        //   let list = [];
+        //   for(let i=0;i<response.data.records.length;i++){
+        //     list.push(
+        //       {
+        //         width: this.width, //(宽度:非必传-默认600)
+        //         height: this.height, //(高度:非必传-默认338)
+        //         url: response.data.records[i].streamUrl,
+        //         cameraIndexCode: response.data.records[i].deviceNo,
+        //       }
+        //     )
+        //   }
+        //   this.$set(this,'videoList',list)
+        //   this.$set(this,'videoTotal',response.data.total);
+        //   this.$nextTick(()=>{
+        //     setTimeout(function(){
+        //       self.$set(self, 'videoType', true);
+        //     },1000);
+        //   })
+        // });
+
+
+        let list = [
+          {
+            width:this.width,
+            height:this.height,
+            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+            cameraIndexCode:'c451e9f079874b6ea6ddb1eb4f55d410',
+          },
+          {
+            width:this.width,
+            height:this.height,
+            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+            cameraIndexCode:'555848cb4ef64234817778ef48e07108',
+          },
+          {
+            width:this.width,
+            height:this.height,
+            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+            cameraIndexCode:'87acbd68f5304e62b054de724d6a73c0',
+          },
+          {
+            width:this.width,
+            height:this.height,
+            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+            cameraIndexCode:'c451e9f079874b6ea6ddb1eb4f55d411',
+          },
+          {
+            width:this.width,
+            height:this.height,
+            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+            cameraIndexCode:'555848cb4ef64234817778ef48e07102',
+          },
+          {
+            width:this.width,
+            height:this.height,
+            url:'wss://labcontrol.nwafu.edu.cn/proxy/172.16.0.68:559/openUrl/luk8N32',
+            cameraIndexCode:'87acbd68f5304e62b054de724d6a73c3',
+          },
+        ];
+        this.$set(this,'videoList',list)
+        // this.$set(this,'videoTotal',response.data.total);
+        this.$nextTick(()=>{
+          setTimeout(function(){
+            self.$set(self, 'videoType', true);
+          },1000);
+        })
       },
       //全屏开启-关闭轮播
       stopTime(cameraIndexCode){
@@ -162,16 +210,18 @@
 </script>
 <style scoped lang="scss">
   .videoComponent{
-    width:3102px;
+    /*width:3102px;*/
+    width:3240px;
     height: 1700px;
     /*background: linear-gradient(180deg, rgba(4, 117, 129, 0.2) 0%, rgba(0, 15, 22, 0) 100%);*/
     display: flex;
     flex-direction: column;
     .top-num-max-box{
-      padding:0 51px;
+      padding:0 75px;
       height:100px;
       display: flex;
-      margin-top:35px;
+      margin-top:55px;
+      margin-bottom:40px;
       .for-address-box{
         display: flex;
       }
@@ -224,6 +274,16 @@
         width:300px;
         margin:570px auto;
       }
+      .video-for-box{
+        display: inline-block;
+        /*width:950px;*/
+        /*height:575px;*/
+        width:970px;
+        height:640px;
+        margin:70px 0 0 80px;
+        background: url("../../../../assets/ZDimages/img_bg_spjk.png") no-repeat;
+        background-size: 100% 100%;
+      }
     }
     .pagination-max-box{
       display: flex;

+ 2 - 2
src/views/home.vue

@@ -782,10 +782,10 @@
   .dept-video-max-box{
     z-index: 1000;
     position: absolute;
-    width:5527px;
+    width:5700px;
     height: 1700px;
     top:270px;
-    left:2960px;
+    left:2900px;
     overflow: hidden;
     .dept-video-box{
       transform:scaleX(1.4);