Merge branch 'master' of http://172.16.90.201:3000/castgroup_forest/castgroup_bigscreen

src/assets/scss/media.scss

@@ -51,7 +51,7 @@
 //   only screen and (                min-resolution: 2.0dppx) { 
 //     /* Retina styles here */
 // }
-@media only screen and (min-height : 800px) and (max-width : 1280px) {
+@media only screen and (max-height:900px) {
     //小班滚动
     .right-wrap{
         .scroll-board-wrap{
@@ -60,6 +60,56 @@
             // .scroll-board-01{
             //     padding: 0;
             // }
+            // .scroll-board-tool{
+            //     .inner{
+            //         left: 0;
+            //         right: 0;
+            //     }
+            // }
+        }
+    }
+    //导航
+    .nav-wrap {
+        .nav-item {
+            line-height: 1.2;
+            font-size: 18px;
+            &:not(:first-of-type) {
+                margin-top: 1vh;
+            }
+            padding: 1.5vh 24px;
+        }
+    }
+    //小班搜索
+    .xiaoban{
+        width: 25vw;
+         .el-input .el-input__inner{
+            font-size: 16px;
+        }
+        .title{
+            font-size: 16px;
+        }
+    }
+
+    .ntitle{
+        margin-bottom: 15px;
+    }
+    .addr{
+        margin-bottom: 15px;
+    }
+   
+}
+
+@media only screen and (min-height : 768px) and (max-width : 1024px) {
+    .left-wrap{
+        left: calc(1vw + 1em + 48px + 10px);
+    }
+    .right-wrap{
+        .scroll-board-wrap{
+            width: 320px;
+            // padding: 0;
+            // .scroll-board-01{
+            //     padding: 0;
+            // }
             .scroll-board-tool{
                 .inner{
                     left: 0;
@@ -72,16 +122,16 @@
     .nav-wrap {
         .nav-item {
             line-height: 1.2;
-            font-size: 18px;
+            font-size: 16px;
             &:not(:first-of-type) {
                 margin-top: 1vh;
             }
-            padding: 1.5vh 24px;
+            padding: 1.2vh 24px;
         }
     }
     //小班搜索
     .xiaoban{
-        width: 25vw;
+        width: 320px;
          .el-input .el-input__inner{
             font-size: 16px;
         }

src/components/amap.vue

@@ -1156,6 +1156,7 @@ export default {
   left: 0;
   right: 0;
   bottom: 0;
+  top: 0;
   pointer-events: none;
 }
 @keyframes imageAnimation_32630606 {

src/components/header.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-06-14 18:11:54
  * @LastEditors: gcz
- * @LastEditTime: 2022-06-30 09:02:02
+ * @LastEditTime: 2022-06-30 09:24:07
  * @FilePath: \castgroup_bigscreen\src\components\header.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -162,7 +162,7 @@ import timeFormat from '@/utils/timeFormat'
         }
     }
 }
-@media only screen and (min-height : 800px) and (max-width : 1280px) {
+@media only screen and (max-height:900px) {
     .top-box{
         h2{
            letter-spacing: 1px;

src/components/numerical.vue

@@ -94,7 +94,7 @@
         }
     }
 }
-@media only screen and (min-height : 800px) and (max-width : 1280px) {
+@media only screen and (max-height:900px) {
     .numerical{
 
         .item-wrap{
@@ -113,5 +113,28 @@
         }
     }
 
+}
+@media only screen and (min-height : 768px) and (max-width : 1024px) {
+
+    .numerical{
+
+        .item-wrap{
+            .numerical-item{
+                padding: 0 0 15px 5px;
+                .name{
+                    font-size: 14px;
+                }
+                .number{
+                    font-size: 14px;
+                    margin-right: auto;
+                }
+                .unit{
+                    font-size: 14px;
+                }
+            }
+        }
+    }
+
+
 }
 </style>

src/dataSchema/page1Char1Schema.js

@@ -29,6 +29,8 @@ let page1Char1Schema = {
             startValue: 0, // 从头开始。
             endValue: 7, // 一次性展示6个
             height: 5, //组件高度
+            width: '50%',
+            left: '30%',
             bottom: '10px',
             borderColor: 'transparent',
             fillerColor: '#14c6d3',
@@ -58,11 +60,17 @@ let page1Char1Schema = {
             color: "rgba(255, 255, 255, 1)",
             // interval: 0,//坐标刻度之间的显示间隔，默认就可以了（默认是不重叠）
             // rotate: 40,//斜着放
-        }
+        },
     },
     yAxis: {
         axisLabel: {
             color: "rgba(255, 255, 255, 1)"
+        },
+        splitLine: {
+            show: true,
+            lineStyle: {
+                color: 'rgba(255,255,255,0.05)',
+            }
         }
     },
     series: [

src/dataSchema/page1Char2Schema.js

@@ -19,6 +19,8 @@ let page1Char2Schema = {
             startValue: 0, // 从头开始。
             endValue: 7, // 一次性展示6个
             height: 5, //组件高度
+            width: '50%',
+            left: '30%',
             bottom: '10px',
             borderColor: 'transparent',
             fillerColor: '#14c6d3',
@@ -59,6 +61,12 @@ let page1Char2Schema = {
     yAxis: {
         axisLabel: {
             color: "rgba(255, 255, 255, 1)"
+        },
+        splitLine: {
+            show: true,
+            lineStyle: {
+                color: 'rgba(255,255,255,0.05)',
+            }
         }
     },
     series: [

src/dataSchema/page2Char2Schema.js

@@ -33,6 +33,12 @@ let page2Char2Schema = {
         type: 'value',
         axisLabel: {
             color: "rgba(255, 255, 255, 1)"
+        },
+        splitLine: {
+            show: true,
+            lineStyle: {
+                color: 'rgba(255,255,255,0.05)',
+            }
         }
     },
     xAxis: {
@@ -50,6 +56,8 @@ let page2Char2Schema = {
             startValue: 0, // 从头开始。
             endValue: 7, // 一次性展示6个
             height: 5, //组件高度
+            width: '50%',
+            left: '30%',
             bottom: '10px',
             borderColor: 'transparent',
             fillerColor: '#14c6d3',

src/dataSchema/page2Char3Schema.js

@@ -34,6 +34,12 @@ let page6Char1Schema = {
         type: 'value',
         axisLabel: {
             color: "rgba(255, 255, 255, 1)"
+        },
+        splitLine: {
+            show: true,
+            lineStyle: {
+                color: 'rgba(255,255,255,0.05)',
+            }
         }
     },
     xAxis: {
@@ -51,6 +57,8 @@ let page6Char1Schema = {
             startValue: 0, // 从头开始。
             endValue: 7, // 一次性展示6个
             height: 5, //组件高度
+            width: '50%',
+            left: '30%',
             bottom: '10px',
             borderColor: 'transparent',
             fillerColor: '#14c6d3',

src/dataSchema/page5Char1Schema.js

@@ -29,6 +29,8 @@ let page5Char1Schema = {
             startValue: 0, // 从头开始。
             endValue: 7, // 一次性展示6个
             height: 5, //组件高度
+            width: '50%',
+            left: '30%',
             bottom: '10px',
             borderColor: 'transparent',
             fillerColor: '#14c6d3',
@@ -62,6 +64,12 @@ let page5Char1Schema = {
     yAxis: {
         axisLabel: {
             color: "rgba(255, 255, 255, 1)"
+        },
+        splitLine: {
+            show: true,
+            lineStyle: {
+                color: 'rgba(255,255,255,0.05)',
+            }
         }
     },
     series: [

src/dataSchema/page5Char2Schema.js

@@ -32,6 +32,8 @@ let page5Char2Schema = {
             startValue: 0, // 从头开始。
             endValue: 7, // 一次性展示6个
             height: 5, //组件高度
+            width: '50%',
+            left: '30%',
             bottom: '10px',
             borderColor: 'transparent',
             fillerColor: '#14c6d3',
@@ -65,6 +67,12 @@ let page5Char2Schema = {
     yAxis: {
         axisLabel: {
             color: "rgba(255, 255, 255, 1)"
+        },
+        splitLine: {
+            show: true,
+            lineStyle: {
+                color: 'rgba(255,255,255,0.05)',
+            }
         }
     },
     series: [

src/dataSchema/page6Char1Schema.js

@@ -33,6 +33,12 @@ let page6Char1Schema = {
         type: 'value',
         axisLabel: {
             color: "rgba(255, 255, 255, 1)"
+        },
+        splitLine: {
+            show: true,
+            lineStyle: {
+                color: 'rgba(255,255,255,0.05)',
+            }
         }
     },
     xAxis: {
@@ -50,6 +56,8 @@ let page6Char1Schema = {
             startValue: 0, // 从头开始。
             endValue: 7, // 一次性展示6个
             height: 5, //组件高度
+            width: '50%',
+            left: '30%',
             bottom: '10px',
             borderColor: 'transparent',
             fillerColor: '#14c6d3',
@@ -84,7 +92,10 @@ let page6Char1Schema = {
             emphasis: {
                 focus: 'series'
             },
-            data: [1, 1, 1, 2, 2, 1, 0]
+            data: [1, 1, 1, 2, 2, 1, 0],
+            // itemStyle: {//自定义颜色
+            //     normal: { color: "rgb(2, 238, 255)" },
+            // }
         },
         {
             name: '乱砍乱伐',

src/dataSchema/page6Char2Schema.js

@@ -44,6 +44,12 @@ let page6Char2Schema = {
         type: 'value',
         axisLabel: {
             color: "rgba(255, 255, 255, 1)"
+        },
+        splitLine: {
+            show: true,
+            lineStyle: {
+                color: 'rgba(255,255,255,0.05)',
+            }
         }
     },
     series: [

src/views/index.vue

@@ -340,7 +340,7 @@ export default {
             return item.number;
           });
           //数量过小时隐藏滚动
-          if(this.page1Char1.xAxis.data.length<=7){
+          if(this.page1Char1.xAxis.data.length<=8){
             this.page1Char1.dataZoom[0].show = false
           }
           let charUuid = this.$refs.page1Char1.mid;
@@ -366,7 +366,7 @@ export default {
             return item.number;
           });
           //数量过小时隐藏滚动
-          if(this.page1Char2.xAxis.data.length<=7){
+          if(this.page1Char2.xAxis.data.length<=8){
             this.page1Char2.dataZoom[0].show = false
           }
           let charUuid = this.$refs.page1Char2.mid;
@@ -525,7 +525,7 @@ export default {
           this.page2Char2.series = seriesList;
 
            //数量过小时隐藏滚动
-          if(this.page2Char2.xAxis.data.length<=7){
+          if(this.page2Char2.xAxis.data.length<=8){
             this.page2Char2.dataZoom[0].show = false
           }
 
@@ -601,7 +601,7 @@ export default {
           this.page2Char3.series = seriesList;
 
            //数量过小时隐藏滚动
-          if(this.page2Char3.xAxis.data.length<=7){
+          if(this.page2Char3.xAxis.data.length<=8){
             this.page2Char3.dataZoom[0].show = false
           }
 
@@ -660,7 +660,7 @@ export default {
             return item.baseArea;
           });
            //数量过小时隐藏滚动
-          if(this.page5Char1.xAxis.data.length<=7){
+          if(this.page5Char1.xAxis.data.length<=8){
             this.page5Char1.dataZoom[0].show = false
           }
           let charUuid = this.$refs.page5Char1.mid;
@@ -687,7 +687,7 @@ export default {
             return item.number;
           });
           //数量过小时隐藏滚动
-          if(this.page5Char2.xAxis.data.length<=7){
+          if(this.page5Char2.xAxis.data.length<=8){
             this.page5Char2.dataZoom[0].show = false
           }
           let charUuid = this.$refs.page5Char2.mid;
@@ -755,7 +755,7 @@ export default {
           // console.log('x坐标',  this.page6Char1.xAxis.data)
           
           //数量过小时隐藏滚动
-          if(this.page6Char1.xAxis.data.length<=7){
+          if(this.page6Char1.xAxis.data.length<=8){
             this.page6Char1.dataZoom[0].show = false
           }
           let charUuid = this.$refs.page6Char1.mid;