From 64fccea3f3cd9bf42a76fb705e8b43ee71a8d0eb Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Wed, 4 Dec 2024 09:08:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E8=BD=A6=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestRun/DriverProgressEdit.aspx.cs        |  2 +-
 .../common/mainMenu_TestRun.aspx              | 44 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/SGGL/FineUIPro.Web/TestRun/DriverProgressEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverProgressEdit.aspx.cs
index 6509a221..494fcd4d 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverProgressEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverProgressEdit.aspx.cs
@@ -64,7 +64,7 @@ namespace FineUIPro.Web.TestRun
             {
                 this.hdId.Text = SQLHelper.GetNewID(typeof(Model.Driver_DriverProgress));
             }
-            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverProgress&menuId={1}", this.hdId.Text, BLL.Const.DriverProgressMenuId)));
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverProgress&menuId={1}", this.hdId.Text, BLL.Const.DriverProgressMenuId)));
         }
         #endregion
 
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
index 2da6f6d8..a740d4f3 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
@@ -123,9 +123,9 @@
                                 <div class="tab" data-value="1">
                                     <div class="t-item" style="background-color: #DD226D">未投料</div>
                                     <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #57C43C">投料中</div>
+                                    <div class="t-item" style="background-color: #FFA500">投料中</div>
                                     <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #B3764D">投料完成</div>
+                                    <div class="t-item" style="background-color: #57C43C">投料完成</div>
                                 </div>
                             </div>
                             <div class="bw-item-content">
@@ -148,9 +148,9 @@
                             </div>
                             <div class="tab-wrap">
                                 <div class="tab" data-value="1">
-                                    <div class="t-item" style="background-color: #B3764D">未运行</div>
+                                    <div class="t-item" style="background-color: #DD226D">未运行</div>
                                     <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #DD226D">运行中</div>
+                                    <div class="t-item" style="background-color: #FFA500">运行中</div>
                                     <div class="spline"></div>
                                     <div class="t-item" style="background-color: #57C43C">停车检修</div>
                                 </div>
@@ -171,9 +171,9 @@
                             </div>
                             <div class="tab-wrap">
                                 <div class="tab" data-value="1">
-                                    <div class="t-item" style="background-color: #B3764D">考核未开始</div>
+                                    <div class="t-item" style="background-color: #DD226D">考核未开始</div>
                                     <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #DD226D">考核进行中</div>
+                                    <div class="t-item" style="background-color: #FFA500">考核进行中</div>
                                     <div class="spline"></div>
                                     <div class="t-item" style="background-color: #57C43C">考核已完成</div>
                                 </div>
@@ -507,7 +507,7 @@
     var fiveStr = '<%=productsStr%>';
     var fiveData = JSON.parse(fiveStr);
     var fivewidth = Math.floor(100 / (fiveData.length / 2));
-    $.each(fourData, function (index, item) {
+    $.each(fiveData, function (index, item) {
         $("#five").append("<div id='five" + index + "' style='width:129px; height:148px; display:inline-block'></div>");
     });
 
@@ -521,12 +521,12 @@
     //if (sixData.States == 3) {
     //    colorData = ["#106722", "#20CE43", "#5DE679"];
     //}
-    var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"];
+    var colorData = ["#DD226D", "#DD226D", "#DD226D", "#DD226D"];
     if (sixData.States == 2) {
-        colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"];
+        colorData = ["#FFA500", "#FFA500", "#FFA500", "#FFA500"];
     }
     if (sixData.States == 3) {
-        colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"];
+        colorData = ["#57C43C", "#57C43C", "#57C43C", "#57C43C"];
     }
     var chart = echarts.init(document.getElementById('six'));
     var value = 100;
@@ -823,10 +823,10 @@
             //}
             var colorData = ["#DD226D", "#DD226D", "#DD226D", "#DD226D"];
             if (item.RunType == 2) {
-                colorData = ["#57C43C", "#57C43C", "#57C43C", "#57C43C"];
+                colorData = ["#FFA500", "#FFA500", "#FFA500", "#FFA500"];
             }
             if (item.RunType == 3) {
-                colorData = ["#B3764D", "#B3764D", "#B3764D", "#B3764D"];
+                colorData = ["#57C43C", "#57C43C", "#57C43C", "#57C43C"];
             }
             var chart = echarts.init(document.getElementById('four' + index));
             var value = 100;
@@ -843,15 +843,15 @@
                     text: `` + sname,
                     subtext: item.RunType == 1 ? "未投料" : item.RunType == 2 ? "投料中" : "投料完成",
                     left: 'center',
-                    top: '45%', //top待调整
+                    top: '35%', //top待调整
                     textStyle: {
                         color: '#fff',
-                        fontSize: 10,
+                        fontSize: 13,
                         fontFamily: 'Microsoft YaHei',
                     },
                     subtextStyle: {
                         color: '#fff',
-                        fontSize: 10,
+                        fontSize: 13,
                         fontFamily: 'Microsoft YaHei',
                         top: 'center'
                     },
@@ -928,13 +928,13 @@
         });
 
         $.each(fiveData, function (index, item) {
-
-            var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"];
+            
+            var colorData = ["#DD226D", "#DD226D", "#DD226D", "#DD226D"];
             if (item.RunType == 2) {
-                colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"];
+                colorData = ["#FFA500", "#FFA500", "#FFA500", "#FFA500"];
             }
             if (item.RunType == 3) {
-                colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"];
+                colorData = ["#57C43C", "#57C43C", "#57C43C", "#57C43C"];
             }
             var chart = echarts.init(document.getElementById('five' + index));
             var value = 100;
@@ -951,15 +951,15 @@
                     text: sname,
                     subtext: item.RunType == 1 ? "未运行" : item.RunType == 2 ? "运行中" : "停车检修",
                     left: 'center',
-                    top: '45%', //top待调整
+                    top: '35%', //top待调整
                     textStyle: {
                         color: '#fff',
-                        fontSize: 10,
+                        fontSize: 13,
                         fontFamily: 'Microsoft YaHei',
                     },
                     subtextStyle: {
                         color: '#ff',
-                        fontSize: 9,
+                        fontSize: 13,
                         fontFamily: 'Microsoft YaHei',
                         top: 'center'
                     },