大屏api对接1

gavel/src/main/resources/static/js/dashboard/api.js

+/* 获取真实数据 */
+		//时段产量
+		function apisetTimeProductionEchart(myChartSdcl){
+			HTTP.post("querySdcl", {}, function(result) {
+				if (result['success']) {
+				let data={}
+				data.xseriesList=result.data.records.xseriesList||[]
+				data.timeperiodMount=result.data.records.timeperiodMount||[]
+				setTimeProductionEchart(myChartSdcl,data);    /*时段产量*/
+				} else {
+				console.log("请求失败")
+				}
+			});
+		}
+		//日排产
+		function apisetDailyDataEchart(chartRpcdcsj){
+			HTTP.post("queryWeekPcsl", {}, function(result) {
+				if (result['success']) {
+				let data=result.data.records
+				data.forEach(function(e,index){
+					data[index].jhrq=new Date(e.pcrq).toLocaleDateString().split('/').join('-')
+				})
+				 setDailyDataEchart(chartRpcdcsj,data); /*日排产达成数据*/
+				} else {
+				console.log("请求失败")
+				}
+			});
+		}
+		//日计划
+		function apisetPieDailyChart(chartRjh){
+			HTTP.post("queryTodayPcsl", {}, function(result) {
+				if (result['success']) {
+				let data=result.data.records
+				let bfb
+				if(!data.wgsl){
+					data.wgsl=0
+				}
+				if(!data.jhsl){
+					data.jhsl=0
+					bfb=0
+				}
+				else{
+					bfb=(data.wgsl/data.jhsl)*100
+					bfb=bfb.toFixed(2)
+				}
+				$("#rjhs").text(data.jhsl)
+				$("#rwgs").text(data.wgsl)
+				 setPieDailyChart(chartRjh,bfb,data);/*日计划*/
+				} else {
+				console.log("请求失败")
+				}
+			});
+		}
+		//月计划数量
+		function apisetPieDailyCharty(chartYjh){
+			HTTP.post("queryMonthPcsl", {}, function(result) {
+				if (result['success']) {
+				let data=result.data.records
+				let bfb
+				if(!data.wgsl){
+					data.wgsl=0
+				}
+				if(!data.jhsl){
+					data.jhsl=0
+					bfb=0
+				}
+				else{
+					bfb=(data.wgsl/data.jhsl)*100
+					bfb=bfb.toFixed(2)
+				}
+				$("#yjhs").text(data.jhsl)
+				$("#ywgs").text(data.wgsl)
+				 setPieDailyChart(chartYjh,bfb,data);/*日计划*/
+				} else {
+				console.log("请求失败")
+				}
+			});
+		}
+		// 合格率
+		function apisetHglEchart(chartHgl){
+			HTTP.post("queryGpfkHgl", {}, function(result) {
+				if (result['success']) {
+				let data=result.data.records
+				result.data.records.forEach(function(e,index){
+					data[index].fkrq=new Date(e.fkrq).toLocaleDateString().split('/').join('-')
+					if(e.fksl==0){
+					data[index].hgl=0
+					}else{
+					let hgl=(e.hgsl/e.fksl)*100
+					hgl=hgl.toFixed(2)
+					data[index].hgl=hgl	
+					}
+				})
+				setHglEchart(chartHgl,data);/*合格率*/
+				} else {
+				console.log("请求失败")
+				}
+			});
+		}
+		//生成进度跟进
+		function apiqueryWo(){
+			let allwglHtml=""
+			HTTP.post("queryWo", {}, function(result) {
+				if (result['success']) {
+				let data=result.data.records
+				data.forEach(function(e,index){
+					let xh=index+1
+					let djid=e.djid
+					let wlxxCode=e.wlxxCode
+					let wlxxName=e.wlxxName
+					let wgsl=e.wgsl
+					let pcsl=e.pcsl
+					let ywrq=new Date(e.ywrq).toLocaleDateString().split('/').join('-')
+					let dcl
+					if(pcsl==0){
+						dcl=0
+					}else{
+						dcl=(wgsl/pcsl)*100
+						dcl=dcl.toFixed(2)+"%"
+					}
+					let wglHtml=" <li>"+
+					"<div class=\"fontInner clearfix\">"+
+					"<span>"+
+					"<b>"+xh+"</b>"+
+					"</span>"+
+					"<span>"+djid+"</span>"+
+					"<span>"+wlxxCode+"</span>"+
+					"<span>"+wlxxName+"</span>"+
+					"<span>"+pcsl+"</span>"+
+					"<span>"+wgsl+"</span>"+
+					"<span>"+ywrq+"</span>"+
+					"<span>"+dcl+"</span>"+
+					"</div>"+
+					"</li>";
+					allwglHtml=allwglHtml+wglHtml
+				})
+				$("#FontScroll ul").html(allwglHtml)
+				} else {
+				console.log("请求失败")
+				}
+			});
+		}
+		/* 静电手环 */
+		function apiqueryringpoint(){
+			let $point=$(".allnav-right ul li").children()
+			let $point1=$(".allnav-right ul li>div").children()
+			console.log($point)
+			HTTP.post("/mes/kmes/point/queryringpoint", {}, function(result) {
+				if (result['success']) {
+				let data=result.data.records
+				data.forEach(function(e,index){
+					if(e.value==0){
+					$($point[index]).css("background-color","greenyellow");	
+					}else if(e.value==1){
+					$($point[index]).css("background-color","red");		
+					}else{
+					$($point[index]).css("background-color","skyblue");
+					}
+					$($point1[index]).html(e.itemId)
+				})
+				} else {
+				console.log("请求失败")
+				}
+			});
+		}
+	/* 日排除合格率 */
+		function apisetRpcHglEchart(chartHgl){
+			function gethgl(){
+				return new Promise(function(y,n){
+					HTTP.post("queryGpfkHgl", {}, function(result) {
+						if (result['success']) {
+						let data=result.data.records
+						result.data.records.forEach(function(e,index){
+							data[index].fkrq=new Date(e.fkrq).toLocaleDateString().split('/').join('-')
+							if(e.fksl==0){
+							data[index].hgl=0
+							}else{
+							let hgl=(e.hgsl/e.fksl)*100
+							hgl=hgl.toFixed(2)
+							data[index].hgl=hgl	
+							}
+							y(data)
+						})
+						} else {
+						n("请求失败")
+						}
+					});
+				})
+			}
+			gethgl().then(function(ye){
+				HTTP.post("queryWeekPcsl", {}, function(result) {
+					if (result['success']) {
+					let data=result.data.records
+					data.forEach(function(e,index){
+						data[index].jhrq=new Date(e.pcrq).toLocaleDateString().split('/').join('-')
+					})
+					 setRpcHglEchart(chartHgl,ye,data)
+					} else {
+					console.log("请求失败")
+					}
+				});
+			}).catch(function(e){
+				console.log(e||"请求失败")
+			})
+		}
+		function apiqueryWorkingWO(){
+			HTTP.post("queryWorkingWO", {}, function(result) {
+				if (result['success']) {
+				let data=result.data.records
+				$("#djid").text(data.djid||"请求失败")
+				$("#wlxxName").text(data.wlxxName||"请求失败")
+				$("#xqsl").text(data.xqsl||"请求失败")
+				$("#ywrq").text(new Date(data.ywrq).toLocaleDateString().split('/').join('-')||"请求失败")
+				$("#bz").text(data.bz||"无")
+				} else {
+				console.log("请求失败")
+				}
+			});
+		}
\ No newline at end of file

