Browse Source

统计分析

彭宇 2 năm trước cách đây
mục cha
commit
0a049e1199

+ 15 - 0
src/components/supermap.vue

@@ -247,6 +247,21 @@ export default {
     showLineLatLng: null
   },
   methods: {
+    loadHeatMap: async function() {
+      var heatNumbers = 150, heatRadius = 30
+      var num = parseInt(heatNumbers)
+      num = (num > 0) ? num : 0
+      var radius = parseInt(heatRadius)
+      radius = (radius > 0) ? radius : 0
+      var heatPoints = []
+      for (var i = 0; i < num; i++) {
+        heatPoints[i] = [Math.random() * 0.28 + 42, Math.random() * 0.5 + 125, Math.random() * 80]
+      }
+      var resultLayer = window.L.heatLayer(heatPoints, {
+        radius: radius,
+        minOpacity: 0.5
+      }).addTo(this.map)
+    },
     clearM: async function(isAggregation) { //清理地图标点
       if (isAggregation) {
         if (this.isAggregationMyGroup != undefined && this.isAggregationMyGroup != false) {

+ 455 - 480
src/views/bigdata/bigdata.vue

@@ -1,491 +1,466 @@
 <!--一体化首页-->
 <template>
-	<div class="bigdata-con">
-		<!-- 头部B -->
-		<div class="header">
-			<!-- title -->
-			<div class="header-left"><img class="logo" src="@/assets/images/integrated/logo-small.png" />
-				<h3 class="title">数字四平态势感知监管平台-数字环保-统计分析</h3></div>
-			<div class="bignav">
-				<img src="@/assets/images/integrated/bigdata-header-nav-left.png" />
-        <router-link v-for="(navbar,index) in navbar " :key="index" :to="navbar.path" class="bignav-list" :class="index===navbar.length-1?'on':''" exact>
+  <div class="bigdata-con">
+    <!-- 头部B -->
+    <div class="header">
+      <!-- title -->
+      <div class="header-left"><img class="logo" src="@/assets/images/integrated/logo-small.png"/>
+        <h3 class="title">数字四平态势感知监管平台-数字环保-统计分析</h3>
+      </div>
+      <div class="bignav">
+        <img src="@/assets/images/integrated/bigdata-header-nav-left.png"/>
+        <router-link v-for="(navbar,index) in navbar " :key="index" :to="navbar.path" class="bignav-list"
+                     :class="index===navbar.length-1?'on':''" exact>
           {{navbar.name}}
         </router-link>
-				<img src="@/assets/images/integrated/bigdata-header-nav-right.png" />
-			</div>
-		</div>
-		<!-- 头部E -->
-
-		<div class="bigdata-body">
-			<!-- 第一纵向-->
-			<div class="bigdata-list wid-li-1">
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>事件类型、分布统计</span>
-					</div>
-					<div class="twins">
-						<div class="count">
-							<div class="count-z m-l-15">事件总数<span>{{total}}</span></div>
-							<div class="count-z m-l-15">未处理<span> {{untreated}}</span></div>
-							<div class="count-z m-l-15">处理中<span> {{processing}}</span></div>
-						</div>
-						<chartEvent></chartEvent>
-					</div>
-				</div>
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>人口分布统计</span>
-					</div>
-					<chartPopulation></chartPopulation>
-				</div>
-				<div class="b-con">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>企业分布统计</span>
-					</div>
-					<chartEnterprise></chartEnterprise>
-				</div>
-			</div>
-			<!-- 第二纵向-->
-			<div class="bigdata-list wid-li-2 m-l-15">
-				<div class="bigdata-map mg-b-20">
-
-				</div>
-				<tabbar></tabbar>
-			</div>
-			<!-- 第三纵向-->
-			<div class="bigdata-list wid-li-1 m-l-15">
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>隐患分布统计</span>
-					</div>
-					<chartDanger></chartDanger>
-				</div>
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>林场分布统计</span>
-					</div>
-					<chartForestFarm></chartForestFarm>
-				</div>
-				<div class="b-con">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>矿坑分布统计</span>
-					</div>
-					<chartPit></chartPit>
-				</div>
-			</div>
-			<!-- 第四纵向-->
-			<div class="bigdata-list wid-li-1 m-l-15">
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>散养户分布统计</span>
-					</div>
-					<chartFreelyraise></chartFreelyraise>
-				</div>
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>养殖场分布统计</span>
-					</div>
-					<chartFarm></chartFarm>
-				</div>
-				<div class="b-con">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>散养户、养殖场养殖种类布统计</span>
-					</div>
-					<chartFarmtype></chartFarmtype>
-				</div>
-			</div>
-			<!-- 第五纵向-->
-			<div class="bigdata-list wid-li-1 m-l-15">
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>收集点分布统计</span>
-					</div>
-					<chartCollection></chartCollection>
-				</div>
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>水鹤分布统计</span>
-					</div>
-					<chartCaterCrane></chartCaterCrane>
-				</div>
-				<div class="b-con">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>处理中心分布统计</span>
-					</div>
-					<chartProcessing></chartProcessing>
-				</div>
-			</div>
-			<!-- 第六纵向-->
-			<div class="bigdata-list wid-li-1 m-l-15">
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>消火栓分布统计</span>
-					</div>
-					<chartHydrant></chartHydrant>
-				</div>
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>泡沫液分布统计</span>
-					</div>
-					<chartFoam></chartFoam>
-				</div>
-				<div class="b-con">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>取水口分布统计</span>
-					</div>
-					<chartWaterIntake></chartWaterIntake>
-				</div>
-			</div>
-			<!-- 第七纵向-->
-			<div class="bigdata-list wid-li-1 m-l-15">
-				<div class="b-con mg-b-20 taller">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>摄像头分布、类型、型号统计</span>
-					</div>
-					<chartCamera></chartCamera>
-				</div>
-			</div>
-			<!-- 第八纵向-->
-			<div class="bigdata-list wid-li-1 m-l-15">
-				<div class="b-con mg-b-20 tall">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>探测器分布、类型统计</span>
-					</div>
-					<chartDetector></chartDetector>
-				</div>
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>消防力量分布统计</span>
-					</div>
-					<chartFireControl></chartFireControl>
-				</div>
-			</div>
-		</div>
-
-	</div>
+        <img src="@/assets/images/integrated/bigdata-header-nav-right.png"/>
+      </div>
+    </div>
+    <!-- 头部E -->
+
+    <div class="bigdata-body">
+      <!-- 第一纵向-->
+      <div class="bigdata-list wid-li-1">
+        <div class="b-con mg-b-20">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>事件来源,类型统计</span>
+          </div>
+          <chartEvent></chartEvent>
+        </div>
+        <div class="b-con mg-b-20">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>林场分布统计</span>
+          </div>
+          <chartForestFarm></chartForestFarm>
+        </div>
+        <div class="b-con">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>设备类型统计</span>
+          </div>
+          <chartEquipmentType></chartEquipmentType>
+        </div>
+      </div>
+      <!-- 第二纵向-->
+      <div class="bigdata-list wid-li-2 m-l-15">
+        <div class="bigdata-map mg-b-20">
+          <!-- 地图 -->
+          <bigdataSupermap ref="bigdataSupermap" style="width: 100%;height: 59vh;" class="indexSupermapClass"
+                           :mapDiv="'bigdataMap'" dynamicPlotting="false" :mapSite="{doubleClickZoom:false}"
+                           :codes="['9fa5']" :isSideBySide="false"/>
+        </div>
+        <tabbar></tabbar>
+      </div>
+      <!-- 第三纵向-->
+      <div class="bigdata-list wid-li-3 m-l-15 flex-r">
+        <div class="b-con mg-b-20 b-49">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>起火原因统计</span>
+          </div>
+          <chartFireCause></chartFireCause>
+        </div>
+        <div class="b-con mg-b-20 b-49">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>设备上报事件数量</span>
+          </div>
+          <chartDeviceReportingEvents></chartDeviceReportingEvents>
+        </div>
+        <div class="b-con mg-b-20 b-49">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>重点区域</span>
+          </div>
+          <chartKeyArea></chartKeyArea>
+        </div>
+        <div class="b-con mg-b-20 b-49">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>珍惜古树</span>
+          </div>
+          <chartAncientTree></chartAncientTree>
+        </div>
+        <div class="b-con">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>事件趋势</span>
+          </div>
+          <chartEventTrend></chartEventTrend>
+          <strong></strong>
+        </div>
+      </div>
+      <!-- 第四纵向-->
+      <div class="bigdata-list wid-li-3 m-l-15 flex-r">
+        <div class="b-con mg-b-20 tall">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>网格分布</span>
+          </div>
+          <chartGridDistribution></chartGridDistribution>
+        </div>
+        <div class="b-con">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>天气趋势</span>
+          </div>
+          <chartWeatherTrends></chartWeatherTrends>
+        </div>
+      </div>
+      <!-- 第五纵向-->
+      <div class="bigdata-list wid-li-3 m-l-15 flex-r">
+        <div class="b-con mg-b-20 tall">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>网格人员</span>
+          </div>
+          <chartGridStaff></chartGridStaff>
+        </div>
+        <div class="b-con mg-b-20 b-49">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>防火队</span>
+          </div>
+          <chartFireBrigade></chartFireBrigade>
+        </div>
+        <div class="b-con mg-b-20 b-49">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>气象站</span>
+          </div>
+          <chartWeatherStation></chartWeatherStation>
+        </div>
+      </div>
+      <!-- 第六纵向-->
+      <div class="bigdata-list wid-li-1 m-l-15">
+        <div class="b-con mg-b-20 taller">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>设备分布</span>
+          </div>
+          <chartEquipmentDistribution></chartEquipmentDistribution>
+        </div>
+      </div>
+    </div>
+
+  </div>
 </template>
 
 <script>
-	import tabbar from './tabbar.vue' //区域切换
-
-	//echarts
-	import chartEvent from './chart-event.vue' //1  事件
-	import chartPopulation from './chart-population.vue' //2  人口
-	import chartEnterprise from './chart-enterprise.vue' //3  公司
-	import chartDanger from './chart-danger.vue' //4  隐患
-	import chartForestFarm from './chart-forestfarm.vue' //5  林场
-	import chartPit from './chart-pit.vue' //6  矿坑
-	import chartFreelyraise from './chart-freelyraise.vue' //7  散养户
-	import chartFarm from './chart-farm.vue' //8  养殖场
-	import chartFarmtype from './chart-farmtype.vue' //9  散养户、养殖场-养殖种类
-	import chartCollection from './chart-collection.vue' //10 收集点
-	import chartCaterCrane from './chart-watercrane.vue' //11 水鹤
-	import chartProcessing from './chart-processing.vue' //12 处理中心
-	import chartHydrant from './chart-hydrant.vue' //13 消火栓
-	import chartFoam from './chart-foam.vue' //14 泡沫液
-	import chartWaterIntake from './chart-waterintake' //15 取水口
-	import chartCamera from './chart-camera' //16 摄像头
-	import chartDetector from './chart-detector' //17 探测器
-	import chartFireControl from './chart-firecontrol' //18 消防力量
-
-
-	export default {
-		components: {
-			tabbar,
-			chartEvent,
-			chartPopulation,
-			chartEnterprise,
-			chartDanger,
-			chartForestFarm,
-			chartPit,
-			chartFreelyraise,
-			chartFarm,
-			chartFarmtype,
-			chartCollection,
-			chartCaterCrane,
-			chartProcessing,
-			chartHydrant,
-			chartFoam,
-			chartWaterIntake,
-			chartCamera,
-			chartDetector,
-			chartFireControl
-		},
-		data() {
-
-			return {
-				visited: '',
-				navbar: [
-          {
-            //生态云图
-            path: '/forest',
-            name: '生态云图',
-          },
-          {
-            //数据中心
-            path: '/datacenter',
-            name: '数据中心',
-          },
-          {
-            //监控中心
-            path: '/monitor',
-            name: '监控中心',
-          }, {
-            path: '/',
-            name: '土壤墒情',
-          },
-          {
-            path: '/',
-            name: '污染源',
-          }, {
-            path: '/',
-            name: '水质环境',
-          },
-          {
-            path: '/',
-            name: '大气环境',
-          },
-          {
-            path: '/bigdata',
-            name: '统计分析',
-          },
-				],
-				total: 0, //事件总数
-				untreated: 0, //事件-未处理
-				processing: 0 // 事件-处理中
-
-
-
-
-
-			}
-		},
-	}
+import tabbar from './tabbar.vue' //区域切换
+import bigdataSupermap from '@/components/supermap' //超图
+
+//echarts
+import chartEvent from './chart-event.vue' //1  事件、、
+import chartForestFarm from './chart-forestFarm.vue' //2  林场分布、、
+import chartEquipmentType from './chart-equipmentType.vue' //3  公司、、
+import chartFireCause from './chart-fireCause.vue' //4  起火原因、、
+import chartDeviceReportingEvents from './chart-deviceReportingEvents.vue' //5  设备上报数量、、
+import chartEventTrend from './chart-eventTrend.vue' //6  事件趋势、、
+import chartKeyArea from './chart-keyArea.vue' //7  重点区域、、
+import chartAncientTree from './chart-ancientTree.vue' //8  珍惜古树、、
+import chartWeatherTrends from './chart-weatherTrends.vue' //9  天气趋势、、
+import chartGridDistribution from './chart-gridDistribution.vue' //10 网格分布、、
+import chartFireBrigade from './chart-fireBrigade.vue' //12 防火队、、
+import chartGridStaff from './chart-gridStaff.vue' //13 网格人员、、
+import chartWeatherStation from './chart-weatherStation.vue' //14 气象站、、
+import chartEquipmentDistribution from './chart-equipmentDistribution' //16 设备分布、、
+
+export default {
+  components: {
+    bigdataSupermap,
+    tabbar,
+    chartEvent,
+    chartForestFarm,
+    chartEquipmentType,
+    chartFireCause,
+    chartDeviceReportingEvents,
+    chartEventTrend,
+    chartKeyArea,
+    chartAncientTree,
+    chartWeatherTrends,
+    chartGridDistribution,
+    chartFireBrigade,
+    chartGridStaff,
+    chartWeatherStation,
+    chartEquipmentDistribution
+  },
+  data() {
+
+    return {
+      visited: '',
+      navbar: [
+        {
+          //生态云图
+          path: '/forest',
+          name: '生态云图'
+        },
+        {
+          //数据中心
+          path: '/datacenter',
+          name: '数据中心'
+        },
+        {
+          //监控中心
+          path: '/monitor',
+          name: '监控中心'
+        }, {
+          path: '/',
+          name: '土壤墒情'
+        },
+        {
+          path: '/',
+          name: '污染源'
+        }, {
+          path: '/',
+          name: '水质环境'
+        },
+        {
+          path: '/',
+          name: '大气环境'
+        },
+        {
+          path: '/bigdata',
+          name: '统计分析'
+        }
+      ],
+      total: 0, //事件总数
+      untreated: 0, //事件-未处理
+      processing: 0 // 事件-处理中
+
+    }
+  },
+  mounted() {
+    setTimeout(() => {
+      this.$refs.bigdataSupermap.loadHeatMap() //事件分布
+    }, 5000)
+  }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-	@import '@/assets/styles/base.scss';
-
-
-	.bigdata-con {
-		width: -webkit-fit-content;
-		height: 100%;
-		background: #01020c;
-
-		.el-loading-mask {
-			background: none;
-		}
-
-		.header {
-			height: 3rem;
-			display: flex;
-			align-items: center;
-
-			.header-left {
-				position: fixed;
-				left: 10px;
-				top: 5px;
-				display: flex;
-				align-items: center;
-				color: $inBlue;
-				font-family: $fontFk;
-
-				.title {
-					margin: 0 auto;
-					text-align: center;
-					background-image: -webkit-linear-gradient(bottom, rgba($color: #00f6ff, $alpha: 1.0), rgba($color: #005aff, $alpha: 1.0));
-					-webkit-background-clip: text;
-					-webkit-text-fill-color: transparent;
-					color: #fff;
-					font-size: 23px;
-				}
-			}
-
-			.bignav {
-				height: 40px;
-				position: fixed;
-				left: 50%;
-				transform: translateX(-50%);
-				top: 0;
-				z-index: 1000;
-				border-radius: 5px;
-				display: flex;
-				justify-content: cetner;
-				align-items: center;
-
-				.bignav-list {
-					background: url(../../assets/images/integrated/bigdata-header-nav-re.png) repeat-x center;
-					float: left;
-					display: flex;
-					justify-content: cetner;
-					align-items: center;
-					color: #fff;
-					height: 40px;
-					font-size: 12px;
-					padding: 0 23px;
-					cursor: pointer;
-					-webkit-transform: translateY(0);
-					transform: translateY(0);
-					transition: all 0.3s ease-in-out;
-				}
-
-				.router-link-active,
-				.bignav-list:hover {
-					filter: brightness(2.3);
-					-webkit-transform: translateY(2px);
-					transform: translateY(2px);
-					color: $inBlueHover;
-					border-bottom: 1px solid $inBlueHover;
-					transition: all 0.3s ease-in-out;
-
-				}
-			}
-
-
-		}
-
-		.bigdata-body {
-			margin: 15px;
-			display: flex;
-			align-items: top;
-			// justify-content: center;
-
-		}
-
-		.bigdata-list {
-			display: flex;
-			flex-direction: column;
-			flex-wrap: wrap;
-
-			.twins-con {
-				width: 100% !important;
-			}
-
-			.b-con {
-				width: 100%;
-				height: 28.5vh;
-
-				box-shadow: 0 0 1px rgba($color: #163696, $alpha: .1),
-					-0 -0 30px rgba($color: #163696, $alpha: .5) inset;
-
-				// display: flex;
-				// flex-direction: column;
-				.b-tit {
-					width: 100%;
-					display: flex;
-					align-items: center;
-					padding: 10px;
-
-					span {
-						font-size: 15px;
-						color: #00ceec;
-						margin-left: 5px;
-						text-shadow: 0 0 3px rgba($color: #41ff84, $alpha: .5),
-							-0 -0 10px rgba($color: #41fff8, $alpha: .9);
-					}
-				}
-
-				.twins {
-					width: 100%;
-					display: flex;
-					position: relative;
-
-					.count {
-						width: 100%;
-						color: #fff;
-						font-size: 12px;
-						position: absolute;
-						display: flex;
-						align-items: center;
-						left: 1rem;
-						top: 9px;
-						z-index: 100;
-
-						.count-z {
-							display: flex;
-							margin: 0 .5rem;
-
-							span {
-								margin-left: .4rem;
-								font-size: 1rem;
-								color: #2ee0fb !important;
-								font-weight: bolder;
-							}
-						}
-
-
-					}
-				}
-
-			}
-
-			.tall {
-				height: 59vh !important;
-			}
-
-			.taller {
-				height: 89.5vh !important;
-			}
-
-			.three {
-				display: flex;
-				flex-direction: column;
-			}
-
-			.el-row {
-				width: 100%;
-			}
-
-
-			.bigdata-map {
-				width: 100%;
-				height: 59vh;
-				position: relative;
-				background: #00101f;
-
-				.event-count {
-					color: #fff;
-					font-size: 14px;
-					font-weight: bolder;
-					padding: 10px;
-					background-color: #000000;
-					position: absolute;
-					top: 10px;
-					left: 10px;
-					z-index: 1000;
-
-					span {
-						font-size: 16px;
-						color: #d50000;
-					}
-				}
-
-			}
-
-		}
-
-		.wid-li-1 {
-			width: 396px;
-		}
-
-		.wid-li-2 {
-			width: 760px;
-		}
-
-		.wid-li-3 {
-			width: 850px;
-		}
-
-		.wid-li-4 {
-			width: 304px;
-		}
-
-		.mg-b-20 {
-			margin-bottom: 2vh;
-		}
-
-		.m-l-15 {
-			margin-left: .5%;
-		}
-	}
+@import '@/assets/styles/base.scss';
+
+
+.bigdata-con {
+  width: -webkit-fit-content;
+  height: 100%;
+  background: #01020c;
+
+  .el-loading-mask {
+    background: none;
+  }
+
+  .header {
+    height: 3rem;
+    display: flex;
+    align-items: center;
+
+    .header-left {
+      position: fixed;
+      left: 10px;
+      top: 5px;
+      display: flex;
+      align-items: center;
+      color: $inBlue;
+      font-family: $fontFk;
+
+      .title {
+        margin: 0 auto;
+        text-align: center;
+        background-image: -webkit-linear-gradient(bottom, rgba($color: #00f6ff, $alpha: 1.0), rgba($color: #005aff, $alpha: 1.0));
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+        color: #fff;
+        font-size: 22px;
+      }
+    }
+
+    .bignav {
+      height: 40px;
+      position: fixed;
+      left: 50%;
+      transform: translateX(-50%);
+      top: 0;
+      z-index: 1000;
+      border-radius: 5px;
+      display: flex;
+      justify-content: cetner;
+      align-items: center;
+
+      .bignav-list {
+        background: url(../../assets/images/integrated/bigdata-header-nav-re.png) repeat-x center;
+        float: left;
+        display: flex;
+        justify-content: cetner;
+        align-items: center;
+        color: #fff;
+        height: 40px;
+        font-size: 12px;
+        padding: 0 23px;
+        cursor: pointer;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+        transition: all 0.3s ease-in-out;
+      }
+
+      .router-link-active,
+      .bignav-list:hover {
+        filter: brightness(2.3);
+        -webkit-transform: translateY(2px);
+        transform: translateY(2px);
+        color: $inBlueHover;
+        border-bottom: 1px solid $inBlueHover;
+        transition: all 0.3s ease-in-out;
+
+      }
+    }
+
+
+  }
+
+  .bigdata-body {
+    margin: 15px;
+    display: flex;
+    align-items: top;
+    // justify-content: center;
+
+  }
+
+  .flex-r {
+    display: flex;
+    flex-direction: row !important;
+    align-content: flex-start;
+    justify-content: space-between
+  }
+
+  .bigdata-list {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+
+    .twins-con {
+      width: 100% !important;
+    }
+
+    .b-49 {
+      width: 49% !important;
+    }
+
+    .b-con {
+      width: 100%;
+      height: 28.5vh;
+
+      box-shadow: 0 0 1px rgba($color: #163696, $alpha: .1),
+      -0 -0 30px rgba($color: #163696, $alpha: .5) inset;
+
+      // display: flex;
+      // flex-direction: column;
+      .b-tit {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        padding: 10px;
+
+        span {
+          font-size: 15px;
+          color: #00ceec;
+          margin-left: 5px;
+          text-shadow: 0 0 3px rgba($color: #41ff84, $alpha: .5),
+          -0 -0 10px rgba($color: #41fff8, $alpha: .9);
+        }
+      }
+
+      .twins {
+        width: 100%;
+        display: flex;
+        position: relative;
+
+        .count {
+          width: 100%;
+          color: #fff;
+          font-size: 12px;
+          position: absolute;
+          display: flex;
+          align-items: center;
+          left: 1rem;
+          top: 9px;
+          z-index: 100;
+
+          .count-z {
+            display: flex;
+            margin: 0 .5rem;
+
+            span {
+              margin-left: .4rem;
+              font-size: 1rem;
+              color: #2ee0fb !important;
+              font-weight: bolder;
+            }
+          }
+
+
+        }
+      }
+
+    }
+
+    .tall {
+      height: 59vh !important;
+    }
+
+    .taller {
+      height: 89.5vh !important;
+    }
+
+    .three {
+      display: flex;
+      flex-direction: column;
+    }
+
+    .el-row {
+      width: 100%;
+    }
+
+
+    .bigdata-map {
+      width: 100%;
+      height: 59vh;
+      position: relative;
+      background: #00101f;
+
+      .event-count {
+        color: #fff;
+        font-size: 14px;
+        font-weight: bolder;
+        padding: 10px;
+        background-color: #000000;
+        position: absolute;
+        top: 10px;
+        left: 10px;
+        z-index: 1000;
+
+        span {
+          font-size: 16px;
+          color: #d50000;
+        }
+      }
+
+    }
+
+  }
+
+  .wid-li-1 {
+    width: 396px;
+  }
+
+  .wid-li-2 {
+    width: 760px;
+  }
+
+  .wid-li-3 {
+    width: 850px;
+  }
+
+  .wid-li-4 {
+    width: 304px;
+  }
+
+  .mg-b-20 {
+    margin-bottom: 2vh;
+  }
+
+  .m-l-15 {
+    margin-left: .5%;
+  }
+}
 </style>
+

src/views/bigdata/chart-farm.vue → src/views/bigdata/chart-ancientTree.vue


+ 0 - 213
src/views/bigdata/chart-detector.vue

@@ -1,213 +0,0 @@
-<!-- **************************************NO.17 探测器*************************************** -->
-<template>
-	<div class="chart-container">
-		<div id="detector1" style="width: 100%; height:25vh; ">
-		</div>
-		<div id="detector2" style="width: 100%; height:30vh; ">
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-	export default {
-		name: 'detector',
-		data() {
-			return {
-				count: 0
-			}
-		},
-		mounted() {
-			this.myEcharts1();
-			this.myEcharts2();
-
-		},
-
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=gK9VdA5_F06NTrpr
-			myEcharts1() {
-				var chartDom = document.getElementById('detector1');
-				var myChart = echarts.init(chartDom);
-				var option;
-				 option = {
-				    tooltip: {
-				        trigger: 'item',
-				    },
-				    color: ['#f7c778', '#d77169', '#c14f60', '#4d9564', '#215b85', ],
-
-				    series : [
-				        {
-				            name:'探测器分布',
-				            type:'funnel',
-				            x: '10%',
-				            y: 15,
-				            //x2: 80,
-				            y2: 15,
-				            width: '80%',
-				            // height: {totalHeight} - y - y2,
-				            min: 0,
-				            max: 100,
-				            minSize: '40%',
-				            maxSize: '100%',
-				            sort : 'descending', // 'ascending', 'descending'
-				            gap :0,
-				            data:[
-				                {value:60, name:'双辽市'},
-				                {value:40, name:'梨树县'},
-				                {value:20, name:'伊通县'},
-				                {value:80, name:'铁东区'},
-				                {value:100, name:'铁西区'}
-				            ].sort(function (a, b) { return a.value - b.value}),
-				            roseType: true,
-				            label: {
-				                normal: {
-				                    color:'#fff',
-				                    formatter:'{b} {c}',
-				                    position: 'center',
-				                    rich:{
-				                        style:{
-				                            fontSize:'20px',
-											color:'#ffffff',
-				                        },
-
-				                    }
-				                }
-				            },
-				            itemStyle: {
-				                normal: {
-				                    borderWidth: 0,
-				                    shadowBlur: 30,
-				                    shadowOffsetX: 0,
-				                    shadowOffsetY: 10,
-				                    shadowColor: 'rgba(0, 0, 0, 0.5)'
-				                }
-				            }
-
-				        }
-
-				    ]
-				};
-				option && myChart.setOption(option);
-			},
-
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=APfCRAFKxpN_qWeq
-			myEcharts2() {
-				var chartDom = document.getElementById('detector2');
-				var myChart = echarts.init(chartDom);
-				var option;
-				const dfColor = ['#92E1FF', '#0097FB', '#30ECA6', '#FFC227', '#FF4848'];
-				let dataArray = {
-				    xdataName: ['类型1', '类型1', '类型3', '类型3', '类型4', '类型5', '类型6'],
-				    contractnum: [9999, 8888, 7777, 6666, 5555, 4444, 3333]
-				}
-
-
-				let color2 = [
-				    [{ offset: 0, color: '#ff8881' }, { offset: 0.15, color: '#ff564c' },{ offset: 1, color: 'rgba(255,86,76, 0.08)' }],
-				    [{ offset: 0, color: '#fff9e1' }, { offset: 0.15, color: '#ffe376' },{ offset: 1, color: 'rgba(255,209,26, 0.08)' }],
-				    [{ offset: 0, color: '#f7ff98' }, { offset: 0.15, color: '#efff37' },{ offset: 1, color: 'rgba(239,255,55, 0.08)' }],
-				    [{ offset: 0, color: '#32ffee' }, { offset: 0.15, color: '#cdfffb' },{ offset: 1, color: 'rgba(50,255,238, 0.1)' }],
-				]
-				// tooltip
-				let tooltip = {
-				    trigger: 'axis',
-				    textStyle: { fontSize: 10 },
-				    axisPointer: { type: 'cross' },
-				    formatter: v => {
-				        let [a] = v
-				        return `
-				            <div class='u-p-2'>
-				                <div>${a.name}:${a.value}</div>
-				            </div>
-				        `
-				    }
-				}
-
-				// grid
-				let grid = { top: '20%', left: '10%', right: '10%', bottom: '20%' }
-
-				// xAxis
-				let xAxis = {
-				    type: 'category',
-				    boundaryGap: true,
-				    data: dataArray.xdataName,
-				    axisLine: { lineStyle: { color: '#fff' } },
-				    axisLabel: {
-				        textStyle: { fontSize: 10, color: '#fff' },
-				        rotate: 0
-				    },
-				    axisTick: { show: false }, //坐标轴刻度
-				}
-
-				// yAxis
-				let yAxis = {
-				     show: false
-				}
-
-				// series
-				let series = [{
-				    name: '中高风险地区',
-				    type: 'pictorialBar',
-				    barWidth: 15,
-				    // 三角矢量柱状图
-				    symbol: 'path://M-0.000,431.000 C59.528,394.477 61.000,-0.000 61.000,-0.000 C61.000,-0.000 62.472,394.477 122.000,431.000 L-0.000,431.000 Z',
-				    // 是否裁剪图形
-				    symbolClip: false,
-				    data: dataArray.contractnum,
-				     itemStyle: {
-				        color: params => {
-				            return params.name === dataArray.xdataName[0]
-				            ? new echarts.graphic.LinearGradient(0, 0, 0, 1, color2[0])
-				            : params.name === dataArray.xdataName[1]
-				            ? new echarts.graphic.LinearGradient(0, 0, 0, 1, color2[1])
-				            : params.name === dataArray.xdataName[2]
-				            ? new echarts.graphic.LinearGradient(0, 0, 0, 1, color2[2])
-				            : new echarts.graphic.LinearGradient(0, 0, 0, 1, color2[3])
-				        }
-				    },
-				    label: {
-				        show: true,
-				        position: 'top',
-				        formatter: params => {
-				            return params.name === dataArray.xdataName[0]
-				            ? `{a|${params.value}}`
-				            : params.name === dataArray.xdataName[1]
-				            ? `{b|${params.value}}`
-				            : params.name === dataArray.xdataName[2]
-				            ? `{c|${params.value}}`
-				            : `{d|${params.value}}`
-				        },
-				        rich: {
-				            a: { color: '#ff564c' },
-				            b: { color: '#ffd11a' },
-				            c: { color: '#efff37' },
-				            d: { color: '#32ffee' },
-
-				        },
-				        textStyle: { fontSize: 16 }
-				    },
-				}]
-
-				// 渲染
-				option = { tooltip, grid, xAxis, yAxis, series }
-				option && myChart.setOption(option);
-			},
-
-
-
-		},
-
-
-	}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.chart-container {
-		width: 100%;
-		height: auto;
-		position: relative;
-		padding-bottom: 10px;
-		display: flex;
-		flex-direction: column;
-	}
-</style>

+ 8 - 8
src/views/bigdata/chart-forestfarm.vue

@@ -44,14 +44,14 @@
 				          top:'16%',
 				          containLabel: true
 				        },
-
+				        
 				        xAxis: {
 				          type: 'category',
 				          data: ['双辽市','梨树县','伊通县','铁东区','铁西区'],
 				          axisLine: {
 				            lineStyle: {
 				              color: '#1cc6a1'
-
+				
 				            }
 				          },
 				          axisLabel: {
@@ -62,7 +62,7 @@
 				            }
 				          },
 				        },
-
+				
 				        yAxis: {
 				          type: 'value',
 				          max:'500',
@@ -80,7 +80,7 @@
 				          },
 				          axisLabel: {}
 				        },
-
+				        
 				        series: [{
 				          type: 'bar',
 				          barWidth: '15%',
@@ -99,13 +99,13 @@
 				          data: [400, 400, 300, 300, 300]
 				        }]
 				      };
-
+				
 				      var app = {
 				        currentIndex: -1,
 				      };
 				      setInterval(function () {
 				        var dataLen = option.series[0].data.length;
-
+				
 				        // 取消之前高亮的图形
 				        myChart.dispatchAction({
 				          type: 'downplay',
@@ -126,8 +126,8 @@
 				          seriesIndex: 0,
 				          dataIndex: app.currentIndex
 				        });
-
-
+				
+				
 				      }, 1000);
 				option && myChart.setOption(option);
 			},

+ 9 - 9
src/views/bigdata/chart-camera.vue

@@ -1,12 +1,12 @@
 <!-- **************************************NO.16 摄像头*************************************** -->
 <template>
 	<div class="chart-container">
-		<div id="camera1" style="width: 100%; height:25vh; ">
-		</div>
-		<div id="camera2" style="width: 100%; height:30vh; ">
-		</div>
-		<div id="camera3" style="width: 100%; height:30vh; ">
+		<!-- <div id="camera1" style="width: 100%; height:25vh; ">
+		</div> -->
+		<div id="camera2" style="width: 100%; height:85vh; ">
 		</div>
+		<!-- <div id="camera3" style="width: 100%; height:30vh; ">
+		</div> -->
 	</div>
 </template>
 
@@ -20,9 +20,9 @@
 			}
 		},
 		mounted() {
-			this.myEcharts1();
+			// this.myEcharts1();
 			this.myEcharts2();
-			this.myEcharts3();
+			// this.myEcharts3();
 
 		},
 
@@ -168,7 +168,7 @@
 
 					},
 					grid: {
-						top: "10%",
+						top: "0%",
 						left: "6%",
 						// right: "4%",
 						bottom: "5%",
@@ -204,7 +204,7 @@
 
 						type: "bar",
 						animationCurve: "easeOutBack",
-						barWidth: 5,
+						barWidth: 8,
 						label: {
 							show: true,
 							position: "right",

+ 6 - 6
src/views/bigdata/chart-enterprise.vue

@@ -22,10 +22,10 @@
 
 		methods:{
 			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=XWNjkKJQ3NBt1FK6
-
+			
 			myEcharts() {
-
-
+				
+				
 				var chartDom = document.getElementById('enterprise');
 				var myChart = echarts.init(chartDom);
 				var color = ['#02CDFF', '#62FBE7', '#7930FF','#E148EB','#ecb935']
@@ -33,12 +33,12 @@
 				 var value = [987, 634, 413, 312, 123];
 				var temp = 0;
 				option = {
-
+				  
 				    tooltip: {
 				        trigger: 'item',
 				        formatter: '{a} <br/>{b} : {c} ',
 				    },
-
+				   
 				    legend: {
 				        // show: false,
 						textStyle:{
@@ -57,7 +57,7 @@
 				            left: '10%',
 				            width: '70%',
 							height:'68%',
-
+							
 				            label: {
 				                show: true,
 				                color: '#07faa9',

+ 17 - 17
src/views/bigdata/chart-event.vue

@@ -26,16 +26,16 @@
 		methods:{
 			// 出处 https://echarts.apache.org/examples/zh/editor.html?c=pie-borderRadius
 			//http://192.144.199.210:8080/editor/index.html?chart_id=K8nTnNyu0caN65uT
-
+			
 			myEcharts() {
-
-
+				
+				
 				var chartDom = document.getElementById('event');
 				var myChart = echarts.init(chartDom);
 				var color = ['#02CDFF', '#62FBE7', '#7930FF','#E148EB','#ecb935']
 				var option;
-
-
+				
+				
 				option = {
 				  color: color,
 				  tooltip: {
@@ -49,7 +49,7 @@
 					  center:['50%','60%'],
 				      radius: ['55%', '70%'],
 				      avoidLabelOverlap: false,
-
+				      
 				      label: {
 				        show: false,
 				        position: 'center'
@@ -72,16 +72,16 @@
 				        { value: 300, name: '事件5' }
 				      ]
 				    },
-
+					
 				  ]
 				};
-
+				
 				option && myChart.setOption(option);
-
+				
 			},
 			myEcharts2() {
-
-
+				
+				
 				var chartDom = document.getElementById('event2');
 				var myChart = echarts.init(chartDom);
 				 let dashedPic =
@@ -114,21 +114,21 @@
 				        value: 30696,
 				        unit: '列',
 				    },
-
+				
 				];
 				let arrName = [];
 				let arrValue = [];
 				let sum = 0;
 				let pieSeries = [],
 				    lineYAxis = [];
-
+				
 				// 数据处理
 				chartData.forEach((v, i) => {
 				    arrName.push(v.name);
 				    arrValue.push(v.value);
 				    sum = sum + v.value;
 				});
-
+				
 				// 图表option整理
 				chartData.forEach((v, i) => {
 				    pieSeries.push({
@@ -209,7 +209,7 @@
 				        },
 				    });
 				});
-
+				
 				option = {
 				    color: color,
 				    grid: {
@@ -287,9 +287,9 @@
 				    ],
 				    series: pieSeries,
 				};
-
+				
 				option && myChart.setOption(option);
-
+				
 			},
 
 

+ 111 - 0
src/views/bigdata/chart-eventTrend.vue

@@ -0,0 +1,111 @@
+<!-- **************************************NO.6 矿坑*************************************** -->
+<template>
+	<div class="chart-container">
+		<div id="pit" style="width: 100%; height:24vh;">
+		</div>
+	</div>
+</template>
+
+<script>
+	import * as echarts from 'echarts';
+	export default {
+		name: 'pit',
+		data() {
+			return {
+				count: 0
+			}
+		},
+		mounted() {
+			this.myEcharts()
+
+		},
+
+		methods: {
+			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=udduEFcFiEYEEj4Q
+
+			myEcharts() {
+
+
+				var chartDom = document.getElementById('pit');
+				var myChart = echarts.init(chartDom);
+				var color = ['#02CDFF', '#62FBE7', '#7930FF','#ef5f9d','#ecb935'];
+				var option;
+        option = {
+          xAxis: {
+            data: [
+              '2021-05-17',
+              '2021-05-18',
+              '2021-05-19',
+              '2021-05-20',
+              '2021-05-21',
+              '2021-05-24',
+              '2021-05-25',
+              '2021-05-26',
+              '2021-05-27',
+            ],
+          },
+          yAxis: {
+            axisLabel: {
+              fontSize: 10,
+              color: '#999',
+              verticalAlign: 'bottom',
+              formatter: function (value, index) {
+                return `${value.toFixed(2)}%`;
+              },
+            },
+          },
+          series: [
+            {
+              type: 'line',
+              lineStyle: {
+                color: '#C22F43',
+                width: 1,
+                type: 'solid',
+              },
+              areaStyle: {
+                color: {
+                  type: 'linear',
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [
+                    {
+                      offset: 0,
+                      color: 'rgba(194, 47, 67, 1.0)',
+                    },
+                    {
+                      offset: 1,
+                      color: 'rgba(194, 47, 67, 0.03)',
+                    },
+                  ],
+                  global: false,
+                },
+                origin: 'start',
+              },
+              opacity: 0.2,
+              shadowColor: 'rgba(194, 47, 67)',
+              shadowBlur: 0,
+              shadowOffsetX: 0,
+              data: [1.56, -1.34, 0.57, 2.34, -0.45, 0.57, 2.34, 1.2, 0.34],
+            },
+          ],
+        };
+				option && myChart.setOption(option);
+			},
+
+		},
+
+
+	}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.chart-container {
+		width: 100%;
+		height: 100%;
+		position: relative;
+		padding-bottom: 10px;
+		display: flex;
+	}
+</style>

+ 0 - 99
src/views/bigdata/chart-farmtype.vue

@@ -1,99 +0,0 @@
-<!-- **************************************NO.9 散养户、养殖场养殖种类*************************************** -->
-<template>
-	<div class="chart-container">
-		<div id="farmtype" style="width: 100%; height:23vh;">
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-	export default {
-		name: 'farmtype',
-		data() {
-			return {
-				count: 0
-			}
-		},
-		mounted() {
-			this.myEcharts()
-
-		},
-
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=smh2KYnoCMWnT1IN
-
-			myEcharts() {
-
-
-				var chartDom = document.getElementById('farmtype');
-				var myChart = echarts.init(chartDom);
-				var color = ['#37a2da','#32c5e9','#9fe6b8','#ffdb5c','#ff9f7f','#fb7293','#e7bcf3','#8378ea'];
-				var option;
-				option = {
-				    color:color,
-				    tooltip : {
-				        formatter: "{b}:{c}%"
-				    },
-
-
-				    legend: {
-						textStyle:{
-							color:'#fffff',
-							fontSize:10
-						},
-						itemWidth:15,
-				        orient: 'vertical',
-				        left: '10%',
-						top:'5%',
-				        data: ['一般修剪', '浇水', '除草', '绿篱修剪', '病虫害防治', '施肥', '伐除', '其他']
-				    },
-				    series: [
-				        {
-				            name: '',
-				            type: 'pie',
-				            radius: '80%',
-				            center: ['65%', '48%'],
-				            data:[
-				                {value:40, name:'一般修剪'},
-				                {value:30, name:'浇水'},
-				                {value:25, name:'除草'},
-				                {value:18, name:'绿篱修剪'},
-				                {value:10, name:'病虫害防治'},
-				                {value:5, name:'施肥'},
-				                {value:4, name:'伐除'},
-				                {value:3, name:'其他'}
-				            ],
-				            emphasis: {
-				                itemStyle: {
-				                    shadowBlur: 10,
-				                    shadowOffsetX: 0,
-				                    shadowColor: 'rgba(0, 0, 0, 0.5)'
-				                }
-				            },
-				            label: {
-				                normal: {
-				                    show: false,
-				                }
-				            }
-				        }
-				    ]
-				};
-				option && myChart.setOption(option);
-			},
-
-		},
-
-
-	}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.chart-container {
-		width: 100%;
-		height: auto;
-		position: relative;
-		padding-bottom: 10px;
-		display: flex;
-	}
-</style>

+ 3 - 3
src/views/bigdata/chart-processing.vue

@@ -45,7 +45,7 @@
 				    name: '铁西区',
 				    value: '76'
 				}];
-
+				
 				option = {
 				        grid: {
 				            left: "16%", //距离左边的距离
@@ -110,7 +110,7 @@
 				                    show: false
 				                }
 				            },
-
+				            
 				        ],
 				        dataZoom: [{
 				            type: 'inside',
@@ -148,7 +148,7 @@
 				                    }
 				                },
 				            },
-
+				            
 				        ]
 				};
 				option && myChart.setOption(option);

src/views/bigdata/chart-danger.vue → src/views/bigdata/chart-fireCause.vue


+ 0 - 130
src/views/bigdata/chart-firecontrol.vue

@@ -1,130 +0,0 @@
-<!-- **************************************NO.18 消防*************************************** -->
-<template>
-	<div class="chart-container">
-		<div id="firecontrol" style="width: 100%; height:25vh; ">
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-	export default {
-		name: 'firecontrol',
-		data() {
-			return {
-				count: 0
-			}
-		},
-		mounted() {
-			this.myEcharts1();
-
-		},
-
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=f46x0t0c7883X-D6
-			myEcharts1() {
-				var chartDom = document.getElementById('firecontrol');
-				var myChart = echarts.init(chartDom);
-				var option;
-				 option = {
-				    tooltip: {
-				        trigger: 'axis',
-				        axisPointer: {
-				            type: 'shadow'
-				        }
-				    },
-				    grid:{
-				        top:'15%',
-				        left:'10%',
-				        right:'10%',
-				        buttom:'15%',
-				    },
-				     xAxis: {
-				        type: 'category',
-				        axisLine: {
-				            lineStyle: {
-				                color: 'rgba(255,255,255,0.12)',
-				            },
-				        },
-				        axisLabel: {
-				            margin: 10,
-				            color: '#e2e9ff',
-				            textStyle: {
-				                fontSize: 10
-				            },
-				        },
-				        axisTick:{
-				            show:false,
-				        },
-				         data: ['双辽市', '梨树县', '伊通县', '铁东区', '铁西区']
-				    },
-				    yAxis: {
-				        nameTextStyle:{
-				            color:'#fff',
-				        },
-				        type: 'value',
-				         axisLine: {
-				             show:false,
-				            lineStyle: {
-				                color: 'rgba(255,255,255,0.12)'
-				            },
-				        },
-				        axisLabel: {
-							 show:false,
-				            formatter: '{value}',
-				            color: '#e2e9ff',
-				        },
-				         splitLine: {
-				            lineStyle: {
-				                color: 'rgba(255,255,255,0.12)'
-				            }
-				        },
-				        axisTick:{
-				            show:true,
-
-				            lineStyle:{
-				                color:'#fff',
-				            },
-				        },
-				    },
-				    series: [{
-				        itemStyle:{
-				            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-				                    offset: 0,
-				                    color: 'rgba(0,244,255,1)'
-				                }, {
-				                    offset: 1,
-				                    color: 'rgba(0,77,167,1)'
-				                }], false),
-				                barBorderRadius: 10,
-				                opacity:0.8
-				        },
-				        barWidth:10,
-				        label:{
-				            show:true,
-				            position:['0','-20'],
-				            color:'#fff',
-				        },
-				        data: [120, 200, 150, 80, 70],
-				        type: 'bar',
-				    }]
-				};
-				option && myChart.setOption(option);
-			},
-
-		},
-
-
-	}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.chart-container {
-		width: 100%;
-		height: auto;
-		position: relative;
-		padding-bottom: 10px;
-		display: flex;
-		flex-direction: column;
-	}
-</style>

+ 16 - 16
src/views/bigdata/chart-population.vue

@@ -22,10 +22,10 @@
 
 		methods:{
 			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=__n0_3jDX4e4bko6
-
+			
 			myEcharts() {
-
-
+				
+				
 				var chartDom = document.getElementById('population');
 				var myChart = echarts.init(chartDom);
 				var color = ['#02CDFF', '#62FBE7', '#7930FF','#eb9123','#ecb935']
@@ -36,11 +36,11 @@
 				    {
 				        name: '双辽市',
 				        value: 2691
-				    },
+				    }, 
 				    {
 				        name: '梨树县',
 				        value: 5000
-				    },
+				    }, 
 				    {
 				        name: '伊通县',
 				        value: 3416
@@ -54,15 +54,15 @@
 					    value: 4666
 					},
 				];
-
+				
 				var bgData = [];
 				var itemData = [];
-
+				
 				// 取出每一条数据value,作为显示数据
 				chartData.forEach(function(items, index) {
 				    itemData.push(items.value);
 				})
-
+				
 				// 取出所有数据最大值,作为背景象形柱图数据
 				chartData.forEach(function(items, index) {
 				    bgData.push({
@@ -70,13 +70,13 @@
 				        value: Math.max.apply(null, itemData)
 				    });
 				})
-
+				
 				// 所有数据最大值
 				var maxValue = Math.max.apply(null, itemData);
-
+				
 				// 字体 distance放大参数
 				var scale = 1;
-
+				
 				//富文本配置
 				var rich = {
 				    white: {
@@ -86,7 +86,7 @@
 				        padding: [0, 0]
 				    },
 				};
-
+				
 				option = {
 				    tooltip:{
 				        formatter:'{b} : {c}'+'人',
@@ -102,13 +102,13 @@
 				        data:(function(data){
 				            var arr=[];
 				            data.forEach(function(items){
-				                arr.push(items.name);
+				                arr.push(items.name);   
 				            });
 				            return arr;
 				        })(chartData),
-
-
-
+				        
+				        
+				        
 				        boundaryGap: ['20%', '20%'],
 				        splitLine: {
 				            show: false

+ 5 - 5
src/views/bigdata/chart-collection.vue

@@ -1,7 +1,7 @@
 <!-- **************************************NO.10 收集点*************************************** -->
 <template>
 	<div class="chart-container">
-		<div id="collection" style="width: 100%; height:23vh;">
+		<div id="collection" style="width: 100%; height:50vh;">
 		</div>
 	</div>
 </template>
@@ -53,7 +53,7 @@
 					    value: '1620',
 					},
 				];
-
+				
 				let formatNumber = function (num) {
 				    let reg = /(?=(\B)(\d{3})+$)/g;
 				    return num.toString().replace(reg, ',');
@@ -61,13 +61,13 @@
 				let total = echartData.reduce((a, b) => {
 				    return a + b.value * 1;
 				}, 0);
-
+				
 				option = {
 				    color: color,
 				    series: [
 				        {
 				            type: 'pie',
-				            radius: ['50%', '70%'],
+				            radius: ['60%', '80%'],
 				            center: ['50%', '50%'],
 				            data: echartData,
 				            hoverAnimation: false,
@@ -75,7 +75,7 @@
 				                normal: {
 				                    borderWidth:1,
 				                },
-
+				
 				                emphasis: {
 				                    borderColor: bgColor,
 				                    borderWidth: 2,

+ 165 - 0
src/views/bigdata/chart-gridStaff.vue

@@ -0,0 +1,165 @@
+<!-- **************************************NO.13 消火栓*************************************** -->
+<template>
+	<div class="chart-container">
+		<div id="hydrant" style="width: 100%; height:55vh;">
+		</div>
+	</div>
+</template>
+
+<script>
+	import * as echarts from 'echarts';
+	export default {
+		name: 'hydrant',
+		data() {
+			return {
+				count: 0
+			}
+		},
+		mounted() {
+			this.myEcharts()
+
+		},
+
+		methods: {
+			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=Ve9zCnhVwZvXTdD0
+			myEcharts() {
+
+
+				var chartDom = document.getElementById('hydrant');
+				var myChart = echarts.init(chartDom);
+        function rand(m, n) {
+          if (!n) {
+            return Math.floor(Math.random() * m);
+          } else {
+            var c = n - m + 1;
+            return Math.floor(Math.random() * c + m);
+          }
+        }
+
+        function getMax(arr, key) {
+          var max = 0,
+            len = arr.length;
+          for (var i = 0; i < len; i++) {
+            var item = arr[i][key];
+            if (max < item) max = item;
+          }
+          return max;
+        }
+
+        function getValArr(arr, key) {
+          var val = [],
+            len = arr.length;
+          for (var i = 0; i < len; i++) {
+            val.push(arr[i][key]);
+          }
+          return val;
+        }
+
+        var arr = [];
+        for (var i = 0; i < 10; i++) {
+          arr.push({
+            name: '类目名称' + rand(99),
+            amount: rand(99999) / 100 // 采购金额
+          });
+        }
+
+        var max = getMax(arr, 'amount'),
+          angleAxisData = getValArr(arr, 'name');
+        $.each(arr, function(i, e) {
+          e.value = (e.amount / max * 100).toFixed(2);
+        });
+        var option = {
+          backgroundColor: '#222',
+          tooltip: {
+            trigger: 'item',
+            textStyle: {
+              fontSize: 16,
+              color: '#fff',
+              fontFamily: 'Microsoft YaHei'
+            }
+          },
+          angleAxis: {
+            type: 'category',
+            axisLine: {
+              lineStyle: {
+                color: '#6d8a92'
+              }
+            },
+            axisLabel: {
+              interval: 0,
+              fontSize: 14,
+              color: '#fff',
+              fontFamily: 'Microsoft YaHei'
+            },
+            axisTick: {
+              show: false
+            },
+            data: angleAxisData,
+            z: 10
+          },
+          radiusAxis: {
+            max: 100,
+            min: 0,
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: '#6d8a92'
+              }
+            },
+            axisLabel: {
+              formatter: '{value}%',
+              textStyle: {
+                fontSize: 11,
+                color: '#61d9fb',
+                fontFamily: 'Microsoft YaHei'
+              }
+            },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: '#6d8a92'
+              }
+            },
+            splitArea: {
+              areaStyle: {
+                color: 'transparent'
+              }
+            }
+          },
+          polar: {
+            center: ['50%', '50%'],
+            radius: '74%',
+          },
+          series: [{
+            type: 'bar',
+            data: arr,
+            itemStyle: {
+              color: function(params) {
+                var colorList = ['#5cc6ca', '#d87a7f', '#f5b97f', '#5ab1ef', '#b6a2de', '#8d98b3', '#e5d02d', '#97b552', '#956f6d', '#d0579c'];
+                return colorList[params.dataIndex];
+              }
+            },
+            coordinateSystem: 'polar',
+          }]
+        };
+				option && myChart.setOption(option);
+			},
+
+		},
+
+
+	}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.chart-container {
+		width: 100%;
+		height: auto;
+		position: relative;
+		padding-bottom: 10px;
+		display: flex;
+	}
+</style>

+ 0 - 233
src/views/bigdata/chart-hydrant.vue

@@ -1,233 +0,0 @@
-<!-- **************************************NO.13 消火栓*************************************** -->
-<template>
-	<div class="chart-container">
-		<div id="hydrant" style="width: 100%; height:23vh;">
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-	export default {
-		name: 'hydrant',
-		data() {
-			return {
-				count: 0
-			}
-		},
-		mounted() {
-			this.myEcharts()
-
-		},
-
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=Ve9zCnhVwZvXTdD0
-			myEcharts() {
-
-
-				var chartDom = document.getElementById('hydrant');
-				var myChart = echarts.init(chartDom);
-				var color = ['#0E7CE2', '#FF8352', '#E271DE', '#F8456B', '#00FFFF', '#4AEAB0'];
-				var option;
-				 var trafficWay = [
-				    {
-				        name: '双辽市',
-				        value: 20,
-				    },
-				    {
-				        name: '梨树县',
-				        value: 20,
-				    },
-				    {
-				        name: '伊通县',
-				        value: 20,
-				    },
-				    {
-				        name: '铁东区',
-				        value: 25,
-				    },
-				    {
-				        name: '铁西区',
-				        value: 20,
-				    },
-				];
-
-				var data = [];
-				var color = ['#F6C558', '#25EFBD', '#21bad6', '#3283F5', '#E44660'];
-				for (var i = 0; i < trafficWay.length; i++) {
-				    data.push(
-				        {
-				            value: trafficWay[i].value,
-				            name: trafficWay[i].name,
-				            itemStyle: {
-				                normal: {
-				                    borderWidth: 8,
-				                    shadowBlur: 0,
-				                    borderColor: color[i],
-				                    shadowColor: color[i],
-				                },
-				            },
-				        },
-				        {
-				            value: 3,
-				            name: '',
-				            labelLine:{
-				              show:false
-				            },
-				            itemStyle: {
-				                normal: {
-				                    label: {
-				                        show: false,
-				                    },
-				                    labelLine: {
-				                        show: false,
-				                    },
-				                    color: 'rgba(0, 0, 0, 0)',
-				                    borderColor: 'rgba(0, 0, 0, 0)',
-				                    borderWidth: 0,
-				                },
-				            },
-				        }
-				    );
-				}
-				var seriesOption = [
-				    {
-				        name: '',
-				        type: 'pie',
-				        clockWise:true,
-				        radius: [70, 70],
-				        hoverAnimation: true,
-				        itemStyle: {
-				            normal: {
-				                label: {
-				                    show: true
-				                },
-				            },
-				        },
-				        data: data,
-				        labelLine: {
-				            normal: {
-				                length: 20,
-				                length2: 20,
-				                lineStyle: {
-				                    type: 'solid',
-				                    color: '#31FFFF',
-				                },
-				            },
-				        },
-				        label: {
-				            normal: {
-				                formatter: function (params) {
-				                    var result = '';
-				                    if (params.name) {
-				                        result +=  params.name+'{blue|' + params.value  + '}';
-				                    }
-				                    return result;
-				                },
-				                borderWidth: 0,
-				                borderRadius: 4,
-				                padding: [60, 0],
-				                height: 10,
-				                fontSize: 10,
-				                align: 'center',
-				                color: '#DEDEDE',
-				                rich: {
-				                    blue: {
-				                        fontSize: 10,
-				                        lineHeight: 5,
-				                        color: '#31FFFF',
-				                        padding: [0, 5],
-				                    },
-				                },
-				            },
-				        },
-				    },
-				    {
-				        type: 'pie',
-				        radius: [60, 60],
-				        hoverAnimation: false,
-				        clockWise: false,
-				        itemStyle: {
-				            normal: {
-				                borderColor: 'rgba(2,178,247,0.2)',
-				                borderWidth: 10,
-				            },
-				        },
-				        label: {
-				            show: false,
-				        },
-				        data: [200],
-				    },
-				    {
-				        type: 'pie',
-				        radius: [0, '20%'],
-				        zlevel: 3,
-				        silent: true,
-				        label: {
-				            normal: {
-				                show: false,
-				            },
-				        },
-				        labelLine: {
-				            normal: {
-				                show: false,
-				            },
-				        },
-				        data: [
-				            {
-				                value: 6,
-				                name: '总数',
-				                itemStyle: {
-				                    normal: {
-				                        color: {
-				                            x: 0,
-				                            y: 0,
-				                            x2: 1,
-				                            y2: 0,
-				                            type: 'linear',
-				                            global: false,
-				                            colorStops: [
-				                                {
-				                                    offset: 0,
-				                                    color: 'rgba(2,178,247,0.2)',
-				                                },
-				                                {
-				                                    offset: 1,
-				                                    color: 'rgba(2,178,247,0.2)',
-				                                },
-				                            ],
-				                        },
-				                    },
-				                },
-				            },
-				        ],
-				    },
-				];
-				option = {
-				    color: color,
-				    tooltip: {
-				        show: false,
-				    },
-				    toolbox: {
-				        show: false,
-				    },
-				    series: seriesOption,
-				};
-				option && myChart.setOption(option);
-			},
-
-		},
-
-
-	}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.chart-container {
-		width: 100%;
-		height: auto;
-		position: relative;
-		padding-bottom: 10px;
-		display: flex;
-	}
-</style>

+ 3 - 3
src/views/bigdata/chart-freelyraise.vue

@@ -108,7 +108,7 @@
 							color: "#2EC7CF"
 						}
 					])
