修改了4K分辨率

src/App.vue

@@ -34,10 +34,11 @@
 </script>
 <style>
   #app{
-    width: 3072px;
-    height: 1660px;
-    /*width: 3840px;*/
-    /*height: 2160px;*/
+    /*width: 3072px;*/
+    /*height: 1660px;*/
+    /*分辨率调整*/
+    width: 3840px;
+    height: 2160px;
     display: flex;
     flex:1;
     overflow: hidden;

src/views/components/centerNotice.vue

@@ -138,9 +138,15 @@
           this.initialize(this.noticeList[this.noticeIndex])
           this.$set(this,'noticeIndex',this.noticeIndex+1);
         }else{
-          setTimeout(function() {
-            self.dashboardsMediaAnnouncements();
-          },300)
+          if(this.noticeList[0]){
+            setTimeout(function() {
+              self.dashboardsMediaAnnouncements();
+            },300)
+          }else{
+            setTimeout(function() {
+              self.dashboardsMediaAnnouncements();
+            },30000)
+          }
         }
       },
       initialize(item){
@@ -356,83 +362,119 @@
       width:100%!important;
       height:100%!important;
       .position-button{
-        top:80px!important;
-        right:90px!important;
-        width:60px!important;
-        height:60px!important;
+        /*top:80px!important;*/
+        /*right:90px!important;*/
+        /*width:60px!important;*/
+        /*height:60px!important;*/
+        /*分辨率调整*/
+        top: 105px !important;
+        right: 110px !important;
+        width: 80px !important;
+        height: 80px !important;
       }
       .null-max-img{
-        width:528px!important;
-        height:474px!important;
-        /*width: 2840px!important;*/
-        /*height: 1400px!important;*/
-        margin: 190px 116px 0!important;
+        /*width:528px!important;*/
+        /*height:474px!important;*/
+        /*margin: 190px 116px 0!important;*/
+        /*分辨率调整*/
+        display: block;
+        width: 900px !important;
+        height:807px!important;
+        margin: 600px auto 0 !important;
       }
       .content-box{
-        width: 2840px!important;
-        height: 1400px!important;
+        /*width: 2840px!important;*/
+        /*height: 1400px!important;*/
+        /*分辨率调整*/
+        width: 3605px!important;
+        height: 1960px!important;
         margin: 190px 116px 0!important;
       }
       #scrollPdfBox{
-        width: 2840px!important;
-        height: 1400px!important;
+        /*width: 2840px!important;*/
+        /*height: 1400px!important;*/
+        /*分辨率调整*/
+        width: 3605px!important;
+        height: 1960px!important;
         margin: 190px 116px 0!important;
       }
       #scrollDocxBox{
