From 9dd1f274817c1ffac33dfee1a550eb2760b6f675 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 18 Nov 2022 16:56:10 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B4=A8=E9=87=8F=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E7=9A=84=E6=A0=87=E9=A2=98+legend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TechyAnalysisHeader.vue        |  28 +-
 src/views/QualityManager/HomePage.vue         |  18 +-
 .../components/TechyAnalysisHeader.vue        | 323 +++++++++++++-----
 .../components/charts/newBar.vue              |   7 +-
 4 files changed, 270 insertions(+), 106 deletions(-)

diff --git a/src/views/EquipmentManager/components/TechyAnalysisHeader.vue b/src/views/EquipmentManager/components/TechyAnalysisHeader.vue
index 43ca9a0..8ad3ede 100644
--- a/src/views/EquipmentManager/components/TechyAnalysisHeader.vue
+++ b/src/views/EquipmentManager/components/TechyAnalysisHeader.vue
@@ -1,10 +1,22 @@
 <template>
   <div class="techy-analysis-header">
-    <span style="display: inline-block; width: calc(56px * var(--beilv)); height: calc(13px * var(--beilv));" v-html="titleLeftSVG" />
-    <span class="techy-analysis-header__title">
-      <slot />
-    </span>
-    <span style="display: inline-block; width: calc(56px * var(--beilv)); height: calc(13px * var(--beilv));"  v-html="titleRightSVG" />
+    <template v-if="type === 'special'">
+      <div style="background: #cccc; width: 200px; height: 20px;"></div>
+    </template>
+
+    <template v-else>
+      <span
+        style="display: inline-block; width: calc(56px * var(--beilv)); height: calc(13px * var(--beilv));"
+        v-html="titleLeftSVG"
+      />
+      <span class="techy-analysis-header__title">
+        <slot />
+      </span>
+      <span
+        style="display: inline-block; width: calc(56px * var(--beilv)); height: calc(13px * var(--beilv));"
+        v-html="titleRightSVG"
+      />
+    </template>
   </div>
 </template>
 
