tudc 5 tahun lalu
induk
melakukan
eb6b748cc8

+ 4 - 0
src/main/java/com/minpay/common/constant/Constant.java

@@ -307,6 +307,10 @@ public class Constant implements IMINBusinessConstant{
 	 * 报表类型 TQTDZB:台区停电周报
 	 */
 	public static final String REPORT_TYPE_01 = "TQTDZB";
+	/**
+	 * 报表类型 TQTDYB:台区停电月报
+	 */
+	public static final String REPORT_TYPE_02 = "TQTDYB";
 	
 	/**
 	 * 原始文件状态 0正常

File diff ditekan karena terlalu besar
+ 46 - 3
src/main/java/com/minpay/common/service/impl/ReportServiceImpl.java


+ 1 - 23
src/main/webapp/admin/index.html

@@ -154,15 +154,6 @@
   </div>
   <script>
     var message;
-    $('#pay').on('click', function() {
-        layer.open({
-          title: false,
-          type: 1,
-          content: '<img src="../src/images/pay.png" />',
-          area: ['500px', '250px'],
-          shadeClose: true
-        });
-     });
     
     $('#loginOut').on('click', function() {
     	layer.confirm('真的要注销吗', function(index){
@@ -320,7 +311,7 @@
 				
 				$('#oneMenu').html(menuHtml);
 				if(data.oneMenuList.length > 0) {
-					oneMenuClick(data.oneMenuList[0].menuId, false);
+					oneMenuClick(data.oneMenuList[0].menuId, true);
 				}
 				else {
 					oneMenuClick('', true);
@@ -379,19 +370,6 @@
 	    	});
     });
     
-    // 修改基本信息
-    /* $(document).on('click','#changeBaseInf', function(){
-  		layer.open({
-	    	      type: 2,
-	    	      title: '修改基本信息',
-	    	      shadeClose: true,
-	    	      shade: true,
-	    	      //maxmin: true, //开启最大化最小化按钮
-	    	   	  area: ['65%', '85%'],
-	    	      content: 'personManage/editUser.html'
-	    	});
-    }); */
-    
     // 反显
     layui.use('form', function(){
     	$.request({

+ 4 - 888
src/main/webapp/admin/main.html

@@ -9,901 +9,17 @@
 		<link rel="stylesheet" type="text/css" href="../css/modify.css" />
 		<link rel="stylesheet" type="text/css" href="../css/base.css" />
 		<link rel="stylesheet" type="text/css" href="../css/master.css" />
-		
 		<script src="../js/min-loader.js"></script>
 		<style type="text/css">
-			.ma-year .layui-edge{
-				background: url(../images/icon_xuanze.svg) no-repeat;
-				position: absolute;
-			    right: 4px;
-			    top: -6px;
-			    cursor: pointer;
-			    transition: none;
-			    -webkit-transition: none;
-			    margin-top: 0px;
-			    border-width: 14px;
-			    border-top-color: transparent;
-		        -webkit-transform: rotate(0deg);
-    			transform: rotate(0deg);
-			}
-			.ma-year .layui-form-select dl{
-				padding: 0;
-			    background: #E7F7FF;
-    			border-radius: 14px;
-   			    border: 1px solid #00A0E8;
-   			    color: #00A0E8;
-			}
-			.ma-year .layui-form-select dl dd.layui-this{
-				background:transparent;
-				color: #00A0E8;
-			}
-			.ma-year .layui-form-select dl dd:hover{
-				background:#00A0E8;
-				color: #fff;
-			}
-			.ma-year .layui-form-select dl dd.layui-select-tips{
-				background:#00A0E8;
-				color: #fff;
+			html,body{
+			    width:100%;
+			    height:100%
 			}
 		</style>
-		
 	</head>
 	<body>
-		<div class="i-index">
-			<div class="display4" style="margin: 0 1.7%;">
-				<div class="i-index-part display4" onclick = "goApproval()" style="cursor:pointer">
-					<div>
-						<p class="f30-black" id="waitApproval"></p>
-						<p class="f14-black4 mt8">总经理待审批订单(笔)</p>
-					</div>
-					<div class="yellow-back">
-						<img alt="" src="../images/icon_dai.svg">
-					</div>
-				</div>
-				<div class="i-index-part display4" onclick = "goOrderManage()" style="cursor:pointer">
-					<div>
-						<p class="f30-black" id="approval">
-						</p>
-						<p class="f14-black4 mt8">历史审批通过订单(笔)</p>
-					</div>
-					<div class="lgreen-back">
-						<img alt="" src="../images/icon_tongguo.svg">
-					</div>
-				</div>
-				<div class="i-index-part display4">
-					<div>
-						<p class="f30-black" id="TotalAmt">
-						</p>
-						<p class="f14-black4 mt8">签约合同总金额(万元)</p>
-					</div>
-					<div class="pink-back">
-						<img alt="" src="../images/icon_qianyue.svg">
-					</div>
-				</div>
-				<div class="i-index-part display4">
-					<div>
-						<p class="f30-black" id="contract">
-						</p>
-						<p class="f14-black4 mt8">采购付汇金额(万元)</p>
-					</div>
-					<div class="cyan-back">
-						<img alt="" src="../images/icon_caigou.svg">
-					</div>
-				</div>
-				<div class="i-index-part display4" style="margin-right: 0;cursor:pointer" onclick = "goCapitalManage()">
-					<div>
-						<p class="f30-black" id="loaningAmt">
-						</p>
-						<p class="f14-black4 mt8">垫资总金额(万元)</p>
-					</div>
-					<div class="purple-back">
-						<img alt="" src="../images/icon_dianzi.svg">
-					</div>
-				</div>
-			</div>
-			<div class="display ma-part" onclick = "goRiskWarning()" style="cursor:pointer;">
-				<div class="display2 ma-part-title">
-					<img alt="" src="../images/icon_yujing.svg">
-					<div class="ma-title">
-						<p class="f14-black-w">风险预警</p>
-						<div class="ma-title-num" id = "overDayNum">3</div>
-					</div>
-				</div>
-				<marquee behavior="scroll" direction="down" scrolldelay="1100" id="riskWarning">
-					<!-- <div class="display3 ma-risk-content" style="float: left">
-						<div class="ma-risk-line"></div>
-						<div>
-							<span class="f12-blue">进入宽限期</span>
-							<span class="f12-gray2">融资订单号:</span>
-							<span class="f12-red2">RZ001</span>
-							<span class="f12-gray2">企业名称:北京天天其速度有限公司</span>
-						</div>
-					</div>
-					<div class="display3 ma-risk-content">
-						<div class="ma-risk-line"></div>
-						<div>
-							<span class="f12-blue">进入宽限期</span>
-							<span class="f12-gray2">融资订单号:</span>
-							<span class="f12-red2">RZ001</span>
-							<span class="f12-gray2">企业名称:北京天天其速度有限公司</span>
-						</div>
-					</div> -->
-				</marquee>
-			</div>
-			
-			<div class="flex-j-sb">
-				<div class="i-left">
-					<div class="ma-currency-title display4">
-						<span>业务趋势</span>
-						<div class="display ma-year">
-							<form class="layui-form" action="">
-								<div class="layui-input-inline">
-							        <select name="modules" lay-verify="required" lay-search="" lay-filter="orderYearSelect" id = "orderYearSelect">
-							        </select>
-						    	</div>
-							</form>
-							<!-- <img alt="" src="../images/icon_xuanze.svg"> -->
-						</div>
-					</div>
-					<div class="display4 ma-subtitle">
-						<span class="f12-black5">本趋势图以订单内签约合同金额为数据来源</span>
-						<div>
-							<span class="f12-gray5">本年总额(万元):</span>
-							<span class="f18-black" id = "yearTotalAmt">4106</span>
-						</div>
-					</div>
-					<div class="" id="zhe" style="height: calc(100% - 102px);width: calc(100% - 16px);"></div>
-				</div>
-				<div class="i-right">
-					<div class="i-right-body" style="height: 276px;">
-						<div class="ma-currency-title display4">
-							<span>财务统计</span>
-							<div class="display ma-year">
-								<form class="layui-form" action="">
-									<div class="layui-input-inline">
-								        <select name="modules" lay-verify="required" lay-search="" lay-filter="financeYear" id = "financeYear">
-								        </select>
-							    	</div>
-								</form>
-								<!-- <img alt="" src="../images/icon_xuanze.svg"> -->
-							</div>
-						</div>
-						<div class="m-unit mt16">单位:万元</div>
-						<div class="" id="yuan" style="height: 195px;width: 100%;"></div>
-						<!-- <div class="i-r-up-content" id="riskWarning" style="height: 12rem">
-							<div class="">
-								<span class="f12-black4">【逾期预警】</span><span class="f12-gray2">融资订单编号: </span><span class="f12-red2">RZ001</span><span class="f12-gray2">企业名称:XX有限</span>
-							</div>
-						</div> -->
-					</div>
-					<div class="i-right-body mt16" style="height: 287px;">
-						<div class="ma-currency-title">
-							用户统计
-						</div>
-						<div class="display4 mt16">
-							<div class="ml16">
-								<span class="f18-black" id = "companyStt02">已实名认证:0</span>
-								<span class="f18-black ml24" id = "companyStt06">已授信成功:0</span>
-							</div>
-							<div class="m-unit">单位:个</div>
-						</div>
-						<div class="" id="ma-user" style="height: 204px"></div>
-					</div>
-				</div>
-			</div>
-			<div class="ma-bottom-part">
-				<!-- <div class="ma-currency-title">操作日志</div> -->
-				<div class="display4 ma-currency-title">
-					<div class="display2">
-						<div class="currency-line black-line"></div>
-						<div class="f14-black-w">操作日志</div>
-					</div>
-					<a id="toggle" class="open">展开</a>
-				</div>
-				<div class="" id="rizhi" style="display: none;">
-					<div class="i-r-d-content flex-wrap" id="operationLog" style="height: 330px"></div>
-				</div>
-			</div>
-		</div>
-		<div class='footer' style="color: #000073;width: 100%;text-align: center;background: #f7f7f7;height: 100px;line-height: 100px"></div>
+		<img alt="" src="../images/homeBack.jpg" width = "100%" height = "100%">
 		<script type="text/javascript">
-		layui.use('layer', function(){
-			  var layer = layui.layer;
-			  loadingId = layer.msg('处理中...', {icon: 16,shade: [0.5, '#f5f5f5'],scrollbar: false,offset: 'auto', time:2000}) ;  
-		});
-		$("#toggle").click(function() {
-			$(this).html($("#rizhi").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开");
-			$("#rizhi").slideToggle();
-		});
-		$('.footer').load('./common/footer.html');
-			layui.use('form', function(){
-				layer.close(loadingId);  
-				var form = layui.form;
-				$.request({
-		       		action : '../../HomeInfoManageAction/queryDataStatistics',
-		       		data : {
-		       		},
-		       		success : function(rsp){
-		       			//总经理待审批订单(笔)
-		       			$("#waitApproval").html(rsp.data.waitApproval);
-		       			//历史审批通过订单(笔)
-		       			$("#approval").html(rsp.data.approval);
-		       			//签约合同总金额(万元)
-		       			$("#TotalAmt").html(rsp.data.TotalAmt);
-		       			//采购付汇金额(万元)
-		       			$("#contract").html(rsp.data.contract);
-		       			//垫资总金额(万元)
-		       			$("#loaningAmt").html(rsp.data.loaningAmt);
-		       			var companyList = rsp.data.companyInfoList;
-		       			for (var i = 0; i < companyList.length; i ++) {
-		       				if (companyList[i].stt == '02') {
-		       					$("#companyStt02").html($("#companyStt02").html().replace('0',parseInt(companyList[0].num) + parseInt(companyList[1].num)));
-		       				} else {
-		       					$("#companyStt06").html($("#companyStt06").html().replace('0',companyList[i].num));
-		       				}
-		       			}
-		       			
-		       			var yearHtml = '';
-		       			var yearList = rsp.data.yearList;
-		       			
-		       			var myDate = new Date();
-		       		    var tYear = myDate.getFullYear();
-		       		    var ifYear = true;
-		       		    
-		       			for (var i = 0; i < yearList.length; i ++) {
-		       				if (tYear == yearList[i]) {
-		       					ifYear = false;
-		       					yearHtml += '<option value="'+yearList[i]+'" selected="selected">'+yearList[i]+'</option>';
-		       				} else {
-		       					yearHtml += '<option value="'+yearList[i]+'">'+yearList[i]+'</option>';
-		       				}
-		       			}
-		       			
-		       			if (ifYear) {
-		       				yearHtml += '<option value="'+tYear+'" selected>'+tYear+'</option>';
-		       			}
-		       			
-		       			$("#orderYearSelect").html(yearHtml);
-		       			yearHtml = yearHtml.replace('selected','');
-		       			yearHtml += '<option value=null selected>全部</option>';
-		       			$("#financeYear").html(yearHtml);
-		       		    
-		       			// 查询订单数据
-		       			orderQuery(tYear);
-		       			financeMessage('');
-		       			form.on('select(orderYearSelect)', function (data) {
-							orderQuery(data.value);
-		       			});
-		       			form.on('select(financeYear)', function (data) {
-		       				financeMessage(data.value);
-		       			});
-		       			
-		       			var companyData = rsp.data.companyData;
-		       			companyMessage(companyData);
-// 		       			$("#countUser").text(rsp.data.countUser);
-// 		       			$("#financingNum").text(rsp.data.financingNum);
-// 		       			$("#loansNum").text(rsp.data.loansNum);
-// 		       			$("#repaymentsNum").text(rsp.data.repaymentsNum);
-		       			$("#overDayNum").text(rsp.data.overDayNum);
-// 		       			$("#todaysData").text(rsp.data.currentDate);
-		       			
-		 				var overDayOrder = rsp.data.overDayOrder;//逾期订单
-		 				var htmlWarning ="";
-		 				for(var i=0; i<overDayOrder.length; i++){
-		   					var riskWarning = overDayOrder[i];
-		   					var orderno = riskWarning.orderno;
-		   					var comName = riskWarning.comName;
-		   					var comId = riskWarning.comId;
-		   					
-		   	   				var div = '<div class="display3 ma-risk-content" style="float: left" id="'+orderno+'" onclick="turnOrderDetail(this);">'+
-											'<div class="ma-risk-line"></div>'+
-											'<div>'+
-												'<span class="f12-blue">进入宽限期</span>'+
-												'<span class="f12-gray2">融资订单号:</span>'+
-												'<span class="f12-red2">'+orderno+'</span>'+
-												'<span class="f12-gray2">企业名称:'+comName+'</span>'+
-											'</div>'+
-										'</div>';
-							htmlWarning += div;
-		   				}
-		 				$("#riskWarning").html(htmlWarning);
-		 				
-// 						$("#countYearUser").text(rsp.data.countYearUser);//本年
-// 						$("#countMonthUser").text(rsp.data.countMonthUser);//本月
-// 						$("#countWeekUser").text(rsp.data.countWeekUser);//本周
-// 						var todayNum = rsp.data.todayNum;//本周周几
-// 		 				var weekdayList = rsp.data.weekdayList;//本周新增
-		 				/* barChart(weekdayList,todayNum); */
-		 				
-// 						var finList = rsp.data.finList;//融资订单统计
-						/* pieChartFun(finList); */
-						
-		 				//每日新增融资订单笔数
-// 		 				var resFinList = rsp.data.resFinList;//每日新增融资订单笔数
-// 		 				lineChart(resFinList);
-						
-		 				//操作日志
-		 				var logList = rsp.data.logList;//操作日志
-		 				var htmlLog = "";
-		 				var color = ["ma-name-blue","ma-name-purple","ma-name-green","ma-name-green","ma-name-yellow","ma-name-blue","ma-name-red","ma-name-cyan"];
-		 				for(var i=0; i<logList.length; i++){
-		   					var operationLog = logList[i];
-		   					var logno = operationLog.logno;//日志编号
-// 		   					var loginfo = operationLog.loginfo.substring(0, 20);//内容
-		   					var loginfo = operationLog.loginfo;//内容
-		   					var logtime = operationLog.logtime;//时间
-		   					var logname = operationLog.logname;//功能
-		   					var rolname = operationLog.rolname;//角色
-		   					var username = operationLog.username;//用户
-		   					
-		   					htmlLog += '<div class="rizhi" id="" style="display: flex;">'+
-						   							'<div class="d-part2 flex-fa-c">'+
-													'<div class="ma-name '+color[i]+'">' + username.substring(0,1) + '</div>'+
-													'<div class="d-line"></div>'+
-											'</div>'+
-												'<div class="d-part3">'+
-													'<div class="">'+
-														'<span class="f14-black-w mr8">' + username + '</span>'+
-														'<span class="f12-gray2 mr8">'+rolname+'</span>';
-// 														'<span class="f12-gray2 mr4">操作员:吴迪,</span>'+
-														if (i == 0 || i == 1 || i == 4 || i == 5) {
-															htmlLog += '<span class="f12-green2">'+loginfo+'</span>';
-														} else {
-															htmlLog += '<span class="f12-red3">'+loginfo+'</span>';
-														}
-										htmlLog += '</div>'+
-						   							'<div class="display2 mt16">'+
-					   	   							'<div class="f12-gray2 mr8">'+logtime+'</div>'+
-						   	   						'<div class="f12-gray2">'+logname+'</div>'+
-						   							'</div>'+
-												'</div>'+
-										'</div>';
-		   				}
-		 				$("#operationLog").html(htmlLog);
-		 				form.render();
-		       		},
-		       		error : function(data) {
-		       		}
-		       	}); 
-			});
-
-		//转百分数
-		function toPercent(point){
-		    var str=Number(point*100).toFixed(2);
-		    str+="%";
-		    return str;
-		}
-		
-		/* function pieChartFun(finList) {
-			var approvalNum = finList.approvalNum;//审批
-			var loanNum = finList.loanNum;//放款
-			var finishNum = finList.finishNum;//还款
-			var overdueNum = finList.overdueNum;//逾期
-			//计算比例
-			var sumOrder = approvalNum+loanNum+finishNum+overdueNum;
-			
-			var scaleApp = '0.00%';
-			var scaleLoan = '0.00%';
-			var scaleFin = '0.00%';
-			var scaleOver = '0.00%';
-			if(sumOrder != 0) {
-				scaleApp = toPercent(approvalNum/sumOrder);
-				scaleLoan = toPercent(loanNum/sumOrder);
-				scaleFin = toPercent(finishNum/sumOrder);
-				scaleOver = toPercent(overdueNum/sumOrder);
-			} */
-			
-// 			var i = 0;
-			/* var colors = ['#00A0E8', '#37C07D', '#F9564F', '#FC9E43', '#666FE9']; */
-			function financeMessage(year) {
-				$.request({
-		       		action : '../../HomeInfoManageAction/queryHomeFianaceData',
-		       		data : {
-		       			year : year
-		       		},
-		       		success : function(rsp){
-		       			var data = rsp.data;
-		       			var myChart2 = echarts.init(document.getElementById('yuan'));
-		       			myChart2.clear();
-		       			var total = 0;
-		       			for (var i = 0; i < data.length; i ++) {
-		       				data[i].value = fomatFloat(data[i].value,2);
-		       				if (data[i].value.substr(0,1) != '-') {
-		       					data[i].flag = '';
-		       				} else {
-		       					data[i].value = data[i].value.replace('-','');
-		       					data[i].flag = '-';
-		       				}
-		       				total += parseFloat(data[i].value);
-		       			}
-						// app.title = '环形图';
-						/* var data = [{
-								value: 234,
-								name: '总收入',
-							},
-							{
-								value: 456,
-								name: '预付款',
-							},
-							{
-								value: 789,
-								name: '总支出',
-							},
-							{
-								value: 542,
-								name: '应 收',
-							},
-							{
-								value: 987,
-								name: '盈 利',
-							}
-						] */
-						var option = {
-							tooltip: {
-								trigger: 'item',
-								formatter: "{a} <br/>{b}: {c} ({d}%)",
-								extraCssText: 'line-height:30px;background: rgba(0,0,0,0.75);box-shadow: 0 2px 8px 0 rgba(0,0,0,0.15);padding:16px;'
-							},
-							legend: {
-								orient: 'vertical',
-								left: '54%', //图例距离左的距离
-								y: 'center', //图例上下居中
-								data: ['总收入', '预付款', '总支出', '应 收', '盈 利'],
-								icon: "circle",
-								itemWidth: 6, // 图例图形宽度
-								itemHeight: 6,
-								itemGap: 0,
-								formatter: function(name) {
-									let target;
-									for (let i = 0; i < data.length; i++) {
-										if (data[i].name === name) {
-											target = data[i].flag + data[i].value,
-												percent = fomatFloat(data[i].value/total,2)
-										}
-									}
-									let arr = ["{a|" + name + "}" + "{b|" + "|" + "}" + "{c|"+ "}" + "{d|" + $.toCashWithComma(fomatFloat(target,6)) + "}"]
-									return arr
-								},
-								textStyle: {
-									rich: {
-										a: {
-											fontSize: 14,
-											color: "rgba(0,0,0,0.65)",
-											padding: 5
-										},
-										b: {
-											fontSize: 10,
-											color: "#D9D9D9",
-											padding: 5,
-										},
-										c: {
-											fontSize: 14,
-											color: "rgba(0,0,0,0.45)",
-										},
-										d: {
-											fontSize: 14,
-											color: "rgba(0,0,0,0.65)",
-											padding: 10,
-										},
-									}
-								}
-							},
-							series: [{
-								name: '融资订单',
-								type: 'pie',
-								radius: ['60%', '80%'],
-								center: ['30%', '50%'], //图的位置,距离左跟上的位置
-								avoidLabelOverlap: false,
-								itemStyle: {
-									normal: {
-										color:function(params) {
-			                                //自定义颜色
-			                                var colorList = ['#00A0E8', '#37C07D', '#F9564F', '#FC9E43', '#666FE9'];
-			                                    return colorList[params.dataIndex]
-			                                 }
-									},
-								},
-								label: {
-									normal: {
-										show: false,
-										position: 'center'
-									},
-									emphasis: {
-										show: true,
-										textStyle: {
-											fontSize: '20',
-											fontWeight: 'bold'
-										}
-									}
-								},
-								labelLine: {
-									normal: {
-										show: false
-									}
-								},
-								data: data
-							}]
-						};
-						myChart2.setOption(option);
-						var index = 0;
-						myChart2.dispatchAction({
-					          type: 'highlight',
-					          seriesIndex: 0,
-					          dataIndex: 0
-					        });
-				        myChart2.on("mouseover", function(e) {
-				            if (e.dataIndex != index) {
-				              myChart2.dispatchAction({
-				                type: "downplay",
-				                seriesIndex: 0,
-				                dataIndex: index
-				              });
-				            }
-				          });
-				          myChart2.on("mouseout", function(e) {
-				            index = e.dataIndex;
-				            myChart2.dispatchAction({
-				              type: "highlight",
-				              seriesIndex: 0,
-				              dataIndex: e.dataIndex
-				            });
-				          });
-		       		},
-		       		error : function () {
-		       		}
-				})	
-			}
-			
-
-		function companyMessage(companyData) {
-			var levelArray = ['A','B','C','D'];
-			var data = new Array();
-			var totalNum = 0;
-			for (var j = 0; j < levelArray.length; j ++) {
-				var one = {};
-				one.name = '信用评级:'+levelArray[j]+'级';
-				for (var i = 0; i < companyData.length; i ++) {
-					if (levelArray[j] == companyData[i].gradeLevel) {
-						one.value = companyData[i].num;
-						break;
-					}
-				}
-				if (isEmpty(one.value)) {
-					one.value = '0';
-				}
-				data.push(one);
-				totalNum = totalNum + parseInt(one.value);
-			}
-			for (var i = 0; i < data.length; i ++) {
-				var one = data[i];
-				one.percenter = toPercent(parseInt(one.value)/totalNum);
-			}
-			var myChart3 = echarts.init(document.getElementById('ma-user'));
-			/* var data = [{
-					value: 335,
-					name: '信用评级:A级',
-					percenter: '10%',
-				},
-				{
-					value: 310,
-					name: '信用评级:B级',
-					percenter: '10%',
-				},
-				{
-					value: 234,
-					name: '信用评级:C级',
-					percenter: '10%',
-				},
-				{
-					value: 135,
-					name: '信用评级:D级',
-					percenter: '10%',
-				}
-			] */
-			var	option = {
-				    tooltip : {
-				        trigger: 'item',
-				        formatter: "{a} <br/>{b} : {c} ({d}%)",
-				        extraCssText: 'line-height:30px;background: rgba(0,0,0,0.75);box-shadow: 0 2px 8px 0 rgba(0,0,0,0.15);padding:16px;'
-				    },
-				    legend: {
-				    	orient: 'vertical',
-						left: '8%', //图例距离左的距离
-						y: 'center', //图例上下居中
-						data: ['信用评级:A级', '信用评级:B级', '信用评级:C级', '信用评级:D级'],
-						formatter: function(name) {
-							let target;
-							let percent;
-							for (let i = 0; i < data.length; i++) {
-								if (data[i].name === name) {
-									target = data[i].value,
-										percent = data[i].percenter
-								}
-							}
-							let arr = ["{a|" + name + "}" + "{b|" + "|" + "}" + "{c|" + target + "}" + "{d|" + percent + "}"]
-							return arr
-
-						},
-						textStyle: {
-							rich: {
-								a: {
-									fontSize: 14,
-									color: "rgba(0,0,0,0.65)",
-									padding: 5
-								},
-								b: {
-									fontSize: 10,
-									color: "#D9D9D9",
-									padding: 5,
-								},
-								c: {
-									fontSize: 14,
-									color: "rgba(0,0,0,0.45)",
-								},
-								d: {
-									fontSize: 14,
-									color: "rgba(0,0,0,0.65)",
-									padding: 10,
-								},
-							}
-						}
-				    },
-				    series : [{
-				    	name: '用户统计',
-				            type: 'pie',
-				            radius : '65%',
-				            center: ['80%', '50%'],
-				            selectedMode: 'single',
-				            avoidLabelOverlap: false,
-				            labelLine: {    //引导线设置
-				                 normal: {
-				                      show: false,   //引导线显示
-				                 }
-				           },
-				           label: {
-								normal: {
-									show: false,
-								},
-								emphasis: {
-									show: false,
-								}
-							},
-				            /* data:[
-								{name: '信用评级:A级', value:535},
-				                {name: '信用评级:B级', value:535},
-				                {name: '信用评级:C级',value:510},
-				                {name: '信用评级:D级',value:634},
-				            ], */
-				            data : data,
-				            /* itemStyle: {
-				                emphasis: {
-				                    shadowBlur: 10,
-				                    shadowOffsetX: 0,
-				                    shadowColor: 'rgba(0, 0, 0, 0.5)'
-				                }
-				            } */
-				            itemStyle: {
-								normal: {
-									color:function(params) {
-		                                //自定义颜色
-		                                var colorList = ['#37C07D', '#FC9E43', '#F9564F', '#666FE9'];
-		                                    return colorList[params.dataIndex]
-		                                 }
-								},
-							},
-				        }
-				    ]
-				};
-				myChart3.setOption(option);
-				
-				var index = 0;
-				myChart3.dispatchAction({
-			          type: 'highlight',
-			          seriesIndex: 0,
-			          dataIndex: 0
-			        });
-		        myChart3.on("mouseover", function(e) {
-		            if (e.dataIndex != index) {
-		              myChart3.dispatchAction({
-		                type: "downplay",
-		                seriesIndex: 0,
-		                dataIndex: index
-		              });
-		            }
-		          });
-		          myChart3.on("mouseout", function(e) {
-		            index = e.dataIndex;
-		            myChart3.dispatchAction({
-		              type: "highlight",
-		              seriesIndex: 0,
-		              dataIndex: e.dataIndex
-		            });
-		          });
-		}
-		
-			
-			function goApproval(){
-				$($("#oneMenu", window.parent.document).find("li")[0]).removeClass("layui-this");
-				$($("#oneMenu", window.parent.document).find("li")[2]).addClass("layui-this");
-				window.parent.oneMenuClick("M21000",false,"212006");
-			}
-			function goOrderManage(){
-				$($("#oneMenu", window.parent.document).find("li")[0]).removeClass("layui-this");
-				$($("#oneMenu", window.parent.document).find("li")[2]).addClass("layui-this");
-				setTempVal("mainOrderState","04");
-				$($("#oneMenu", window.parent.document).find("a")[2]).click();
-			}
-			function goCapitalManage(){
-				$($("#oneMenu", window.parent.document).find("li")[0]).removeClass("layui-this");
-				$($("#oneMenu", window.parent.document).find("li")[1]).addClass("layui-this");
-				window.parent.oneMenuClick("M11000",false,"112001");
-			}
-			function goRiskWarning(){	//无权限
-				$($("#oneMenu", window.parent.document).find("li")[0]).removeClass("layui-this");
-				$($("#oneMenu", window.parent.document).find("li")[2]).addClass("layui-this");
-				window.parent.oneMenuClick("M21000",false,"215001");
-			}
-			
-			function orderQuery(year) {
-				$.request({
-		       		action : '../../HomeInfoManageAction/queryHomeOrderData',
-		       		data : {
-		       			year : year
-		       		},
-		       		success : function(rsp){
-		       			var totalAmt = rsp.totalAmt;
-		       			if (isEmpty(totalAmt)) {
-		       				totalAmt = '0.00';
-		       			}
-		       			totalAmt = fomatFloat(totalAmt,2)
-		       			$("#yearTotalAmt").html($.toCashWithComma(totalAmt));
-	       				var myChart1 = echarts.init(document.getElementById('zhe'));
-	       	          	
-	       	          //计算最大值
-	       	            function calMax(el) {
-	       	              let max = 0;
-// 	       	              arr.forEach((el) => {
-	       	                el.forEach((el1) => {
-	       	                  if (!isEmpty(el1)) {
-	       	                    if (parseFloat(max) < parseFloat(el1)) {
-	       	                      max = el1;
-	       	                    }
-	       	                  }
-	       	                })
-// 	       	              })
-	       	              let maxint = Math.ceil(max / 9.5);//不让最高的值超过最上面的刻度
-	       	              let maxval = maxint * 10;//让显示的刻度是整数
-	       	              return maxval;
-	       	            }
-	       	           
-	       	            //计算最小值
-	       	            function calMin(el) {
-	       	              let min = 0;
-// 	       	              arr.forEach((el) => {
-	       	                el.forEach((el1) => {
-	       	                  if (!isEmpty(el1)) {
-	       	                    if (parseFloat(min) > parseFloat(el1)) {
-	       	                      min = el1;
-	       	                    }
-	       	                  }
-	       	                })
-// 	       	              })
-	       	              let minint = Math.floor(min / 10);
-	       	              let minval = minint * 10;//让显示的刻度是整数
-	       	              return minval;
-	       	            }
-	       	            
-	       	         	var data1 = new Array();
-	       	         	var data2 = new Array();
-	       	         	var data3 = new Array();
-	       	            
-	       	            var orderData = rsp.data;
-	       	            var monthNear = rsp.monthNear;
-	       	         	monthNear = monthNear.replace('(','');
-	       	         	monthNear = monthNear.replace(')','');
-	       	         	monthNear = monthNear.replace(/\'/g,"");
-	       	         	var monthNearArray = monthNear.split(",");
-	       	         	for (var i = 0; i < monthNearArray.length; i ++) {
-	       	         		var amt = "0.00";
-	       	         		var num = "0.00";
-	       	         		var month = monthNearArray[11-i];
-		       	         	for (var j = 0; j < orderData.length;  j++) {
-		       	         		if (orderData[j].createDate == month) {
-		       	         			amt = currKeepTwo(fomatFloat(orderData[j].amt,6));
-		       	         			num = orderData[j].num;
-		       	         			break;
-		       	         		}
-		       	            }
-		       	        	data1.push(amt);
-		       	        	data3.push(num);
-		       	        	data2.push(month.substr(-2) + "月");
-	       	         	}
-// 	       	            var data1 = [250, 300, 350, 500, 600, 700, 750, 650, 550, 400, 450, 250],
-// 	       	              data3 = [250, 300, 350, 500, 600, 700, 750, 650, 550, 400, 450, 250],
-	       	           
-       	                var Min1 = calMin(data1), Min2 = calMin(data3),
-       	                Max1 = calMax(data1), Max2 = calMax(data3);
-	       	            var option = {
-	       	              grid: {left: '46', right: '46', bottom: '36', top: '50'},
-	       	              color: ['#00A0E8', '#2FC25B'],
-	       	              /* tooltip: {trigger: 'axis', axisPointer: {type: 'cross', crossStyle: {color: '#999'}}}, */
-	       	              tooltip: {
-	       					 trigger: 'axis',
-	       					 /* formatter: "{b}<br/>新增融资订单笔数:{c}", */
-	       					 extraCssText: 'line-height:30px;background: rgba(0,0,0,0.75);box-shadow: 0 2px 8px 0 rgba(0,0,0,0.15);padding:16px;'
-	       				  },
-	       	              legend: {data: ['融资订单笔数', '融资订单金额']},
-	       	              xAxis: [{
-	       	                type: 'category',
-	       	                axisLabel: {color: "#000"},
-	       	                lineWidth: 0,
-	       	                /* axisPointer: {
-	       	                  type: 'shadow'
-	       	                }, */
-	       	                axisLine: {
-	       						lineStyle: {
-	       							color: '#D9D9D9',
-	       							width: 1,
-	       						}
-	       					},
-	       	                data: data2,
-	       	              }],
-	       	              yAxis: [
-							{
-						       name: '单位:笔',
-						       type: 'value',
-						       nameTextStyle: {color: '#999999'},
-						       axisLine: {show: false},
-						       axisTick: {show: false},
-						       axisLabel: {verticalAlign: "bottom", color: "#999999"},
-						       splitLine: {
-									lineStyle: { //x网格线
-										color: '#E9E9E9',
-										type: 'dashed'
-									}
-								},
-						       
-						       	min: Min2,
-		       	                max: Max2,
-		       	                splitNumber: 10,
-		       	                interval: (Max2 - Min2) / 10
-						     },        
-	       	              {
-	       	                name: '单位:万元',
-	       	                nameTextStyle: {color: '#999999'},
-	       	                type: "value",
-	       	                axisLine: {show: false},
-	       	                axisTick: {show: false},
-	       	                axisLabel: {verticalAlign: "bottom", color: "#999999"},
-	       					splitLine: {
-	       						lineStyle: { //x网格线
-	       							color: '#E9E9E9',
-	       							type: 'dashed'
-	       						}
-	       					},
-	       					min: Min1,
-					       	max: Max1,
-					       	splitNumber: 10,
-					       	interval: (Max1 - Min1) / 10
-	       	              }],
-	       	              series: [
-	       	                		{name: '融资订单笔数', type: 'bar', barGap: 0, barWidth: 30, data: data3, barWidth : 24},
-	       	                		{name: '融资订单金额', type: 'line', yAxisIndex: 1, data: data1},
-	       	              ]
-	       	            };
-	       				// 使用刚指定的配置项和数据显示图表。
-	       				myChart1.setOption(option);
-		       		},
-		       		error : function(data) {
-		       		}
-		       	}); 
-			}
-			
-			function turnOrderDetail(obj) {
-				var orderno = obj.id;
-				layui.sessionData("ROW_DATA", {key:"NOW_ROW", value : orderno});
-				openMainTabPage('215003-02', ' 订单详情', 'orderManage/details.html', '', '-1');
-			}
 		</script>
 	</body>
 </html>

+ 1 - 0
src/main/webapp/admin/reprotManage/reportProduce.html

@@ -72,6 +72,7 @@
 		  <p id = "fileName" contenteditable="true">国网泰安供电公司2020年8月份配网运行分析月报</p>
 		  <table id = "reportTable" class="layui-table">
 		  </table>
+		  <p id = "content"></p>
 		  <p>报表关联的工具表为《<a id = "utilName" onclick = "goUtilDetail(this)">2020年6月底低电压月报工具表</a>》  关联的报表算法为《<a id = "algorithmName" onclick = "goAlgorithmDetail(this)">国网泰安供电公司2020年8月份配网运行分析月报</a>》    的算法</p>
 		</div>
 		<div style="margin-top : 50px;">