-
+					
 				];
 				var attackSourcesColor1 = [
 					"#EB3B5A",
@@ -270,7 +270,7 @@
 										lineHeight: 5
 									}
 								},
-
+								
 							}
 						},
 						{ //右侧名字
@@ -285,7 +285,7 @@
 									fontSize: "12"
 								}
 							},
-							//data: attackSourcesDataFmt(attaName)
+							//data: attackSourcesDataFmt(attaName) 
 							data: attackSourcesDataFmt(attaData) //数字
 						},
 						{ //名称

+ 0 - 87
src/views/bigdata/chart-pit.vue

@@ -1,87 +0,0 @@
-<!-- **************************************NO.6 矿坑*************************************** -->
-<template>
-	<div class="chart-container">
-		<div id="pit" style="width: 100%; height:23vh;">
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-	export default {
-		name: 'pit',
-		data() {
-			return {
-				count: 0
-			}
-		},
-		mounted() {
-			this.myEcharts()
-
-		},
-
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=udduEFcFiEYEEj4Q
-
-			myEcharts() {
-
-
-				var chartDom = document.getElementById('pit');
-				var myChart = echarts.init(chartDom);
-				var color = ['#02CDFF', '#62FBE7', '#7930FF','#ef5f9d','#ecb935'];
-				var option;
-				option = {
-
-				    color:color,
-				    tooltip : {
-				        trigger: 'item',
-				        formatter: "{b}: {c}"
-				    },
-				    toolbox: {
-				        show : true,
-
-				    },
-
-				    series : [
-				        {
-				            name:'业务警种',
-				            type:'pie',
-				            roseType: true,
-				            radius : ['50%', '70%'],
-				            label: {
-				              show: true,
-				              formatter: "{b} {c}",
-							  textStyle: {
-							      fontSize: 10 ,
-
-							  }
-
-				            },
-				            data:[
-				                {value:20, name:'双辽市'},
-				                {value:25, name:'梨树县'},
-				                {value:30, name:'伊通县'},
-				                {value:35, name:'铁东区'},
-								{value:35, name:'铁西区'}
-				            ]
-				        }
-				    ]
-				};
-				option && myChart.setOption(option);
-			},
-
-		},
-
-
-	}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.chart-container {
-		width: 100%;
-		height: auto;
-		position: relative;
-		padding-bottom: 10px;
-		display: flex;
-	}
-</style>