gavel/src/main/resources/static/js/dashboard/echarts.js

@@ -1939,41 +1939,49 @@ $(function () {
 
 });
 /*时段产量图表*/
-function setTimeProductionEchart(chart) {
-    var data = [
-        {
-            name: "产量",
-            list: [{
-                date: "周一",
-                value: 20
-            },
-                {
-                    date: "周二",
-                    value: 13
-                },
-                {
-                    date: "周三",
-                    value: 15
-                },
-                {
-                    date: "周四",
-                    value: 18
-                },
-                {
-                    date: "周五",
-                    value: 6
-                },
-                {
-                    date: "周六",
-                    value: 11
-                },
-                {
-                    date: "周日",
-                    value: 14
-                }
-            ]
-        }
-    ];
+function setTimeProductionEchart(chart,apidata) {
+	if(apidata){
+		var list=[]
+		apidata.xseriesList.forEach(function(e,index){
+			list[index]={date:e,value:apidata.timeperiodMount[index]}
+		})
+		var data=[{name: "产量",list:list}]
+	}else{
+		var data = [
+		    {
+		        name: "产量",
+		        list: [{
+		            date: "周一",
+		            value: 20
+		        },
+		            {
+		                date: "周二",
+		                value: 13
+		            },
+		            {
+		                date: "周三",
+		                value: 15
+		            },
+		            {
+		                date: "周四",
+		                value: 18
+		            },
+		            {
+		                date: "周五",
+		                value: 6
+		            },
+		            {
+		                date: "周六",
+		                value: 11
+		            },
+		            {
+		                date: "周日",
+		                value: 14
+		            }
+		        ]
+		    }
+		];
+	}
     var dateList=[];
     var yData1 = [];
     data[0].list.forEach(function(item,index){
@@ -1981,6 +1989,7 @@ function setTimeProductionEchart(chart) {
         yData1.push(data[0].list[index].value);
     });
     var opsChart={
+		
         color: ['#e08f68'],
         tooltip: {
             trigger: 'axis',
@@ -2013,6 +2022,7 @@ function setTimeProductionEchart(chart) {
             type: 'category',
             data: dateList,
             axisLabel: {
+				interval: 4,
                 tooltip: {
                     show: true,
                 },
@@ -2020,7 +2030,6 @@ function setTimeProductionEchart(chart) {
                 textStyle: {
                     fontSize: 14
                 },
-                interval: 0,
                 color: 'rgba(255,255,255,0.6)'
             },
             axisTick: {
@@ -2093,7 +2102,25 @@ function setTimeProductionEchart(chart) {
 }
 
 /*日排产达成数据*/
-function setDailyDataEchart(chart) {
+function setDailyDataEchart(chart,apidata) {
+	let datelist=[]
+	let jslist=[]
+	let wglist=[]
+	if(apidata){
+		apidata.forEach(function(e,index){
+			datelist[index]=e.jhrq
+		})
+	}
+	if(apidata){
+		apidata.forEach(function(e,index){
+			jslist[index]=e.jhsl
+		})
+	}
+	if(apidata){
+		apidata.forEach(function(e,index){
+			wglist[index]=e.wgsl
+		})
+	}
     var ops= {
         color:["#67c23a","#409eff"],
         tooltip: {
@@ -2118,7 +2145,7 @@ function setDailyDataEchart(chart) {
         xAxis: [
             {
                 type: 'category',
-                data: ['1/01', '1/02', '1/03', '1/04', '1/05', '1/06', '1/07'],
+                data: datelist||['1/01', '1/02', '1/03', '1/04', '1/05', '1/06', '1/07'],
                 axisTick:{
                     show:true,
                     lineStyle:{
@@ -2163,7 +2190,7 @@ function setDailyDataEchart(chart) {
                 emphasis: {
                     focus: 'series'
                 },
-                data: [120, 132, 101, 134, 90, 230, 210]
+                data: jslist||[120, 132, 101, 134, 90, 230, 210]
             },
             {
                 name: '完工',
@@ -2172,7 +2199,7 @@ function setDailyDataEchart(chart) {
                 emphasis: {
                     focus: 'series'
                 },
-                data: [220, 182, 191, 234, 290, 330, 310]
+                data: wglist||[220, 182, 191, 234, 290, 330, 310]
             }
         ]
     };
@@ -2182,12 +2209,20 @@ function setDailyDataEchart(chart) {
 
 /*合格率*/
 
-function setHglEchart(chart) {
+function setHglEchart(chart,apidata) {
+	let datelist=[]
+	let hgllist=[]
+	if(apidata){
+		apidata.forEach(function(e){
+			datelist.push(e.fkrq)
+			hgllist.push(e.hgl)
+		})
+	}
     var ops= {
         color:["#409eff"],
         xAxis: {
             type: 'category',
-            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+            data:datelist|| ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
             axisTick:{
                 show:true,
                 lineStyle:{
@@ -2223,7 +2258,7 @@ function setHglEchart(chart) {
         },
         series: [
             {
-                data: [150, 230, 224, 218, 135, 147, 260],
+                data:hgllist|| [150, 230, 224, 218, 135, 147, 260],
                 type: 'line',
                 itemStyle : { normal: {label : {show: true}}}
             }
@@ -2232,7 +2267,13 @@ function setHglEchart(chart) {
     chart.setOption(ops,true);
 }
 
-function setPieDailyChart(chart,cerpent) {
+function setPieDailyChart(chart,cerpent,pdata) {
+	let apidata={}
+		apidata.jhsl=0
+	    apidata.wgsl=0
+		if(pdata){
+			apidata=pdata
+		}
     var ops= {
         color:["#A2E9FF","#409eff"],
         tooltip: {
@@ -2274,8 +2315,8 @@ function setPieDailyChart(chart,cerpent) {
                     }
                 },
                 data: [
-                    { value: 20, name: '未完工'},
-                    { value: 80, name: '完工' },
+                    { value: (apidata.jhsl-apidata.wgsl)||0, name: '未完工'},
+                    { value: apidata.wgsl||0, name: '完工' },
                 ]
             }
         ]
@@ -2283,7 +2324,21 @@ function setPieDailyChart(chart,cerpent) {
     chart.setOption(ops,true);
 }
 
-function setRpcHglEchart(chart) {
+function setRpcHglEchart(chart,apidata1,apidata2) {
+	let datelist=[]
+	let hgllist=[]
+	let jslist=[]
+	let wglist=[]
+	if(apidata1&&apidata2){
+		apidata1.forEach(function(e){
+			datelist.push(e.fkrq)
+			hgllist.push(e.hgl)
+		})
+		apidata2.forEach(function(e){
+			jslist.push(e.jhsl)
+			wglist.push(e.wgsl)
+		})
+	}
     var ops = {
         color:["#409eff","#ffd03e"],
         // tooltip: {
@@ -2310,7 +2365,7 @@ function setRpcHglEchart(chart) {
         xAxis: [
             {
                 type: 'category',
-                data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri'],
+                data: datelist||['Mon', 'Tue', 'Wed', 'Thu', 'Fri'],
                 axisPointer: {
                     type: 'shadow'
                 },
@@ -2399,7 +2454,7 @@ function setRpcHglEchart(chart) {
             {
                 name: '计划',
                 type: 'bar',
-                data: [
+                data: jslist||[
                     2.6, 5.9, 9.0, 26.4, 28.7,
                 ],
                 barWidth : 30,
@@ -2421,7 +2476,7 @@ function setRpcHglEchart(chart) {
                 name: '合格率',
                 type: 'line',
                 yAxisIndex: 1,
-                data: [20,30,90,30,29],
+                data: hgllist||[20,30,90,30,29],
                 itemStyle:{
                     normal:{
                         label:{

gavel/src/main/resources/templates/views/kmes/dashboard/first.html

@@ -6,6 +6,20 @@
     <link rel="stylesheet" href="../../css/dashboard/wodry.css">
     <link rel="stylesheet" href="../../css/dashboard/index.css">
     <link rel="stylesheet" href="../../css/dashboard/public.css">
+	<style type="text/css">
+		.allnav-circle li{
+			width: 32%!important;
+		}
+		.in{
+			text-align: center;
+		}
+		.in::before{
+		            display: inline-block;
+		            content: "";
+		            height: 100%;
+		            vertical-align: middle;
+		}
+	</style>
 </head>
 <body>
 
@@ -53,10 +67,6 @@
                                     <span class="circle circle-small circle-close"></span>
                                     <span>关闭</span>
                                 </li>
-                                <li>
-                                    <span class="circle circle-small circle-offine"></span>
-                                    <span>离线</span>
-                                </li>
                                 <li>
                                     <span class="circle circle-small circle-info"></span>
                                     <span>警告</span>
@@ -83,11 +93,9 @@
         <div class="center-cen fl">
             <div class="cen-top rightTop border">
                 <video width="100%" height="100%" controls id="firstVideo" autoplay="autoplay" muted>
-                    <source src="https://media.w3.org/2010/05/sintel/trailer.mp4" type="video/mp4">
-<!--                    <source src="http://vfx.mtime.cn/Video/2019/02/04/mp4/190204084208765161.mp4.ogg" type="video/ogg">-->
-<!--                    <source src="http://vfx.mtime.cn/Video/2019/02/04/mp4/190204084208765161.mp4.webm" type="video/webm">-->
-                    <object data="https://media.w3.org/2010/05/sintel/trailer.mp4" width="100%" height="100%">
-                        <embed src="https://media.w3.org/2010/05/sintel/trailer.mp4" width="100%" height="100%">
+                   <source src="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" type="video/mp4">
+                    <object data="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" width="100%" height="100%">
+                        <embed src="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" width="100%" height="100%">
                     </object>
                 </video>
             </div>
@@ -255,8 +263,8 @@
                                 <div id="chartRjh" class="allnav"></div>
                             </div>
                             <div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
-                                <div>日计划数：<span>100</span></div>
-                                <div>日完工数：<span>80</span></div>
+                                <div>日计划数：<span id="rjhs">100</span></div>
+                                <div>日完工数：<span id="rwgs">80</span></div>
                             </div>
                         </li>
                         <li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
@@ -264,8 +272,8 @@
                                 <div id="chartYjh" class="allnav"></div>
                             </div>
                             <div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
-                                <div>月计划数：<span>3000</span></div>
-                                <div>月完工数：<span>2400</span></div>
+                                <div>月计划数：<span id="yjhs">3000</span></div>
+                                <div>月完工数：<span id="ywgs">2400</span></div>
                             </div>
                         </li>
                     </ul>
@@ -281,7 +289,7 @@
             <div class="right-bottom rightTop border">
                 <div class="title">工艺流程图</div>
                 <div class="chat">
-                        <img src="../../images/dashboard/gylc.png" alt="" style="width: 100%;height: 100%">
+                 <canvas id="gylct" style="width: 100%;height: 100%"></canvas>
                 </div>
             </div>
         </div>
@@ -291,10 +299,16 @@
 
 <script language="JavaScript" type="text/javascript" src="../../lib/easyui/jquery.min.js" charset="utf-8"></script>
 <script language="JavaScript" type="text/javascript" src="../../lib/gui/static/plugins/echarts/echarts.min.js"></script>
+<script language="JavaScript" type="text/javascript" src="/mes/js/common/http.js"></script>
+<!--PDf在线预览-->
+<script language="JavaScript" type="text/javascript" src="../../lib/pdfjs/build/pdf.js"></script>
+<script language="JavaScript" type="text/javascript" src="../../lib/pdfjs/web/viewer.js"></script>
+
 <script src="../../js/dashboard/wodry.min.js"></script>
 <script src="../../js/dashboard/fontscroll.js"></script>
 <script src="../../js/dashboard/echarts.js"></script>
-
+<script src="/mes/js/pdfshow.js" type="text/javascript" charset="utf-8"></script>
+<script src="../../js/dashboard/api.js"></script>
 
 <!--<script src="js/mymap.js"></script>-->
 <script>
@@ -305,7 +319,6 @@
             var whei = $(window).width();
             $("html").css({ fontSize: whei / 22 })
         });
-
         var myChartSdcl = echarts.init(document.getElementById('chartSdcl'));
         var chartRpcdcsj=echarts.init(document.getElementById("chartRpcdcsj"));
         var chartHgl=echarts.init(document.getElementById("chartHgl"));
@@ -314,15 +327,31 @@
         var chartJdshCirle=$("#chartJdshCirle");
         setTimeProductionEchart(myChartSdcl);    /*时段产量*/
         setDailyDataEchart(chartRpcdcsj); /*日排产达成数据*/
-        setHglEchart(chartHgl);/*合格率*/
+        // setHglEchart(chartHgl);/*合格率*/
         setPieDailyChart(chartRjh,80);/*日计划*/
-        setPieDailyChart(chartYjh);
+        setPieDailyChart(chartYjh,80);
         $('.myscroll').myScroll({
             speed: 60, //数值越大，速度越慢
             rowHeight: 46 //li的高度
         });
+		/* 调用 */
+		pdfshow("D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\pdf\\dashboard.pdf","gylct",20000)
+		function getAlldata(){
+			apisetTimeProductionEchart(myChartSdcl)
+			apisetDailyDataEchart(chartRpcdcsj)
+			apisetPieDailyChart(chartRjh)
+			apisetPieDailyCharty(chartYjh)
+			apisetHglEchart(chartHgl)
+			apiqueryWo()
+			apiqueryringpoint()
+		}
+		getAlldata()
+		setInterval(function(){
+			getAlldata()
+		},1000*60*5)
     });
 </script>
+
 <script>
   
     //顶部时间

gavel/src/main/resources/templates/views/kmes/dashboard/fourth.html

@@ -6,6 +6,32 @@
     <link rel="stylesheet" href="../../css/dashboard/wodry.css">
     <link rel="stylesheet" href="../../css/dashboard/index.css">
     <link rel="stylesheet" href="../../css/dashboard/public.css">
+	<style type="text/css">
+		.allnav-circle li{
+			width: 32%!important;
+		}
+		.in{
+			text-align: center;
+		}
+		.in::before{
+		            display: inline-block;
+		            content: "";
+		            height: 100%;
+		            vertical-align: middle;
+		}
+		.listTxt{
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+		}
+		.listTxt p{
+			/* flex: 1; */
+			width: 50%;
+		}
+		.listTxt label{
+			width: auto!important;
+		}
+	</style>
 </head>
 <body>
 
@@ -27,18 +53,18 @@
         <div class="center-left fl" style="width: 33.3%">
             <div class="left-top rightTop border">
                 <video width="100%" height="100%" controls id="firstVideo" autoplay="autoplay" muted>
-                    <source src="https://media.w3.org/2010/05/sintel/trailer.mp4" type="video/mp4">
+                    <source src="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" type="video/mp4">
                     <!--                    <source src="http://vfx.mtime.cn/Video/2019/02/04/mp4/190204084208765161.mp4.ogg" type="video/ogg">-->
                     <!--                    <source src="http://vfx.mtime.cn/Video/2019/02/04/mp4/190204084208765161.mp4.webm" type="video/webm">-->
-                    <object data="https://media.w3.org/2010/05/sintel/trailer.mp4" width="100%" height="100%">
-                        <embed src="https://media.w3.org/2010/05/sintel/trailer.mp4" width="100%" height="100%">
+                    <object data="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" width="100%" height="100%">
+                        <embed src="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" width="100%" height="100%">
                     </object>
                 </video>
             </div>
             <div class="left-cen rightTop border">
                 <div class="title">工艺流程图</div>
                 <div class="bottom-b">
-                    <img src="../../images/dashboard/gylc.png" alt="" style="width: 100%;height: 100%">
+                     <canvas id="gylct" style="width: 100%;height: 100%"></canvas>
                 </div>
             </div>
             <div class="left-bottom rightTop border">
@@ -68,10 +94,6 @@
                                     <span class="circle circle-small circle-offine"></span>
                                     <span>离线</span>
                                 </li>
-                                <li>
-                                    <span class="circle circle-small circle-info"></span>
-                                    <span>警告</span>
-                                </li>
                             </ul>
                         </div>
                         <div class="allnav-right">
@@ -244,11 +266,11 @@
                    <div class="allnav banner">
                            <div class="list clearfix">
                                <div class="listTxt">
-                                   <p><label>在制订单：</label> <span>11213131</span></p>
-                                   <p><label for="">订单数：</label><span>5000</span></p>
-                                   <p><label for="">订单日期：</label><span>2022-02-23</span> </p>
-                                   <p><label for="">产品名称：</label><span>电子产品、手机、电脑</span></p>
-                                   <p><label for="">备注：</label><span>全国 </span></p>
+                                   <p><label>在制订单：</label> <span id="djid">11213131</span></p>
+                                   <p><label for="">订单数：</label><span id="xqsl">5000</span></p>
+                                   <p><label for="">订单日期：</label><span id="ywrq">2022-02-23</span> </p>
+                                   <p><label for="">产品名称：</label><span id="wlxxName">电子产品、手机、电脑</span></p>
+                                   <p><label for="">备注：</label><span id="bz">全国 </span></p>
                                </div>
                            </div>
                    </div>
@@ -305,9 +327,15 @@
 
 <script language="JavaScript" type="text/javascript" src="../../lib/easyui/jquery.min.js" charset="utf-8"></script>
 <script language="JavaScript" type="text/javascript" src="../../lib/gui/static/plugins/echarts/echarts.min.js"></script>
+<script language="JavaScript" type="text/javascript" src="/mes/js/common/http.js"></script>
+<!--PDf在线预览-->
+<script language="JavaScript" type="text/javascript" src="../../lib/pdfjs/build/pdf.js"></script>
+<script language="JavaScript" type="text/javascript" src="../../lib/pdfjs/web/viewer.js"></script>
 <script src="../../js/dashboard/wodry.min.js"></script>
 <script src="../../js/dashboard/fontscroll.js"></script>
 <script src="../../js/dashboard/echarts.js"></script>
+<script src="/mes/js/pdfshow.js" type="text/javascript" charset="utf-8"></script>
+<script src="../../js/dashboard/api.js"></script>
 
 
 <!--<script src="js/mymap.js"></script>-->
@@ -335,6 +363,24 @@
             speed: 60, //数值越大，速度越慢
             rowHeight: 46 //li的高度
         });
+		/* 调用 */
+		pdfshow("D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\pdf\\dashboard.pdf","gylct",20000)
+		/*  */
+		function getAlldata(){
+			apisetTimeProductionEchart(myChartSdcl)
+			apisetDailyDataEchart(chartRpcdcsj)
+			apisetPieDailyChart(chartRjh)
+			apisetPieDailyCharty(chartYjh)
+			apisetHglEchart(chartHgl)
+			apiqueryWo()
+			apiqueryringpoint()
+			apiqueryWorkingWO()
+		}
+		apiqueryWorkingWO()
+		getAlldata()
+		setInterval(function(){
+			getAlldata()
+		},1000*60*5)
     });
 </script>
 <script>

gavel/src/main/resources/templates/views/kmes/dashboard/second.html

@@ -5,7 +5,7 @@
     <title>KEWELL车间作业及质量看板</title>
     <link rel="stylesheet" href="../../css/dashboard/wodry.css">
     <link rel="stylesheet" href="../../css/dashboard/index.css">
-    <link rel="stylesheet" href="../../css/dashboard/public.css">
+    <link rel="stylesheet" href="../../css/dashboard/public.css">	
 </head>
 <body>
 
@@ -27,9 +27,9 @@
         <div class="center-cen fl">
             <div class="cen-top rightTop border">
                 <video width="100%" height="100%" controls id="firstVideo" autoplay="autoplay" muted>
-                    <source src="https://media.w3.org/2010/05/sintel/trailer.mp4" type="video/mp4">
-                    <object data="https://media.w3.org/2010/05/sintel/trailer.mp4" width="100%" height="100%">
-                        <embed src="https://media.w3.org/2010/05/sintel/trailer.mp4" width="100%" height="100%">
+                    <source src="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" type="video/mp4">
+                    <object data="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" width="100%" height="100%">
+                        <embed src="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" width="100%" height="100%">
                     </object>
                 </video>
             </div>
@@ -202,8 +202,8 @@
                                 <div id="chartRjh" class="allnav"></div>
                             </div>
                             <div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
-                                <div>日计划数：<span>100</span></div>
-                                <div>日完工数：<span>80</span></div>
+                              <div>日计划数：<span id="rjhs">100</span></div>
+                              <div>日完工数：<span id="rwgs">80</span></div>
                             </div>
                         </li>
                         <li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
@@ -211,8 +211,8 @@
                                 <div id="chartYjh" class="allnav"></div>
                             </div>
                             <div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
-                                <div>月计划数：<span>3000</span></div>
-                                <div>月完工数：<span>2400</span></div>
+                                <div>月计划数：<span id="yjhs">3000</span></div>
+                                <div>月完工数：<span id="ywgs">2400</span></div>
                             </div>
                         </li>
                     </ul>
@@ -238,9 +238,11 @@
 
 <script language="JavaScript" type="text/javascript" src="../../lib/easyui/jquery.min.js" charset="utf-8"></script>
 <script language="JavaScript" type="text/javascript" src="../../lib/gui/static/plugins/echarts/echarts.min.js"></script>
+<script language="JavaScript" type="text/javascript" src="/mes/js/common/http.js"></script>
 <script src="../../js/dashboard/wodry.min.js"></script>
 <script src="../../js/dashboard/fontscroll.js"></script>
 <script src="../../js/dashboard/echarts.js"></script>
+<script src="../../js/dashboard/api.js"></script>
 
 
 <!--<script src="js/mymap.js"></script>-->
@@ -268,6 +270,18 @@
             speed: 60, //数值越大，速度越慢
             rowHeight: 46 //li的高度
         });
+		function getAlldata(){
+			apisetTimeProductionEchart(myChartSdcl)
+			apisetDailyDataEchart(chartRpcdcsj)
+			apisetPieDailyChart(chartRjh)
+			apisetPieDailyCharty(chartYjh)
+			apisetHglEchart(chartHgl)
+			apiqueryWo()
+		}
+		getAlldata()
+		setInterval(function(){
+			getAlldata()
+		},1000*60*5)
     });
 </script>
 <script>

gavel/src/main/resources/templates/views/kmes/dashboard/third.html

@@ -6,6 +6,20 @@
     <link rel="stylesheet" href="../../css/dashboard/wodry.css">
     <link rel="stylesheet" href="../../css/dashboard/index.css">
     <link rel="stylesheet" href="../../css/dashboard/public.css">
+	<style type="text/css">
+		.allnav-circle li{
+			width: 32%!important;
+		}
+		.in{
+			text-align: center;
+		}
+		.in::before{
+		            display: inline-block;
+		            content: "";
+		            height: 100%;
+		            vertical-align: middle;
+		}
+	</style>
 </head>
 <body>
 
@@ -189,10 +203,6 @@
                                     <span class="circle circle-small circle-close"></span>
                                     <span>关闭</span>
                                 </li>
-                                <li>
-                                    <span class="circle circle-small circle-offine"></span>
-                                    <span>离线</span>
-                                </li>
                                 <li>
                                     <span class="circle circle-small circle-info"></span>
                                     <span>警告</span>
@@ -224,9 +234,9 @@
         <div class="center-cen fr" style="width: 60%">
             <div class="cen-top rightTop border">
                 <video width="100%" height="100%" controls id="firstVideo" autoplay="autoplay" muted>
-                    <source src="https://media.w3.org/2010/05/sintel/trailer.mp4" type="video/mp4">
-                    <object data="https://media.w3.org/2010/05/sintel/trailer.mp4" width="100%" height="100%">
-                        <embed src="https://media.w3.org/2010/05/sintel/trailer.mp4" width="100%" height="100%">
+                    <source src="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" type="video/mp4">
+                    <object data="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" width="100%" height="100%">
+                        <embed src="D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\video\\dashboard.mp4" width="100%" height="100%">
                     </object>
                 </video>
             </div>
@@ -245,8 +255,8 @@
                                 <div id="chartRjh" class="allnav"></div>
                             </div>
                             <div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
-                                <div>日计划数：<span>100</span></div>
-                                <div>日完工数：<span>80</span></div>
+                               <div>日计划数：<span id="rjhs">100</span></div>
+                               <div>日完工数：<span id="rwgs">80</span></div>
                             </div>
                         </li>
                         <li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
@@ -254,8 +264,8 @@
                                 <div id="chartYjh" class="allnav"></div>
                             </div>
                             <div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
-                                <div>月计划数：<span>3000</span></div>
-                                <div>月完工数：<span>2400</span></div>
+                               <div>月计划数：<span id="yjhs">3000</span></div>
+                               <div>月完工数：<span id="ywgs">2400</span></div>
                             </div>
                         </li>
                     </ul>
@@ -269,9 +279,11 @@
 
 <script language="JavaScript" type="text/javascript" src="../../lib/easyui/jquery.min.js" charset="utf-8"></script>
 <script language="JavaScript" type="text/javascript" src="../../lib/gui/static/plugins/echarts/echarts.min.js"></script>
+<script language="JavaScript" type="text/javascript" src="/mes/js/common/http.js"></script>
 <script src="../../js/dashboard/wodry.min.js"></script>
 <script src="../../js/dashboard/fontscroll.js"></script>
 <script src="../../js/dashboard/echarts.js"></script>
+<script src="../../js/dashboard/api.js"></script>
 
 
 <!--<script src="js/mymap.js"></script>-->
@@ -297,6 +309,20 @@
             speed: 60, //数值越大，速度越慢
             rowHeight: 46 //li的高度
         });
+		/* 分割线 */
+		function getAlldata(){
+			apisetTimeProductionEchart(myChartSdcl)
+			apisetPieDailyChart(chartRjh)
+			apisetPieDailyCharty(chartYjh)
+			apisetRpcHglEchart(chartHgl)
+			apiqueryWo()
+			apiqueryringpoint()
+		}
+		getAlldata()
+		setInterval(function(){
+			getAlldata()
+		},1000*60*5)
+		
     });
 </script>
 <script>

gavel/src/main/resources/templates/views/kmes/gpjy/bhgXq.html

-<div id="bhgXqEdit" class="e-dialog-container"  data-options="width:700,height:270">
-	<div class="e-dialog-body">
-		<div class="list" style="height: 100%"></div>
-	</div>
-	</div>
-	<div class="e-dialog-footer">
-		<a href="javascript:void(0);" class="e-dialog-cancel"></a>
-	</div>
-</div>
-<script>
-    $(function () {
-        var $dialog=$('#bhgXqEdit');
-        var res=[
-			{value:"1",text:"异物"},
-			{value:"2",text:"毛屑"},
-			{value:"3",text:"赃污"},
-			{value:"4",text:"划伤"},
-			{value:"5",text:"黑白影"},
-			{value:"6",text:"亮点"},
-			{value:"7",text:"漏光"},
-			{value:"8",text:"白点"},
-			{value:"9",text:"画面发暗"},
-			{value:"10",text:"压伤"},
-			{value:"11",text:"顶白"},
-			{value:"12",text:"嵌合不良"},
-			{value:"13",text:"标签外观不良"},
-			{value:"14",text:"FLIM组装不良"},
-			{value:"15",text:"FLIM多少组"},
-			{value:"16",text:"S/T不良"},
-			{value:"17",text:"L/B外观不良"},
-			{value:"18",text:"胶框外观不良"},
-			{value:"19",text:"扣点外观不良"},
-			{value:"20",text:"框线"},
-			{value:"21",text:"厚度NG"},
-			{value:"22",text:"其他"},
-		];
-        $dialog.find(".list").datalist({
-			valueField:"value",
-			textField:"text",
-			data:res
-		})
-    })
-
-</script>
\ No newline at end of file

gavel/src/main/resources/templates/views/kmes/gpwx/bhgXq.html

-<div id="bhgXqGpwx" class="e-dialog-container"  data-options="width:700,height:270">
-	<div class="e-dialog-body">
-		<div class="list" style="height: 100%"></div>
-	</div>
-	</div>
-	<div class="e-dialog-footer">
-		<a href="javascript:void(0);" class="e-dialog-cancel"></a>
-	</div>
-</div>
-<script>
-    $(function () {
-        var $dialog=$('#bhgXqGpwx');
-        var $fieldView=$dialog.find(".list");
-		var parmas=$dialog.parents("form").dialog("options").queryParams;
-		var columnsXm=[
-			{title: "序号", field: "xh", width: 50, align: "center"},
-			{title: "检验项目ID", field: "jyxmid", fieldType: "ftString", hidden: true},
-			{title: "检验项目编码", field: "jyxmcode", width: 120},
-			{title: "检验项目名称", field: "jyxmname",fieldType: "ftString", width: 140},
-			{title: "检验值", field: "jyz", width:120,},
-		];
-		$fieldView.datagrid({
-			title:"不合格项",
-			columns:[new $.common.formatterCol(columnsXm)],
-			pagination:false,
-			fitColumns:true,
-			scrollbarSize:0,
-		});
-		HTTP.post("/kmes/gpwx/getBhgJymx",{wosnid:parmas.wosnid||""},function (res) {
-			if(res.success){
-				$fieldView.datagrid("loadData",res.data.records||[])
-			}
-		})
-
-    })
-
-</script>
\ No newline at end of file

gavel/src/main/resources/templates/views/kmes/gpwx/gx.html

-<div class="e-dialog-container"  data-options="width:480,height:280"  id="gpwxGx">
-	<div class="gui-fluid editTable">
-		<input type="hidden" name="gxName">
-		<input type="hidden" name="gzzxid">
-		<input type="hidden" name="gzzxname">
-		<div class="gui-row">
-			<div class="gui-col-sm12">
-				<label class="gui-form-label">工序：</label>
-				<div class="gui-input-block">
-					<input type="text" name="gxid" data-toggle="gui-combobox">
-				</div>
-			</div>
-		</div>
-		<div class="gui-row">
-			<div class="gui-col-sm12">
-				<label class="gui-form-label">班型：</label>
-				<div class="gui-input-block">
-					<input type="text" name="bxid" style="width: 100%;" data-options="required:true">
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script>
-    $(function () {
-        var $dialog=$("#gpwxGx");
-        var $inputGxid=$dialog.find("input[name='gxid']");
-        var $inputBx=$dialog.find("input[name='bxid']");
-		function paramInit(ops){
-
-		}
-
-		function pageInit() {
-			$inputGxid.iCombobox({valueField: "id", textField: "name", allowNull:false,required:true, allowEdit:false, url: 'gygl/bzgx/queryWxBzgx',onSelect:function (a) {
-						$dialog.find("input[name='gxName']").val(a.name)
-						$dialog.find("input[name='gzzxid']").val(a.gzzxid||'')
-						$dialog.find("input[name='gzzxname']").val(a.gzzxname||'')
-
-				},
-				loadFilter: function (a) {
-					var datas=a["data"]["records"]
-					$.each(datas,function (i,item) {
-						item["name"]=item["gzzxname"]+"-"+item["name"]
-					});
-					return datas
-				}});
-			$inputBx.iCombobox({valueField: "id", textField:"name", allowNull:false, allowEdit:false, url: 'kmes/bx/query',onSelect:function (a) {
-				}});
-
-		}
-		/*数据初始化*/
-		function dataInit(obj){
-
-
-		}
-
-		function run(res){
-
-
-		}
-
-
-		gas.load(paramInit,pageInit,dataInit,run);
-    })
-
-</script>
\ No newline at end of file