ccj hace 2 años
padre
commit
ccab85ea7a
Se han modificado 2 ficheros con 31 adiciones y 14 borrados
  1. 25 9
      src/utils/util.js
  2. 6 5
      src/views/home/index.vue

+ 25 - 9
src/utils/util.js

@@ -199,25 +199,41 @@ export const fullscreenEnable = () => {
  * 浏览器全屏
  */
 export const reqFullScreen = () => {
-  if (document.documentElement.requestFullScreen) {
-    document.documentElement.requestFullScreen();
-  } else if (document.documentElement.webkitRequestFullScreen) {
-    document.documentElement.webkitRequestFullScreen();
-  } else if (document.documentElement.mozRequestFullScreen) {
-    document.documentElement.mozRequestFullScreen();
+  let _documentDom = document.getElementById('contentView')
+  if (_documentDom.requestFullScreen) {
+    _documentDom.requestFullScreen();
+  } else if (_documentDom.webkitRequestFullScreen) {
+    _documentDom.webkitRequestFullScreen();
+  } else if (_documentDom.mozRequestFullScreen) {
+    _documentDom.mozRequestFullScreen();
   }
+  // if (document.documentElement.requestFullScreen) {
+  //   document.documentElement.requestFullScreen();
+  // } else if (document.documentElement.webkitRequestFullScreen) {
+  //   document.documentElement.webkitRequestFullScreen();
+  // } else if (document.documentElement.mozRequestFullScreen) {
+  //   document.documentElement.mozRequestFullScreen();
+  // }
 };
 /**
  * 浏览器退出全屏
  */
 export const exitFullScreen = () => {
-  if (document.documentElement.requestFullScreen) {
+  let _documentDom = document.getElementById('contentView')
+    if (_documentDom.requestFullScreen) {
     document.exitFullScreen();
-  } else if (document.documentElement.webkitRequestFullScreen) {
+  } else if (_documentDom.webkitRequestFullScreen) {
     document.webkitCancelFullScreen();
-  } else if (document.documentElement.mozRequestFullScreen) {
+  } else if (_documentDom.mozRequestFullScreen) {
     document.mozCancelFullScreen();
   }
+  // if (document.documentElement.requestFullScreen) {
+  //   document.exitFullScreen();
+  // } else if (document.documentElement.webkitRequestFullScreen) {
+  //   document.webkitCancelFullScreen();
+  // } else if (document.documentElement.mozRequestFullScreen) {
+  //   document.mozCancelFullScreen();
+  // }
 };
 /**
  * 递归寻找子类的父类

+ 6 - 5
src/views/home/index.vue

@@ -1,6 +1,6 @@
 <!-- 首页模块 首页面 -->
 <template>
-  <div class="home">
+  <div class="home" id='contentView'>
     <div class="body-middle" :class="{ 'body-middle-height': blockList[0].flag }">
       <div class="body-middle-left">
         <!-- 任务、消息、提醒、超期 -->
@@ -75,7 +75,7 @@
             </el-row>
             <el-row>
               <h3 class="content2-map">库点流向分布</h3>
-              <div class="center-map">
+              <div class="center-map" style="border: 2px solid #6a5f5f">
                 <map-drag :listData=' mapInfo'></map-drag>
               </div>
             </el-row>
@@ -586,7 +586,7 @@
               color = ['#247ef4', '#3a3b40'];
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
-                name: '已开票1',
+                name: '已开票',
                 value: Number((this.chartsData[i].biViewInfoList[0].count)/10000).toFixed(2),
                 type: '采购合同'
               }, {
@@ -751,7 +751,8 @@
         let _y = []
         for (let i = 0; i < this.totalReserves.length; i++) {
           _x.push(this.totalReserves[i].name)
-          _y.push(this.totalReserves[i].count)
+          var a = Number(this.totalReserves[i].count).toFixed(2)
+          _y.push(a)
         }
 
         // 柱状图
@@ -1952,7 +1953,7 @@
   }
 
   .home {
-    background: rgb(27, 28, 30);
+    background: #2a2a2a;
     padding-bottom: 20px
   }