From eb29c7b524c0ffdd7f9132ce4d9e180e5163dfdc Mon Sep 17 00:00:00 2001
From: xuli <xul@valueics.com>
Date: Thu, 22 Feb 2024 14:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=B4=A8=E9=87=8F=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=20=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/config/applicationhost.config             |   2 +-
 NFine.Application/SRM/WatchPanelApp.cs        | 243 +++++-
 .../WatchPanel/WatchPanelController.cs        |  36 +-
 .../Areas/SRM/Views/WatchPanel/PanelCK.cshtml | 760 ++++++++++++++++++
 NFine.Web/NFine.Web.csproj                    |   1 +
 NFine.Web/Views/Login/Index.cshtml            |  11 +-
 6 files changed, 1047 insertions(+), 6 deletions(-)
 create mode 100644 NFine.Web/Areas/SRM/Views/WatchPanel/PanelCK.cshtml

diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
index 9b651af..3b10c5a 100644
--- a/.vs/config/applicationhost.config
+++ b/.vs/config/applicationhost.config
@@ -171,7 +171,7 @@
             </site>
             <site name="NFine.Web(1)" id="3">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="F:\工作\振翔看板\看板\NFine.Web" />
+                    <virtualDirectory path="/" physicalPath="D:\工作\代码\振翔\看板新\NFine.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:1974:localhost" />
diff --git a/NFine.Application/SRM/WatchPanelApp.cs b/NFine.Application/SRM/WatchPanelApp.cs
index 9483f41..afd9021 100644
--- a/NFine.Application/SRM/WatchPanelApp.cs
+++ b/NFine.Application/SRM/WatchPanelApp.cs
@@ -1541,8 +1541,249 @@ ORDER BY 销售车号,物料编码,报工人
 
             return dt;
         }
