大屏修改

WebChartNewest/Script/Common/huayi.config.js

@@ -3,10 +3,10 @@ if (huayi == undefined) {
     var huayi = {};
 }
 huayi.config = {
-//	  callcenter_url: "http://192.168.8.9:1042/",//生产环境  
+	// callcenter_url: "http://192.168.8.9:1042/",//生产环境  
 	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/",
-    socket_ip: "61.54.2.122",//ip 61.54.2.122:8081
-    socket_port: "8081",//端口
+    socket_ip: "222.143.106.43",//ip 61.54.2.122:8081   ws://222.143.106.43:8081/
+    socket_port: "8081",// 端口
     indextime: 30000//报表刷新时间
 
 };

WebChartNewest/index.html

@@ -90,13 +90,23 @@
 						<span class="responseLength" data-state='3'>切换</span>
 						<img src="./image/switch.png" alt="">-->
 					</div>
-					<div class="dataT act">
-						<input hidden="hidden" id="themeClassType" value="0"/>
-						<label  class="dataAct" data-pos="1" indexTitle="专题-按分类">
+					<!--<div class="dataT act">
+						<input hidden="hidden" id="themeClassType" value="0"/>
+						<label  class="newdataAct" data-pos="1" indexTitle="专题-按分类">
 							分类<span class="day active"></span>
 						</label><br>
 						<label  class="dataAct" data-pos="2" indexTitle="专题-按单位">
 							单位<span class="month"></span>
+						</label>
+					</div>-->
+					<!--注释--专题，分类单位切换，增加日月专题切换-->
+					<div class="dataT act">
+						<input hidden="hidden" id="themeClassType" value="0"/>
+						<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>
 						</label>
 					</div>
 					<div id="hotThings" style="width: 100%;height:250px;"></div>

WebChartNewest/js/dispatTopic/dispatTopic.js

@@ -1,16 +1,109 @@
 //热线整合受理情况&重大事件
