首页图表

package.json

@@ -45,6 +45,7 @@
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@babel/polyfill": "^7.12.1",
     "@babel/preset-env": "^7.14.4",
+    "@jiaminghi/data-view": "^2.10.0",
     "axios": "^0.20.0",
     "babel-polyfill": "^6.26.0",
     "base-core-lib": "^1.3.16",

src/utils/util.js

@@ -199,7 +199,7 @@ export const fullscreenEnable = () => {
  * 浏览器全屏
  */
 export const reqFullScreen = () => {
-  let _documentDom = document.getElementById('contentView')
+  let _documentDom = document.getElementById('index')
   if (_documentDom.requestFullScreen) {
     _documentDom.requestFullScreen();
   } else if (_documentDom.webkitRequestFullScreen) {

src/views/home/drawMixin.js

@@ -46,7 +46,8 @@ const scale = {
             scale.height = (window.innerHeight / baseHeight).toFixed(5)
             console.log(scale.width,scale.height,'放大');
             //整个页面的元素样式，缩放宽高用当前同比例放大的宽高
-            appRef.style.transform = `scale(${scale.width}, ${scale.height}) translate(-50%, -50%)`
+            // appRef.style.transform = `scale(${scale.width}, ${scale.height}) translate(-50%, -50%)`
+            appRef.style.transform = `scale(${scale.width}, ${scale.height})`
           } else {
             // 如果不大于默认比例代表缩小了。
             //那么把默认缩放的宽高改为：同比例缩小
@@ -54,7 +55,7 @@ const scale = {
             scale.width = (window.innerWidth / baseWidth).toFixed(5)
             console.log(scale.width,scale.height,'缩小');
             //整个页面的元素样式，缩放宽高用当前同比例放大的宽高
-            appRef.style.transform = `scale(${scale.width}, ${scale.height}) translate(-50%, -50%)`
+            appRef.style.transform = `scale(${scale.width}, ${scale.height}) `
           }
         }
       },

src/views/home/index.vue

@@ -2,6 +2,9 @@
 <template>
   <div id="index" ref="appRef">
      <!-- <dv-loading v-show="loading">Loading...</dv-loading> -->
+     <div class='bg'>
+
+     
      <div class="host-body">
         <div>
           <!-- 顶部title部分 -->
@@ -114,6 +117,7 @@
           </el-row>
         </div>
       </div>
+    </div>
   </div>
 </template>
 
@@ -1134,41 +1138,45 @@ a {
 //页面样式部分！！！！
 #index {
   color: #d3d6dd;
-  // width: 100%;
-  // height: calc(100% - 60px);
-   width: 1920px;
-  height: 1080px;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  transform-origin: left top;
-  overflow: hidden;
+  width: 100vw;
+  height: 100vh;
+  // height: 100%;
+  //  width: 1920px;
+  height: 1000px;
+  // position: absolute;
+  // top: 50%;
+  // left: 50%;
+  // transform: translate(-50%, -50%);
+  transform-origin: 50px 10px;
+  // overflow: hidden;
     background: #2a2a2a;
+    // background-image: url("../../../public/img/homebg2.png"); 
+    // background-size: 100%; //背景尺寸
+    // background-position: center center; //背景位置
   .bg {
     //整体页面背景
     width: 100%;
     height: 100%;
     padding: 16px 16px 0 16px;
-    // background-image: url("../assets/pageBg.png"); //背景图
+    background-image: url("../../../public/img/homebg2.png"); //背景图
     background-size: cover; //背景尺寸
     background-position: center center; //背景位置
   }
   //顶部右边装饰效果
   .title_left {
     width: 100%;
-    height: 50px;
+    height: 12px;
   }
   //顶部左边装饰效果
   .title_right {
     width: 100%;
-    height: 50px;
-    margin-top: 18px;
+    height: 12px;
+    margin-top: 12px;
   }
   //顶部中间装饰效果
   .title_center {
     width: 100%;
-    height: 50px;
+    height: 12px;
   }
   //顶部中间文字数据可视化系统
   .title_text {
@@ -1184,47 +1192,47 @@ a {
   }
   //中国地图
   #china-map {
-    height: 660px;
+    height: 642px;
     width: 100%;
   }
   //中间折线图
   .line_center {
     width: 100%;
-    height: 288px;
+    height: 278px;
   }
   //左1模块
   .left_box1 {
-    height: 310px;
+    height: 302px;
     width: 100%;
     margin-bottom: 10px;
     position: relative;
   }
   //左2模块
   .left_box2 {
-    height: 310px;
+    height: 302px;
     width: 100%;
     margin-bottom: 10px;
   }
   //左3模块
   .left_box3 {
-    height: 310px;
+    height: 302px;
     width: 100%;
   }
   //右1模块
   .right_box1 {
-    height: 310px;
+    height: 302px;
     width: 100%;
     margin-bottom: 10px;
   }
   //右2模块
   .right_box2 {
-    height: 310px;
+    height: 302px;
     width: 100%;
     margin-bottom: 10px;
   }
   //右3模块
   .right_box3 {
-    height: 310px;
+    height: 302px;
     width: 100%;
   }
   //左1模块-玫瑰饼图
@@ -1262,7 +1270,7 @@ a {
   }
   //左2模块 柱状图
   #columnar {
-    height: 97%;
+    height: 100%;
     width: 95%;
     margin-left: 3%;
     margin-top: 5px;

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -60,10 +60,10 @@
                       :value="item.inOutTaskNo" />
                   </el-select>
                 </ws-form-item>
-                <!-- <ws-form-item v-if='serviceManagementType==3' label="业务编号" span="1" prop="qualityNo">
+                <ws-form-item v-if='serviceManagementType==3&&deptBudgetList.id' label="业务编号" span="1" prop="qualityNo">
                   <ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
-                </ws-form-item> -->
+                </ws-form-item>
                 <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="购粮性质" span="1"
                   prop="natureOfGrainPurchase">
                   <ws-input v-model="deptBudgetList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10"
@@ -3386,4 +3386,4 @@ export default {
   font-weight: 500;
   margin-left: 10px;
 }
-</style>
+</style>