-        width: 2840px!important;
-        height: 1400px!important;
+        /*width: 2840px!important;*/
+        /*height: 1400px!important;*/
+        /*分辨率调整*/
+        width: 3605px!important;
+        height: 1960px!important;
         margin: 190px 116px 0!important;
       }
       .img-max-big-box{
-        width: 2840px!important;
-        height: 1400px!important;
+        /*width: 2840px!important;*/
+        /*height: 1400px!important;*/
+        /*分辨率调整*/
+        width: 3605px!important;
+        height: 1960px!important;
         margin: 190px 116px 0!important;
       }
       .mp4-max-big-box{
-        width: 2840px!important;
-        height: 1400px!important;
+        /*width: 2840px!important;*/
+        /*height: 1400px!important;*/
+        /*分辨率调整*/
+        width: 3605px!important;
+        height: 1960px!important;
         margin: 190px 116px 0!important;
         .video-player{
-          width:2840px!important;
-          height:1400px!important;
+          /*width:2840px!important;*/
+          /*height:1400px!important;*/
+          /*分辨率调整*/
+          width: 3605px!important;
+          height: 1960px!important;
         }
       }
     }
   }
   .centerNotice{
-    width:1314px;
-    height:753px;
+    /*width:1314px;*/
+    /*height:753px;*/
+    /*分辨率调整*/
+    width: 1570px;
+    height:1003px;
     overflow: hidden;
     background-image: url("../../assets/ZDimages/img_sptz_bg@1x.png");
     background-size: 100% 100%;
     color:#fff;
     .centerNotice-page{
-      width:1314px;
-      height:753px;
+      /*width:1314px;*/
+      /*height:753px;*/
+      /*分辨率调整*/
+      width: 1570px;
+      height:1003px;
       overflow: hidden;
       position: relative;
       .position-button{
         position: absolute;
-        top:24px;
-        right:28px;
+        /*top:24px;*/
+        /*right:28px;*/
+        /*分辨率调整*/
+        top:40px;
+        right:38px;
         width:50px;
         height:50px;
         cursor: pointer;
       }
       .null-max-img{
-        /*width:1150px;*/
-        /*height:650px;*/
         width:528px!important;
         height:474px!important;
-        margin:170px 0 0 393px;
-        /*margin:85px 81px 0;*/
+        margin:300px 0 0 520px;
       }
       //富文本
       .content-box{
         flex:1;
-        width:1150px;
-        height:650px;
-        margin:85px 81px 0;
+        /*width:1150px;*/
+        /*height:650px;*/
+        /*margin:85px 81px 0!important;*/
+        /*分辨率调整*/
+        width:1406px;
+        height:860px;
+        margin:115px 81px 0!important;
         overflow-y: scroll;
       }
       .content-box::-webkit-scrollbar{
@@ -451,20 +493,30 @@
       }
       #scrollPdfBox{
         display: block!important;
-        width:1150px!important;
-        height:650px!important;
-        margin:85px 81px 0!important;
+        /*width:1150px;*/
+        /*height:650px;*/
+        /*margin:85px 81px 0!important;*/
+        /*分辨率调整*/
+        width:1406px;
+        height:860px;
+        margin:115px 81px 0!important;
       }
       #scrollDocxBox{
         display: block!important;
-        width:1150px!important;
-        height:650px!important;
-        margin:85px 81px 0!important;
+        /*width:1150px;*/
+        /*height:650px;*/
+        /*margin:85px 81px 0!important;*/
+        /*分辨率调整*/
+        width:1406px;
+        height:860px;
+        margin:115px 81px 0!important;
       }
       //PDF
       ::v-deep .vue-office-pdf{
         margin:20px auto!important;
-        width:1190px!important;
+        /*width:1190px!important;*/
+        /*分辨率调整*/
+        width:1406px!important;
       }
       ::v-deep .vue-office-pdf-wrapper{
         background-color: rgba(0,0,0,0)!important;
@@ -506,9 +558,13 @@
         display: none;
       }
       .img-max-big-box{
-        width:1150px;
-        height:650px;
-        margin:85px 81px 0;
+        /*width:1150px;*/
+        /*height:650px;*/
+        /*margin:85px 81px 0!important;*/
+        /*分辨率调整*/
+        width:1406px;
+        height:860px;
+        margin:115px 81px 0!important;
         overflow: hidden;
         position: relative;
         img {
@@ -518,13 +574,20 @@
       }
       .mp4-max-big-box{
         display:block;
-        width:1150px;
-        height:650px;
-        margin:85px 81px 0;
+        /*width:1150px;*/
+        /*height:650px;*/
+        /*margin:85px 81px 0!important;*/
+        /*分辨率调整*/
+        width:1406px;
+        height:860px;
+        margin:115px 81px 0!important;
         .video-player{
           display:block;
-          width:1150px;
-          height:650px;
+          /*width:1150px;*/
+          /*height:650px;*/
+          /*分辨率调整*/
+          width:1406px;
+          height:860px;
         }
       }
     }

src/views/components/components/alarmComponent.vue

@@ -118,7 +118,9 @@
       display: block;
       width:1371px;
       height:753px;
-      margin:454px 0 0 850px;
+      /*margin:454px 0 0 850px;*/
+      /*分辨率调整*/
+      margin:700px 0 0 1234px;
       background-image: url("../../../assets/ZDimages/img_bj_bg@1x.png");
       background-size: 100% 100%;
       .title-top-box{

src/views/components/components/titleComponent.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="titleComponent">
-    <p class="title-left">{{titleData.name}}</p>
+    <!--<p class="title-left">{{titleData.name}}</p>-->
+    <p class="title-left" :style="titleData.name=='设施数据概览'?'line-height:98px;':(
+    titleData.name=='实时视频监控'?'line-height:88px;':(
+    titleData.name=='科研项目情况概览'?'line-height:84px;':(
+    titleData.name=='人员进入记录'?'line-height:84px;':(
+    titleData.name=='设施数据概览'?'line-height:98px;':'line-height:80px;'
+    )
+    )
+    )
+    )">{{titleData.name}}</p>
     <!--<img src="@/assets/ZDimages/icon_jg@1x.png">-->
     <p class="title-right">{{titleData.text}}</p>
   </div>
