浏览代码

地图样式修改

wangcc 2 年之前
父节点
当前提交
d981656c58

二进制
src/assets/img/back_mb.png


二进制
src/assets/img/fiull.png


二进制
src/assets/img/home.png


二进制
src/assets/img/left_bac.png


二进制
src/assets/img/right_xiaoban.png


+ 10 - 8
src/assets/scss/common.scss

@@ -34,10 +34,10 @@ body {
     height: 38px;
     line-height: 38px;
     text-align: left;
-    background: url(../img/ntitle.png) no-repeat;
-    background-size: 100% 100%;
+    // background: url(../img/ntitle.png) no-repeat;
+    // background-size: 100% 100%;
     text-indent: 40px;
-    margin-bottom: 10px;
+    // margin-bottom: 10px;
 }
 .addr{
     text-align: right;
@@ -113,11 +113,13 @@ body {
     // display: flex;
     // flex-direction: column;
     .left-item{
+        background-image: url('../img/left_bac.png');
+        background-size: 100% 100%;
         // flex: 1;
         height: calc( ( 100vh - var(--header-height) - 24px - 50px ) / 3 );
-        @include mbg(0.3);
+        // @include mbg(0.3);
         // border: 1px solid var(--main-color);
-        background: rgba(11,21,17,.6);
+        // background: rgba(11,21,17,.6);
         // border-radius: 8px;
         margin-bottom: 17px;
         &.chart-wrap .ntitle{
@@ -150,8 +152,8 @@ body {
 
     .scroll-board-wrap {
         position: relative;
-        margin-left: auto;
-        background-color: rgba(1,33,35,.7);
+        // margin-left: auto;
+        // background-color: rgba(1,33,35,.7);
         width: 380px;
         // border-radius: 8px;
         overflow: hidden;
@@ -205,7 +207,7 @@ body {
 .xiaoban{
     margin: 10px 0;
     width: 380px;
-    margin-left: auto;
+    // margin-left: auto;
     color: var(--main-color);
      .el-input .el-input__inner{
         border: none;

+ 1 - 0
src/assets/scss/flex.scss

@@ -1,6 +1,7 @@
 .u-flex {
 	display: flex;
 	flex-direction: row;
+	justify-content: center;
 	align-items: center;
 }
 

+ 5 - 8
src/components/amapnow.vue

@@ -599,9 +599,10 @@ export default {
           if (_this.smallClassPolygonArr) {
             _this.map.remove(_this.smallClassPolygonArr);
           }
-          // if (_this.treeCompMarkers.length > 0) {
-          //   _this.map.remove(_this.treeCompMarkers);
-          // }
+          
+          if (_this.treeCompMarkers.length > 0) {
+            _this.map.remove(_this.treeCompMarkers);
+          }
         });
 
         let wms = new AMap.TileLayer.WMTS({
@@ -1623,11 +1624,7 @@ export default {
           polygon.on('mouseout', (e) => {
             this.map.remove(that.smallMarker);
           });
-          that.map.on('rightclick', function (e) {
-            if (that.treeCompMarkers.length > 0) {
-              that.map.remove(that.treeCompMarkers);
-            }
-          });
+          
         }
       }
       // });

+ 186 - 132
src/components/header.vue

@@ -2,8 +2,8 @@
  * @Description: 
  * @Author: wangcc
  * @Date: 2022-06-14 18:11:54
- * @LastEditors: gcz
- * @LastEditTime: 2022-07-14 17:58:27
+ * @LastEditors: wangcc 1053578651@qq.com
+ * @LastEditTime: 2022-10-30 15:53:15
  * @FilePath: \castgroup_bigscreen\src\components\header.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -12,43 +12,52 @@
 -->
 <template>
     <div class="top-box">
-      <span class="top-time">{{nowTime}}</span>
-      <h2>贵州民投林业数字化工作平台</h2>
-      <div class="weather">
-        <div id="he-plugin-simple"></div>
-      </div>
-      <img v-if="!isFull" src="@/assets/img/full.png" @click="toggleFullScreen" />
-      <img v-else src="@/assets/img/back.png" @click="toggleFullScreen" />
+        <div class="go_home">
+            <a href="http://castgrouptest.hw.hongweisoft.com/" target="_blank" rel="noopener noreferrer">
+                <img src="../assets/img/home.png" alt="">
+                <p>返回首页</p>
+            </a>
+        </div>
+        <span class="top-time">{{ nowTime }}</span>
+        <h2>贵州民投林业数字化工作平台</h2>
+        <div class="weather">
+            <div id="he-plugin-simple"></div>
+        </div>
+        <div class="img-none">
+            <img v-if="!isFull" src="@/assets/img/fiull.png" @click="toggleFullScreen" />
+            <img v-else src="@/assets/img/back.png" @click="toggleFullScreen" />
+        </div>
+
     </div>
 </template>
 
 <script>
 import timeFormat from '@/utils/timeFormat'
-    export default {
-        name: 'Header',
-        components: {},
-        data () {
-            return {
-                nowTime:'',
-                isFull:false,
-            };
-        },
-        created(){
-            setInterval(() => {
-                this.nowTime = timeFormat(new Date(),'yyyy年mm月dd日 hh时MM分ss秒');
-            }, 1000);
-        },
-        mounted(){
-            window.onresize = () =>{
-                let clientHeight = document.documentElement.clientHeight;
-                let windowHeight = window.screen.height;
-                if(clientHeight==windowHeight){
-                    this.isFull=true
-                }else{
-                    this.isFull=false
-                }
-            };
-            window.WIDGET = {
+export default {
+    name: 'Header',
+    components: {},
+    data() {
+        return {
+            nowTime: '',
+            isFull: false,
+        };
+    },
+    created() {
+        setInterval(() => {
+            this.nowTime = timeFormat(new Date(), 'yyyy年mm月dd日 hh时MM分ss秒');
+        }, 1000);
+    },
+    mounted() {
+        window.onresize = () => {
+            let clientHeight = document.documentElement.clientHeight;
+            let windowHeight = window.screen.height;
+            if (clientHeight == windowHeight) {
+                this.isFull = true
+            } else {
+                this.isFull = false
+            }
+        };
+        window.WIDGET = {
             CONFIG: {
                 modules: '01234',
                 background: '5',
@@ -69,126 +78,171 @@ import timeFormat from '@/utils/timeFormat'
                 horizontal: 'left',
                 key: '4c47862a466540e881cc8e942c56fedf'
             }
-            };
-            let script = document.createElement('script');
-            script.type = 'text/javascript';
-            script.src =
+        };
+        let script = document.createElement('script');
+        script.type = 'text/javascript';
+        script.src =
             'https://widget.qweather.net/simple/static/js/he-simple-common.js?v=2.0';
-            document.getElementsByTagName('head')[0].appendChild(script);
-        },
-        methods: {
-            toggleFullScreen(){
-                // alternative standard method
-                if (!document.fullscreenElement &&
-                    !document.mozFullScreenElement && !document.webkitFullscreenElement && !document.msFullscreenElement) { // current working methods
-                    this.isFull = true;
-                    if (document.documentElement.requestFullscreen) {
-                        document.documentElement.requestFullscreen();
-                    } else if (document.documentElement.msRequestFullscreen) {
-                        document.documentElement.msRequestFullscreen();
-                    } else if (document.documentElement.mozRequestFullScreen) {
-                        document.documentElement.mozRequestFullScreen();
-                    } else if (document.documentElement.webkitRequestFullscreen) {
-                        document.documentElement.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
-                    }
-                } else {
-                    this.isFull = false;
-                    if (document.exitFullscreen) {
-                        document.exitFullscreen();
-                    } else if (document.msExitFullscreen) {
-                        document.msExitFullscreen();
-                    } else if (document.mozCancelFullScreen) {
-                        document.mozCancelFullScreen();
-                    } else if (document.webkitExitFullscreen) {
-                        document.webkitExitFullscreen();
-                    }
+        document.getElementsByTagName('head')[0].appendChild(script);
+    },
+    methods: {
+        toggleFullScreen() {
+            // alternative standard method
+            if (!document.fullscreenElement &&
+                !document.mozFullScreenElement && !document.webkitFullscreenElement && !document.msFullscreenElement) { // current working methods
+                this.isFull = true;
+                if (document.documentElement.requestFullscreen) {
+                    document.documentElement.requestFullscreen();
+                } else if (document.documentElement.msRequestFullscreen) {
+                    document.documentElement.msRequestFullscreen();
+                } else if (document.documentElement.mozRequestFullScreen) {
+                    document.documentElement.mozRequestFullScreen();
+                } else if (document.documentElement.webkitRequestFullscreen) {
+                    document.documentElement.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
                 }
-            }    
-        },
-    }
+            } else {
+                this.isFull = false;
+                if (document.exitFullscreen) {
+                    document.exitFullscreen();
+                } else if (document.msExitFullscreen) {
+                    document.msExitFullscreen();
+                } else if (document.mozCancelFullScreen) {
+                    document.mozCancelFullScreen();
+                } else if (document.webkitExitFullscreen) {
+                    document.webkitExitFullscreen();
+                }
+            }
+        }
+    },
+}
 </script>
 
 <style lang='scss' scoped>
 .top-box {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 85px;
-  background-image: url('../assets/img/index-top.png');
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  z-index: 999;
-  h2 {
-    margin: 0;
-    line-height: 48px;
-    color: #05d6e5;
-    position: absolute;
-    width: 100%;
-    top: 20px;
-    text-align: center;
-    letter-spacing: 1px;
-    font-size: 35px;
-    text-indent: -0.8em;
-    text-shadow: 0 2px #04213b;
-  }
-  span {
-    color: #0c6e7a;
-    font-size: 1.2em;
-    position: absolute;
-    line-height: 36px;
-    left: 7%;
-    top: 40px;
-    font-weight: bold;
-  }
-  img {
-    width: 27px;
-    height: 27px;
-    cursor: pointer;
-    position: absolute;
-    top: 5px;
-    right: 10px;
-    top: 40px;
-  }
-  .weather {
-    font-weight: bold;
-    /deep/ .s-sticker >div{
-        color: #0c6e7a!important;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 85px;
+    background-image: url('../assets/img/back_mb.png');
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    z-index: 999;
+
+    h2 {
+        margin: 0;
+        line-height: 48px;
+        color: #05d6e5;
+        position: absolute;
+        width: 100%;
+        top: 5px;
+        text-align: center;
+        letter-spacing: 1px;
+        font-size: 34px;
+        text-indent: -0.8em;
+        text-shadow: 0 2px #04213b;
+    }
+
+    span {
+        color: #00FAFD;
+        font-size: 1.2em;
+        position: absolute;
+        line-height: 36px;
+        left: 1%;
+        top: 55px;
+        // font-weight: bold;
+    }
+
+    .img-none {
+        width: 30px;
+        height: 30px;
+        cursor: pointer;
+        position: absolute;
+        top: 5px;
+        right: 10px;
+        top: 55px;
+
+        img {
+            width: 100%;
+            height: 100%;
+        }
+    }
+
+    .weather {
+        font-weight: bold;
+
+        /deep/ .s-sticker>div {
+            color: #00FAFD !important;
+            font-weight: normal;
+        }
+
+        position: absolute;
+        line-height: 40px;
+        width: 120px;
+        right: 100px;
+        top: 55px;
+    }
+
+    .go_home {
+        position: absolute;
+        top: 6px;
+        left: 1%;
+
+        cursor: pointer;
+        z-index: 99;
+
+        a {
+            width: 200px;
+            height: 30px;
+            text-decoration: none;
+            display: flex;
+            align-items: center;
+        }
+
+        p {
+            margin: 0 10px;
+
+            color: rgba(0, 250, 253, .6);
+            font-size: 16px;
+        }
+
+        img {
+            width: 26px;
+            height: 26px;
+        }
     }
-    position: absolute;
-    line-height: 40px;
-    width: 120px;
-    right: 100px;
-    top: 40px;
-  }
 }
+
 @media only screen and (max-width : 1200px) {
-    .top-box{
-        h2{
-           letter-spacing: 1px;
+    .top-box {
+        h2 {
+            letter-spacing: 1px;
             font-size: 28px;
-            text-indent: -0.8em; 
+            text-indent: -0.8em;
         }
     }
 }
+
 @media only screen and (max-height:900px) {
-    .top-box{
-        h2{
-           letter-spacing: 1px;
+    .top-box {
+        h2 {
+            letter-spacing: 1px;
             font-size: 30px;
-            text-indent: -0.8em; 
+            text-indent: -0.8em;
         }
     }
 
 }
+
 @media only screen and (min-height : 768px) and (max-width : 1024px) {
-    .top-box{
-        h2{
-           letter-spacing: 1px;
+    .top-box {
+        h2 {
+            letter-spacing: 1px;
             font-size: 24px;
-            text-indent: -0.8em; 
+            text-indent: -0.8em;
         }
-        .top-time{
+
+        .top-time {
             font-size: 16px;
         }
     }

+ 80 - 75
src/components/numerical.vue

@@ -1,9 +1,9 @@
 <!--
- * @LastEditors: gcz
+ * @LastEditors: wangcc 1053578651@qq.com
 -->
 <template>
   <div class="numerical" ref="numericalRef">
-    <div class="ntitle">{{$store.state.addr.selectAddr}}{{ntitle}}</div>
+    <div class="ntitle">{{ $store.state.addr.selectAddr }}{{ ntitle }}</div>
     <!-- <div class="ntitle">
             <span v-if="$store.state.addr.mapLevel=='province'">{{$store.state.addr.selectAddr}}{{ntitle}}</span>
             <span v-if="$store.state.addr.mapLevel=='city'">{{$store.state.addr.selectAddr}}{{ntitle}}</span>
@@ -15,53 +15,32 @@
       <div class="inner u-flex u-flex-wrap">
         <!-- @mouseenter="showDetails(item)"
         @mouseleave="unShowDetails" -->
-        <div
-          class="numerical-item"
-          v-for="(item,index) in data"
-          @click="showDetails(item)"
-          :key="item.name+index"
-        >
-          <div class="cell name">{{item.name}}</div>
-          <span class="cell number">{{item.number}}</span>
-          <span class="cell unit">{{item.unit}}</span>
+        <div class="numerical-item" v-for="(item, index) in data" @click="showDetails(item)" :key="item.name + index">
+          <div class="cell name">{{ item.name }}</div>
+          <span class="cell number">{{ item.number }}</span>
+          <span class="cell unit">{{ item.unit }}</span>
         </div>
       </div>
     </div>
-    <div
-      class="detail-wrap"
-      @mouseenter="isShowDetails=true"
-      @mouseleave="isShowDetails=false"
-      v-show="isShowDetails"
-      ref="detailRef"
-    >
-      <el-table
-        :key="hotKey"
-        :data="detailsData"
-        empty-text="该区域暂无数据"
-        style="width: 100%;overflow-y: auto;"
-        height="240"
-        @row-click="detailClick"
-      >
-        <el-table-column
-          :label="item.title"
-          :prop="item.value"
-          v-for="(item, index) in headerList"
-          :key="index"
-          align="center"
-        >
-          <template slot-scope="scope">{{scope.row[item.value]||'-'}}</template>
+    <div class="detail-wrap" @mouseenter="isShowDetails = true" @mouseleave="isShowDetails = false" v-show="isShowDetails"
+      ref="detailRef">
+      <el-table :key="hotKey" :data="detailsData" empty-text="该区域暂无数据" style="width: 100%;overflow-y: auto;"
+        height="240" @row-click="detailClick">
+        <el-table-column :label="item.title" :prop="item.value" v-for="(item, index) in headerList" :key="index"
+          align="center">
+          <template slot-scope="scope">{{ scope.row[item.value] || '-' }}</template>
         </el-table-column>
       </el-table>
     </div>
-    <div class="bottom-info" v-if="showBottomInfo&&pageName=='forest'">
-      截止目前,在{{$store.state.addr.selectAddr}}内,
-      {{bottomInfo.courseName}}项目有
-      {{bottomInfo.smallClassCount}}个小班,
-      累计占地面积{{bottomInfo.landArea}}亩,
-      累计蓄积量{{bottomInfo.smallClassStock}}平方米,
+    <div class="bottom-info" v-if="showBottomInfo && pageName == 'forest'">
+      截止目前,在{{ $store.state.addr.selectAddr }}内,
+      {{ bottomInfo.courseName }}项目有
+      {{ bottomInfo.smallClassCount }}个小班,
+      累计占地面积{{ bottomInfo.landArea }}亩,
+      累计蓄积量{{ bottomInfo.smallClassStock }}平方米,
       其中
-      <span v-for="(tree,index) in bottomInfo.treeList" :key="index">
-        {{tree.name}}{{tree.value}}株<i v-if="index<=bottomInfo.length">,</i><i v-else>。</i>
+      <span v-for="(tree, index) in bottomInfo.treeList" :key="index">
+        {{ tree.name }}{{ tree.value }}株<i v-if="index <= bottomInfo.length">,</i><i v-else>。</i>
       </span>
       <!-- xx树累计xxxx株,xx树累计xxxxx株。 -->
     </div>
@@ -97,18 +76,18 @@ export default {
       headerList: [],
       detailsData: [],
       hotKey: Date.now(),
-      showBottomInfo:false,
-      bottomInfo:{},
-      forestDetailTreeList:[],
+      showBottomInfo: false,
+      bottomInfo: {},
+      forestDetailTreeList: [],
     };
   },
-  watch:{
+  watch: {
     isShowDetails: {
-      handler: function(n,o) {
-          if(!n){
-            this.showBottomInfo=false;
-            this.headerList=[]
-          }
+      handler: function (n, o) {
+        if (!n) {
+          this.showBottomInfo = false;
+          this.headerList = []
+        }
       },
       // deep: true,
       immediate: true
@@ -126,7 +105,7 @@ export default {
   methods: {
     showDetails(item) {
       // console.log('pageName',this.pageName);
-      let param={
+      let param = {
         cityId: this.$store.state.addr.selectCity.areaId,
         countyId: this.$store.state.addr.selectDistrict.areaId,
         townId: this.$store.state.addr.selectStreet.areaId
@@ -153,14 +132,14 @@ export default {
       forestFarmDetail(param)
         .then((res) => {
           let resData = res.rows;
-          this.forestDetailTreeList = resData.map((item) =>{
+          this.forestDetailTreeList = resData.map((item) => {
             return item.treeList
           });
           // console.log('this.forestDetailTreeList',this.forestDetailTreeList);
           this.detailsData = resData;
-          console.log('forestFarmDetail res',this.detailsData);
+          console.log('forestFarmDetail res', this.detailsData);
 
-          resData.length>0 ? this.getHeaderList(resData):this.headerList=[];
+          resData.length > 0 ? this.getHeaderList(resData) : this.headerList = [];
         })
         .catch((err) => {
           console.log('forestFarmDetail err', err);
@@ -173,7 +152,7 @@ export default {
           let resData = res.data;
           this.detailsData = resData;
           // console.log('treeListDetail res',this.detailsData);
-         resData.length>0 ? this.getHeaderList(resData):this.headerList=[];
+          resData.length > 0 ? this.getHeaderList(resData) : this.headerList = [];
         })
         .catch((err) => {
           console.log('treeListDetail err', err);
@@ -186,7 +165,7 @@ export default {
           let resData = res.rows;
           this.detailsData = resData;
           console.log('baseItemDetail res', this.detailsData);
-          resData.length>0 ? this.getHeaderList(resData):this.headerList=[];
+          resData.length > 0 ? this.getHeaderList(resData) : this.headerList = [];
         })
         .catch((err) => {
           console.log('baseItemDetail err', err);
@@ -224,12 +203,12 @@ export default {
       });
 
       let newData = JSON.parse(JSON.stringify(data1));
-      console.log('this.pageName',this.pageName);
-      console.log('newData',newData);
+      console.log('this.pageName', this.pageName);
+      console.log('newData', newData);
       if (this.pageName == 'economics') {
         newData.splice(1, 1); //删除基地数量
         newData.splice(2, 1); //删除作物数量
-      }else if(this.pageName == 'forest'){
+      } else if (this.pageName == 'forest') {
         newData.splice(4, 1); //删除treeList
       }
 
@@ -243,10 +222,10 @@ export default {
         this.isShowDetails = false;
       }
     },
-    detailClick(row){
+    detailClick(row) {
       this.showBottomInfo = true;
       this.bottomInfo = row;
-      console.log('detailClick row',row);
+      console.log('detailClick row', row);
 
     }
   }
@@ -256,6 +235,7 @@ export default {
 <style lang='scss' scoped>
 // @import url('https://fonts.font.im/css?family=Rubik');
 .numerical {
+
   // box-sizing: border-box;
   // margin-bottom: 2vh;
   // border-radius: 10px;
@@ -265,33 +245,44 @@ export default {
     height: calc(100% - 48px);
     display: flex;
     align-items: center;
+
     .inner {
       width: 100%;
     }
+
     .numerical-item {
-      padding: 0 15px 15px 15px;
+      padding:15px;
       box-sizing: border-box;
-      width: 50%;
+      width: 43%;
+      margin: 5px;
       text-align: center;
+      box-shadow: inset 0px 0px 31px 1px rgba(0, 250, 253, 0.4);
+      border-radius: 0px 0px 0px 0px;
+      opacity: 1;
+      border: 1px solid rgba(0, 250, 253, 0.33);
+
       .name {
-        font-size: 18px;
+        font-size: 14px;
         color: #a6b7bf;
         margin-bottom: 5px;
       }
+
       .number {
         color: var(--main-color);
-        font-size: 32px;
+        font-size: 24px;
         margin-right: 5px;
         font-family: 'Rubik', sans-serif;
       }
+
       .unit {
         font-size: 14px;
         color: var(--main-color);
       }
     }
   }
+
   .detail-wrap {
-    
+
     position: absolute;
     top: 0;
     // right: -135%;
@@ -302,23 +293,27 @@ export default {
     z-index: 99;
     overflow: hidden;
     border-radius: 10px;
+
     // border: 1px solid rgb(2, 238, 255);
     ::-webkit-scrollbar {
       width: 0.3rem;
       height: 0.625rem;
       background: transparent;
     }
+
     ::-webkit-scrollbar-thumb {
       background-color: rgba($color: rgba(4, 175, 206, 0.884), $alpha: 0.6);
       border-radius: 2em;
     }
-    /deep/ .el-table{
+
+    /deep/ .el-table {
       // background: transparent;
       background: url('../assets/img/hoverbac.png');
       background-repeat: no-repeat;
       background-size: 100% 100%;
     }
-   /deep/ .el-table th {
+
+    /deep/ .el-table th {
       background-color: transparent !important;
       color: #fff;
       height: 51px;
@@ -329,15 +324,18 @@ export default {
     /deep/ .el-table tr {
       background-color: transparent !important;
       color: #00FAFD;
-      &:hover{
+
+      &:hover {
         cursor: pointer;
-        background: rgba(8,238,255,.1)!important;
+        background: rgba(8, 238, 255, .1) !important;
       }
     }
+
     /deep/ .el-table--enable-row-transition .el-table__body td,
     .el-table .cell {
       background-color: transparent;
     }
+
     /deep/ .el-table::before {
       //去除底部白线
       left: 0;
@@ -345,13 +343,16 @@ export default {
       width: 100%;
       height: 0px;
     }
-    /deep/ .el-table td.el-table__cell, /deep/ .el-table th.el-table__cell.is-leaf{
-        border-bottom:none;
+
+    /deep/ .el-table td.el-table__cell,
+    /deep/ .el-table th.el-table__cell.is-leaf {
+      border-bottom: none;
     }
   }
-   
+
 }
-.bottom-info{
+
+.bottom-info {
   position: fixed;
   box-sizing: border-box;
   left: 50%;
@@ -368,17 +369,21 @@ export default {
 }
 
 @media only screen and (max-width: 1280px) {
+
   //概况
   .numerical {
     .item-wrap {
       .numerical-item {
         padding: 0 0 15px 5px;
+
         .name {
           font-size: 16px;
         }
+
         .number {
           font-size: 24px;
         }
+
         .unit {
           font-size: 16px;
         }

+ 5 - 4
src/components/pickerAddr.vue

@@ -1,5 +1,5 @@
 <!--
- * @LastEditors: wangcc
+ * @LastEditors: wangcc 1053578651@qq.com
 -->
 <template>
   <div class="pickerAddr u-flex">
@@ -244,9 +244,10 @@ export default {
       // height: 50px;
       // line-height: 50px;
       color: var(--main-color);
-      background: url(../assets/img/select-bg.png) no-repeat;
-      background-size: 100% 100%;
-      border: none;
+      background: linear-gradient(180deg, rgba(0,250,253,0.3) 0%, rgba(0,250,253,0) 54%, rgba(0,250,253,0.3) 100%);
+border-radius: 0px 0px 0px 0px;
+opacity: 0.9;
+border: 1px solid rgba(0,250,253,0.3);
       &::-webkit-input-placeholder {
         color: var(--main-color);
       }

+ 81 - 145
src/views/index.vue

@@ -2,8 +2,8 @@
  * @Description: 
  * @Author: wangcc
  * @Date: 2022-07-06 15:56:45
- * @LastEditors: wangcc
- * @LastEditTime: 2022-10-28 17:54:59
+ * @LastEditors: wangcc 1053578651@qq.com
+ * @LastEditTime: 2022-10-30 16:35:16
  * @FilePath: \castgroup_bigscreen\src\views\index.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -14,38 +14,21 @@
     <Header></Header>
 
     <section class="nav-wrap">
-      <div
-        class="nav-item"
-        :class="{active:(index+1)==page}"
-        v-for="(item,index) in navList"
-        @click="navClick(index+1)"
-        :key="index"
-      >{{item.text}}</div>
+      <div class="nav-item" :class="{ active: (index + 1) == page }" v-for="(item,index) in navList" @click="navClick(index + 1)"
+        :key="index">{{ item.text }}</div>
     </section>
 
-    <Alarm v-if="page==6&&alarmData.length>=1" :data="alarmData" />
+    <Alarm v-if="page == 6 && alarmData.length >= 1" :data="alarmData" />
 
-    <section class="left-wrap" v-if="$store.state.addr.page=='forest'">
+    <section class="left-wrap" v-if="$store.state.addr.page == 'forest'">
       <Numerical class="left-item" :data="page1numerical" pageName="forest" />
-      <MyEcharts
-        class="left-item chart-wrap"
-        mid="page1Char1"
-        streetTitleText="各小班"
-        ref="page1Char1"
-        :option="page1Char1"
-        style
-      />
-      <MyEcharts
-        class="left-item chart-wrap"
-        mid="page1Char2"
-        streetTitleText="各小班"
-        ref="page1Char2"
-        :option="page1Char2"
-        style
-      />
+      <MyEcharts class="left-item chart-wrap" mid="page1Char1" streetTitleText="各小班" ref="page1Char1"
+        :option="page1Char1" style />
+      <MyEcharts class="left-item chart-wrap" mid="page1Char2" streetTitleText="各小班" ref="page1Char2"
+        :option="page1Char2" style />
     </section>
 
-    <section class="left-wrap" v-if="$store.state.addr.page=='treeSpecies'">
+    <section class="left-wrap" v-if="$store.state.addr.page == 'treeSpecies'">
       <Numerical class="left-item" :data="page2numerical" pageName="treeSpecies" />
       <!-- <MyEcharts
         class="left-item chart-wrap"
@@ -53,49 +36,24 @@
         :option="page2Char1"
         ref="page2Char1"
       />-->
-      <MyEcharts
-        class="left-item chart-wrap"
-        mid="page2Char2"
-        streetTitleText="各小班"
-        :option="page2Char2"
-        ref="page2Char2"
-      />
-      <MyEcharts
-        class="left-item chart-wrap"
-        mid="page2Char3"
-        streetTitleText="各小班"
-        :option="page2Char3"
-        ref="page2Char3"
-      />
+      <MyEcharts class="left-item chart-wrap" mid="page2Char2" streetTitleText="各小班" :option="page2Char2"
+        ref="page2Char2" />
+      <MyEcharts class="left-item chart-wrap" mid="page2Char3" streetTitleText="各小班" :option="page2Char3"
+        ref="page2Char3" />
     </section>
 
     <!-- 林业经济 -->
-    <section class="left-wrap" v-if="$store.state.addr.page=='economics'">
+    <section class="left-wrap" v-if="$store.state.addr.page == 'economics'">
       <!-- <Typeslide :data="typeSlideData" /> -->
       <Numerical class="left-item" :data="page5numerical" pageName="economics" />
-      <MyEcharts
-        class="left-item chart-wrap"
-        mid="page5Char2"
-        ref="page5Char2"
-        :option="page5Char2"
-      />
-      <MyEcharts
-        class="left-item chart-wrap"
-        mid="page5Char1"
-        ref="page5Char1"
-        :option="page5Char1"
-      />
+      <MyEcharts class="left-item chart-wrap" mid="page5Char2" ref="page5Char2" :option="page5Char2" />
+      <MyEcharts class="left-item chart-wrap" mid="page5Char1" ref="page5Char1" :option="page5Char1" />
     </section>
 
     <!-- 事件信息 -->
-    <section class="left-wrap event-page" v-if="$store.state.addr.page=='event'">
+    <section class="left-wrap event-page" v-if="$store.state.addr.page == 'event'">
       <Numerical class="left-item" :data="page6numerical" />
-      <MyEcharts
-        class="left-item chart-wrap"
-        mid="page6Char1"
-        ref="page6Char1"
-        :option="page6Char1"
-      />
+      <MyEcharts class="left-item chart-wrap" mid="page6Char1" ref="page6Char1" :option="page6Char1" />
       <!-- <MyEcharts
           class="left-item chart-wrap"
           mid="page6Char2"
@@ -105,23 +63,13 @@
       <div class="left-item">
         <!-- <div class="ntitle">{{$store.state.addr.selectAddr}}事件发生记录</div> -->
         <div class="ntitle">
-          <span
-            v-if="$store.state.addr.mapLevel=='province'"
-          >{{$store.state.addr.selectAddr}}各地州(市)事件发生记录</span>
-          <span v-if="$store.state.addr.mapLevel=='city'">{{$store.state.addr.selectAddr}}各县事件发生记录</span>
-          <span
-            v-if="$store.state.addr.mapLevel=='district'"
-          >{{$store.state.addr.selectAddr}}各乡镇事件发生记录</span>
-          <span v-if="$store.state.addr.mapLevel=='street'">{{$store.state.addr.selectAddr}}各村事件发生记录</span>
+          <span v-if="$store.state.addr.mapLevel == 'province'">{{ $store.state.addr.selectAddr }}各地州(市)事件发生记录</span>
+          <span v-if="$store.state.addr.mapLevel == 'city'">{{ $store.state.addr.selectAddr }}各县事件发生记录</span>
+          <span v-if="$store.state.addr.mapLevel == 'district'">{{ $store.state.addr.selectAddr }}各乡镇事件发生记录</span>
+          <span v-if="$store.state.addr.mapLevel == 'street'">{{ $store.state.addr.selectAddr }}各村事件发生记录</span>
         </div>
-        <dv-scroll-board
-          :key="scrollBoardKey"
-          class="scroll-event"
-          :config="scrollEventConfig"
-          ref="scrollBoard"
-          @click="scrollEventClick"
-          @mouseout="scrollEventOut"
-        />
+        <dv-scroll-board :key="scrollBoardKey" class="scroll-event" :config="scrollEventConfig" ref="scrollBoard"
+          @click="scrollEventClick" @mouseout="scrollEventOut" />
       </div>
     </section>
 
@@ -133,72 +81,47 @@
           <i class="el-icon-search el-input__icon" slot="suffix" @click="basesearch"></i>
         </el-input>
       </div>
-      <div class="tab-box" v-if="showxiaoban">
-        <div
-          class="tab-btn"
-          :class="{tabActive:cur == index}"
-          @click="tabLink(index)"
-          v-for="(item,index) in tabData"
-          :key="index"
-        >
-          <span class="tab-span">{{item.name}}</span>
-        </div>
-      </div>
-      <div v-if="showxiaoban" class="xiaoban u-flex">
-        <div class="tab-class-search" v-if="cur == 1">
-          <!-- <div class="title">小班查询:</div> -->
-          <el-input v-model="xiaobaninput" placeholder="请输入小班号">
-            <i class="el-icon-search el-input__icon" slot="suffix" @click="xiaobansearch"></i>
-          </el-input>
+      <div class="right_xiaoban">
+        <div class="tab-box" v-if="showxiaoban">
+          <div class="tab-btn" :class="{ tabActive: cur == index }" @click="tabLink(index)" v-for="(item, index) in tabData"
+            :key="index">
+            <span class="tab-span">{{ item.name }}</span>
+          </div>
         </div>
-        <div class="tab-class-search" v-if="cur == 0">
-          <!-- <div class="title">项目查询:</div> -->
-          <el-input v-model="projectInput" placeholder="请输入项目名称">
-            <i class="el-icon-search el-input__icon" slot="suffix" @click="projectSearch"></i>
-          </el-input>
+        <div v-if="showxiaoban" class="xiaoban u-flex">
+          <div class="tab-class-search" v-if="cur == 1">
+            <!-- <div class="title">小班查询:</div> -->
+            <el-input v-model="xiaobaninput" placeholder="请输入小班号">
+              <i class="el-icon-search el-input__icon" slot="suffix" @click="xiaobansearch"></i>
+            </el-input>
+          </div>
+          <div class="tab-class-search" v-if="cur == 0">
+            <!-- <div class="title">项目查询:</div> -->
+            <el-input v-model="projectInput" placeholder="请输入项目名称">
+              <i class="el-icon-search el-input__icon" slot="suffix" @click="projectSearch"></i>
+            </el-input>
+          </div>
         </div>
-      </div>
-      <section
-        v-if="showxiaoban||showbase"
-        class="scroll-board-wrap"
-        :class="{close:showScrollBoard==true}"
-        @mouseout="scrollOut"
-      >
-        <dv-scroll-board
-          v-if="showbase"
-          :key="scrollBoardKey"
-          class="scroll-board-01 scroll-base"
-          :config="scrollBaseListConfig"
-          ref="scrollBaseList"
-          @click="scrollBaseListClick"
-          @mouseout="baseListClick"
-        />
-        <dv-scroll-board
-          v-if="showxiaoban && cur == 1"
-          :key="scrollBoardKey"
-          class="scroll-board-01"
-          :config="scrollBoardConfig"
-          ref="scrollBoard"
-          @click="scrollBoardClick"
-          @mouseout="scrollOut"
-          :style="scrollBoardStyle"
-        />
-        <dv-scroll-board
-          v-if="showxiaoban && cur == 0"
-          :key="scrollBoardKey"
-          class="scroll-board-01"
-          :config="scrollPeojectConfig"
-          ref="scrollProjectBoard"
-          @click="scrollProjectClick"
-          @mouseout="scrollOut"
-          :style="scrollBoardStyle"
-        />
+        <section v-if="showxiaoban || showbase" class="scroll-board-wrap" :class="{ close: showScrollBoard == true }"
+        @mouseout="scrollOut">
+        <dv-scroll-board v-if="showbase" :key="scrollBoardKey" class="scroll-board-01 scroll-base"
+          :config="scrollBaseListConfig" ref="scrollBaseList" @click="scrollBaseListClick" @mouseout="baseListClick" />
+        <dv-scroll-board v-if="showxiaoban && cur == 1" :key="scrollBoardKey" class="scroll-board-01"
+          :config="scrollBoardConfig" ref="scrollBoard" @click="scrollBoardClick" @mouseout="scrollOut"
+          :style="scrollBoardStyle" />
+        <dv-scroll-board v-if="showxiaoban && cur == 0" :key="scrollBoardKey" class="scroll-board-01"
+          :config="scrollPeojectConfig" ref="scrollProjectBoard" @click="scrollProjectClick" @mouseout="scrollOut"
+          :style="scrollBoardStyle" />
         <div class="scroll-board-tool" @click="toggleShowScrollBoard">
           <div class="inner">
             <img src="../assets/img/jiantou.png" alt />
           </div>
         </div>
       </section>
+      </div>
+
+
+      
     </section>
     <!-- </dv-full-screen-container> -->
   </div>
@@ -338,7 +261,7 @@ export default {
       baseinput: ''
     };
   },
-  created() {},
+  created() { },
   computed: {
     ...mapGetters(['vuexCityList', 'vuexDistrictList', 'vuexStreetList'])
   },
@@ -1272,14 +1195,16 @@ export default {
 
 <style lang='scss' scoped>
 @import url(./index.scss);
+
 .tab-box {
   // background-color: rgba(1, 33, 35, 0.7);
-  height: 46px;
-  width: 380px;
-  margin-left: auto;
+  height: 36px;
+  width: 100%;
+  // margin-left: auto;
   display: flex;
   justify-content: left;
   align-items: center;
+
   .tab-btn {
     width: 50%;
     background-color: rgba(0, 69, 70, 0.6);
@@ -1291,32 +1216,43 @@ export default {
     color: rgba(255, 255, 255, 0.6);
 
     cursor: pointer;
+
     .tab-span {
       display: inline-block;
     }
   }
+
   .tabActive {
-    background-image: linear-gradient(
-      rgba(0, 251, 255, 0.2) 6%,
-      transparent,
-      rgba(0, 251, 255, 0.2) 96%
-    );
+    background-image: linear-gradient(rgba(0, 251, 255, 0.2) 6%,
+        transparent,
+        rgba(0, 251, 255, 0.2) 96%);
     color: #00fafd;
   }
 }
+
 .tab-class-search {
   display: flex;
   height: 40px;
   width: 100%;
   align-items: center;
 }
+
 /deep/ .row-item {
   line-height: normal !important;
   align-items: center;
 }
+
 /deep/ .dv-scroll-board .rows .ceil {
   white-space: normal;
   overflow: unset;
   text-overflow: unset;
 }
+.right_xiaoban{
+  background-color: rgba(1,33,35,0.7);
+  display: flex;
+    flex-direction: column;
+    /* justify-content: right; */
+    width: 59%;
+    float: right;
+}
 </style>