李楠 4 years ago
parent
commit
6f791f5522

BIN
public/favicon.ico


+ 1 - 1
public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>长兴县乡村大脑</title>
   </head>
   <body>
     <noscript>

File diff suppressed because it is too large
+ 1 - 1
src/assets/js/changxing.js


+ 15 - 4
src/components/HyHeader.vue

@@ -6,18 +6,25 @@
             </a>
         </div>
         <div class="mainbav">
-            <a href="http://hy.ifarmcloud.com/screen/#/lvShanXiang">吕山牧场</a>
+            <a
+                href="http://hy.ifarmcloud.com/screen/#/lvShanXiang"
+                :class="{ h_m_active: navTag == 0 }"
+                >吕山牧场</a
+            >
             <a
                 href="http://hy.ifarmcloud.com/screen/#/butcher"
+                :class="{ h_m_active: navTag == 1 }"
                 >湖羊产业</a
             >
-            <a class="h_m_active" href="javascrtpt:void(0)">特色湖羊</a>
+            <a href="http://221.12.135.185:8090/bigScreen_new/page/hy.html"
+                >特色湖羊</a
+            >
             <a
                 href="http://hy.ifarmcloud.com/screen/#/yield"
+                :class="{ h_m_active: navTag == 3 }"
                 >湖羊养殖</a
             >
-            <a
-                href="http://122.237.98.3:8888/LvShanDaShuJu/page/page_map.html"
+            <a href="http://122.237.98.3:8888/LvShanDaShuJu/page/page_map.html"
                 >智慧养殖</a
             >
         </div>
@@ -37,6 +44,10 @@
 <script>
 export default {
     name: "HyHeader",
+    data() {
+        return {};
+    },
+    props: ["navTag"],
 };
 </script>
 

+ 3 - 3
src/router/index.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-// import Home from '../views/Home.vue'
+import Home from '../views/Home.vue'
 
 Vue.use(VueRouter)
 
@@ -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',

+ 1 - 1
src/views/Butcher/Butcher.vue

@@ -2,7 +2,7 @@
     <div class="Butcher">
         <header>
             <!-- <h1 class="title">湖羊全产业链数字化管理系统</h1> -->
-            <hy-header></hy-header>
+            <hy-header :navTag="1"></hy-header>
         </header>
         <section>
             <aside class="left">

+ 1 - 1
src/views/LvShanXiang/LvShanXiang.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="LvShanXiang">
-        <hy-header></hy-header>
+        <hy-header  :navTag="0"></hy-header>
         <div class="warp">
             <div class="left">
                 <div class="left1">

+ 2 - 2
src/views/LvShanXiang/charts/ELeft1.vue

@@ -41,7 +41,7 @@ export default {
                     bottom: 10,
                     data: ["种母羊", "种公羊", "商品羊", "羔羊"],
                     textStyle: {
-                        fontSize: 20,
+                        fontSize: 25,
                         color: "#fff",
                     },
                 },
@@ -61,7 +61,7 @@ export default {
                         ],
                         color: ["#FFB2FF", "#72DADA", "#3ABAFF", "#FF6A01"],
                         label: {
-                            fontSize: 20,
+                            fontSize: 30,
                         },
                     },
                 ],

+ 3 - 3
src/views/LvShanXiang/charts/ELeft2.vue

@@ -32,7 +32,7 @@ export default {
                     trigger: "item",
                     formatter: "{b}: {c} ({d}%)",
                     textStyle: {
-                        fontSize: 20,
+                        fontSize: 25,
                         color: "#fff",
                     },
                 },
@@ -41,7 +41,7 @@ export default {
                     bottom: 10,
                     data: ["特级", "一级", "二级", "三级"],
                     textStyle: {
-                        fontSize: 20,
+                        fontSize: 25,
                         color: "#fff",
                     },
                 },
@@ -61,7 +61,7 @@ export default {
                         ],
                         color: ["#BA43F5", "#FF3C43", "#F5944C", "#8CE8FA"],
                         label: {
-                            fontSize: 20,
+                            fontSize: 30,
                         },
                     },
                 ],

+ 1 - 1
src/views/Yield/Yield.vue

@@ -2,7 +2,7 @@
     <div class="Yield">
         <header>
             <!-- <h1 class="title">湖羊全产业链数字化管理系统</h1> -->