+ 0 - 135
src/views/bigdata/chart-watercrane.vue

@@ -1,135 +0,0 @@
-<!-- **************************************NO.11 水鹤*************************************** -->
-<template>
-	<div class="chart-container">
-		<div id="watercrane" style="width: 100%; height:23vh;">
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-	export default {
-		name: 'watercrane',
-		data() {
-			return {
-				count: 0
-			}
-		},
-		mounted() {
-			this.myEcharts()
-
-		},
-
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=vNg2RQ3LrePk4CnZ
-			myEcharts() {
-
-
-				var chartDom = document.getElementById('watercrane');
-				var myChart = echarts.init(chartDom);
-				var color = ['#0E7CE2', '#FF8352', '#E271DE', '#F8456B', '#00FFFF', '#4AEAB0'];
-				var option;
-				var salvProName = ["双辽市", "梨树县", "伊通县", "铁东区", "铁西区"];
-				var salvProValue = [11000, 10000, 9000, 8000, 7000];
-				var salvProMax = []; //背景按最大值
-				for (let i = 0; i < salvProValue.length; i++) {
-				    salvProMax.push(salvProValue[0])
-				}
-				option = {
-				    grid: {
-				        left: '8%',
-				        right: '8%',
-				        bottom: '0%',
-				        top: '5%',
-				        containLabel: true
-				    },
-				    tooltip: {
-				        trigger: 'axis',
-				        axisPointer: {
-				            type: 'none'
-				        },
-				        formatter: function(params) {
-				            return params[0].name + ' : ' + params[0].value
-				        }
-				    },
-				    xAxis: {
-				        show: false,
-				        type: 'value'
-				    },
-				    yAxis: [{
-				        type: 'category',
-				        inverse: true,
-				        axisLabel: {
-				            show: true,
-				            textStyle: {
-				                color: '#248bf9',
-				                fontSize: 12,
-				                fontWeight: 500
-				            },
-				        },
-				        splitLine: {
-				            show: false
-				        },
-				        axisTick: {
-				            show: false
-				        },
-				        axisLine: {
-				            show: false
-				        },
-				        data: salvProName
-				    }, {
-				        type: 'category',
-				        inverse: true,
-				        axisTick: 'none',
-				        axisLine: 'none',
-				        show: true,
-				        axisLabel: {
-				            textStyle: {
-				                color: '#fffdfe',
-				                fontSize:10
-				            },
-				            formatter: function(value) {
-				                return (value * 10 / 10).toLocaleString();
-				            },
-				        },
-				        data: salvProValue
-				    }],
-				    series: [{
-				            name: '值',
-				            type: 'bar',
-				            zlevel: 1,
-				            itemStyle: {
-				                normal: {
-				                    barBorderRadius: 10,
-				                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-				                        offset: 0,
-				                        color: 'rgb(57,89,255,1)'
-				                    }, {
-				                        offset: 1,
-				                        color: 'rgb(46,200,207,1)'
-				                    }]),
-				                },
-				            },
-				            barWidth: 10,
-				            data: salvProValue
-				        },
-				    ]
-				};
-				option && myChart.setOption(option);
-			},
-
-		},
-
-
-	}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.chart-container {
-		width: 100%;
-		height: auto;
-		position: relative;
-		padding-bottom: 10px;
-		display: flex;
-	}
-</style>

