.

src/assets/css/reset.scss

@@ -11,5 +11,5 @@ html,body,#app{
     // overflow: hidden;
 }
 html{
-    zoom: 50%;
+    // zoom: 50%;
 }

src/components/HyHeader.vue

@@ -80,7 +80,7 @@ header {
 }
 
 .mainbav a {
-    background-image: url(../assets/li_bg2.png);
+    // background-image: url(../assets/li_bg2.png);
     background-size: 100% 100%;
     background-repeat: no-repeat;
     display: block;
@@ -88,7 +88,7 @@ header {
     height: 78px;
     line-height: 78px;
     text-align: center;
-    font-size: 44px;
+    font-size: 54px;
     font-weight: normal;
     font-stretch: normal;
     letter-spacing: 2px;
@@ -98,12 +98,27 @@ header {
 }
 
 .h_m_active {
-    width: 420px !important;
+    width: 270px !important;
     height: 100px !important;
     line-height: 100px !important;
     font-size: 60px !important;
     opacity: 1 !important;
     color: #00fcff !important;
+    position: relative;
+}
+
+.h_m_active::before{
+    content: url(../assets/wenzi_left.png);
+    position: absolute;
+    display: inline-block;
+    left: 0;
+    transform: translateX(-100%);
+}
+.h_m_active::after{
+    content: url(../assets/wenzi_right.png);
+    position: absolute;
+    right: 0;
+    transform: translateX(100%);
 }
 
 .rightsidebar {

src/main.js

@@ -8,6 +8,7 @@ import 'echarts/map/js/china'
 import 'echarts/map/js/province/zhejiang'
 import './assets/js/huzhou'
 import './assets/js/changxing'
+import './assets/js/lvshan'
 import 'echarts-gl'
 
 // import VueAMap from 'vue-amap';

src/router/index.js

@@ -8,8 +8,8 @@ const routes = [
   {
     path: '/',
     name: 'Home',
-    component: Home
-    // component: () => import('@/views/Yield/Yield.vue')
+    // component: Home
+    component: () => import('@/views/Yield/Yield.vue')
   },
   {
     path: '/lvShanXiang',

src/views/Butcher/Butcher.vue

@@ -28,8 +28,19 @@
                     </table>
                 </article>
                 <article class="left_2">
-                    <h3>市场行情</h3>
-                    <E-Left1 style="height: 100%"></E-Left1>
+                    <!-- <h3>市场行情</h3>
+                    <E-Left1 style="height: 100%"></E-Left1> -->
+                    <h3>屠宰销售去向</h3>
+                    <table class="table">
+                        <tr>
+                            <th>羊只</th>
+                            <th>去向</th>
+                        </tr>
+                        <tr v-for="item in 9" :key="item" class="row">
+                            <td style="width: 30%">{{ 21457 + Math.floor(Math.random()*5000) }}</td>
+                            <td>安徽省六安市金安区</td>
+                        </tr>
+                    </table>
                 </article>
                 <article class="left_3">
                     <h3>长兴县销售情况</h3>
@@ -135,8 +146,8 @@
                             <th>羊只</th>
                             <th>来源地</th>
                         </tr>
-                        <tr v-for="item in 8" :key="item" class="row">
-                            <td style="width: 30%">{{ 12457 + item }}</td>
+                        <tr v-for="item in 9" :key="item" class="row">
+                            <td style="width: 30%">{{ 12457 + Math.floor(Math.random()*2000) }}</td>
                             <td>湖州市长兴县吕山乡</td>
                         </tr>
                     </table>
@@ -148,8 +159,8 @@
                             <th>羊只</th>
                             <th>去向</th>
                         </tr>
-                        <tr v-for="item in 8" :key="item" class="row">
-                            <td style="width: 30%">{{ 11457 + item }}</td>
+                        <tr v-for="item in 9" :key="item" class="row">
+                            <td style="width: 30%">{{ 11457 + Math.floor(Math.random()*1000) }}</td>
                             <td>安徽</td>
                         </tr>
                     </table>
@@ -211,25 +222,25 @@ export default {
                     isRise: false,
                 },
                 {
-                    description: "肉羊",
+                    description: "种羊",
                     price: "31",
                     site: "安徽",
                     isRise: false,
                 },
                 {
-                    description: "肉羊",
+                    description: "种羊",
                     price: "31",
                     site: "湖南",
                     isRise: true,
                 },
                 {
-                    description: "肉羊",
+                    description: "种羊",
                     price: "32",
                     site: "江西",
                     isRise: true,
                 },
                 {
-                    description: "肉羊",
+                    description: "种羊",
                     price: "29",
                     site: "内蒙古",
                     isRise: true,
@@ -384,6 +395,16 @@ export default {
             .left_3 {
                 min-width: 600px;
             }
+            .left_2{
+                overflow: hidden;
+                > .table {
+                    color: #fff;
+                    font-size: 30px;
+                    margin: 20px;
+                    width: 96%;
+                    text-align: center;
+                }
+            }
             > .left_1 {
                 overflow: hidden;
                 > .table {

src/views/Butcher/charts/EBottom1.vue

@@ -26,7 +26,7 @@ export default {
             let option = {
                 // backgroundColor: "#0D1943",
                 title: {
-                    text: "销售占比",
+                    text: "种羊销售额度",
                     left: "4%",
                     top: "4%",
                     textStyle: {
@@ -48,14 +48,14 @@ export default {
                         color: "#fff"
                     }
                 },
-                legend: {
-                    data: ["胴体", "种羊"],
-                    top: 10,
-                    textStyle: {
-                        fontSize: 20,
-                        color: "#fff",
-                    },
-                },
+                // legend: {
+                //     data: ["胴体", "种羊"],
+                //     top: 10,
+                //     textStyle: {
+                //         fontSize: 20,
+                //         color: "#fff",
+                //     },
+                // },
                 xAxis: {
                     data: ["5月", "6月", "7月", "8月", "9月", "10月", "11月"],
                     axisLabel: {
@@ -98,33 +98,34 @@ export default {
                     },
                 },
                 series: [
-                    {
-                        //真实数据所在
-                        name: "胴体",
-                        type: "bar",
-                        itemStyle: {
-                            color: "#147CE3",
-                            barBorderRadius: 3,
-                        },
-                        barWidth: '50%',
-                        label: {
-                            show: true, //开启显示
-                            position: "top", //在上方显示
-                            textStyle: {
-                                //数值样式
-                                color: "#42EFF5",
-                                fontSize: 20,
-                            },
-                            formatter: "{c}",
-                        },
-                        data: this.data1,
-                    },
+                    // {
+                    //     //真实数据所在
+                    //     name: "胴体",
+                    //     type: "bar",
+                    //     itemStyle: {
+                    //         color: "#147CE3",
+                    //         barBorderRadius: 3,
+                    //     },
+                    //     barWidth: '50%',
+                    //     label: {
+                    //         show: true, //开启显示
+                    //         position: "top", //在上方显示
+                    //         textStyle: {
+                    //             //数值样式
+                    //             color: "#42EFF5",
+                    //             fontSize: 20,
+                    //         },
+                    //         formatter: "{c}",
+                    //     },
+                    //     data: this.data1,
+                    // },
                     {
                         //真实数据所在
                         name: "种羊",
                         type: "bar",
                         itemStyle: {
-                            color: "#28A757ee",
+                            // color: "#28A757ee",
+                            color: "#16AFB8",
                             barBorderRadius: 3,
                         },
                         barGap: "-100%",

src/views/Butcher/charts/EBottom3.vue

@@ -25,7 +25,7 @@ export default {
             // 指定图表的配置项和数据
             let option = {
                 title: {
-                    text: "销售地排行",
+                    text: "种羊销售地排行",
                     left: "4%",
                     top: "4%",
                     textStyle: {

src/views/LvShanXiang/LvShanXiang.vue

@@ -79,20 +79,13 @@
                         />
                         <i class="icon_search" @click.stop="search"></i>
                     </main>
-                    <!-- <img class="bg_map" src="../../assets/u922.png" />
-                    <div class="icon_pasture_1" @click.stop="clickPoint('dr')">
-                        <img src="../../assets/icon_pasture.png">
-                        <h3>长兴德睿生态农业开发有限公司</h3>
-                    </div>
-                    <div class="icon_pasture_2" @click.stop="clickPoint('ys')">
-                        <img src="../../assets/icon_pasture.png">
-                        <h3>长兴永盛牧业有限公司</h3>
-                    </div> -->
-                    <iframe
+                    <!-- <iframe
                         src="http://122.237.98.3:8888/LvShanDaShuJu/page/map.html"
                         frameborder="0"
                         style="height: 100%; width: 100%"
-                    ></iframe>
+                    ></iframe> -->
+                    <Map style="height:100%; width:100%"></Map>
+                    <!-- <E-MiddleMap style="height: 100%"></E-MiddleMap> -->
                 </footer>
                 <footer class="footer_2" v-show="!isShowMain">
                     <h1>族谱溯源</h1>
@@ -106,10 +99,6 @@
                         <div class="mm">母母：{{ sheepClan.mm }}</div>
                     </article>
                 </footer>
-                <!-- <footer class="footer"> -->
-                <!-- <iframe src="http://122.237.98.3:8888/LvShanDaShuJu/page/map.html" frameborder="0" style="height: 100%; width:100%"></iframe> -->
-                <!-- <Map></Map> -->
-                <!-- </footer> -->
             </div>
             <div class="right">
                 <div class="right1">
@@ -144,6 +133,7 @@ import ERight2 from "./charts/ERight2";
 import ERight3 from "./charts/ERight3";
 
 import Map from "./charts/Map";
+import EMiddleMap from "../Yield/charts/EMiddleMap";
 
 export default {
     name: "LvShanXiang",
@@ -195,6 +185,7 @@ export default {
         ERight2,
         ERight3,
         Map,
+        EMiddleMap
     },
     created() {
         document.title = "吕山牧场";

src/views/Yield/Yield.vue

@@ -57,6 +57,7 @@
             </div>
             <div class="center">
                 <E-MiddleMap style="height: 100%"></E-MiddleMap>
+                <!-- <img src="../../assets/9bce2ea1dc3f5a0faeae227ad9ee24c.png" style="height: 100%; width: 100%"> -->
             </div>
             <div class="right">
                 <div class="warp">