-            <hy-header></hy-header>
+            <hy-header :navTag="3"></hy-header>
         </header>
         <section>
             <div class="left">

+ 6 - 92
src/views/Yield/charts/EMiddleMap.vue

@@ -21,91 +21,6 @@ export default {
             let myChart = this.$echarts.init(
                 document.getElementById("EMiddleMap")
             );
-            // 指定图表的配置项和数据
-            // let option =
-            // {
-            //     tooltip: {},
-            //     visualMap: {
-            //         min: 200,
-            //         max: 1500,
-            //         left: "left",
-            //         top: "bottom",
-            //         text: ["High", "Low"],
-            //         seriesIndex: [1],
-            //         inRange: {
-            //             color: [
-            //                 "#45DE92",
-            //                 "#E0C740",
-            //                 "#46DF3C",
-            //                 "#4038E0",
-            //                 "#4038E0",
-            //             ],
-            //         },
-            //         calculable: true,
-            //     },
-            //     geo: {
-            //         map: "湖州市",
-            //         type: "map3D",
-            //         roam: true,
-            //         label: {
-            //             normal: {
-            //                 show: true,
-            //                 textStyle: {
-            //                     color: "#FF5A74",
-            //                     fontSize: 25,
-            //                 },
-            //             },
-            //         },
-            //         itemStyle: {
-            //             normal: {
-            //                 borderColor: "rgba(0, 0, 0, 0.2)",
-            //             },
-            //             emphasis: {
-            //                 areaColor: null,
-            //                 shadowOffsetX: 0,
-            //                 shadowOffsetY: 0,
-            //                 shadowBlur: 20,
-            //                 borderWidth: 0,
-            //                 shadowColor: "rgba(0, 0, 0, 0.5)",
-            //             },
-            //         },
-            //     },
-            //     series: [
-            //         {
-            //             type: "scatter",
-            //             coordinateSystem: "geo",
-            //             symbolSize: 20,
-            //             symbol: "none",
-            //             symbolRotate: 35,
-            //             label: {
-            //                 normal: {
-            //                     formatter: "{b}",
-            //                     position: "right",
-            //                     show: false,
-            //                 },
-            //                 emphasis: {
-            //                     show: true,
-            //                 },
-            //             },
-            //             itemStyle: {
-            //                 normal: {
-            //                     color: "#F06C00",
-            //                 },
-            //             },
-            //         },
-            //         {
-            //             name: "categoryA",·
-            //             type: "map",
-            //             geoIndex: 0,
-            //             // tooltip: {show: false},
-            //             data: [
-            //                 // { name: "长兴县", value: "0" },
-            //                 // { name: "安吉县", value: "111" },
-            //                 // { name: "上海", value: "222" },
-            //             ],
-            //         },
-            //     ],
-            // };
             let option = {
                 tooltip: {
                     formatter: function (params) {
@@ -118,7 +33,6 @@ export default {
                             );
                         }
                     },
-
                     textStyle: {
                         fontSize: 25,
                         color: "#fff",
@@ -141,15 +55,15 @@ export default {
                 // },
                 series: [
                     {
-                        name: "湖州市",
+                        name: "长兴县",
                         type: "map3D",
-                        map: "湖州市",
-                        data: [{ name: "长兴县", value: ["数量:", 422290] }],
+                        map: "长兴县",
+                        data: [{ name: "吕山乡", value: ["数量:", 422290] }],
                         regionHeight: 4,
                         boxWidth: 120,
                         // top: "10%",
                         // bottom: "10%",
-                        boxDepth: 100,
+                        boxDepth: 120,
                         regionHeight: 5,
                         // environment: new this.$echarts.graphic.LinearGradient(
                         //     0,
@@ -186,7 +100,7 @@ export default {
                             textStyle: {
                                 color: "#FFFFFF",
                                 fontWeight: "normal",
-                                fontSize: 25,
+                                fontSize: 20,
                                 backgroundColor: "rgba(0, 0, 0, 0)",
                             },
                             emphasis: {
@@ -218,7 +132,7 @@ export default {
                         viewControl: {
                             autoRotate: false, // 自动旋转
                             // distance: 115,
-                            distance: 140,
+                            distance: 130,
                         },
                     },
                 ],