+ 0 - 110
src/views/bigdata/chart-waterintake.vue

@@ -1,110 +0,0 @@
-<!-- **************************************NO.15 取水口*************************************** -->
-<template>
-	<div class="chart-container">
-		<div id="waterintake" style="width: 100%; height:23vh;">
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-	export default {
-		name: 'waterintake',
-		data() {
-			return {
-				count: 0
-			}
-		},
-		mounted() {
-			this.myEcharts()
-
-		},
-
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=AQ8Ea8ewtkr0NVzH
-			myEcharts() {
-
-
-				var chartDom = document.getElementById('waterintake');
-				var myChart = echarts.init(chartDom);
-				var option;
-				  option = {
-				     color: ['#1890FF', '#12DDA1', '#F78048', '#FFB026', '#FD4D63', 'rgba(255,255,255,.5)'],
-				     tooltip: {
-				         trigger: 'item',
-				         padding: [10, 10, 10, 10],
-				         formatter: '{b} :<br/> {d}%',
-				     },
-				     series: [
-				         {
-				             name: '',
-				             type: 'pie',
-				             radius: ['36%', '66%'],
-				             center: ['50%', '50%'],
-				             label: {
-				                 fontSize: 10,
-				                 color: '#00a0e5',
-				                 formatter: '{b} {c}',
-				                 // 自定义富文本样式
-
-				             },
-				             labelLine: {
-				                 show: true,
-				                 // length: 6,
-				                 // length2: 15
-				             },
-				             data: [
-				                 {
-				                     name: '双辽市',
-				                     value: '40',
-				                 },
-				                 {
-				                     name: '梨树县',
-				                     value: '25',
-				                 },
-				                 {
-				                     name: '伊通县',
-				                     value: '18',
-				                 },
-				                 {
-				                     name: '铁东区',
-				                     value: '12',
-				                 },
-				                 {
-				                     name: '铁西区',
-				                     value: '5',
-				                 },
-				             ],
-				         },
-				         {
-				             type: 'pie',
-				             radius: ['36%', '43%'],
-				             center: ['50%', '50%'],
-				             silent: true,
-				             data: [
-				                 {
-				                     name: '',
-				                     value: 1,
-				                 },
-				             ],
-				         },
-				     ],
-				 };
-				option && myChart.setOption(option);
-			},
-
-		},
-
-
-	}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.chart-container {
-		width: 100%;
-		height: auto;
-		position: relative;
-		padding-bottom: 10px;
-		display: flex;
-	}
-</style>

