大屏代码提交

WebChartNewest/index.html

@@ -55,10 +55,10 @@
 					</ul>
 					<!-- <div id="hotline" style="width: 100%;height:240px;"></div> -->
 				</div>
-				<!-- 重大事件预警 -->
+				<!-- 舆情监测 -->
 				<div class="accept_channel">
 					<div class="title_img">
-						<h2>重大事件预警</h2>
+						<h2>舆情监测</h2>
 					</div>
 					<div class="dataT">
 						当月数据
@@ -489,7 +489,7 @@
 				<img src="./image/second/X.png" alt="" class="close_icon">
 				<div class="head_name">
 					<img src="./image/second/title_right.png" class="title_left">
-					<h3>重大事件预警</h3>
+					<h3>舆情监测</h3>
 					<img src="./image/second/title_left.png" class="title_right">
 				</div>
 				<div style="position: relative;">

WebChartNewest/js/index.js

@@ -73,16 +73,22 @@ $('.closeMap_icon').click(function () {
 })
 //
 //热搜词移入，移入内容以外关闭出现页面
-document.addEventListener('mousemove', (e) => {
-	let t = document.getElementById('keyword'); // 最外层元素
-	let l = document.getElementById('hotline3');
-	if (!e.path.includes(t)) {
-		$('.keyWrap').css('display', 'none')
-	}
-	if (!e.path.includes(l)) {
-		$('.lineB').css('display', 'none')
-	}
-})
+//document.addEventListener('mousemove', (e) => {
+//	let t = document.getElementById('keyword'); // 最外层元素
+//	let l = document.getElementById('hotline3');
+//	if (!e.path.includes(t)) {
+//		$('.keyWrap').css('display', 'none')
+//	}
+//	if (!e.path.includes(l)) {
+//		$('.lineB').css('display', 'none')
+//	}
+//})
+$("#keyword").mouseleave(function(){
+    $('.keyWrap').css('display', 'none')
+ });
+ $("#hotline3").mouseleave(function(){
+    $('.lineB').css('display', 'none')
+ });
 function getHotlineAccept() {
 	new doAjax({
 		url: huayi.config.callcenter_url + "/InfoNew/GetSourceCountBy",
@@ -469,8 +475,8 @@ function getHotThings() {
 		},
 		callBack: function (res) {
 			res.forEach(function (v, n) {
-				// if(v.name!='中毒'&&v.name!='地震'){
-				nameData.push(v.name);
+				// if(v.name!='中毒'&&v.name!='地震'){ str.replace(/[0-9]+/g,"")
+				nameData.push(v.name.replace(/[0-9]+/g,""));
 				conNum.push(v.count)
 				secData.push({
 					level: v.name,
@@ -481,7 +487,7 @@ function getHotThings() {
 			for (var i = 0; i < secData.length; i++) {
 				maxNum.push(Math.max.apply(null, conNum) + 200);
 			}
-			hotThingsChart('hotThings', nameData, conNum, maxNum)
+			hotThingsChart('hotThings', nameData, conNum, maxNum,-30)
 		}
 	});
 }
@@ -748,121 +754,121 @@ function getworkOrder() {
 	});
 }
 
-function hotThingsChart(dom, data, count, count1) {
+function hotThingsChart(dom, data, count, count1,rotate=0) {
 	let hotThings = echarts.init(document.getElementById(dom));
 	window.onresize = function () {
 		hotThings.resize()
 	}
 	option = {
-		"textStyle": {
-			"color": "#c0c3cd",
-			"fontSize": 11
+		textStyle: {
+			color: "#c0c3cd",
+			fontSize: 11
 		},
 		grid: {
 			top: '25%',
-			bottom: '15%'
+			bottom: '30%'
 		},
-		"xAxis": {
-			"nameTextStyle": {
-				"color": "#c0c3cd",
-				"padding": [0, 0, -10, 0],
-				"fontSize": 11
+		xAxis: {
+			nameTextStyle: {
+				color: "#c0c3cd",
+				padding: [0, 0, -10, 0],
+				fontSize: 11
 			},
-			"axisLabel": {
-				"color": "#c0c3cd",
-				"fontSize": 11,
-				"interval": 0,
+			axisLabel: {
+				color: "#c0c3cd",
+				fontSize: 11,
+				rotate: rotate,
 			},
-			"axisTick": {
-				"lineStyle": {
-					"color": "#8398c4",
-					"width": 1
+			axisTick: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1
 				},
-				"show": false
+				show: false
 			},
-			"minorTick": {
-				"length": 8
+			minorTick: {
+				length: 8
 			},
-			"splitLine": {
-				"show": false
+			splitLine: {
+				show: false
 			},
-			"axisLine": {
-				"lineStyle": {
-					"color": "#8398c4",
-					"width": 1,
-					"type": "solid"
+			axisLine: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1,
+					type: "solid"
 				},
-				"show": true
+				show: true
 			},
-			"data": data,
-			"type": "category"
+			data: data,
+			type: "category"
 		},
-		"yAxis": {
-			"nameTextStyle": {
-				"color": "#c0c3cd",
-				"padding": [0, 0, 10, -5],
-				"fontSize": 11
+		yAxis: {
+			nameTextStyle: {
+				color: "#c0c3cd",
+				padding: [0, 0, 10, -5],
+				fontSize: 11
 			},
-			"axisLabel": {
-				"color": "#c0c3cd",
-				"fontSize": 11
+			axisLabel: {
+				color: "#c0c3cd",
+				fontSize: 11
 			},
-			"axisTick": {
-				"lineStyle": {
-					"color": "#8398c4",
-					"width": 1
+			axisTick: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1
 				},
-				"show": true
+				show: true
 			},
-			"splitLine": {
-				"show": true,
-				"lineStyle": {
-					"color": "#8398c4",
-					"type": "dashed"
+			splitLine: {
+				show: true,
+				lineStyle: {
+					color: "#8398c4",
+					type: "dashed"
 				}
 			},
-			"axisLine": {
-				"lineStyle": {
-					"color": "#8398c4",
-					"width": 1,
-					"type": "solid"
+			axisLine: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1,
+					type: "solid"
 				},
-				"show": true,
+				show: true,
 				// "symbol":['none', 'arrow'],
-				"symbol": ['none', 'path://M5, 20 L5, 5 L8, 8 L5, 2 L2, 8 L5, 5 L5.3, 6 L5.3,                  20'],
-				'symbolOffset': 5,
-				'symbolSize': [35, 38],
+				symbol: ['none', 'path://M5, 20 L5, 5 L8, 8 L5, 2 L2, 8 L5, 5 L5.3, 6 L5.3,                  20'],
+				symbolOffset: 5,
+				symbolSize: [35, 38],
 			},
-			"name": "条"
+			name: "条"
 		},
-		"series": [{
-			"data": count,
-			"type": "bar",
-			"barMaxWidth": "auto",
-			"barWidth": 15,
-			"itemStyle": {
-				"color": {
-					"x": 0,
-					"y": 0,
-					"x2": 0,
-					"y2": 1,
-					"type": "linear",
-					"global": false,
-					"colorStops": [{
-						"offset": 0,
-						"color": "#ff4519"
+		series: [{
+			data: count,
+			type: "bar",
+			barMaxWidth: "auto",
+			barWidth: 15,
+			itemStyle: {
+				color: {
+					x: 0,
+					y: 0,
+					x2: 0,
+					y2: 1,
+					type: "linear",
+					global: false,
+					colorStops: [{
+						offset: 0,
+						color: "#ff4519"
 					}, {
-						"offset": 1,
-						"color": "#fff500"
+						offset: 1,
+						color: "#fff500"
 					}]
 				},
 				barBorderRadius: [30, 30, 0, 0]
 			},
-			"label": {
-				"show": true,
-				"position": "top",
-				"distance": 10,
-				"color": "#fff"
+			label: {
+				show: true,
+				position: "top",
+				distance: 10,
+				color: "#fff"
 			},
 			emphasis: {
 				itemStyle: {
@@ -881,51 +887,51 @@ function hotThingsChart(dom, data, count, count1) {
 				}
 			},
 		}, {
-			"data": [1, 1, 1, 1, 1, 1],
-			"type": "pictorialBar",
-			"barMaxWidth": "20",
-			"symbol": "none",
+			data: [1, 1, 1, 1, 1, 1],
+			type: "pictorialBar",
+			barMaxWidth: "20",
+			symbol: "none",
 		},
 		{
 			// "data": [1500, 1148, 756, 1395, 1750, 1148],
-			"type": "pictorialBar",
-			"barMaxWidth": "20",
-			"symbolPosition": "end",
-			"symbol": "none",
-			"symbolOffset": [0, "-50%"],
-			"symbolSize": [30, 12],
-			"zlevel": 1
+			type: "pictorialBar",
+			barMaxWidth: "20",
+			symbolPosition: "end",
+			symbol: "none",
+			symbolOffset: [0, "-50%"],
+			symbolSize: [30, 12],
+			zlevel: 1
 		},
 		{
-			"data": count1,
-			"type": "bar",
-			"barMaxWidth": "auto",
-			"barWidth": 15,
-			"barGap": "-100%",
-			"itemStyle": {
-				"color": '#234caf'
+			data: count1,
+			type: "bar",
+			barMaxWidth: "auto",
+			barWidth: 15,
+			barGap: "-100%",
+			itemStyle: {
+				color: '#234caf'
 			},
-			"zlevel": -1
+			zlevel: -1
 		}, {
-			"data": [1, 1, 1, 1, 1, 1],
-			"type": "pictorialBar",
-			"barMaxWidth": "20",
-			"symbol": "none",
-			"symbolOffset": [0, "50%"],
-			"symbolSize": [30, 15],
-			"zlevel": -2
+			data: [1, 1, 1, 1, 1, 1],
+			type: "pictorialBar",
+			barMaxWidth: "20",
+			symbol: "none",
+			symbolOffset: [0, "50%"],
+			symbolSize: [30, 15],
+			zlevel: -2
 		}, {
-			"data": count1,
-			"type": "pictorialBar",
-			"barMaxWidth": "20",
-			"symbolPosition": "end",
-			"symbol": "circle",
-			"symbolOffset": [0, "-60%"],
-			"symbolSize": [15, 12],
-			"itemStyle": {
-				"color": '#234caf'
+			data: count1,
+			type: "pictorialBar",
+			barMaxWidth: "20",
+			symbolPosition: "end",
+			symbol: "circle",
+			symbolOffset: [0, "-60%"],
+			symbolSize: [15, 12],
+			itemStyle: {
+				color: '#234caf'
 			},
-			"zlevel": -1
+			zlevel: -1
 		},
 		]
 	}
@@ -1844,7 +1850,6 @@ $('.accept_channel').click(function (e) {
 		done: function (value) {
 			new doAjax({
 				url: huayi.config.callcenter_url + "/InfoNew/Majorevents",
-				// url: "http://192.168.8.9:1042/InfoNew/Majorevents",
 				Type: 'get',
 				data: {
 					stime: value && value.split(' ~ ')[0],
@@ -1866,7 +1871,6 @@ $('.accept_channel').click(function (e) {
 	});
 	new doAjax({
 		url: huayi.config.callcenter_url + "/InfoNew/Majorevents",
-		// url: "http://192.168.8.9:1042/InfoNew/Majorevents",
 		Type: 'get',
 		data: {
 			stime: $('#date2').val() && $('#date2').val().split(' ~ ')[0],
@@ -1876,10 +1880,9 @@ $('.accept_channel').click(function (e) {
 			let eventsData = []
 			res.forEach(function (v, n) {
 				eventsData.push({
-					level: v.name,
+					level: v.name.replace(/[0-9]+/g,""),
 					landArea: v.count
 				})
-				// }
 			})
 			getHonelineChart2(eventsData, 'events')
 		}

WebChartNewest/js/newIndex.js

@@ -459,8 +459,7 @@ function getHotThings() {
 		},
 		callBack: function (res) {
 			res.forEach(function (v, n) {
-				// if(v.name!='中毒'&&v.name!='地震'){
-				nameData.push(v.name);
+				nameData.push(v.name.replace(/[0-9]+/g,""));
 				conNum.push(v.count)
 				secData.push({
 					level: v.name,
@@ -468,6 +467,7 @@ function getHotThings() {
 				})
 				// }
 			})
+			console.log(nameData)
 			for (var i = 0; i < secData.length; i++) {
 				maxNum.push(Math.max.apply(null, conNum) + 200);
 			}
@@ -617,6 +617,7 @@ function hotThingsChart(dom, data, count, count1) {
 			"axisLabel": {
 				"color": "#c0c3cd",
 				"fontSize": 11,
+				"rotate": -45,
 				"interval": 0,
 			},
 			"axisTick": {
@@ -1627,7 +1628,6 @@ $('.accept_channel').click(function (e) {
 		done: function(value) {
 			new doAjax({
 				url: huayi.config.callcenter_url + "/InfoNew/Majorevents",
-				// url: "http://192.168.8.9:1042/InfoNew/Majorevents",
 				Type: 'get',
 				data: {
 					stime: value && value.split(' ~ ')[0],
@@ -1649,7 +1649,6 @@ $('.accept_channel').click(function (e) {
 	});
 	new doAjax({
 		url: huayi.config.callcenter_url + "/InfoNew/Majorevents",
-		// url: "http://192.168.8.9:1042/InfoNew/Majorevents",
 		Type: 'get',
 		data: {
 			stime: $('#date2').val() && $('#date2').val().split(' ~ ')[0],
@@ -1659,7 +1658,7 @@ $('.accept_channel').click(function (e) {
 			let eventsData = []
 			res.forEach(function (v, n) {
 				eventsData.push({
-					level: v.name,
+					level: v.name.replace(/[0-9]+/g,""),
 					landArea: v.count
 				})
 				// }