-var dispatTopicType = 2		// 1 周 2月
-$('.cutDispatchHandle').click(function (e) {
-	
-	console.log($(this).text())
-	if ($(this).text() === '月调度专题') {
-		dispatTopicType = 1
-		$(this).text('周调度专题')
+var dispatTopicType = 2 // 1 周 2月
+var hotThings = echarts.init(document.getElementById("hotThings"));
+//$('.cutDispatchHandle').click(function(e) {
+//	if($(this).text() === '月调度专题') {
+//		dispatTopicType = 1
+//		$(this).text('周调度专题')
+//		getHotThings()
+//	} else if($(this).text() === '周调度专题') {
+//		dispatTopicType = 2
+//		$(this).text('月调度专题')
+//		getHotThings()
+//	}
+//})
+
+$('.newDataAct').click(function () {
+	console.log('dataAct')
+	var indexTitle = $(this).attr('indexTitle')
+	if($(this).attr('data-pos') == '1'){
 		
-		getHotThings()
-	} else if($(this).text() === '周调度专题'){
+		$(this).children(".day").addClass('active');
+		$(this).siblings("label").children('.month').removeClass('active');
+//		$('#themeClassType').val('0');
+		dispatTopicType = 1
+		trafficState = 0;
+		cutHotThings();
+	} else if ($(this).attr('data-pos') == '2') {
+		$(this).children('.month').addClass('active')
+		$(this).siblings("label").children('.day').removeClass('active');
+//		$('#themeClassType').val('1');
 		dispatTopicType = 2
-		$(this).text('月调度专题')
-		getHotThings()
+		cutHotThings();
+		trafficState = 1;
 	}
 })
+hotThings.getZr().on('click', function (params) {
+	$(".themeBarTit").text($('.cutDispatchHandle').text())
+	$(".themeBar_wrap").show()
+	var pointInPixel = [params.offsetX, params.offsetY];
+	var pointInGrid = hotThings.convertFromPixel({
+        seriesIndex: 0
+    }, pointInPixel);
+    var xIndex = pointInGrid[0];  //索引
+    var handleIndex = Number(xIndex);
+    var seriesObj = hotThings.getOption(); //图表object对象
+	$('.themeBar_down').siblings().hide()
+	$('.themeBar_down').show();
+	themeDblId = seriesObj.series[1].data[handleIndex].themId
+	console.log(hotThings)
+	console.log(themeDblId)
+	getThemeStatics();
+//	getHotThings()
+})
+function cutHotThings() {
+	var nameData = [];
+	var conNum = [];
+	var conNumData = []
+	var maxNum = []
+	var secData = [];
+	var type = $('#themeClassType').val();
+	var url = '/InfoNew/GetThemeSpecial';
+//	if (type == '1') url = '/InfoNew/GetThemeDept1';
+	
+	new doAjax({
+		url: huayi.config.callcenter_url + url,
+		Type: 'get',
+		data: {
+			token: $.cookie("token"),
+			stime: '',
+			etime: '',
+			timetype: MajoreventsDataType,
+			id: themeDblId,
+			type: dispatTopicType
+		},
+		callBack: function(res) {
+			if(res.state === "notoken") {
+				window.location.href = "login.html";
+			}
+			res.data.forEach(function(v, n) {
+				var name = '';
+				if(type == '1') {
+					name = v.deptName ? v.deptName.replace(/[0-9]+/g, "") : '其他'
+				} else {
+					name = v.F_Name ? v.F_Name.replace(/[0-9]+/g, "") : '其他'
+				}
+
+				nameData.push(name)
+				var objCount = {}
+				objCount.count = v.count
+				objCount.themId = v.F_ID
+				conNumData.push(objCount)
+				conNum.push(v.count)
+				secData.push({
+					level: name,
+					landArea: v.count
+				})
+			})
+
+			if(res.data && res.data.length > 0) {
+				$('#themeRate').text(res.data[0].Proportion);
+			}
+			for(var i = 0; i < secData.length; i++) {
+				maxNum.push(Math.max.apply(null, conNum) + 200);
+			}
+			hotThingsChart('hotThings', nameData, conNum, maxNum, -30,conNumData)
+		}
+	});
+
+}

WebChartNewest/js/dispatTopic/themeDoubleClick.js

@@ -1,19 +1,20 @@
 var themeDoubleFlag = false
 var timerTheme = null
+
 var  themeBarEcharts = echarts.init(document.getElementById('themeBarEle'));
 var themeBarDownEcharts = echarts.init(document.getElementById("themeBarDownEle"));
 var themeDblId
 //调度专题
-$('.accept_channel #hotThings').click(function(e) {
-	clearTimeout(themeDoubleFlag)
-	themeDoubleFlag = setTimeout(function(){
-		console.log("单击")
-		$(".themeBarTit").text($('.cutDispatchHandle').text())
-		$(".themeBar_wrap").show()
-		getThemeStatics();
-	},500)
-	
-})
+//$('.accept_channel #hotThings').click(function(e) {
+//	clearTimeout(themeDoubleFlag)
+//	themeDoubleFlag = setTimeout(function(){
+//		console.log("单击")
+//		$(".themeBarTit").text($('.cutDispatchHandle').text())
+//		$(".themeBar_wrap").show()
+//		getThemeStatics();
+//	},500)
+//	
+//})
 $(".accept_channel #hotThings").dblclick(function(){
 		$(".themeBarTit").text($('.cutDispatchHandle').text())
 		clearTimeout(themeDoubleFlag)
@@ -40,7 +41,6 @@ themeBarEcharts.getZr().on('click', function (params) {
 	console.log(params)
 	console.log(params.value)
 	var pointInPixel = [params.offsetX, params.offsetY];
-	
 	var pointInGrid = themeBarEcharts.convertFromPixel({
         seriesIndex: 0
     }, pointInPixel);
@@ -52,7 +52,8 @@ themeBarEcharts.getZr().on('click', function (params) {
 	domM = 'themeBarDownEle'
 	themeDblId = seriesObj.series[0].data[handleIndex].themId
 	
-	getHotThings()
+//	getHotThings()
+	cutHotThings()
 })
 //themeDblId = null
 $("#themeBarDownEle").click(function () {

WebChartNewest/js/documentDready.js

@@ -24,7 +24,8 @@ function documentInit(){
 //		index.js
 		gettraffic() //话务量
 		getHotline() //热线
-		getHotThings() //重大事件
+		// getHotThings() //重大事件
+		cutHotThings()
 		getKeyWord(); //热搜词
 		getworkOrderType() //工单类型
 		timeTable() //办理时限

WebChartNewest/js/index.js

@@ -513,7 +513,12 @@ if (type == '1') url = '/InfoNew/GetThemeDept1';
 				
 				
 				
-				conNum.push(v.count)
+				
+				var objCount = {}
+				objCount.count = v.count
+				objCount.id = v.F_ID
+				
+				conNum.push(objCount)
 				secData.push({
 					level: name,
 					landArea: v.count
@@ -521,7 +526,7 @@ if (type == '1') url = '/InfoNew/GetThemeDept1';
 				// }
 				
 			})
-			
+			console.log(conNum)
 			if (res.data &&res.data.length > 0) {
 				$('#themeRate').text(res.data[0].Proportion);
 			}
@@ -639,7 +644,6 @@ function getHotline() {
 
 function getHotLineInfo(strName, bili, n) {
 	$('.lineB').text(strName + '：' + bili);
-	console.log(n)
 	switch (Number(n)){
 		case 0:
 			getLineBcss('-24px','-20px')
@@ -747,8 +751,7 @@ function getworkOrderType() {
 	});
 }
 
-function hotThingsChart(dom, data, count, count1, rotate = 0) {
-	let hotThings = echarts.init(document.getElementById(dom));
+function hotThingsChart(dom, data, count, count1, rotate = 0,conNumData) {
 	window.onresize = function() {
 		hotThings.resize()
 	}
@@ -878,7 +881,18 @@ function hotThingsChart(dom, data, count, count1, rotate = 0) {
 						)
 					}
 				},
-			}, {
+			},
+			{
+				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",

WebChartNewest/js/main.js

@@ -216,7 +216,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)
+//				hotThingsChart('callSeatState', callSeatStateName, callSeatStateData, 500)
 			}
 			
 		}

WebChartNewest/js/newAdd/operationEvent.js

@@ -23,7 +23,7 @@ $('.dataAct').click(function () {
 		}else if(indexTitle=="来电监测"){
 			console.log("日-来电监测")
 			MajoreventsDataType = 0
-			getHotThings()
+//			getHotThings()
 		}else if(indexTitle=="高频事项"){
 			keyCountDataType = 0
 			$('#gpsxDataAct').val('1');
@@ -39,7 +39,7 @@ $('.dataAct').click(function () {
 		} else if (indexTitle=="专题-按分类") {
 			$('#themeClassType').val('0');
 			console.log('123')
-			getHotThings();
+//			getHotThings();
 		}
 		trafficState = 0;
 	} else if ($(this).attr('data-pos') == '2') {
@@ -56,7 +56,7 @@ $('.dataAct').click(function () {
 			getHotline()
 		}else if(indexTitle=="来电监测"){
 			MajoreventsDataType = 1
-			getHotThings()
+//			getHotThings()
 		}else if(indexTitle=="高频事项"){
 			$('#gpsxDataAct').val('2');
 			keyCountDataType = 1
@@ -69,7 +69,7 @@ $('.dataAct').click(function () {
 			initTable();
 		} else if (indexTitle=="专题-按单位") {
 			$('#themeClassType').val('1');
-			getHotThings();
+//			getHotThings();
 		}
 		trafficState = 1;
 	}

WebChartNewest/js/second_1.js

@@ -58,6 +58,7 @@ function initHoneline(value) {
 	}
 hotline2M.on('click', function (params) {
 	console.log(params, 'hotline2')
+	domM = 'hotline2'
 	if (domM== 'hotline2') {
 		workTable('', '', '', params.name, '', '', '', '', hotlineTimeType)
 	} else if (domM== 'events') {
@@ -82,6 +83,8 @@ hotline2M.on('click', function (params) {
 	
 })
 channelM.on('click', function (params) {
+	
+	domM = 'channel'
 	var time = $('#date3').val().split(' ~ ');
 	var sourceInfo = sourceCountId.find(function(o) {
 		return o.name == params.name;
@@ -166,7 +169,7 @@ function getHonelineChart2(data) {
 		
 		LEV.push(item.level)
 	})
-	console.log(VALUE)
+//	console.log(VALUE)
 	let maxItem = [].concat(VALUE).sort((a, b) => b - a)[0]
 
 	let SUM = 0
@@ -187,7 +190,6 @@ function getHonelineChart2(data) {
 			transitionDuration: 0.4,
 			formatter: function (params) {
 				var resultValue = ''
-				console.log(domM)
 				if (domM === 'themeBarEle') {
 					resultValue =  VALUE[params.dataIndex].value
 				} else {

WebChartNewest/js/second_index.js

@@ -9,7 +9,6 @@ let reg = /\w\d+$/;
 $('.backKey_icon').click(function () {
 	for (let i = 0; i < keyidArr.length; i++) {
 		if (keyidArr[i].id == keyid) {
-			console.log(keyidArr[i - 1].id)
 			$('.keyWordTitle').text(keyidArr[i - 1].name + '问题分类')
 			$('.head_title').text(keyidArr[i - 1].name + '关键字数据分析')
 			keyWordTable(keyidArr[i - 1].id);
@@ -19,6 +18,7 @@ $('.backKey_icon').click(function () {
 	}
 })
 $('.closeKey_icon').click(function () {
+	$('#themeIdHidden').val('')
 	$('.bulletFrame').hide();
 	$('.bulletFrameT').hide();
 	if ($('.bulletFrame').css('display') == 'none') {
@@ -87,12 +87,10 @@ function getKeyClass(id, classId, con) {
 			$('.keyWordTitle').text(keyidArr[0].name + '问题分类')
 			$('.head_title').text(keyidArr[0].name + '关键字数据分析')
 			$('.statisticsTime').html(value)
-			console.log(value, 'value')
 			
 			keyWordTable(keyidArr[0].id, keyidArr[0].name, value);
 		}
 	});
-	console.log($('#gpsxDataAct').val(), 'dataact')
 	if (classId == '1' || classId == '0') {
 		
 		// 当月
@@ -125,7 +123,6 @@ function getKeyClass(id, classId, con) {
 }
 
 function keyWordTable(id, con, value) {
-	console.log(value)
 	var $tableLeft = $('#keyWordlist');
 	$tableLeft.bootstrapTable('destroy');
 	//初始化表格,动态从服务器加载数据
@@ -219,7 +216,6 @@ function keyword_chart(dom, nameArray, piData, con) {
 	keywordNum.forEach(function (v, n) {
 		keywordName.push(v.value.replace(reg, ''));
 	})
-	console.log(keywordName)
 	keywordName.forEach(function (v, n) {
 		if (v.length > 20) {
 			keylegend = [{
@@ -514,7 +510,6 @@ function getKeyName(v, r) {
 	for (let i = 0; i < keyidArr.length; i++) {
 		if (keyidArr[i].id == keyid) {
 			if (keyidArr[0].id == keyid) {
-				console.log('1111', keyname)
 				$('.backKey_icon').css('display', 'none')
 			} else {
 				$('.backKey_icon').css('display', 'block')
@@ -829,9 +824,6 @@ var tableColumns = [
  		if(!val) {
  			val = 0
  		}
- 		
- 		console.log($('#rankDate').val(), 'asfasdf')
-
  		return '<div class="imgs" ><a class="" onclick="examineList(\'' + row.deptid + '\', \'' + tab + '\', \''+ $('#rankDate').val() +'\')" >' + val +
  			'</a></div>'
  	} else {
@@ -998,7 +990,6 @@ newDataL.rows = data;
 
 			newDataL.state = "success";
 			newDataL.message = "加载成功";
-			console.log(newDataL)
 			$tableLeft.bootstrapTable('load', newDataL);
 		},
 		onLoadError: function () { //加载失败时执行
@@ -1072,7 +1063,6 @@ function getAcceptanceType() {
 			newDataL.message = data.message;
 			newDataL.rows = data.data;
 			$tableLeft.bootstrapTable('load', newDataL);
-			console.log(newDataL.rows, 'newDataL.rows')
 			new doAjax({
 				url: huayi.config.callcenter_url + "/InfoNew/GetHandling",
 				data: {
@@ -1163,7 +1153,6 @@ function getHandling(data) {
 	};
 	sortPie.setOption(option);
 	sortPie.on('click', function (params) {
-		console.log(params.name)
 		if (params.name == '直办') {
 			workTable('', '', '', '', '', '', '', '', 0, 2)
 		} else if (params.name == '督办') {
@@ -1224,7 +1213,6 @@ function trafficMonthChart(hours, monthCount, dayCount) {
 			position: ['75%', '55%'],
 			backgroundColor: 'rgba(250,250,250,0)',
 			formatter: function (params) {
-				console.log()
 				let str = '<div style="position: absolute;top:-315px;left:-423px">接通率：' + ((params[1].value / params[0].value) * 100).toFixed(0) + '%</div>'
 				return str;
 			}
@@ -1323,7 +1311,6 @@ function trafficMonthChart(hours, monthCount, dayCount) {
 				fontSize: 14,
 				fontWeight: '600',
 				formatter: function (params) {
-					console.log(params)
 					return params.seriesName + '：' + params.value
 				}
 			},
@@ -1849,7 +1836,6 @@ function getRealTimeTraffi(hours, hrCount, hcCount) {
 			// 	fontSize: 14,
 			// 	fontWeight: '600',
 			// 	formatter: function (params) {
-			// 		console.log(params)
 			// 		return params.seriesName + '：' + params.value
 			// 	}
 			// },
@@ -1955,9 +1941,6 @@ function getThemeStatics() {
 //		$('.body').css('opacity', '0.4')
 //	}
 //	
-
-
-
 	new doAjax({
 		url: huayi.config.callcenter_url + '/InfoNew/GetThemeClassification1',
 		Type: 'get',
@@ -1975,7 +1958,6 @@ function getThemeStatics() {
 			}
 			
 			if (res.data && res.data.length > 0) {
-				console.log(res.data[0].Themeid, 'res.data[0].Themeid')
 				$('#themeIdHidden').val(res.data[0].Themeid)
 			}
 			
@@ -2034,7 +2016,6 @@ function getThemeStatics() {
 
 
 function theme_chart(dom, nameArray, piData) {
-	console.log('theme_chart')
 
 	let keywordPieChart = echarts.init(document.getElementById(dom));
 	let keywordNum = [];
@@ -2065,8 +2046,6 @@ function theme_chart(dom, nameArray, piData) {
 		allCount += parseInt(v.value);
 	})
 	
-	console.log(allCount, 'allCount')
-	
 	let max;
 	for (let i = 0; i < keywordNum.length; i++) {
 		for (let j = i; j < keywordNum.length; j++) {
@@ -2080,7 +2059,6 @@ function theme_chart(dom, nameArray, piData) {
 	keywordNum.forEach(function (v, n) {
 		keywordName.push(v.value.replace(reg, ''));
 	})
-	console.log(keywordName)
 	keywordName.forEach(function (v, n) {
 		if (v.length > 20) {
 			keylegend = [{
@@ -2323,26 +2301,22 @@ function theme_chart(dom, nameArray, piData) {
 		}]
 	};
 	
-	console.log(option, 'option')
 	keywordPieChart.setOption(option);
 	
 	keywordPieChart.on('click', function (params) {
-    	console.log(params, 'keywordPieChart');
     	if (dom === 'themeByClass') {
     		
     		workTable('','','','','' ,'','',null,null,null,null,null, null, null, null, null, null, null, params.data.dataId, 1)
     	} else if (dom === 'themeByDept') {
 //  		workTable(KeyId,deptid,sourceId,PhoneType,keyword ,type,sourceArea,key,timetype,handling,source,dptype, date, Township, strworkid, stime, etime, isspecial, special, time = 0, monthlytheme)
-workTable('',params.data.dataId,'','','' ,'',null,null,null,null,null,null, null, null, null, null, null, null, null, 1, params.data.themeId)
+			workTable('',params.data.dataId,'','','' ,'',null,null,null,null,null,null, null, null, null, null, null, null, null, 1, params.data.themeId)
     	}
 	});
 }
 
 
 function getAllThemeOrders() {
-	console.log('getAllThemeOrders')
 	var id = $('#themeIdHidden').val();
-	console.log(id, 'getAllThemeOrders')
 	if (id != '') {
 		workTable('','','','','' ,'',null,null,null,null,null,null, null, null, null, null, null, null, null, 1)
 	}

WebChartNewest/js/workOrder.js

@@ -99,6 +99,7 @@ function initTable(parm) {
 			};
 		},
 		onLoadSuccess: function(res) { //加载成功时执行
+			$('#themeIdHidden').val('')
 		},
 		onLoadError: function() { //加载失败时执行
 			//layer.msg("加载数据失败", { time: 1500, icon: 2 });

WebUI/CallCenterWeb.UI/CommonHtml/js/orderDetail.js

@@ -4,7 +4,9 @@ function detialVisit(result) {
 	var html1 = '';
 	var html2 = '';
 	var visitRole = ['GLY','ZXLD']
-	
+	if (visitRole.indexOf(roleCode)!== -1) {
+		$(".visitLimit").show()
+	}
 	if(result.data.length < 0) {
 		html = '<tr>' +
 			'<td class="text-center">' + n.UserName + '</td>' +
@@ -68,12 +70,11 @@ function detialVisit(result) {
 			
 			html2 = html
 			if (visitRole.indexOf(roleCode)!== -1) {
-				$(".visitLimit").show()
+				
 				var itemHf = JSON.stringify(n).replace(/"/g, "'")
 				html2 += '</td>'
 				html2 += '<td class="text-center">' +   
 					'<a class="xg" onclick="visitHandle('+itemHf+')" title="修改">修改</a>' +
-					"<a class='xg' onclick='deleteVisit(\""+n.F_Id+"\")' title='删除'>删除</a>" +
 					'</td>';
 			}
 			

WebUI/CallCenterWeb.UI/Media/MediaWorkOrderList.html

@@ -20,8 +20,8 @@
                 <sapn>
                     <i class="syIcon"></i>位置：
                     <a href="javaScript:;" id="ReIndex">首页</a>&gt;
-                    <a href="javaScript:;">媒体监督</a>&gt;
-                    <a href="" class="nowPosition">媒体工单</a>
+                    <a href="javaScript:;">综合查询</a>&gt;
+                    <a href="" class="nowPosition">公共事项</a>
                 </sapn>
             </div>
             <div class="dhRight">