-       
 
 
+        public DataTable GetOtherData()
+        {
+
+            string SqlText = "";
+
+            SqlText = @"    
+               
+              if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#Tcustttemp1'))
+			             drop table #Tcustttemp1 
+              if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#Tcusttfilter'))
+			             drop table #Tcusttfilter 
+              if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#TcusttDJ'))
+			             drop table #TcusttDJ 
+             if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#Tcustt_TOCKQty'))
+			             drop table #Tcustt_TOCKQty
+
+
+            --用途程表关联wip表拼出所有的检验数据
+            select  a.ITEMCODE,a.ROUTECODE,a.OPCODE, a.OPType AS OPTIONALOP, a.OPControlSeq,b.LOTNO,
+            isnull(b.ACTIONRESULT,'~') as ACTIONRESULT,b.MOCODE,b.MOSEQ,d.molotcode  into #Tcustttemp1
+            from ICSITEMROUTE2OPLot a with(nolock)
+            left join  icslotonwip b with(nolock) on a.ITEMCODE = b.ITEMCODE and a.ROUTECODE = b.ROUTECODE and a.OPCODE = b.OPCODE
+            inner join (SELECT distinct  a.ITEMCODE,a.ROUTECODE  
+            from ICSITEMROUTE2OPLot a  with(nolock) 
+            left join icslotonwip b  with(nolock) on a.ITEMCODE = b.ITEMCODE and a.ROUTECODE = b.ROUTECODE and a.OPCODE = b.OPCODE
+            WHERE b.ACTIONRESULT is not null
+              ) c on a.ITEMCODE = c.ITEMCODE and a.ROUTECODE = c.ROUTECODE
+
+            left join icsmo d  with(nolock) on d.MOCODE = b.MOCODE and b.SEQ = d.MOSEQ
+ 
+            order by ITEMCODE,OPControlSeq
+            --把wip表里有在开工的排除
+            select  ITEMCODE,ROUTECODE,ACTIONRESULT  into #Tcusttfilter from icslotonwip  with(nolock) 
+            group by ITEMCODE,ROUTECODE,ACTIONRESULT HAVING COUNT(ITEMCODE) = 1 and COUNT(ROUTECODE)=1
+            --找出待检的工序
+            select ITEMCODE,a.ROUTECODE,OPCODE,c.MOCODE,c.MOSEQ,c.LOTNO into #TcusttDJ  from #Tcustttemp1 a
+            inner join 
+            (select min(OPControlSeq) OPControlSeq,ROUTECODE  from #Tcustttemp1 where OPTIONALOP = '检验工序' and LOTNO is null--最小未检前一道结束的
+            and ROUTECODE in
+            (select ROUTECODE from (select max(a.OPControlSeq) OPControlSeq,a.ROUTECODE from #Tcustttemp1  a
+            inner join (select min(OPControlSeq) OPControlSeq,ROUTECODE from #Tcustttemp1 where OPTIONALOP = '检验工序' and LOTNO is null  group by ROUTECODE) b 
+            on a.ROUTECODE = b.ROUTECODE and b.OPControlSeq >a.OPControlSeq and a.ACTIONRESULT = 'COLLECT_END' group by a.ROUTECODE) a )   
+            GROUP BY ROUTECODE) b
+            on a.ROUTECODE = b.ROUTECODE and a.OPControlSeq = b.OPControlSeq
+            inner join ( select distinct  mocode,MOSEQ,ROUTECODE,LOTNO from icslotonwip  with(nolock) ) c 
+            on a.ROUTECODE =c.ROUTECODE 
+            where 
+            not EXISTS( select 1 from #Tcusttfilter f 
+	            where f.ITEMCODE=a.ITEMCODE and f.ROUTECODE =a.ROUTECODE )
+ 
+            --将数据拼接成在检和待检两部分
+ 
+
+            --1、待检验数据 待检车辆
+             select count(1)  Qty into #Tcustt_TOCKQty
+             from (
+            select b.molotCode [销售车号]  , dj.LOTNO [产品跟踪单], dj.OPCODE [工序代码] 
+            from #TcusttDJ dj
+            inner join #Tcustttemp1 a on dj.ROUTECODE = a.ROUTECODE and a.OPCODE = dj.OPCODE and optionalop ='检验工序'
+            inner join icsmo b  with(nolock) on dj.MOCODE = b.MOCODE and dj.MOSEQ = b.MOSEQ
+            inner join ICSMO2user  d  with(nolock) on b.mocode = d.mocode and b.moseq = d.moseq and d.opcode = dj.OPCODE 
+ 
+            union All
+            select c.molotCode [销售车号]  ,  d.LOTNO [产品跟踪单], d.OPCODE [工序代码]  
+            from 
+            (select * from ICSITEMROUTE2OP  with(nolock) where optionalop ='检验工序'  and routecode in(
+            select DISTINCT routecode  from  ICSITEMROUTE2OP   with(nolock)  GROUP BY routecode  HAVING count(*)  = 1 )) a  --查询只有一道工序的工艺路线
+            inner JOIN ICSMO2ROUTE  b  with(nolock) on a.routeid = b.routeid
+            inner join  ICSMO  c  with(nolock) on c.id = b.moid
+            inner join ICSMO2user  d  with(nolock) on c.mocode = d.mocode and c.moseq = d.moseq
+             inner join ICSITEMROUTE2OPLot lot  with(nolock) on lot.itemcode = a.ITEMCODE and b.ROUTECODE = lot.ROUTECODE and lot.OPCODE = d.opcode
+  
+            where not exists (select 1 from ICSLOTONWIP wip  with(nolock) where wip.lotno = d.LOTNO and wip.opcode  =d.OPCODE and wip.actionresult ='COLLECT_END')
+            ) jj
+
+
+            --1、已检验数据 已检车辆
+            select count(1) Qty into #Tcustt_CKQty
+            from (
+            SELECT distinct  mm.molotcode 销售车号,b.LOTNO,a.OPCODE
+            from ICSQualityCKDATA a  with(nolock) 
+            LEFT JOIN ICSQualityCKDATADetail  b   with(nolock) on a.LOTNO=b.LOTNO and a.ID=b.DATAID
+            LEFT JOIN ICSLOTONWIP d  with(nolock) on d.LotNo=a.LOTNO and d.opcode=a.OPCODE 
+            LEFT JOIN icsmo mm  with(nolock) on mm.MOCODE =d.MOCODE and mm.MOSEQ=d.MOSEQ 
+ 
+            LEFT JOIN ICSITEMROUTE2OPLot ll  with(nolock) on ll.OPCODE=a.OPCODE and ll.LotNo=a.LOTNO
+ 
+ 
+            WHERE ll.OPType='检验工序'  and b.MTIME>= CONVERT(varchar(7), dateadd(mm,-1,getdate()), 21) +'-01 00:00:00'
+            and b.CKRESULT is not null
+             ) jj
+ 
+ 
+             select isnull((select Qty from #Tcustt_TOCKQty ),0) 待检车辆,
+             isnull((select Qty from #Tcustt_CKQty ),0) 已检车辆,
+             isnull((select count(1) from ICSZXCheck with(nolock)   where checked='0'),0) 待整改,
+              isnull((select count(1) from ICSZXCheck with(nolock)   where checked='1' and month>= CONVERT(varchar(7), dateadd(mm,-1,getdate()), 21) +'-01' ),0) 已整改 
+ 
+
+             if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#Tcustttemp1'))
+			             drop table #Tcustttemp1 
+              if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#Tcusttfilter'))
+			             drop table #Tcusttfilter 
+              if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#TcusttDJ'))
+			             drop table #TcusttDJ 
+             if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#Tcustt_TOCKQty'))
+			             drop table #Tcustt_TOCKQty
+ 
+  
+ 
+ 
+            ";
+
+
+            DataTable dt = Repository().GetDataTableBySql_Other(SqlText, "MESconnstr", null);
+
+
+            return dt;
+        }
+
+
+        public DataTable GetCKData()
+        {
+
+            string SqlText = "";
+
+            SqlText = @"    
+            SELECT TOP 100 mm.molotcode 销售车号,yy.INVNAME 部件名称,
+                b.MUSERName 人员,
+                pp.CKGROUPDESC 项目,
+                CONVERT(varchar(16), b.MTIME, 120)  as 时间,
+                b.Type 类型 , 
+                CASE when b.CKRESULT ='1' then '合格' when b.CKRESULT ='0' then '不合格' end as '结果'
+                from ICSQualityCKDATA a  with(nolock) 
+                LEFT JOIN ICSQualityCKDATADetail  b  with(nolock) on a.LOTNO=b.LOTNO and a.ID=b.DATAID
+                LEFT JOIN ICSLOTONWIP d  with(nolock) on d.LotNo=a.LOTNO and d.opcode=a.OPCODE
+                LEFT JOIN ICSOQCCKLIST  qq  with(nolock) on qq.invcode= d.itemcode and qq.opcode=d.opcode and qq.ckgroupattr=b.Type  and b.CKitemid=qq.id
+                LEFT JOIN icsmo mm  with(nolock) on mm.MOCODE =d.MOCODE and mm.MOSEQ=d.MOSEQ
+                -- LEFT JOIN ICSMO2ROUTE tt on tt.mocode=mm.mocode and tt.EATTRIBUTE1=mm.MOSEQ
+                LEFT JOIN ICSINVENTORY yy  with(nolock) on yy.INVCODE=mm.ITEMCODE
+                LEFT JOIN ICSITEMROUTE2OPLot ll  with(nolock) on ll.OPCODE=a.OPCODE and ll.LotNo=a.LOTNO
+                LEFT JOIN ICSOQCCKGROUP pp  with(nolock) on pp.CKGROUP=qq.CKGROUPCode
+                -- LEFT JOIN ICSECS  sss on sss.ecscode=b.CKvalue
+                -- LEFT JOIN ICSECS  s1 on s1.ecscode=b.CKvalue2
+                -- LEFT JOIN ICSECS  s2 on s2.ecscode=b.CKvalue3
+                -- LEFT JOIN ICSECS  s3 on s3.ecscode=b.CKvalue4
+                -- LEFT JOIN ICSECS  s4 on s4.ecscode=b.CKvalue5
+                -- LEFT JOIN ICSECS  s5 on s5.ecscode=b.CKvalue6
+                WHERE ll.OPType='检验工序' and 1=1
+                ORDER BY  b.MTIME desc 
+ 
+                        ";
+
+
+            DataTable dt = Repository().GetDataTableBySql_Other(SqlText, "MESconnstr", null);
+
+
+            return dt;
+        }
+
+        public DataTable GetCKOKRate()
+        {
+
+            string SqlText = "";
+
+            SqlText = @"    
+              if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#Tcustccff'))
+			 drop table #Tcustccff	 
+			select convert(varchar(7),DATEADD(month,number*-1,getdate()) ,120) AS 月份,number
+        into #Tcustccff			
+			from master.dbo.spt_values
+			where type='p' 
+			AND number<=5
+			and number>=0
+			order by 1 
+
+  select ff.月份, Convert(decimal(18,0),isnull(case when isnull(count(1),0)=0 then 0 else sum(合格)*100.0000/count(1) end,0)) Qty  
+            from #Tcustccff	ff
+					left join 	(
+            SELECT distinct  mm.molotcode 销售车号,b.LOTNO,a.OPCODE,
+						CASE when b.CKRESULT ='1' then 1 when b.CKRESULT ='0' then 0 end as 合格,
+					CONVERT(varchar(7),	b.MTIME,21) 月份
+            from ICSQualityCKDATA a  with(nolock) 
+            LEFT JOIN ICSQualityCKDATADetail  b   with(nolock) on a.LOTNO=b.LOTNO and a.ID=b.DATAID
+            LEFT JOIN ICSLOTONWIP d  with(nolock) on d.LotNo=a.LOTNO and d.opcode=a.OPCODE 
+            LEFT JOIN icsmo mm  with(nolock) on mm.MOCODE =d.MOCODE and mm.MOSEQ=d.MOSEQ 
+ 
+            LEFT JOIN ICSITEMROUTE2OPLot ll  with(nolock) on ll.OPCODE=a.OPCODE and ll.LotNo=a.LOTNO
+ 
+ 
+            WHERE ll.OPType='检验工序'  and b.MTIME>= CONVERT(varchar(7), dateadd(mm,-6,getdate()), 21) +'-01 00:00:00'
+            and b.CKRESULT is not null
+             ) jj on ff.月份=jj.月份
+						 group by  ff.月份,ff.number
+						 order by ff.number desc
+ if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#Tcustccff'))
+			 drop table #Tcustccff	
+                        ";
+
+
+            DataTable dt = Repository().GetDataTableBySql_Other(SqlText, "MESconnstr", null);
+
+
+            return dt;
+        }
+
+        public DataTable GetCKOKRateALL()
+        {
+
+            string SqlText = "";
+
+            SqlText = @"    
+              
+  select   Convert(decimal(18,0),isnull(case when isnull(count(1),0)=0 then 0 else sum(合格)*1.0000/count(1) end,0)) Qty  
+            from  (
+            SELECT distinct  mm.molotcode 销售车号,b.LOTNO,a.OPCODE,
+						CASE when b.CKRESULT ='1' then 1 when b.CKRESULT ='0' then 0 end as 合格,
+					CONVERT(varchar(7),	b.MTIME,21) 月份
+            from ICSQualityCKDATA a  with(nolock) 
+            LEFT JOIN ICSQualityCKDATADetail  b   with(nolock) on a.LOTNO=b.LOTNO and a.ID=b.DATAID
+            LEFT JOIN ICSLOTONWIP d  with(nolock) on d.LotNo=a.LOTNO and d.opcode=a.OPCODE 
+            LEFT JOIN icsmo mm  with(nolock) on mm.MOCODE =d.MOCODE and mm.MOSEQ=d.MOSEQ 
+ 
+            LEFT JOIN ICSITEMROUTE2OPLot ll  with(nolock) on ll.OPCODE=a.OPCODE and ll.LotNo=a.LOTNO
+ 
+ 
+            WHERE ll.OPType='检验工序'  
+            and b.CKRESULT is not null
+             ) jj  
+					 
+ 
+                        ";
+
+
+            DataTable dt = Repository().GetDataTableBySql_Other(SqlText, "MESconnstr", null);
+
+
+            return dt;
+        }
+
+        
+
     }
 }
diff --git a/NFine.Web/Areas/SRM/Controllers/WatchPanel/WatchPanelController.cs b/NFine.Web/Areas/SRM/Controllers/WatchPanel/WatchPanelController.cs
index 6574431..186887a 100644
--- a/NFine.Web/Areas/SRM/Controllers/WatchPanel/WatchPanelController.cs
+++ b/NFine.Web/Areas/SRM/Controllers/WatchPanel/WatchPanelController.cs
@@ -334,8 +334,36 @@ namespace NFine.Web.Areas.SRM.Controllers
             var data = App.GetZhiXing_RCVUnInWare();
             return Content(data.ToJson());
         }
-        
+        [HttpGet]
+        [HandlerAjaxOnly]
+        public ActionResult GetOtherData(string XX)
+        {
+            var data = App.GetOtherData();
+            return Content(data.ToJson());
+        }
+        [HttpGet]
+        [HandlerAjaxOnly]
+        public ActionResult GetCKData(string XX)
+        {
+            var data = App.GetCKData();
+            return Content(data.ToJson());
+        }
+        [HttpGet]
+        [HandlerAjaxOnly]
+        public ActionResult GetCKOKRate(string XX)
+        {
+            var data = App.GetCKOKRate();
+            return Content(data.ToJson());
+        }
 
+        [HttpGet]
+        [HandlerAjaxOnly]
+        public ActionResult GetCKOKRateALL(string XX)
+        {
+            var data = App.GetCKOKRateALL();
+            return Content(data.ToJson());
+        }
+        
 
         public virtual ActionResult PanelWIP()
         {
@@ -370,7 +398,11 @@ namespace NFine.Web.Areas.SRM.Controllers
         {
             return View();
         }
-        
+        public virtual ActionResult PanelCK()
+        {
+            return View();
+        }
+
         [HttpGet]
         [HandlerAjaxOnly]
         public ActionResult GetSScode() {
diff --git a/NFine.Web/Areas/SRM/Views/WatchPanel/PanelCK.cshtml b/NFine.Web/Areas/SRM/Views/WatchPanel/PanelCK.cshtml
new file mode 100644
index 0000000..70ac8f9
--- /dev/null
+++ b/NFine.Web/Areas/SRM/Views/WatchPanel/PanelCK.cshtml
@@ -0,0 +1,760 @@
+
+<!DOCTYPE html>
+<html>
+<head>
+    <!--更多资源： -->
+    <meta charset="utf-8" />
+    <meta name="description" content="" />
+    <meta name="keywords" content="" />
+
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+ 
+    <title>产品质量控制</title>
+    <!--大屏-->
+    <link type="text/css" href="~/Content/Cust003/css/public.css" rel="stylesheet" />
+    <link type="text/css" href="~/Content/Cust003/css/icon.css" rel="stylesheet" />
+    <link type="text/css" href="~/Content/Cust003/css/index.css" rel="stylesheet" />
+    <link rel="stylesheet" href="~/Content/Cust069/fonts/icomoon.css">
+    <script src="~/Content/js/jquery/jquery-2.1.1.min.js" type="text/javascript"></script> 
+    <script src="~/Content/Cust003/js/jquery.numscroll.js"  type="text/javascript"   charset="utf-8"></script>
+    <script src="~/Content/js/echarts/echarts5.3.3.js"></script>
+
+
+
+    <script src="~/Content/js/echarts4.8/echarts-liquidfill.js"></script>
+    <style>
+        h3 {
+            color: #FFFFFF;
+            text-shadow: #05d1fc 0px 1px 3px, #05d1fc 1px 0px 3px,#05d1fc 0px -1px 3px, #05d1fc -1px 0px 3px;
+            filter: glow(color=#00FFCC,strength=3);
+        }
+
+        .rightMain_top,.leftMain_bottom ul li {
+            width: 100%;
+           
+        }
+        .leftWZ ul    {
+            height: 50%;
+           
+        }
+        .titleCust {
+            background-color:#bbcec830;
+        }
+
+        .animationNone {
+            animation: none !important;
+        }
+
+        .leftWZ ul li {
+            width:calc(25% ) !important;
+            color:white;
+            float:left;
+            vertical-align: bottom;
+    text-align: center;
+    height:100%;
+        }
+         
+
+        .leftMain_top, .leftMain_bottom {
+            height: calc( 46% );
+        }
+
+        .leftMain_topIn, .leftMain_bottomIn, .leftMain_topInUL,
+      .rightMain_bottom, .rightMain_bottomIn,.leftMain_bottom ul {
+            height: 100%;
+        }
+
+        img {
+            height: 0.2rem;
+            width: 0.5rem;
+            padding-top: 0.05rem;
+        }
+
+        .bg {
+            padding-top: 0.01rem;
+        }
+
+        .title {
+            height: 8%;
+            text-shadow: #01db78 0px 2px 3px, #01db78 1px 0px 3px, #05d1fc 0px -2px 3px, #05d1fc -1px 0px 3px;
+        }
+
+
+        .TopName {
+            vertical-align: middle;
+            text-align: center;
+            font-size: 30px;
+            font-weight: 700;
+            color: white;
+        }
+
+        .TopNameTime {
+            vertical-align: middle;
+            text-align: right;
+            font-size: 20px;
+            font-weight: 700;
+            color: white;
+        }
+        
+        .rightMain_bottomIn .biaoge_list ul li {
+            overflow: hidden;
+            padding-right: 0px;
+        }
+        .rightMain_bottomIn .biaoge {
+            height: calc(100% );
+        }
+        .zantingCla li {
+            color:yellow !important;
+        }
+        .allnav {
+            /*height: calc(100% - 0.01rem);*/
+            height: 100%;
+            width:100%;
+            position:relative;
+        }
+
+
+    </style>
+    <script type="text/javascript">
+            document.documentElement.style.fontSize =
+              (document.documentElement.clientWidth / 768) * 100 + 'px'
+    </script>
+     
+
+</head>
+
+
+<body>
+
+    <div class="bg">
+        <table class="title">
+            <tr>
+                <td style="width:20%">
+                    <div class="TopNamelogo" id="TopNamelogo">
+                        <img src="~/Content/img/zhenxiang.png" border="0" class="logoclass" />
+                    </div>
+                </td>
+
+                <td style="width:60%">
+                    <div class="TopName" id="TopName">产品质量控制</div>
+                </td>
+                <td style="width:20%">
+                    <div class="TopNameTime" id="TopNameTime"></div>
+                </td>
+
+            </tr>
+        </table>
+       
+
+        <div class="leftMain_top">
+            <div class="leftMain_topIn">
+                <ul class="leftMain_topInUL">
+                    <li class="LineLi" style="width:72%">
+
+                        <div class="rightMain_bottom">
+                            <div class="leftWZ" style="height:calc( 18% )">
+                                
+                                <ul>
+                                    <li class="titleCust">待检车辆</li>
+                                    <li class="titleCust">已检车辆</li>
+                                    <li class="titleCust">待整改车辆</li>
+                                    <li class="titleCust">已整改车辆</li>
+                                </ul>
+                                <ul id="ttt2">
+                                    <li>0台</li>
+                                    <li>0台</li>
+                                    <li>0台</li>
+                                    <li>0台</li>
+                                </ul>
+                            </div>
+                            <div class="rightMain_bottomIn" style="height:calc( 82% )">
+                                <div class="biaoge biaoge_list" id="marqueelist1"
+                                     style="width: 100%;  ">
+                                    <div class="allnav" id="echart2_2"></div>
+                                </div>
+                                <span class="border_bg_leftTop"></span>
+                                <span class="border_bg_rightTop"></span>
+                                <span class="border_bg_leftBottom"></span>
+                                <span class="border_bg_rightBottom"></span>
+                            </div>
+                        </div>
+                        @*</div>*@
+                    </li>
+                    <li class="LineLi" style="width:28%">
+
+                        <div class="rightMain_bottom">
+                            <div class="rightMain_bottomIn"> 
+                                <div class="biaoge biaoge_list" id="marqueelist1"
+                                     style="width: 100%;  ">
+                                    <div class="allnav"  id="echart33"> 
+                                    </div>
+                                </div>
+                                <span class="border_bg_leftTop"></span>
+                                <span class="border_bg_rightTop"></span>
+                                <span class="border_bg_leftBottom"></span>
+                                <span class="border_bg_rightBottom"></span>
+                            </div>
+                        </div>
+                       
+                    </li>
+
+                </ul>
+            </div>
+        </div>
+       
+
+        <div class="leftMain_bottom"   >
+            <div class="leftMain_bottomIn">
+                <ul>
+                    <li class="LineLi">
+
+                        <div class="rightMain_bottom">
+                            <div class="rightMain_bottomIn">
+                                @*<h3> SMT车间生产加工数据</h3>*@
+                                <div class="biaoge biaoge_list"  
+                                     style="width: 100%;  ">
+                                    <div class="biaoge_listIn CustDiv4">
+                                        <ul class="ul_title">
+                                            <li>销售车号</li>
+                                            <li>部件</li>
+                                            <li>人员</li>
+                                            <li>项目</li>
+                                            <li>时间</li>
+                                            <li>类型</li>
+                                            <li>结果</li> 
+
+                                        </ul>
+                                        <div class="ul_list" id="marqueeCust1">
+                                            <div class="ul_listIn" id="marqueeCustCH1">
+                                                
+</div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <span class="border_bg_leftTop"></span>
+                                <span class="border_bg_rightTop"></span>
+                                <span class="border_bg_leftBottom"></span>
+                                <span class="border_bg_rightBottom"></span>
+                            </div>
+                        </div>
+
+                    </li>
+                  
+
+
+                </ul>
+            </div>
+        </div>
+
+       
+
+        <div style="clear: both"></div>
+    </div>
+
+
+
+    <script>
+
+            var DataF = 300;// 300;//单位秒 //刷新数据时间
+        var _BarWidth = "25%";
+        var _barBorderRadius_M = 2;
+        var myChart = echarts.init(document.getElementById('echart2_2'));
+        var myChartArea3 = echarts.init(document.getElementById('echart33'));
+        $(function () {
+            getTime();
+            GetDataZong();
+
+            //刷新数据
+            timer = setInterval(function () {
+                GetDataZong();
+            }, DataF * 1000);
+
+
+        });
+        function getTime() {
+            var days = new Array("日", "一", "二", "三", "四", "五", "六");
+            var currentDT = new Date();
+            var y, m, date, day, hs, ms, ss, theDateStr;
+            y = currentDT.getFullYear(); //四位整数表示的年份
+            m = currentDT.getMonth() < 10 ? '0' + (currentDT.getMonth() + 1) : (currentDT.getMonth() + 1); //月
+            date = currentDT.getDate() < 10 ? '0' + currentDT.getDate() : currentDT.getDate(); //日
+            day = currentDT.getDay(); //星期
+            hs = currentDT.getHours() < 10 ? '0' + currentDT.getHours() : currentDT.getHours(); //时
+            ms = currentDT.getMinutes() < 10 ? '0' + currentDT.getMinutes() : currentDT.getMinutes(); //分
+            ss = currentDT.getSeconds() < 10 ? '0' + currentDT.getSeconds() : currentDT.getSeconds(); //秒
+            theDateStr = y + "-" + m + "-" + date + " " + hs + ":" + ms + ":" + ss;
+            //填充到组件中
+            $("#TopNameTime").text(theDateStr);
+            // setTimeout 在执行时,是在载入后延迟指定时间后,去执行一次表达式,仅执行一次
+            window.setTimeout(getTime, 1000);
+        }
+        function GetDataZong() {
+             
+
+            GetZhiXing_MO("marqueeCustCH1", "30");
+           
+             SetIfGo("marqueeCust1", "marqueeCustCH1", "marqueelist1");//判断是否需要滚动
+             GetOtherData();
+             echart2_2();
+             echart2_3();
+             
+        }
+
+        function SetIfGo(DivID, DivCHID,listID)
+        {
+            var ListDIV = $("#" + listID)[0].clientHeight;
+            var H_marqueediv = $("#" + DivCHID)[0]; 
+           var H_marqueeView = $("#" + DivID)[0].clientHeight;
+           if ((ListDIV-40) > H_marqueeView) {
+                if (!$("#" + DivID).hasClass("animationNone")) {
+                    $("#" + DivID).addClass("animationNone");
+                }
+                if (!$("#" + DivCHID).hasClass("animationNone")) {
+                    $("#" + DivCHID).addClass("animationNone");
+                }
+
+            }
+            else {
+
+                if ($("#" + DivID).hasClass("animationNone")) {
+                    $("#" + DivID).removeClass("animationNone");
+                }
+                if ($("#" + DivCHID).hasClass("animationNone")) {
+                    $("#" + DivCHID).removeClass("animationNone");
+                }
+            }
+        }
+       
+
+
+        function GetZhiXing_MO(marqueeID, ItemNumber) {
+            $.ajax({
+                url: "/SRM/WatchPanel/GetCKData?XX=XX&" + Math.random(),
+                dataType: "json",
+                async: false,
+                success: function (data) {
+                    if (data != false && data != null && data.length > 0) {
+                       
+                     
+                        for (var i = 0; i < data.length; i++) {
+                            var html = "<ul>";
+                     
+                            html += '  <li  >' + data[i].销售车号 + '</li>  ';
+                            html += '  <li  >' + data[i].部件名称 + '</li> <li  >' + data[i].人员 + '</li>';
+                            html += '    <li  >' + data[i].项目 + '</li> <li   >' + data[i].时间 + '</li>';
+                            html += '   <li  >' + data[i].类型 + '</li> <li   >' + data[i].结果 + '</li>   </ul> ';
+
+                        }
+                       
+                        $("#" + marqueeID).html(html);
+                    }
+                    else {
+                        $("#" + marqueeID).html("");
+                    }
+                },
+                error: function (aa) {
+
+                }
+            });
+        }
+ 
+        function GetOtherData()
+        {
+            $.ajax({
+                url: "/SRM/WatchPanel/GetOtherData?XX=XX&" + Math.random(),
+                dataType: "json",
+                async: false,
+                success: function (data) {
+                    if (data != false && data != null && data.length > 0) {
+                    
+                        for (var i = 0; i < data.length; i++) {
+                       
+                            $("#ttt2").html="<li>"+data[i].待检车辆+"台</li> <li>"+data[i].已检车辆+
+                              "台</li>  <li>" + data[i].待整改 + "台</li>   <li>" + data[i].已整改 + "台</li>";
+                            
+                        }
+
+                    }
+                }
+            });
+        }
+        function echart2_2() {
+            // 基于准备好的dom，初始化echarts实例
+          
+            var colors = ['#4992ff', '#7cffb2', '#fddd60', '#ff6e76'];
+            var colors2 = ['#4992ff40', '#7cffb230', '#fddd609e', '#ff6e7678']; 
+
+            var MonArray =  new Array();//月份["2023-01","2023-02","2023-03","2023-04"]
+         
+            var ZongArray = new Array();//Qty [89,90,60,90] 
+
+        
+        
+
+            $.ajax({
+                url: "/SRM/WatchPanel/GetCKOKRate?XX=XX&" + Math.random(),
+                dataType: "json",
+                async: false,
+                success: function (data) {
+                    if (data != false && data != null && data.length > 0) {
+                      
+                        for (var i = 0; i < data.length; i++) { 
+                            MonArray.push(data[i].月份); 
+                            ZongArray.push(data[i].Qty);
+                        }
+
+                    }
+                }
+            });
+
+
+            
+            option = {
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: { type: 'shadow' },
+                    formatter: function (params) {
+                        var showHtm = "";
+                        showHtm = params[0].name + "月:" + '<br>' +
+                            params[0].seriesName + ':' + params[0].data + '%' ;
+
+                        return showHtm;
+                    }
+                },
+                grid: {
+                    "top": "35",
+                    "right": "5",
+                    "bottom": "20",
+                    "left": "30",
+
+                },
+                legend: {
+                    show: false,
+                },
+                title: {
+                    text: '一次性验收合格率',
+                    textStyle: {
+                        fontSize: 15,
+                        color: "rgba(250, 249, 249, 1)",
+                    },
+                },
+               
+
+                "xAxis": [
+                  {
+                      "type": "category",
+                      data: MonArray,
+                      axisLine: { show: true, lineStyle: { color: "rgba(255,255,255,.5)", } },
+                      axisTick: { show: false, },
+                      axisLabel: {
+                          textStyle: {
+                              fontSize: 9,
+                              color: "rgba(255,255,255,.8)",
+                          },
+                      },
+
+                  },
+                ],
+                "yAxis": [
+                  {
+                      
+                      "type": "value",
+                      axisTick: { show: false },
+                      splitLine: { show: false, },
+                       
+                      "axisLabel": {
+                          "show": true,
+                          fontSize: 9,
+                          color: "rgba(255,255,255,.8)"
+
+                      },
+                      axisLine: { show: true, lineStyle: { color: "rgba(255,255,255,.5)", } },
+
+                  },
+
+                ],
+                "series": [
+
+                  {
+                      "name": "一次检验合格率",
+                      "type": "line",
+                      "data": ZongArray,
+                      areaStyle: {},
+                      "itemStyle": {
+                          "normal": {
+                              barBorderRadius: _barBorderRadius_M,
+                              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                  offset: 0,
+                                  color: '#8bd46e'
+                              }, {
+                                  offset: 1,
+                                  color: '#09bcb7'
+                              }]),
+                          }
+                      },
+                      "barGap": "0.2",
+                      stack: 'SunShi',
+                  } 
+                ]
+            };
+
+
+
+            myChart.setOption(option);
+
+        }
+
+        function echart2_3() {
+            // 基于准备好的dom，初始化echarts实例
+           
+            var colors = ['#7cffb220', '#7cffb2', '#04040445', '#ff6e76'];
+           
+
+ 
+            var ZongArray = 0;//[89, 90, 60, 90]//new Array();//工作总时间
+
+         
+            $.ajax({
+                url: "/SRM/WatchPanel/GetCKOKRateALL?XX=XX&" + Math.random(),
+                dataType: "json",
+                async: false,
+                success: function (data) {
+                    if (data != false && data != null && data.length > 0) {
+
+                        for (var i = 0; i < data.length; i++) { 
+                            ZongArray=data[i].Qty;
+                        }
+
+                    }
+                }
+            });
+
+
+            //ZongArray = 0.7;
+            var options = {
+
+                title:   {
+                        text: '质量控制指标',
+                        textStyle: {
+                            fontSize: 15,
+                            color: "rgba(250, 249, 249, 1)",
+                        },
+                    } 
+                 ,
+                
+                series: [
+                    {
+                        type: 'liquidFill',
+                        radius: '85%', 
+                        color: [
+                            {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 0,
+                                y2: 1,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: colors[1],
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: colors[0],
+                                    },
+                                ],
+                                globalCoord: false,
+                            },
+                        ],
+                        data: [ZongArray, ZongArray-0.1, ZongArray], // data个数代表波浪数
+                        backgroundStyle: {
+                            borderWidth: 1,
+                            color: colors[2],
+                        },
+                        label: {
+                            normal: {
+                                textStyle: {
+                                    fontSize: 26,
+                                    color: '#fff',
+                                },
+                            },
+                        },
+                        outline: {
+                            // show: false
+                            borderDistance: 0,
+                            itemStyle: {
+                                borderWidth: 6,
+                                borderColor: colors[1],
+                            },
+                        },
+                    } 
+                ],
+            };
+
+            myChartArea3.setOption(options);
+
+        }
+
+
+   
+        function GetArea3() {
+             
+            var value = 0.4;
+            var value1 = 0.6;
+            var value2 = 0.3;
+            var value3 = 0.4;
+            var value4 = 0.5;
+            var value5 = 0.4;
+            var value6 = 0.4;
+            var value7 = 0.5;
+         
+            $("#div3-C1-C1").html(value7 + "月完成率");
+            $("#div3-C2-C1").html(value6 + "月完成率");
+            $("#div3-C1-C2-div1").html(value3);
+            $("#lastMothPlan").html(value3);
+            $("#div3-C1-C2-div2").html(value2);
+            $("#div3-C2-C2-div1").html(value1);
+            $("#div3-C2-C2-div2").html(value); 
+
+            var data = [value5, value5, value5];
+            var option3 = {
+
+                title: [
+                    {
+                        text: value7 + '月完成率',
+                        x: '22%',
+                        y: '90%',
+                        textStyle: {
+                            fontSize: 14,
+                            fontWeight: '100',
+                            color: '#5dc3ea',
+                            lineHeight: 16,
+                            textAlign: 'center',
+                        },
+                    },
+                    {
+                        text: value6 + '月完成率',
+                        x: '76%',
+                        y: '90%',
+                        textStyle: {
+                            fontSize: 14,
+                            fontWeight: '100',
+                            color: '#5dc3ea',
+                            lineHeight: 16,
+                            textAlign: 'center',
+                        },
+                    },
+                ],
+                series: [
+                    {
+                        type: 'liquidFill',
+                        radius: '85%',
+                        center: ['30%', '48%'],
+                        color: [
+                            {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 0,
+                                y2: 1,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#446bf5',
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#0000FF',
+                                    },
+                                ],
+                                globalCoord: false,
+                            },
+                        ],
+                        data: [value5, value5, value5], // data个数代表波浪数
+                        backgroundStyle: {
+                            borderWidth: 1,
+                            color: 'RGBA(51, 66, 127, 0.7)',
+                        },
+                        label: {
+                            normal: {
+                                textStyle: {
+                                    fontSize: 14,
+                                    color: '#fff',
+                                },
+                            },
+                        },
+                        outline: {
+                            // show: false
+                            borderDistance: 0,
+                            itemStyle: {
+                                borderWidth: 6,
+                                borderColor: '#0000FF',
+                            },
+                        },
+                    },
+
+
+                    { //第二个球的填充
+                        type: 'liquidFill',
+                        radius: '85%',
+                        center: ['84%', '45%'],
+                        color: [
+                            {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 0,
+                                y2: 1,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#2aa1e3',
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#08bbc9',
+                                    },
+                                ],
+                                globalCoord: false,
+                            },
+                        ],
+                        data: [value4, value4, value4], // data个数代表波浪数
+                        backgroundStyle: {
+                            borderWidth: 1,
+                            color: 'RGBA(51, 66, 127, 0.7)',
+                        },
+                        label: {
+                            normal: {
+                                textStyle: {
+                                    fontSize: 28,
+                                    color: '#fff',
+                                },
+                            },
+                        },
+                        outline: {
+                            // show: false
+                            borderDistance: 0,
+                            itemStyle: {
+                                borderWidth: 6,
+                                borderColor: '#08bbc9',
+                            },
+                        },
+                    },
+                ],
+            };
+
+
+            myChartArea3.setOption(option3);
+            
+
+
+
+        }
+
+
+        
+    </script>
+</body>
+</html>
+
diff --git a/NFine.Web/NFine.Web.csproj b/NFine.Web/NFine.Web.csproj
index f00e629..207817e 100644
--- a/NFine.Web/NFine.Web.csproj
+++ b/NFine.Web/NFine.Web.csproj
@@ -525,6 +525,7 @@
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Areas\SRM\Views\WatchPanel\PanelCK.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Home\About.cshtml" />
     <Content Include="Views\Home\Default.cshtml" />
diff --git a/NFine.Web/Views/Login/Index.cshtml b/NFine.Web/Views/Login/Index.cshtml
index fb1672e..b774d4c 100644
--- a/NFine.Web/Views/Login/Index.cshtml
+++ b/NFine.Web/Views/Login/Index.cshtml
@@ -45,7 +45,9 @@
             <div class="row ButClassRow">
                 <a id="NF-WatchPanel1" authorize="yes" class="btn btn-primary dropdown-text ButClass" onclick="btn_WIP2()">执行大看板</a>
             </div>
-
+            <div class="row ButClassRow">
+                <a id="NF-WatchPanel1" authorize="yes" class="btn btn-primary dropdown-text ButClass" onclick="btn_WIP3()">产品质量控制</a>
+            </div>
           
 
             <div class="login_tips"></div>
@@ -81,8 +83,13 @@
         function btn_WIP2() {
             window.open("/SRM/WatchPanel/PanelWIPZhiXingDa2?&" + Math.random());
         }
+
+
        
-        PanelWareHouseNew
+        function btn_WIP3() { 
+            var cc = window.location.href.replace("/Login/Index", "");
+            window.open(cc + "SRM/WatchPanel/PanelCK?&" + Math.random());
+        }
     </script>
 </body>
 </html>