改url

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

@@ -172,7 +172,7 @@
 			});
 		}
 	/* 日排除合格率 */
-		function apisetRpcHglEchart(chartHgl){
+		function apisetRpcHglEchart(chartHgl,isRcl){
 			function gethgl(){
 				return new Promise(function(y,n){
 					HTTP.post("queryGpfkHgl", {}, function(result) {
@@ -202,7 +202,11 @@
 					data.forEach(function(e,index){
 						data[index].jhrq=new Date(e.pcrq).toLocaleDateString().split('/').join('-')
 					})
-					 setRpcHglEchart(chartHgl,ye,data)
+					if(isRcl=='rcl'){
+						setRclHglEchart(chartHgl,ye,data)
+					}else{
+						setRpcHglEchart(chartHgl,ye,data)
+					}
 					} else {
 					console.log("请求失败")
 					}

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

@@ -43,13 +43,13 @@
         <div class="center-left fl">
             <div class="left-top rightTop border">
                 <!--<h1 id="ceshi">数据可视化</h1>-->
-                <div class="title">日产量</div>
+                <div class="title">OA考勤</div>
                 <div class="bottom-b">
                     <div id="chartSdcl" class="allnav"></div>
                 </div>
             </div>
             <div class="left-cen rightTop border">
-                <div class="title">日排产&合格率</div>
+                <div class="title">日产量&合格率</div>
                 <div class="bottom-b">
                     <div id="chartRpcdcsj" class="allnav"></div>
                 </div>
@@ -104,7 +104,7 @@
         </div>
         <div class="center-cen fl">
             <div class="cen-top rightTop border">
-                <video  width="100%" height="100%" controls id="firstVideo" autoplay="autoplay" muted loop="loop">
+                <video  width="100%" height="100%" controls id="firstVideo" muted autoplay="autoplay"  loop="loop">
                 </video>
             </div>
             <div class="cen-bottom rightTop border">
@@ -293,7 +293,13 @@
                 </div>
 
             </div>
-            <div class="right-bottom rightTop border" style="height: 6.8rem;">
+			<div class="right-bottom rightTop border" style="height: 3.2rem;margin-bottom: 0.2rem;">
+			    <div class="title">工艺流程图</div>
+			    <div class="chat" style="height: calc(100% - 0.4rem);">
+			   <!--  <canvas id="gylct" style="width: 100%;height: 100%"></canvas> -->
+			    </div>
+			</div>
+            <div class="right-bottom rightTop border" style="height: 3.2rem;margin-top: 0.4rem;">
                 <div class="title">工艺流程图</div>
                 <div class="chat" style="height: calc(100% - 0.4rem);">
                  <canvas id="gylct" style="width: 100%;height: 100%"></canvas>
@@ -336,7 +342,8 @@
         var chartRjh=echarts.init(document.getElementById("chartRjh"));
         var chartYjh=echarts.init(document.getElementById("chartYjh"));
         var chartJdshCirle=echarts.init(document.getElementById("chartJdshCirle"));
-        setTimeProductionEchart(myChartSdcl);    /*时段产量*/
+		
+        oaechart(myChartSdcl);    /*时段产量*/
         setDailyDataEchart(chartRpcdcsj); /*日排产达成数据*/
         // setHglEchart(chartHgl);/*合格率*/
         setPieDailyChart(chartRjh,80);/*日计划*/
@@ -355,8 +362,8 @@
 		}
 		/* 调用 */
 		function getAlldata(){
-			apisetRpcHglEchart(chartRpcdcsj)
-			apisetTimeProductionEchart(myChartSdcl)
+			apisetRpcHglEchart(chartRpcdcsj,'rcl')
+			// apisetTimeProductionEchart(myChartSdcl)
 			// apisetDailyDataEchart(chartRpcdcsj)
 			apisetPieDailyChart(chartRjh)
 			apisetPieDailyCharty(chartYjh)

gavel/src/main/resources/templates/views/kmes/gphy/index.html

@@ -3,6 +3,9 @@
 		<script src="js/gethash.js" type="text/javascript" charset="utf-8"></script>
 		<link rel="stylesheet" type="text/css" href="css/zpfk.css"/>
 		<style type="text/css">
+			video{
+				object-fit:cover!important;
+			}
 			.errdialog{
 				min-width:35%;
 				/* width: 35%; */
@@ -47,6 +50,9 @@
 		/* 通用代码 */
 		/* 通用pdf参数 */
 		const pdfUr="kmes/gpfk/queryPdfByWoidAndZpgx"
+		var urlo="kmes/gpfkfj/queryFjBybzgx/"+window.bzlx+"/O"
+		var urlt="kmes/gpfkfj/queryFjBybzgx/"+window.bzlx+"/T"
+		var urlm="kmes/gpfkfj/queryFjBybzgx/"+window.bzlx+"/M"
 		/* 大屏内部弹框 */
 		function screenAlert(dom,msg,timeNum){
 			let getdom=$(dom)
@@ -205,9 +211,11 @@
 				if(that.sivpdf){
 					clearInterval(that.sivpdf)
 				}
-				pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
+				/*
+				 老pdf禁用
+				 pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
 					that.sivpdf = e
-				})
+				}) */
 			}
 		}
 		/* 初始化表格 */
@@ -271,7 +279,7 @@
 				</ul>
 			</div>
 			<!-- 左侧信息条 -->
-			<div class="left">
+			<div class="left" style="width: 30%;">
 				<!-- 左上信息表 -->
 				<div class="cbinfor">
 					<div class="cpif">
@@ -320,9 +328,20 @@
 				</div>
 			</div>
 			<!-- 右侧信息pdf -->
-			<div class="right">
+			<div class="right" style="width: 45%;">
 				<canvas id="kwrkb01pdf" class="rightPdf"></canvas>
 			</div>
+			<!-- new右侧 -->
+			<div class="right" style="width: 25%;">
+				<div style="height: 50%;overflow: hidden;">
+					<video  width="100%" height="100%" :src="urlm" controls muted autoplay="autoplay"  loop="loop">
+					</video>
+				</div>
+				<div ref="scrollmain" style="height: 50%;overflow: auto;border-bottom: 1px solid #EEEEEE;">
+					<canvas id="kwrkb01rpdf" ref="scroll" style="width: 100%;height: 160%;" ></canvas>
+				</div>
+				
+			</div>
 		</div>
 		<!-- div2 -->
 		<div id="kwrkb02" style="display: none;">
@@ -471,6 +490,7 @@
 					this.initpage()
 					dbenlarge('kwrkb01', 1, this.initpage)
 					$(this.el).dblclick()
+					this.scroll()
 					this.gettime()
 					this.isFocus()
 					this.appdestory()
@@ -478,10 +498,13 @@
 				destroyed() {
 					clearInterval(this.sivdestory)
 					clearInterval(this.sivpdf)
+					clearInterval(this.sivrpdf)
 					clearInterval(this.sivtimer)
+					clearInterval(this.sivscroll)
 				},
 				data: function() {
 					return {
+						urlm:urlm,
 						fksl:0,
 						username:localStorage.getItem("username"),
 						okOrng:"",
@@ -500,9 +523,30 @@
 						sivtimer: null, //时间计数器
 						sivpdf: null,
 						sivdestory: null,
+						sivscroll:null,
+						sivrpdf:null
 					}
 				},
 				methods: {
+					scroll(){
+						console.log(urlo)
+						/* test */
+						pdfshow(urlo,'kwrkb01pdf', 10000).then(e => {
+							that.sivpdf = e
+						})
+						/* test */
+						pdfshow(urlt,'kwrkb01rpdf', 10000).then(e => {
+							that.sivrpdf = e
+						})
+						const mainData=this.$refs.scrollmain
+						const divData =this.$refs.scroll
+						this.sivscroll=setInterval(() => {
+						 mainData.scrollTop += 1
+						 if (mainData.clientHeight + mainData.scrollTop+10 > mainData.scrollHeight) {
+						 mainData.scrollTop = 0
+						 }
+						 }, 100)
+					},
 					// 扫码接口
 					apiscanxlh(){
 						let that=this