+ 1 - 1
src/views/bigdata/chart-foam.vue

@@ -84,7 +84,7 @@
 				              data: [150, 298, 206, 75, 154]
 				          }
 				      ],
-
+				 
 				      series: [{
 				              name: "受理数", // bar图的外边框
 				              type: "bar",

+ 219 - 0
src/views/bigdata/chart-weatherTrends.vue

@@ -0,0 +1,219 @@
+<!-- **************************************NO.9 散养户、养殖场养殖种类*************************************** -->
+<template>
+	<div class="chart-container">
+		<div id="farmtype" style="width: 100%; height:24vh;">
+		</div>
+	</div>
+</template>
+
+<script>
+	import * as echarts from 'echarts';
+	export default {
+		name: 'farmtype',
+		data() {
+			return {
+				count: 0
+			}
+		},
+		mounted() {
+			this.myEcharts()
+
+		},
+
+		methods: {
+			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=smh2KYnoCMWnT1IN
+
+			myEcharts() {
+
+
+				var chartDom = document.getElementById('farmtype');
+				var myChart = echarts.init(chartDom);
+        var xData = ['2022年1月','2022年2月','2022年3月','2022年4月','2022年5月','2022年6月','2022年7月','2022年8月','2022年9月','2022年10月','2022年11月','2022年12月'];
+        var option;
+        option = {
+          backgroundColor:'#232d36',
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              lineStyle: {
+                color: {
+                  type: 'linear',
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [{
+                    offset: 0,
+                    color: 'rgba(0, 255, 233,0)'
+                  }, {
+                    offset: 0.5,
+                    color: 'rgba(255, 255, 255,1)',
+                  }, {
+                    offset: 1,
+                    color: 'rgba(0, 255, 233,0)'
+                  }],
+                  global: false
+                }
+              },
+            },
+          },
+          grid: {
+            top: '15%',
+            left: '10%',
+            right: '5%',
+            bottom: '15%',
+          },
+          legend:{
+            data:['最高气温','最低气温'],
+            textStyle:{
+              color:'#fff',
+              align: 'center',
+              fontSize: 16
+            },
+            x:'center'
+          },
+          xAxis: [{
+            type: 'category',
+            // 轴线
+            axisLine: {
+              show: true,
+              lineStyle:{
+                color: '#85B1B4',
+              }
+            },
+            // 轴刻度线
+            axisTick:{
+              show:false,
+            },
+            // 坐标轴名称
+            axisLabel: {
+              color: '#fff',
+              margin:6,
+            },
+            // 轴分隔线
+            splitLine: {
+              show: false
+            },
+            // 轴两侧留白
+            boundaryGap: ['5%','5%'],
+            data: xData
+
+          }],
+
+          yAxis: [{
+            type: 'value',
+            min: 0,
+            // max: 140,
+            splitNumber: 4,
+            splitLine: {
+              show: false,
+            },
+            axisLine: {
+              show: true,
+              lineStyle:{
+                color: '#85B1B4'
+              }
+            },
+            axisLabel: {
+              show: true,
+              margin: 10,
+              textStyle: {
+                color: '#fff',
+
+              },
+            },
+            axisTick: {
+              show: false,
+            },
+          }],
+          series: [
+            {
+              name:'最高气温',
+              type: 'line',
+              showAllSymbol: true,
+              symbol: 'circle',
+              symbolSize: 4,
+              lineStyle: {
+                normal: {
+                  color: "#FF8736",
+                },
+              },
+              label: {
+                show: false,
+              },
+              itemStyle: {
+                color: "#FF8736",
+                borderColor: "#FF8736",
+                borderWidth: 2,
+              },
+              // areaStyle: {
+              //     normal: {
+              //         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              //             {
+              //                 offset: 0,
+              //                 color: 'rgba(43,193,145,0.3)'
+              //             },
+              //             {
+              //                 offset: 1,
+              //                 color: 'rgba(43,193,145,0)'
+              //             }
+              //         ], false),
+              //     }
+              // },
+              data: [4,7,8,12,15,23,24,24,25,28,27,24,21,23]//data.values
+            },
+            {
+              name:'最低气温',
+              type: 'line',
+              showAllSymbol: true,
+              symbol: 'circle',
+              symbolSize:4,
+              lineStyle: {
+                normal: {
+                  color: "#13EFB7",
+                },
+              },
+              label: {
+                show: false,
+              },
+              itemStyle: {
+                color: "#13EFB7",
+                borderColor: "#13EFB7",
+                borderWidth: 2,
+              },
+              areaStyle: {
+                normal: {
+                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                    {
+                      offset: 0,
+                      color: 'rgba(81,150,164,0.3)'
+                    },
+                    {
+                      offset: 1,
+                      color: 'rgba(81,150,164,0)'
+                    }
+                  ], false),
+                }
+              },
+              data: [3,5,4,2,1,7,6,3,4,5,6,7,1,2]//data.values
+            },
+          ]
+        };
+				option && myChart.setOption(option);
+			},
+
+		},
+
+
+	}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.chart-container {
+		width: 100%;
+		height: auto;
+		position: relative;
+		padding-bottom: 10px;
+		display: flex;
+	}
+</style>