@@ -34,7 +43,9 @@
   .titleComponent{
     display: flex;
     .title-left{
-      margin-left:65px;
+      /*margin-left:65px;*/
+      /*分辨率调整*/
+      margin-left:95px;
       height:60px;
       line-height:60px;
       font-size:24px;

src/views/components/facilityUtilizationRate.vue

@@ -878,33 +878,48 @@
 </script>
 <style scoped lang="scss">
   .facilityUtilizationRate {
-    width: 826px;
-    height: 937px;
+    /*width: 826px;*/
+    /*height: 937px;*/
+    /*分辨率调整*/
+    width: 1082px;
+    height: 1187px;
     margin-top: 21px;
     background-image: url("../../assets/ZDimages/img_sssyljzttj_bg@1x.png");
     background-size: 100% 100%;
     position: relative;
     overflow: hidden;
     .eCharts-max-big-top-box {
-      width: 801px;
-      height: 432px;
+      /*width: 801px;*/
+      /*height: 432px;*/
+      /*分辨率调整*/
+      width: 1057px;
+      height: 620px;
       margin: 42px 12px 0;
       overflow: hidden;
       .eCharts-box {
         display: inline-block;
-        width: 267px;
-        height: 216px;
+        /*width: 267px;*/
+        /*height: 216px;*/
+        /*分辨率调整*/
+        width: 350px;
+        height: 299px;
         overflow: hidden;
       }
     }
     .eCharts-max-big-bottom-box {
-      width: 826px;
-      height: 402px;
+      /*width: 826px;*/
+      /*height: 402px;*/
+      /*分辨率调整*/
+      width: 1081px;
+      height: 460px;
       overflow: hidden;
     }
     .position-shade-box{
-      width: 826px;
-      height: 937px;
+      /*width: 826px;*/
+      /*height: 937px;*/
+      /*分辨率调整*/
+      width: 1081px;
+      height: 1187px;
       position: absolute;
       top:0;
       left:0;

src/views/components/headComponent.vue

@@ -89,7 +89,9 @@
     .center-title-box{
       display: flex;
       .logo-img{
-        margin:35px 16px 0 1245px;
+        /*margin:35px 16px 0 1245px;*/
+        /*分辨率调整*/
+        margin:35px 16px 0 1620px;
         width:64px;
         height:64px;
       }

src/views/components/overviewOfFacilityData.vue

@@ -456,20 +456,29 @@
 </script>
 <style scoped lang="scss">
   .overviewOfFacilityData {
-    width:826px;
-    height:423px;
+    /*width:826px;*/
+    /*height:423px;*/
+    /*分辨率调整*/
+    width: 1082px;
+    height:673px;
     background-image: url("../../assets/ZDimages/img_sssjgl_bg@1x.png");
     background-size: 100% 100%;
     overflow: hidden;
     position: relative;
     #overviewOfFacilityData-eCharts{
-      height:500px;
-      width:500px;
+      /*height:500px;*/
+      /*width:500px;*/
+      /*分辨率调整*/
+      width:670px;
+      height:770px;
     }
     .position-right-list-box{
       position: absolute;
-      left:480px;
-      top:90px;
+      /*left:480px;*/
+      /*top:90px;*/
+      /*分辨率调整*/
+      left:700px;
+      top:200px;
       .for-box{
         display: flex;
         p:nth-child(1){
@@ -498,8 +507,11 @@
     }
     .position-left-list-box{
       position: absolute;
-      left:150px;
-      top:180px;
+      /*left:150px;*/
+      /*top:180px;*/
+      /*分辨率调整*/
+      left:240px;
+      top:310px;
       p:nth-child(1){
         font-size:30px;
         color:#fff;
@@ -523,10 +535,15 @@
     }
     .position-img{
       position: absolute;
-      top: 130px;
-      left: 55px;
+      /*top: 130px;*/
+      /*left: 55px;*/
+      /*z-index: 0;*/
+      /*width: 390px;*/
+      /*分辨率调整*/
+      top: 225px;
+      left: 35px;
       z-index: 0;
-      width: 390px;
+      width: 600px;
     }
   }
 </style>

src/views/components/personnelEntryRecord.vue

@@ -14,7 +14,7 @@
     </div>
     <div class="bottom-list-max-big-box">
       <p class="null-p" v-if="!config.data[0]">暂无数据</p>
-      <dv-scroll-board :config="config" style="width:740px;height:418px;margin:15px 0 0 43px;" v-if="config.data[0]"/>
+      <dv-scroll-board :config="config" style="width:900px;height:580px;margin:20px 0 0 90px;" v-if="config.data[0]"/>
     </div>
   </div>
 </template>
@@ -36,7 +36,7 @@
         todayTotal:'',
         totalNumber:'',
         config: {
-          rowNum: 7,
+          rowNum: 9,
           oddRowBGC: 'rgba(0,71,152,0.1)',
           evenRowBGC: 'rgba(0,0,0,0.1)',
           data: []
@@ -90,8 +90,11 @@
 </script>
 <style scoped lang="scss">
   .personnelEntryRecord{
-    width:826px;
-    height:657px;
+    /*width:826px;*/
+    /*height:657px;*/
+    /*分辨率调整*/
+    width: 1082px;
+    height:907px;
     margin-top:17px;
     display: flex;
     flex-direction: column;
@@ -99,15 +102,20 @@
     background-image: url("../../assets/ZDimages/img_ryjrjl_bg@1x.png");
     background-size: 100% 100%;
     .top-num-max-big-box{
-      height:120px;
-      width:826px;
+      /*height:120px;*/
+      /*width:826px;*/
+      /*分辨率调整*/
+      width: 1082px;
+      height:180px;
       display: flex;
       .left-num-box{
         width:303px;
         height:115px;
         background-image: url("../../assets/ZDimages/img_aqzr_bg@1x.png");
         background-size: 100% 100%;
-        margin:13px 21px 0 89px;
+        /*margin:13px 21px 0 89px;*/
+        /*分辨率调整*/
+        margin:60px 21px 0 220px;
         display: flex;
         p:nth-child(1){
           width:60px;
@@ -139,7 +147,9 @@
         height:115px;
         background-image: url("../../assets/ZDimages/img_jrjr_bg@1x.png");
         background-size: 100% 100%;
-        margin:13px 0 0 0;
+        /*margin:13px 0 0 0;*/
+        /*分辨率调整*/
+        margin:60px 0 0 0;
         display: flex;
         p:nth-child(1){
           width:60px;
@@ -168,8 +178,11 @@
       }
     }
     .bottom-list-max-big-box{
+      /*height:470px;*/
+      /*width:826px;*/
+      /*分辨率调整*/
       height:470px;
-      width:826px;
+      width: 1082px;
       .null-p{
         text-align: center;
         color:#dedede;

src/views/components/scientificResearchProject.vue

@@ -663,39 +663,55 @@
 </script>
 <style scoped lang="scss">
   .scientificResearchProject {
-    width: 826px;
-    height: 707px;
+    /*width: 826px;*/
+    /*height: 707px;*/
+    /*分辨率调整*/
+    width: 1082px;
+    height: 957px;
     overflow: hidden;
     background-image: url("../../assets/ZDimages/img_kyxm_bg@1x.png");
     background-size: 100% 100%;
     .scientificResearchProject-page {
-      width: 826px;
-      height: 647px;
+      /*width: 826px;*/
+      /*height: 647px;*/
+      /*分辨率调整*/
+      width: 1082px;
+      height: 897px;
       overflow: hidden;
       display: flex;
       position: relative;
       .left-max-big-box {
-        width: 351px;
+        width: 451px;
         height: 647px;
+        /*分辨率调整*/
+        margin-top:130px;
+        margin-left:20px;
       }
       .right-max-big-box {
         width: 475px;
-        height: 647px;
+        /*height: 647px;*/
         .right-top-big-box {
           width: 475px;
           height: 320px;
+          /*分辨率调整*/
+          margin:100px 0 0 60px;
         }
         .right-bottom-big-box {
           width: 475px;
           height: 327px;
+          /*分辨率调整*/
+          margin:80px 0 0 60px;
         }
       }
       .position-top-right-p {
         z-index: 2;
         width: 100px;
         position: absolute;
-        top: 145px;
-        right: 187px;
+        /*top: 145px;*/
+        /*right: 187px;*/
+        /*分辨率调整*/
+        top: 245px;
+        right: 284px;
         height: 50px;
         line-height: 50px;
         text-align: center;
@@ -709,8 +725,11 @@
       .position-img {
         z-index: 1;
         position: absolute;
-        top: 111px;
-        right: 178px;
+        /*top: 111px;*/
+        /*right: 178px;*/
+        /*分辨率调整*/
+        top: 210px;
+        right: 275px;
       }
     }
   }

src/views/components/videoSurveillance.vue

@@ -124,8 +124,10 @@
           videoList.push(
             {
               fullShow:true,
-              width: 599, //(宽度:非必传-默认600)
-              height: 367, //(高度:非必传-默认338)
+              // width: 599, //(宽度:非必传-默认600)
+              // height: 367, //(高度:非必传-默认338)
+              width: 720, //(宽度:非必传-默认600)
+              height: 500, //(高度:非必传-默认338)
               url: response.data.records[0].streamUrl,
               cameraIndexCode: response.data.records[0].deviceNo,
             }
@@ -133,8 +135,10 @@
           videoList.push(
             {
               fullShow:true,
-              width: 599, //(宽度:非必传-默认600)
-              height: 367, //(高度:非必传-默认338)
+              // width: 599, //(宽度:非必传-默认600)
+              // height: 367, //(高度:非必传-默认338)
+              width: 720, //(宽度:非必传-默认600)
+              height: 500, //(高度:非必传-默认338)
               url: response.data.records[response.data.records.length-1].streamUrl,
               cameraIndexCode: response.data.records[response.data.records.length-1].deviceNo,
             }
@@ -160,22 +164,28 @@
 </script>
 <style scoped lang="scss">
   .videoSurveillance{
-    width:1314px;
-    height:538px;
+    /*width:1314px;*/
+    /*height:538px;*/
+    /*分辨率调整*/
+    width: 1570px;
+    height:788px;
     margin-top:31px;
     background-image: url("../../assets/ZDimages/img_ssspjk_bg@1x.png");
     background-size: 100% 100%;
     .video-max-big-box{
-      width:1263px;
-      height:367px;
-      margin:75px 26px 0;
+      /*width:1263px;*/
+      /*height:367px;*/
+      /*分辨率调整*/
+      width:1519px;
+      height:610px;
+      margin:160px 28px 0;
       display: flex;
       .for-video-box{
-        width:599px;
-        height:367px;
+        width:720px;
+        height:500px;
       }
       .for-video-box:nth-child(1){
-        margin-right:65px;
+        margin-right:75px;
       }
 
     }

src/views/home.vue

@@ -75,10 +75,9 @@
 
     },
     mounted(){
-      this.laboratoryBigViewSelectTriggerInfo();
+      // this.laboratoryBigViewSelectTriggerInfo();
       //开启预案定时查询
-      this.alarmTimerFunction();
-      // this.login();
+      // this.alarmTimerFunction();
     },
     methods:{
       login() {
@@ -233,8 +232,11 @@
 </script>
 <style scoped lang="scss">
   .home{
-    width: 3072px;
-    height: 1660px;
+    /*width: 3072px;*/
+    /*height: 1660px;*/
+    /*分辨率调整*/
+    width: 3840px;
+    height: 2160px;
     flex:1;
     display: flex;
     flex-direction: column;
@@ -249,14 +251,18 @@
         display: flex;
         flex-direction: column;
         overflow: hidden;
-        width:826px;
+        /*width:826px;*/
+        /*分辨率调整*/
+        width: 1082px;
         margin:0 0 0 32px;
       }
       .home-center-box{
         display: flex;
         flex-direction: column;
         overflow: hidden;
-        width:1314px;
+        /*width:1314px;*/
+        /*分辨率调整*/
+        width: 1570px;
         margin:0 21px;
         padding-top:38px;
       }
@@ -264,12 +270,16 @@
         display: flex;
         flex-direction: column;
         overflow: hidden;
-        width:826px;
+        /*width:826px;*/
+        /*分辨率调整*/
+        width: 1082px;
         margin:0 32px 0 0;
       }
     }
     .button-img-box{
-      width:3072px;
+      /*width:3072px;*/
+      /*分辨率调整*/
+      width: 3840px;
       height:54px;
       margin-top:17px;
       overflow: hidden;