大屏修改

WebChartNewest/css/index.css

@@ -1099,7 +1099,7 @@ input::-webkit-input-placeholder{
 	margin-bottom: 10px;
 }
 .zx_charts .realTimeTraffi{
-	width: 521px;
+	/*width: 521px;*/
 	height: 208px;
 }
 

WebChartNewest/index.html

@@ -82,7 +82,7 @@
 				<!-- 调度专题 -->
 				<div class="accept_channel">
 					<div class="title_img">
-						<h2 class="cutDispatchHandle">月调度专题</h2>
+						<h2 class="cutDispatchHandle">调度专题</h2>
 					</div>
 					<div class="btn_rank">
 						<span data-state='0' id="themeRate"></span>
@@ -102,8 +102,8 @@
 					<!--注释--专题，分类单位切换，增加日月专题切换-->
 					<div class="dataT act">
 						<input hidden="hidden" id="themeClassType" value="0"/>
-						<label  class="newDataAct" data-pos="1" indexTitle="日专题">
-							日调度<span class="day"></span>
+						<label  class="newDataAct" data-pos="1" indexTitle="周专题">
+							周专题<span class="day"></span>
 						</label><br>
 						<label  class="newDataAct" data-pos="2" indexTitle="月专题">
 							月调度<span class="month active"></span>

WebChartNewest/js/dispatTopic/dispatTopic.js

@@ -82,8 +82,12 @@ function cutHotThings() {
 					name = v.deptName ? v.deptName.replace(/[0-9]+/g, "") : '其他'
 				} else {
 					name = v.F_Name ? v.F_Name.replace(/[0-9]+/g, "") : '其他'
+					if(dispatTopicType == 2){
+						if(v.F_Cycle.indexOf('年'!== -1))
+						name = v.F_Cycle.split('年')[1] + name 
+					}
 				}
-
+				
 				nameData.push(name)
 				var objCount = {}
 				objCount.count = v.count

WebChartNewest/js/index.js

@@ -751,6 +751,7 @@ function getworkOrderType() {
 	});
 }
 
+
 function hotThingsChart(dom, data, count, count1, rotate = 0,conNumData) {
 	window.onresize = function() {
 		hotThings.resize()
@@ -951,6 +952,201 @@ function hotThingsChart(dom, data, count, count1, rotate = 0,conNumData) {
 	
 }
 
+function hotThingsChartMain(dom, data, count, count1, rotate = 0,conNumData) {
+	window.onresize = function() {
+		hotThings.resize()
+	}
+	option = {
+		textStyle: {
+			color: "#c0c3cd",
+			fontSize: 11
+		},
+		grid: {
+			top: '25%',
+			bottom: '30%'
+		},
+		xAxis: {
+			nameTextStyle: {
+				color: "#c0c3cd",
+				padding: [0, 0, -10, 0],
+				fontSize: 11
+			},
+			axisLabel: {
+				color: "#c0c3cd",
+				fontSize: 11,
+				rotate: rotate,
+			},
+			axisTick: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1
+				},
+				show: false
+			},
+			minorTick: {
+				length: 8
+			},
+			splitLine: {
+				show: false
+			},
+			axisLine: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1,
+					type: "solid"
+				},
+				show: true
+			},
+			data: data,
+			type: "category"
+		},
+		yAxis: {
+			nameTextStyle: {
+				color: "#c0c3cd",
+				padding: [0, 0, 10, -5],
+				fontSize: 11
+			},
+			axisLabel: {
+				color: "#c0c3cd",
+				fontSize: 11
+			},
+			axisTick: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1
+				},
+				show: true
+			},
+			splitLine: {
+				show: true,
+				lineStyle: {
+					color: "#8398c4",
+					type: "dashed"
+				}
+			},
+			axisLine: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1,
+					type: "solid"
+				},
+				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],
+			},
+			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"
+						}, {
+							offset: 1,
+							color: "#fff500"
+						}]
+					},
+					barBorderRadius: [30, 30, 0, 0]
+				},
+				label: {
+					show: true,
+					position: "top",
+					distance: 10,
+					color: "#fff"
+				},
+				emphasis: {
+					itemStyle: {
+						color: new echarts.graphic.LinearGradient(
+							0, 0, 0, 1, [{
+									offset: 0,
+									color: '#fde301'
+								},
+								{
+									offset: 1,
+									color: '#0a2f3e'
+								}
+							]
+						)
+					}
+				},
+			},
+			{
+				data: conNumData,
+				type: "line",
+				symbolSize: 0, // symbol的大小设置为0
+			    showSymbol: false, // 不显示symbol
+			    lineStyle: {
+			        width: 0, // 线宽是0
+			        color: 'rgba(0, 0, 0, 0)' // 线的颜色是透明的
+			    }
+			},
+			{
+				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
+			},
+			{
+				data: count1,
+				type: "bar",
+				barMaxWidth: "auto",
+				barWidth: 15,
+				barGap: "-100%",
+				itemStyle: {
+					color: '#234caf'
+				},
+				zlevel: -1
+			}, {
+				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'
+				},
+				zlevel: -1
+			},
+		]
+	}
+	
+	callSeatState.setOption(option);
+	
+}
+
 function getKeyInfo(keyid, n) {
 	$('.keyInfo').html('');
 	new doAjax({

WebChartNewest/js/main.js

@@ -3,6 +3,7 @@ if(typeof console == "undefined") {
 		log: function(msg) {}
 	};
 }
+var callSeatState = echarts.init(document.getElementById("callSeatState"));
 // 如果浏览器不支持websocket，会使用这个flash自动模拟websocket协议，此过程对开发者透明
 WEB_SOCKET_SWF_LOCATION = "./js/websocket/WebSocketMain.swf";
 // 开启flash的websocket debug
@@ -216,7 +217,7 @@ function Connect() {
 				callDate = [Number(data.AgentOnlineCount), Number(data.WaiteCallCount), Number(hwcount), Number(jtcount)]
 				const outLine = dataLength - data.AgentOnlineCount;
 				callSeatStateData = [data.WaiteCallCount, data.AgentSpeakCount, data.AgentProcessingCount, data.AgentReposeCount, data.AgentFreeCount]
-//				hotThingsChart('callSeatState', callSeatStateName, callSeatStateData, 500)
+				hotThingsChartMain('callSeatState', callSeatStateName, callSeatStateData, 500)
 			}
 			
 		}

WebUI/CallCenterWeb.UI/Script/Common/huayi.config.js

@@ -3,9 +3,9 @@
 }
 //var AYWebUrl = window.document.location.href
 huayi.config = {
-	callcenter_url: "http://192.168.8.9:1042/",// 生产环境	39.164.159.226
+//	callcenter_url: "http://192.168.8.9:1042/",// 生产环境	39.164.159.226
 //	callcenter_url: "http://39.164.159.226:1042/",// 生产环境	39.164.159.226
-//		callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
+		callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
 	socket_ip: "ws://39.164.159.226:8081", //ip 
 	// socket_ip: "wss://12345sp.zwfw.anyang.gov.cn:8082", //ip 
 	//	translation_socket:"ws://125.45.12.102:12233",