+ 0 - 88
src/views/bigdata/fastmenu.vue

@@ -1,88 +0,0 @@
-<template>
-	<div class="fast-menu">
-		<div class="menu-list">
-			<router-link v-for="(fastMenu,index) in fastMenu" :to="fastMenu.path" :key="index" class="header-right" exact><span>{{fastMenu.name}}</span></router-link>
-		</div>
-	</div>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				fastMenu:[
-					{
-						name:'数据中心',
-						path:'/'
-					},
-					{
-						name:'事件中心',
-						path:'/'
-					},
-					{
-						name:'监控中心',
-						path:'/integrated/monitor'
-					},
-					{
-						name:'任务中心',
-						path:'/'
-					},
-					{
-						name:'评测中心',
-						path:'/'
-					}
-				]
-
-			}
-		}
-	}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-	@import '@/assets/styles/base.scss';
-.bigdata-con {
-	.fast-menu {
-
-		position: fixed;
-		right: 1rem;
-		display: flex;
-
-		.menu-list {
-			margin-left: 20px;
-			display: flex;
-			align-items: center;
-
-			span {
-				min-width: 5.625rem;
-				background: url(../../assets/images/integrated/bigdata-header-right-bg.png) center no-repeat;
-				font-size: 12px;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				padding: 10px 12px;
-				color: $inBlue;
-				height: 100%;
-				cursor: pointer;
-				text-align: center;
-				-webkit-transform: translateX(0px);
-				transform: translateX(0px);
-				transition: all 0.5s ease-in-out;
-
-
-				i {
-					padding-right: 3px;
-				}
-			}
-
-			span:hover {
-				filter: brightness(2.3);
-				-webkit-transform: translateX(-5px);
-				transform: translateX(-5px);
-				transition: all 0.5s ease-in-out;
-				color: $inBlueHover;
-			}
-		}
-
-	}
-	}
-</style>

+ 2 - 5
src/views/bigdata/tabbar.vue

@@ -1,7 +1,5 @@
 <template>
 	<div class="bigdata-map-tabbar">
-		<el-tabs v-model="activeName" @tab-click="handleClick">
-			<el-tab-pane v-for="(district,index) in district" :label="district.label" :name="district.name">
 				<el-row :gutter="20">
 					<el-col :span="4" v-for="(regionNum,index) in regionNum" :key="index">
 						<div class="list-content">
@@ -10,8 +8,6 @@
 						</div>
 					</el-col>
 				</el-row>
-			</el-tab-pane>
-		</el-tabs>
 	</div>
 </template>
 
@@ -148,6 +144,7 @@
 			color: #fff;
 			font-size: 12px;
 			height: 32px;
+			line-height: 32px;
 			padding: 0 10px;
 		}
 
@@ -196,7 +193,7 @@
 				display: flex;
 				flex-direction: column;
 				font-size: 12px;
-
+				color: $white;
 				padding: .5rem 0;
 				font-weight: bolder;
 				border: 1px solid #091641;