From 2a18ecf8b145f62de12a53c5ad86b58cd7d3fb75 Mon Sep 17 00:00:00 2001
From: wangqing <945983254@qq.com>
Date: Wed, 26 Jun 2024 01:26:20 +0800
Subject: [PATCH] 1

---
 .../common/mainMenu_TestRun.aspx              | 83 +++++++++++++------
 1 file changed, 56 insertions(+), 27 deletions(-)

diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
index 2106e0fb..cb378079 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
@@ -109,6 +109,11 @@
                 <div class="item">
                     <div class="bw-b-bottom ptop6">
                         <div class="bw-b-bottom-up">
+                            <div class="tab-wrap" style="left: 20px">
+                                <div class="tab" style="border: 0; box-shadow: none;">
+                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">投料试车进度</div>
+                                </div>
+                            </div>
                             <div class="tab-wrap">
                                 <div class="tab" data-value="1">
                                     <div class="t-item" style="background-color: #B3764D">未投料</div>
@@ -131,13 +136,18 @@
                 <div class="item">
                     <div class="bw-b-bottom ptop6">
                         <div class="bw-b-bottom-up">
+                            <div class="tab-wrap" style="left: 20px">
+                                <div class="tab" style="border: 0; box-shadow: none;">
+                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">试运行进度</div>
+                                </div>
+                            </div>
                             <div class="tab-wrap">
                                 <div class="tab" data-value="1">
-                                    <div class="t-item" style="background-color: #3939E9">未运行</div>
+                                    <div class="t-item" style="background-color: #B3764D">未运行</div>
                                     <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #A5F82A">运行中</div>
+                                    <div class="t-item" style="background-color: #DD226D">运行中</div>
                                     <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #E95B39">停车检修</div>
+                                    <div class="t-item" style="background-color: #57C43C">停车检修</div>
                                 </div>
                             </div>
                             <div class="bw-item-content">
@@ -149,16 +159,21 @@
                 <div class="item">
                     <div class="bw-b-bottom ptop6">
                         <div class="bw-b-bottom-up">
-                            <div class="tab-wrap">
-                                <div class="tab" data-value="1">
-                                    <div class="t-item" style="background-color: #6D5F5F">考核未开始</div>
-                                    <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #3E1DC0">考核进行中</div>
-                                    <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #20CE43">考核已完成</div>
+                            <div class="tab-wrap" style="left: 20px">
+                                <div class="tab" style="border: 0; box-shadow: none;">
+                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">性能考核进度</div>
                                 </div>
                             </div>
-                            <div class="bw-item-content">                              
+                            <div class="tab-wrap">
+                                <div class="tab" data-value="1">
+                                    <div class="t-item" style="background-color: #B3764D">考核未开始</div>
+                                    <div class="spline"></div>
+                                    <div class="t-item" style="background-color: #DD226D">考核进行中</div>
+                                    <div class="spline"></div>
+                                    <div class="t-item" style="background-color: #57C43C">考核已完成</div>
+                                </div>
+                            </div>
+                            <div class="bw-item-content">
                                 <div id='six' style="width: 100%; height: 100%;"></div>
                             </div>
                         </div>
@@ -494,12 +509,19 @@
     //图6
     var sixStr = '<%=runProductionStr%>';
     var sixData = JSON.parse(sixStr);
-    var colorData = ["#988989", "#6D5F5F", "#524747"];
+    //var colorData = ["#988989", "#6D5F5F", "#524747"];
+    //if (sixData.States == 2) {
+    //    colorData = ["#2B1485", "#3E1DC0", "#603FE2"];
+    //}
+    //if (sixData.States == 3) {
+    //    colorData = ["#106722", "#20CE43", "#5DE679"];
+    //}
+    var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"];
     if (sixData.States == 2) {
-        colorData = ["#2B1485", "#3E1DC0", "#603FE2"];
+        colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"];
     }
     if (sixData.States == 3) {
-        colorData = ["#106722", "#20CE43", "#5DE679"];
+        colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"];
     }
     var chart = echarts.init(document.getElementById('six'));
     var value = 100;
@@ -787,12 +809,19 @@
 
         $.each(fourData, function (index, item) {
 
-            var colorData = ["#808080", "#A2945E", "#B3764D", "#482F1F"];
+            //var colorData = ["#808080", "#A2945E", "#B3764D", "#482F1F"];
+            //if (item.RunType == 2) {
+            //    colorData = ["#A2945E", "#4444BB", "#D52B6F", "#DD226D"];
+            //}
+            //if (item.RunType == 3) {
+            //    colorData = ["#CCCC33", "#8FCC33", "#57C43C", "#22DD48"];
+            //}
+            var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"];
             if (item.RunType == 2) {
-                colorData = ["#A2945E", "#4444BB", "#D52B6F", "#DD226D"];
+                colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"];
             }
             if (item.RunType == 3) {
-                colorData = ["#CCCC33", "#8FCC33", "#57C43C", "#22DD48"];
+                colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"];
             }
             var chart = echarts.init(document.getElementById('four' + index));
             var value = 100;
@@ -805,13 +834,13 @@
                     top: '45%', //top待调整
                     textStyle: {
                         color: '#fff',
-                        fontSize: 9,
-                        fontFamily: 'DINAlternate-Bold',
+                        fontSize: 10,
+                        fontFamily: 'Microsoft YaHei',
                     },
                     subtextStyle: {
-                        color: '#ff',
-                        fontSize: 9,
-                        fontFamily: 'PingFangSC-Regular',
+                        color: '#fff',
+                        fontSize: 10,
+                        fontFamily: 'Microsoft YaHei',
                         top: 'center'
                     },
                     itemGap: 10 //主副标题间距
@@ -890,10 +919,10 @@
 
             var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"];
             if (item.RunType == 2) {
-                colorData = ["#A5F82A", "#2AF853", "#31F0F0", "#3FC1E2"];
+                colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"];
             }
             if (item.RunType == 3) {
-                colorData = ["#F82AF8", "#F0A431", "#E95B39", "#F82A2A"];
+                colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"];
             }
             var chart = echarts.init(document.getElementById('five' + index));
             var value = 100;
@@ -906,13 +935,13 @@
                     top: '45%', //top待调整
                     textStyle: {
                         color: '#fff',
-                        fontSize: 9,
-                        fontFamily: 'DINAlternate-Bold',
+                        fontSize: 10,
+                        fontFamily: 'Microsoft YaHei',
                     },
                     subtextStyle: {
                         color: '#ff',
                         fontSize: 9,
-                        fontFamily: 'PingFangSC-Regular',
+                        fontFamily: 'Microsoft YaHei',
                         top: 'center'
                     },
                     itemGap: 10 //主副标题间距