@@ -109,6 +121,12 @@ const titleRightSVG = `<svg
 
 export default {
   name: 'TechyAnalysisHeader',
+  props: {
+    type: {
+      type: String,
+      default: 'default-type'
+    }
+  },
   data() {
     return { titleLeftSVG, titleRightSVG }
   }
diff --git a/src/views/QualityManager/HomePage.vue b/src/views/QualityManager/HomePage.vue
index 0f90051..2d0f38e 100644
--- a/src/views/QualityManager/HomePage.vue
+++ b/src/views/QualityManager/HomePage.vue
@@ -38,10 +38,10 @@
             <!-- 第一行 -->
             <div class="quality-analysis__body__row-1">
               <!-- 第一列 -->
-              <div class="grow-8 flex gap-16">
-                <div class="grow">
-                  <techy-box class="" style="padding: calc(16px * var(--beilv));">
-                    <techy-analysis-header>产线缺陷日对比</techy-analysis-header>
+              <div class="flex gap-16">
+                <div class="grow" style="max-width: 24vw;">
+                  <techy-box class="" style="padding: calc(8px * var(--beilv));">
+                    <techy-analysis-header type="special">产线缺陷日对比</techy-analysis-header>
                     <div
                       class="absolute top-0 left-0"
                       style="position: absolute; width: 100%; height: 100%; top: 0; left: 0;"
@@ -67,9 +67,9 @@
                     </div>
                   </techy-box>
                 </div>
-                <div class="grow">
-                  <techy-box class="" style="padding: calc(16px * var(--beilv));">
-                    <techy-analysis-header>产线缺陷月对比</techy-analysis-header>
+                <div class="grow" style="max-width: 24vw;">
+                  <techy-box class="" style="padding: calc(8px * var(--beilv));">
+                    <techy-analysis-header type="special">产线缺陷月对比</techy-analysis-header>
                     <div
                       class="absolute top-0 left-0"
                       style="position: absolute; width: 100%; height: 100%; top: 0; left: 0;"
@@ -99,7 +99,7 @@
               </div>
 
               <!-- 第二列 -->
-              <div class="grow-6 flex gap-16">
+              <div class="grow flex gap-16">
                 <div class="width-222">
                   <techy-box class="" style="padding: calc(16px * var(--beilv));">
                     <techy-analysis-header :show-top-icon="false">产线缺陷分析</techy-analysis-header>
@@ -554,7 +554,7 @@ export default {
 .date-select {
   position: absolute;
   top: calc(16px * var(--beilv));
-  right: calc(10px * var(--beilv));
+  right: calc(22px * var(--beilv));
   border-radius: calc(2px * var(--beilv));
   overflow: hidden;
   display: flex;
diff --git a/src/views/QualityManager/components/TechyAnalysisHeader.vue b/src/views/QualityManager/components/TechyAnalysisHeader.vue
index f1669e1..0ca14ec 100644
--- a/src/views/QualityManager/components/TechyAnalysisHeader.vue
+++ b/src/views/QualityManager/components/TechyAnalysisHeader.vue
@@ -1,104 +1,221 @@
 <template>
   <div class="techy-analysis-header">
-    <span v-if="showTopIcon" class="top-icon">
-      <svg
-        width="100%"
-        height="100%"
-        viewBox="0 0 56 13"
-        version="1.1"
-        xmlns="http://www.w3.org/2000/svg"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
+    <template v-if="type === 'special'">
+      <div
+        style="background: #ccc0; width: 100%; height: calc(22px * var(--beilv)); display: flex; justify-content: center; align-items: center;"
       >
-        <title>left</title>
-        <g id="2MES。2-6蓝底-7、8白底" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-          <g id="2-5质量管理" transform="translate(-419.000000, -808.000000)" fill="#31A6AE">
-            <g id="编组-16备份-7" transform="translate(360.000000, 513.000000)">
-              <g id="编组-20备份" transform="translate(24.000000, 277.000000)">
-                <g id="编组-13备份" transform="translate(35.000000, 16.000000)">
-                  <g
-                    id="编组-2备份"
-                    transform="translate(28.000000, 8.500000) scale(1, -1) translate(-28.000000, -8.500000) translate(0.000000, 2.000000)"
-                  >
-                    <polygon id="路径-11" points="47.1645736 7.79376563e-14 43 0 52.2664792 13 56 13"></polygon>
-                    <polygon
-                      id="路径-11备份"
-                      opacity="0.8"
-                      points="36.1645736 7.79376563e-14 32 0 41.2664792 13 45 13"
-                    ></polygon>
-                    <polygon
-                      id="路径-11备份-3"
-                      opacity="0.4"
-                      points="14.1645736 7.79376563e-14 10 0 19.2664792 13 23 13"
-                    ></polygon>
-                    <polygon
-                      id="路径-11备份-2"
-                      opacity="0.601434"
-                      points="25.1645736 7.79376563e-14 21 0 30.2664792 13 34 13"
-                    ></polygon>
-                    <polygon
-                      id="路径-11备份-4"
-                      opacity="0.201434"
-                      points="4.16457365 7.79376563e-14 5.06480115e-16 0 9.26647921 13 13 13"
-                    ></polygon>
+        <div class="legend" style="background: #fff0; width: calc(126px * var(--beilv));"></div>
+
+        <div style="flex: 1; white-space: nowrap; overflow: hidden;">
+          <span class="top-icon">
+            <svg
+              width="100%"
+              height="100%"
+              viewBox="0 0 56 13"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              xmlns:xlink="http://www.w3.org/1999/xlink"
+            >
+              <title>left</title>
+              <g id="2MES。2-6蓝底-7、8白底" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                <g id="2-5质量管理" transform="translate(-419.000000, -808.000000)" fill="#31A6AE">
+                  <g id="编组-16备份-7" transform="translate(360.000000, 513.000000)">
+                    <g id="编组-20备份" transform="translate(24.000000, 277.000000)">
+                      <g id="编组-13备份" transform="translate(35.000000, 16.000000)">
+                        <g
+                          id="编组-2备份"
+                          transform="translate(28.000000, 8.500000) scale(1, -1) translate(-28.000000, -8.500000) translate(0.000000, 2.000000)"
+                        >
+                          <polygon id="路径-11" points="47.1645736 7.79376563e-14 43 0 52.2664792 13 56 13"></polygon>
+                          <polygon
+                            id="路径-11备份"
+                            opacity="0.8"
+                            points="36.1645736 7.79376563e-14 32 0 41.2664792 13 45 13"
+                          ></polygon>
+                          <polygon
+                            id="路径-11备份-3"
+                            opacity="0.4"
+                            points="14.1645736 7.79376563e-14 10 0 19.2664792 13 23 13"
+                          ></polygon>
+                          <polygon
+                            id="路径-11备份-2"
+                            opacity="0.601434"
+                            points="25.1645736 7.79376563e-14 21 0 30.2664792 13 34 13"
+                          ></polygon>
+                          <polygon
+                            id="路径-11备份-4"
+                            opacity="0.201434"
+                            points="4.16457365 7.79376563e-14 5.06480115e-16 0 9.26647921 13 13 13"
+                          ></polygon>
+                        </g>
+                      </g>
+                    </g>
+                  </g>
+                </g>
+              </g>
+            </svg>
+          </span>
+          <span class="techy-analysis-header__title">
+            <slot />
+          </span>
+          <span class="top-icon">
+            <svg
+              width="100%"
+              height="100%"
+              viewBox="0 0 56 13"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              xmlns:xlink="http://www.w3.org/1999/xlink"
+            >
+              <title>right</title>
+              <g id="2MES。2-6蓝底-7、8白底" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                <g id="2-5质量管理" transform="translate(-653.000000, -808.000000)" fill="#31A6AE">
+                  <g id="编组-16备份-7" transform="translate(360.000000, 513.000000)">
+                    <g id="编组-20备份" transform="translate(24.000000, 277.000000)">
+                      <g id="编组-13备份" transform="translate(35.000000, 16.000000)">
+                        <g
+                          id="编组-2备份-2"
+                          transform="translate(262.000000, 8.500000) scale(-1, -1) translate(-262.000000, -8.500000) translate(234.000000, 2.000000)"
+                        >
+                          <polygon id="路径-11" points="47.1645736 7.79376563e-14 43 0 52.2664792 13 56 13"></polygon>
+                          <polygon
+                            id="路径-11备份"
+                            opacity="0.8"
+                            points="36.1645736 7.79376563e-14 32 0 41.2664792 13 45 13"
+                          ></polygon>
+                          <polygon
+                            id="路径-11备份-3"
+                            opacity="0.4"
+                            points="14.1645736 7.79376563e-14 10 0 19.2664792 13 23 13"
+                          ></polygon>
+                          <polygon
+                            id="路径-11备份-2"
+                            opacity="0.601434"
+                            points="25.1645736 7.79376563e-14 21 0 30.2664792 13 34 13"
+                          ></polygon>
+                          <polygon
+                            id="路径-11备份-4"
+                            opacity="0.201434"
+                            points="4.16457365 7.79376563e-14 5.06480115e-16 0 9.26647921 13 13 13"
+                          ></polygon>
+                        </g>
+                      </g>
+                    </g>
+                  </g>
+                </g>
+              </g>
+            </svg>
+          </span>
+        </div>
+
+        <div class="legend" style="background: #fff0; width: calc(126px * var(--beilv)); padding-left: calc(8px * var(--beilv));">
+          <div class="legend-item pla" style="margin-right: calc(8px * var(--beilv));">产线A</div>
+          <div class="legend-item plb">产线B</div>
+        </div>
+      </div>
+    </template>
+
+    <template v-else>
+      <span v-if="showTopIcon" class="top-icon">
+        <svg
+          width="100%"
+          height="100%"
+          viewBox="0 0 56 13"
+          version="1.1"
+          xmlns="http://www.w3.org/2000/svg"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+        >
+          <title>left</title>
+          <g id="2MES。2-6蓝底-7、8白底" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+            <g id="2-5质量管理" transform="translate(-419.000000, -808.000000)" fill="#31A6AE">
+              <g id="编组-16备份-7" transform="translate(360.000000, 513.000000)">
+                <g id="编组-20备份" transform="translate(24.000000, 277.000000)">
+                  <g id="编组-13备份" transform="translate(35.000000, 16.000000)">
+                    <g
+                      id="编组-2备份"
+                      transform="translate(28.000000, 8.500000) scale(1, -1) translate(-28.000000, -8.500000) translate(0.000000, 2.000000)"
+                    >
+                      <polygon id="路径-11" points="47.1645736 7.79376563e-14 43 0 52.2664792 13 56 13"></polygon>
+                      <polygon
+                        id="路径-11备份"
+                        opacity="0.8"
+                        points="36.1645736 7.79376563e-14 32 0 41.2664792 13 45 13"
+                      ></polygon>
+                      <polygon
+                        id="路径-11备份-3"
+                        opacity="0.4"
+                        points="14.1645736 7.79376563e-14 10 0 19.2664792 13 23 13"
+                      ></polygon>
+                      <polygon
+                        id="路径-11备份-2"
+                        opacity="0.601434"
+                        points="25.1645736 7.79376563e-14 21 0 30.2664792 13 34 13"
+                      ></polygon>
+                      <polygon
+                        id="路径-11备份-4"
+                        opacity="0.201434"
+                        points="4.16457365 7.79376563e-14 5.06480115e-16 0 9.26647921 13 13 13"
+                      ></polygon>
+                    </g>
                   </g>
                 </g>
               </g>
             </g>
           </g>
-        </g>
-      </svg>
-    </span>
-    <span class="techy-analysis-header__title">
-      <slot />
-    </span>
-    <span v-if="showTopIcon" class="top-icon">
-      <svg
-        width="100%"
-        height="100%"
-        viewBox="0 0 56 13"
-        version="1.1"
-        xmlns="http://www.w3.org/2000/svg"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-      >
-        <title>right</title>
-        <g id="2MES。2-6蓝底-7、8白底" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-          <g id="2-5质量管理" transform="translate(-653.000000, -808.000000)" fill="#31A6AE">
-            <g id="编组-16备份-7" transform="translate(360.000000, 513.000000)">
-              <g id="编组-20备份" transform="translate(24.000000, 277.000000)">
-                <g id="编组-13备份" transform="translate(35.000000, 16.000000)">
-                  <g
-                    id="编组-2备份-2"
-                    transform="translate(262.000000, 8.500000) scale(-1, -1) translate(-262.000000, -8.500000) translate(234.000000, 2.000000)"
-                  >
-                    <polygon id="路径-11" points="47.1645736 7.79376563e-14 43 0 52.2664792 13 56 13"></polygon>
-                    <polygon
-                      id="路径-11备份"
-                      opacity="0.8"
-                      points="36.1645736 7.79376563e-14 32 0 41.2664792 13 45 13"
-                    ></polygon>
-                    <polygon
-                      id="路径-11备份-3"
-                      opacity="0.4"
-                      points="14.1645736 7.79376563e-14 10 0 19.2664792 13 23 13"
-                    ></polygon>
-                    <polygon
-                      id="路径-11备份-2"
-                      opacity="0.601434"
-                      points="25.1645736 7.79376563e-14 21 0 30.2664792 13 34 13"
-                    ></polygon>
-                    <polygon
-                      id="路径-11备份-4"
-                      opacity="0.201434"
-                      points="4.16457365 7.79376563e-14 5.06480115e-16 0 9.26647921 13 13 13"
-                    ></polygon>
+        </svg>
+      </span>
+      <span class="techy-analysis-header__title">
+        <slot />
+      </span>
+      <span v-if="showTopIcon" class="top-icon">
+        <svg
+          width="100%"
+          height="100%"
+          viewBox="0 0 56 13"
+          version="1.1"
+          xmlns="http://www.w3.org/2000/svg"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+        >
+          <title>right</title>
+          <g id="2MES。2-6蓝底-7、8白底" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+            <g id="2-5质量管理" transform="translate(-653.000000, -808.000000)" fill="#31A6AE">
+              <g id="编组-16备份-7" transform="translate(360.000000, 513.000000)">
+                <g id="编组-20备份" transform="translate(24.000000, 277.000000)">
+                  <g id="编组-13备份" transform="translate(35.000000, 16.000000)">
+                    <g
+                      id="编组-2备份-2"
+                      transform="translate(262.000000, 8.500000) scale(-1, -1) translate(-262.000000, -8.500000) translate(234.000000, 2.000000)"
+                    >
+                      <polygon id="路径-11" points="47.1645736 7.79376563e-14 43 0 52.2664792 13 56 13"></polygon>
+                      <polygon
+                        id="路径-11备份"
+                        opacity="0.8"
+                        points="36.1645736 7.79376563e-14 32 0 41.2664792 13 45 13"
+                      ></polygon>
+                      <polygon
+                        id="路径-11备份-3"
+                        opacity="0.4"
+                        points="14.1645736 7.79376563e-14 10 0 19.2664792 13 23 13"
+                      ></polygon>
+                      <polygon
+                        id="路径-11备份-2"
+                        opacity="0.601434"
+                        points="25.1645736 7.79376563e-14 21 0 30.2664792 13 34 13"
+                      ></polygon>
+                      <polygon
+                        id="路径-11备份-4"
+                        opacity="0.201434"
+                        points="4.16457365 7.79376563e-14 5.06480115e-16 0 9.26647921 13 13 13"
+                      ></polygon>
+                    </g>
                   </g>
                 </g>
               </g>
             </g>
           </g>
-        </g>
-      </svg>
-    </span>
+        </svg>
+      </span>
+    </template>
   </div>
 </template>
 
@@ -106,6 +223,10 @@
 export default {
   name: 'TechyAnalysisHeader',
   props: {
+    type: {
+      type: String,
+      default: 'dafault-type'
+    },
     showTopIcon: {
       type: Boolean,
       default: true
@@ -132,6 +253,30 @@ export default {
 .top-icon {
   display: inline-block;
   width: calc(56px * var(--beilv));
-  height: calc(13px * var(--beilv));
+  height: calc(12px * var(--beilv));
+  margin-bottom: calc(2px * var(--beilv));
+}
+
+.legend-item {
+  font-size: calc(10px * var(--beilv));
+  line-height: 1.5;
+  color: #dff1fe;
+  display: inline-block;
+}
+
+.legend-item::before {
+  content: '';
+  display: inline-block;
+  width: calc(8px * var(--beilv));
+  height: calc(8px * var(--beilv));
+  background: #fffc;
+  margin-right: calc(8px * var(--beilv));
+}
+
+.pla::before {
+  background: linear-gradient(to top, #49fbd6, transparent);
+}
+.plb::before {
+  background: linear-gradient(to top, #49b2ff, transparent);
 }
 </style>
diff --git a/src/views/QualityManager/components/charts/newBar.vue b/src/views/QualityManager/components/charts/newBar.vue
index 378fb92..5fbdacf 100644
--- a/src/views/QualityManager/components/charts/newBar.vue
+++ b/src/views/QualityManager/components/charts/newBar.vue
@@ -250,14 +250,15 @@ export default {
           containLabel: true
         },
         legend: {
-          itemWidth: 8,
-          itemHeight: 8,
+          show: false,
+          itemWidth: 10,
+          itemHeight: 10,
           selectedMode: false,
           top: '7%',
           right: '2%',
           textStyle: {
             color: '#fff9',
-            fontSize: 10
+            fontSize: 12
           }
         },
         xAxis: {