src/views/copilot/components/BarChartBase.vue

@@ -62,32 +62,7 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {
+        tooltip: {},
-          trigger: "axis",
-          axisPointer: {
-            // type: "cross",
-            crossStyle: {
-              color: "rgba(237,237,237,0.5)",
-            },
-          },
-          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
-          backgroundColor: '#001829',
-          borderColor: '#001829',
-          formatter: params => {
-            console.log('params', params)
-            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
-            for (var i = 0, l = params.length; i < l; i++) {
-              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
-              // console.log(item.color, color);
-              res +=
-                "<br/>" +
-                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
-                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
-                `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
-            }
-            return res;
-          },
-        },
         xAxis: {
           axisTick: {
             show: false,
@@ -213,13 +188,13 @@ export default {
       this.canvasReset()
     },
     isFullscreen(val) {
-      this.options.series.map((item) => {
+      this.actualOptions.series.map((item) => {
         item.barWidth = val ? 18 : 12;
       });
-      this.options.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.options.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.options.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.options);
+      this.initChart(this.actualOptions);
       // this.actualOptions.series.map((item) => {
       //   item.barWidth = val ? 18 : 12;
       // });
@@ -234,14 +209,14 @@ export default {
         this.initChart(this.options);
         return;
       }
-      // const actualOptions = JSON.parse(JSON.stringify(this.options));
+      const actualOptions = JSON.parse(JSON.stringify(this.options));
-      // console.log('actualOptions', this.options)
+      console.log('actualOptions', this.options)
-      this.options.series[0].data = val[0].data;
+      actualOptions.series[0].data = val[0].data;
-      this.options.series[0].name = val[0].name;
+      actualOptions.series[0].name = val[0].name;
-      this.options.series[1].data = val?.[1]?.data || [];
+      actualOptions.series[1].data = val?.[1]?.data || [];
-      this.options.series[1].name = val?.[1]?.name || "";
+      actualOptions.series[1].name = val?.[1]?.name || "";
-      // this.actualOptions = actualOptions;
+      this.actualOptions = actualOptions;
-      this.initChart(this.options);
+      this.initChart(actualOptions);
     },
   },
   mounted() {
@@ -250,7 +225,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    // this.actualOptions = this.options
+    this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -274,7 +249,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.chart);
-      this.chart.setOption(this.options);
+      this.chart.setOption(this.actualOptions);
     },
   },
 };

src/views/copilot/components/ftoBarChartBase.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-23 15:49:14
- * @LastEditTime: 2024-07-03 14:08:52
+ * @LastEditTime: 2024-06-04 08:54:10
  * @LastEditors: zhp
  * @Description:
 -->
@@ -63,32 +63,7 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {
+        tooltip: {},
-          trigger: "axis",
-          axisPointer: {
-            // type: "cross",
-            crossStyle: {
-              color: "rgba(237,237,237,0.5)",
-            },
-          },
-          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
-          backgroundColor: '#001829',
-          borderColor: '#001829',
-          formatter: params => {
-            console.log('params', params)
-            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
-            for (var i = 0, l = params.length; i < l; i++) {
-              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
-              // console.log(item.color, color);
-              res +=
-                "<br/>" +
-                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
-                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
-              `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
-            }
-            return res;
-          },
-        },
         xAxis: {
           axisTick: {
             show: false,
@@ -214,13 +189,13 @@ export default {
       this.canvasReset()
     },
     isFullscreen(val) {
-      this.options.series.map((item) => {
+      this.actualOptions.series.map((item) => {
         item.barWidth = val ? 18 : 12;
       });
-      this.options.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.options.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.options.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.options);
+      this.initChart(this.actualOptions);
       // this.actualOptions.series.map((item) => {
       //   item.barWidth = val ? 18 : 12;
       // });
@@ -235,14 +210,14 @@ export default {
         this.initChart(this.options);
         return;
       }
-      // const actualOptions = JSON.parse(JSON.stringify(this.options));
+      const actualOptions = JSON.parse(JSON.stringify(this.options));
-      // console.log('actualOptions', this.options)
+      console.log('actualOptions', this.options)
-      this.options.series[0].data = val[0].data;
+      actualOptions.series[0].data = val[0].data;
-      this.options.series[0].name = val[0].name;
+      actualOptions.series[0].name = val[0].name;
-      this.options.series[1].data = val[1].data;
+      actualOptions.series[1].data = val[1].data;
-      this.options.series[1].name = val[1].name;
+      actualOptions.series[1].name = val[1].name;
-      // this.actualOptions = actualOptions;
+      this.actualOptions = actualOptions;
-      this.initChart(this.options);
+      this.initChart(actualOptions);
     },
   },
   mounted() {
@@ -251,7 +226,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    // this.actualOptions = this.options
+    this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -275,7 +250,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.ftoChart);
-      this.chart.setOption(this.options);
+      this.chart.setOption(this.actualOptions);
     },
   },
 };

src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 13:22:43
- * @LastEditTime: 2024-07-03 14:08:44
+ * @LastEditTime: 2024-06-17 09:22:17
  * @LastEditors: zhp
  * @Description:
 -->
@@ -62,32 +62,7 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {
+        tooltip: {},
-          trigger: "axis",
-          axisPointer: {
-            // type: "cross",
-            crossStyle: {
-              color: "rgba(237,237,237,0.5)",
-            },
-          },
-          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
-          backgroundColor: '#001829',
-          borderColor: '#001829',
-          formatter: params => {
-            console.log('params', params)
-            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
-            for (var i = 0, l = params.length; i < l; i++) {
-              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
-              // console.log(item.color, color);
-              res +=
-                "<br/>" +
-                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
-                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
-              `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
-            }
-            return res;
-          },
-        },
         xAxis: {
           axisTick: {
             show: false,
@@ -266,7 +241,7 @@ export default {
       // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.options)
+      this.initChart(this.actualOptions)
       this.canvasReset()
     },
     series(val) {
@@ -277,14 +252,14 @@ export default {
       // console.log('val', val)
       const actualOptions = JSON.parse(JSON.stringify(this.options))
       console.log(actualOptions)
-      this.options.series[0].data = val[0].data;
+      actualOptions.series[0].data = val[0].data;
-      this.options.series[0].name = val[0].name;
+      actualOptions.series[0].name = val[0].name;
-      this.options.series[1].data = val?.[1]?.data;
+      actualOptions.series[1].data = val?.[1]?.data;
-      this.options.series[1].name = val?.[1]?.name;
+      actualOptions.series[1].name = val?.[1]?.name;
-      this.options.series[2].data = val?.[2]?.data || [];
+      actualOptions.series[2].data = val?.[2]?.data || [];
-      this.options.series[2].name = val?.[2]?.name || "";
+      actualOptions.series[2].name = val?.[2]?.name || "";
       this.actualOptions = actualOptions;
-      this.initChart(this.options);
+      this.initChart(actualOptions);
     },
   },
   mounted() {
@@ -298,7 +273,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    // this.actualOptions = this.options
+    this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -321,7 +296,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.oeeChart);
-      this.chart.setOption(this.options);
+      this.chart.setOption(this.actualOptions);
     },
   },
 };

src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-23 15:50:44
- * @LastEditTime: 2024-07-03 14:08:12
+ * @LastEditTime: 2024-06-17 09:23:39
  * @LastEditors: zhp
  * @Description:
 -->
@@ -62,32 +62,7 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {
+        tooltip: {},
-          trigger: "axis",
-          axisPointer: {
-            // type: "cross",
-            crossStyle: {
-              color: "rgba(237,237,237,0.5)",
-            },
-          },
-          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
-          backgroundColor: '#001829',
-          borderColor: '#001829',
-          formatter: params => {
-            console.log('params', params)
-            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
-            for (var i = 0, l = params.length; i < l; i++) {
-              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
-              // console.log(item.color, color);
-              res +=
-                "<br/>" +
-                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
-                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
-              `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
-            }
-            return res;
-          },
-        },
         xAxis: {
           axisTick: {
             show: false,
@@ -266,7 +241,7 @@ export default {
       // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.options)
+      this.initChart(this.actualOptions)
       this.canvasReset()
     },
     series(val) {
@@ -275,15 +250,15 @@ export default {
         return;
       }
       console.log(val)
-      // const actualOptions = JSON.parse(JSON.stringify(this.options))
+      const actualOptions = JSON.parse(JSON.stringify(this.options))
-      this.options.series[0].data = val[0].data;
+      actualOptions.series[0].data = val[0].data;
-      this.options.series[0].name = val[0].name;
+      actualOptions.series[0].name = val[0].name;
-      this.options.series[1].data = val?.[1]?.data || [];
+      actualOptions.series[1].data = val?.[1]?.data || [];
-      this.options.series[1].name = val?.[1]?.name || "";
+      actualOptions.series[1].name = val?.[1]?.name || "";
-      this.options.series[2].data = val?.[2]?.data || [];
+      actualOptions.series[2].data = val?.[2]?.data || [];
-      this.options.series[2].name = val?.[2]?.name || "";
+      actualOptions.series[2].name = val?.[2]?.name || "";
-      // this.actualOptions = actualOptions;
+      this.actualOptions = actualOptions;
-      this.initChart(this.options);
+      this.initChart(actualOptions);
     },
   },
   mounted() {
@@ -297,7 +272,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    // this.actualOptions = this.options
+    this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -320,7 +295,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.oeeChart);
-      this.chart.setOption(this.options);
+      this.chart.setOption(this.actualOptions);
     },
   },
 };

src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue

@@ -318,8 +318,6 @@ export default {
   .legend-item {
     margin-left: 15px;
     display: flex;
-    font-size: 16px;
-    // font-weight: 600;
     flex-direction: column;
     // align-items: center;
     align-items: flex-start;
@@ -373,6 +371,8 @@ export default {
   background: #003982;
 }
   .legend-item__value {
+    font-size: 24px;
+    font-weight: 600;
   }
 }
 </style>

src/views/copilot/factoryData/components/BarChartBase.vue

@@ -80,7 +80,7 @@ export default {
               res +=
                 `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
               `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${params[0].axisValueLabel}</span>` +
-              `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
+              `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value + '片'}</span>`;
             }
             return res;
           },
@@ -117,7 +117,6 @@ export default {
         yAxis: {
             type: "value",
             name: "单位/片",
-            position: 'left',
             nameTextStyle: {
               color: "rgba(255, 255, 255, 0.7)",
               fontSize: 12,

src/views/copilot/factoryData/components/BarChartChipOEE.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-30 08:58:39
- * @LastEditTime: 2024-07-03 14:10:06
+ * @LastEditTime: 2024-07-02 10:53:34
  * @LastEditors: zhp
  * @Description:
 -->
@@ -110,7 +110,7 @@ export default {
                   "<br/>" +
                   `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
                   `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
-                  `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
+                  `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value + '片'}</span>`;
               }
               return res;
             },
@@ -132,7 +132,6 @@ export default {
         },
         yAxis: {
           name: "单位/片",
-          position: 'left',
           nameTextStyle: {
             color: "#fff",
             fontSize: 12,
@@ -338,7 +337,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-
 .bar-chart-base {
   // position: relative;
 
@@ -352,7 +350,7 @@ export default {
     position: relative;
     // font-size: 12px;
     margin-right:1.2vw;
-    color: #DFF1FE;
+
     &::before {
       content: "";
       display: inline-block;

src/views/copilot/factoryData/components/Order.vue

@@ -40,7 +40,6 @@ export default {
         evenRowBGC: "rgba(rgba(2, 13, 45, 0.18)",
         data: [],
         rowNum: 12,
-        fontSize:14,
         waitTime: 3000,
         columnWidth: [150],
         align: ["left"],
@@ -114,19 +113,19 @@ export default {
               `<span title=${this.prodOrder[i].actualProduction || ""}>${this.prodOrder[i].actualProduction || ""
               }</span>`,
               `<span style="display:inline-block;width:45px;">${this.prodOrder[i].productionProgress
-                ? this.prodOrder[i].productionProgress.toFixed(0) * 100 + "%"
+                ? this.prodOrder[i].productionProgress.toFixed(0) + "%"
                 : "0%"
               }</span>
             <div style="display:inline-block;height:20px;margin-top:-5px;vertical-align:middle;">
             <svg xmlns="http://www.w3.org/200/svg" height="20" width="20">
               <circle cx="10" cy="10" r="6" fill="none" stroke="#283851" stroke-width="4" stroke-linecap="round"/>
               <circle style="transform-origin: center;transform: rotate(-90deg);" id="J_progress_bar" cx="10" cy="10" r="6" fill="none" stroke="#47FF27" stroke-width="4" stroke-dasharray="${this.prodOrder[i].productionProgress
-                ? this.prodOrder[i].productionProgress.toFixed(0) *100 *
+                ? this.prodOrder[i].productionProgress.toFixed(0) *
                 37.68 *
                 0.01 +
                 "," +
                 (1 -
-                  this.prodOrder[i].productionProgress.toFixed(0) * 0.01) * 100 *
+                  this.prodOrder[i].productionProgress.toFixed(0) * 0.01) *
                 37.68
                 : 0 + "," + 37.68
               }"/>

src/views/copilot/factoryData/components/ProdMonitor.vue

@@ -249,7 +249,7 @@ export default {
           // width: 5vw;
           color: #FFFFFF;
           line-height: 24px;
-          // text-align: left;
+          text-align: left;
           font-style: normal;
           display: inline-block;
       }

src/views/copilot/factoryData/components/button.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-06 14:22:56
- * @LastEditTime: 2024-07-02 13:54:08
+ * @LastEditTime: 2024-06-07 10:53:39
  * @LastEditors: zhp
  * @Description:
 -->
@@ -62,7 +62,7 @@ button {
   font-size: 16px;
   color: #FFFFFF;
   line-height: 22px;
-  /* letter-spacing: 5px; */
+  letter-spacing: 5px;
   text-align: center;
   font-style: normal;
   letter-spacing: 10px;

src/views/copilot/factoryData/components/leftContainer.vue

@@ -116,12 +116,7 @@ export default {
     border-radius: 2px;
     left: 8%;
     bottom: 0;
-     background: radial-gradient(
+    background: linear-gradient(to right, #024798, transparent);
-      circle at center,
-      #024798 2%,
-      #024798 30%,
-      transparent
-    );
     z-index: 0;
   }
 

src/views/copilot/factoryData/components/rightContainer.vue

@@ -79,13 +79,14 @@ export default {
 
 <style scoped lang="scss">
 .copilot-container {
-  height: 100%;
+  height: 0;
   flex: 1;
   display: flex;
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
   backdrop-filter: blur(4px);
+
   &::before {
     content: "";
     position: absolute;

src/views/copilot/factoryData/index.vue

@@ -196,7 +196,7 @@ export default {
     gap: 16px;
     .flex {
       display: flex;
-      gap: 16px;
+      gap: 20px;
       flex: 1;
     }
     .top > div,

src/views/dashboard/charts/ChipYieldChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-07-03 15:56:48
+ * @LastEditTime: 2024-06-14 09:03:26
  * @LastEditors: zhp
  * @Description:
 -->
@@ -53,32 +53,7 @@ export default {
           top: 0,
           containLabel: true,
         },
-        tooltip: {
+        tooltip: {},
-          trigger: "item",
-          // axisPointer: {
-          //   // type: "cross",
-          //   crossStyle: {
-          //     color: "rgba(237,237,237,0.5)",
-          //   },
-          // },
-          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
-          backgroundColor: '#001829',
-          borderColor: '#001829',
-          formatter: params => {
-            console.log('params', params)
-            var res = ``;
-            for (var i = 0, l = params.length; i < l; i++) {
-              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
-              // console.log(item.color, color);
-              res +=
-                // `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
-                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${params[0].axisValueLabel}</span>` +
-                `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
-            }
-            console.log('res',res)
-            return res;
-          },
-        },
         title: {
           text: "0%",
           left: "48%",
@@ -248,49 +223,40 @@ export default {
     actualOptions() {
       console.log('this.output.current / this.output.target', this.output.current/this.output.target);
       const year = new Date().getFullYear()
-      const options = this.options
+      const options = JSON.parse(JSON.stringify(this.options));
       // console.log('options', options);
       // 标题
-      if (!this.output.target && !this.output.current) options.title.text = "0%";
+      if (!this.output.target) options.title.text = "0%";
-      else if (!this.output.target && this.output.current) options.title.text = "100%";
+      else
-      else options.title.text =
+        options.title.text =
-        ((this.output.current / this.output.target).toFixed(2)) * 100 + "%";
+          ((this.output.current / this.output.target).toFixed(2)) * 100 + "%";
       // 外环
       if (
         this.output.current == this.output.target &&
         this.output.current == 0
       ) {
-        this.options.series[1].data[0].value = 0;
+        options.series[1].data[0].value = 0;
-        this.options.series[1].data[1].value = 1;
+        options.series[1].data[1].value = 1;
-        this.options.series[1].data[0].tooltip.formatter =
+        options.series[1].data[0].tooltip.formatter = year + '累计完成:0';
-          `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year + '累计完成'}</span>` +
+        options.series[1].data[1].tooltip.formatter = year + '累计完成:0';
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${0 + '片'}</span>`;
-        this.options.series[1].data[1].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year + '累计完成'}</span>` +
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${0 + '片'}</span>`;
       } else {
-        this.options.series[1].data[0].value = this.output.current;
+        options.series[1].data[0].value = this.output.current;
-        this.options.series[1].data[1].value =
+        options.series[1].data[1].value =
           this.output.target - this.output.current;
-        this.options.series[1].data[0].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year + '累计完成'}</span>` +
+        options.series[1].data[0].tooltip.formatter = year + '累计完成:' + this.output.current;
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${this.output.current + '片'}</span>`;
+        options.series[1].data[1].tooltip.formatter = year + '累计完成:' + this.output.current;
-        this.options.series[1].data[1].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year + '累计完成'}</span>` +
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${this.output.current + '片'}</span>`;
       }
       // 内环
       if (this.output.previous == 0) {
-        this.options.series[2].data[0].value = 0;
+        options.series[2].data[0].value = 0;
-        this.options.series[2].data[1].value = 1;
+        options.series[2].data[1].value = 1;
-        this.options.series[2].data[0].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year -1 + '累计完成'}</span>` +
+        options.series[2].data[0].tooltip.formatter = year-1 + '累计完成:' + 0;
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${0 + '片'}</span>`;
+        options.series[2].data[1].tooltip.formatter = year-1 + '累计完成:' + 0;
-        this.options.series[2].data[1].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year -1 + '累计完成'}</span>` +
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${0 + '片'}</span>`;
       } else {
-        this.options.series[2].data[0].value = this.output.previous;
+        options.series[2].data[0].value = this.output.previous;
-        this.options.series[2].data[1].value = 0;
+        options.series[2].data[1].value = 0;
-        this.options.series[2].data[0].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year -1 + '累计完成'}</span>` +
+        options.series[2].data[0].tooltip.formatter = year - 1 + '累计完成:' + this.output.previous;
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${this.output.previous + '片'}</span>`;
+        options.series[2].data[1].tooltip.formatter = year - 1 + '累计完成:' + this.output.previous;
-        this.options.series[2].data[1].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year - 1 + '累计完成'}</span>` +
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${this.output.previous + '片'}</span>`;
       }
       console.log('options', options);
       return options;
@@ -308,9 +274,6 @@ export default {
     factory(val) {
       this.initOptions(this.actualOptions);
     },
-    actualOptions() {
-      this.initOptions(this.actualOptions);
-    }
   },
   mounted() {
     console.log("mounted", this.actualOptions);

src/views/dashboard/charts/LeftChartBase.vue

@@ -73,23 +73,27 @@ export default {
               color: "rgba(237,237,237,0.5)",
             },
           },
-          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+          // backgroundColor: '#000000',
-          backgroundColor: '#001829',
+          // textStyle: {
-          borderColor: '#001829',
+          //   color: '#ffff'
+          // }
           formatter: params => {
-            console.log('params', params)
+            // console.log(params);
-            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
+            // 获取xAxis data中的数据
-            for (var i = 0, l = params.length; i < l; i++) {
+            let dataStr = `<div><p style="font-weight:bold;margin:0 8px 15px;">${params[0].name}</p></div>`
-              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+            params.forEach(item => {
-              // console.log(item.color, color);
+              let color = item.color.colorStops ? item.color.colorStops[0].color : ''
-              res +=
+              console.log(item.color, color);
-                "<br/>" +
+              dataStr += `<div>
-                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
+          <div style="margin: 0 8px;">
-                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
+            <span style="display:inline-block;margin-right:5px;width:10px;height:10px;background-color:${item.color.colorStops[0].color};"></span>
-                `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
+            <span>${item.seriesName}</span>
-            }
+            <span style="float:right;color:#000000;margin-left:20px;">${item.data}</span>
-            return res;
+          </div>
-          },
+        </div>`
+            })
+            return dataStr
+          }
         },
         xAxis: {
           axisTick: {

src/views/dashboard/charts/RightChartBase.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-07-03 14:13:59
+ * @LastEditTime: 2024-06-28 09:28:56
  * @LastEditors: zhp
  * @Description:
 -->
@@ -79,23 +79,22 @@ export default {
               color: "rgba(237,237,237,0.5)",
             },
           },
-          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
-          backgroundColor: '#001829',
-          borderColor: '#001829',
           formatter: params => {
-            console.log('params', params)
+            // 获取xAxis data中的数据
-            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
+            let dataStr = `<div><p style="font-weight:bold;margin:0 8px 15px;">${params[0].name}</p></div>`
-            for (var i = 0, l = params.length; i < l; i++) {
+            params.forEach(item => {
-              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              let color = Object.prototype.toString.call(item.color) == "[object String]" ? item.color : item.color.colorStops ? item.color.colorStops[0].color : ''
-              // console.log(item.color, color);
+              console.log(item.color, color);
-              res +=
+              dataStr += `<div>
-                "<br/>" +
+          <div style="margin: 0 8px;">
-                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
+            <span style="display:inline-block;margin-right:5px;width:10px;height:10px;background-color:${color};"></span>
-                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
+            <span>${item.seriesName}</span>
-                `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
+            <span style="float:right;color:#000000;margin-left:20px;">${item.data}</span>
-            }
+          </div>
-            return res;
+        </div>`
-          },
+            })
+            return dataStr
+          }
         },
         xAxis: {
           axisTick: {

src/views/produce/data/lineChart.vue

@@ -111,7 +111,6 @@ export default {
               <div style="width: 60px; text-align: right">${factoryListabbr[1]}</div>
             </div>`
             const newArray = params.map(p => {
-              console.log(factoryListabbr[p.seriesName.split('-')[1]], p.seriesName.split('-')[0])
               return {
                 glass: p.seriesName.split('-')[0], // 玻璃类型
                 factoryName: factoryListabbr[p.seriesName.split('-')[1]], // 工厂名称
@@ -157,7 +156,7 @@ export default {
         yAxis: [
           {
             type: 'value',
-            name: '单位：片'
+            name: '单位：个'
           }
         ],
         grid: {

src/views/report/components/produceLineYieldBarTarget.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-21 09:05:14
- * @LastEditTime: 2024-07-03 16:07:42
+ * @LastEditTime: 2024-07-02 08:33:22
  * @LastEditors: zhp
  * @Description:
 -->
@@ -51,7 +51,7 @@ export default {
             },
           },
           formatter: function (params) {
-            console.log('params', params)
+            // console.log('params', params)
             let arr = []
             var res = ``;
             // for (var i = 0, l = params.length; i < l; i++) {
@@ -64,7 +64,7 @@ export default {
                   ? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
                 : params[0].name === "转化效率"
                     ? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
-                  : params[0].axisValueLabel.search('总功率') != -1
+                  : params[0].seriesName.search('总功率') != -1
                     ? (params[0].value ? params[0].value : 0) + "MW"
                     : (params[0].value ? params[0].value : 0) + "片"
                 }</span>`;
@@ -78,7 +78,7 @@ export default {
                 ? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
                 : params[1].name === "转化效率"
                   ? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
-                  : params[1].axisValueLabel.search('总功率') != -1
+                  : params[1].seriesName.search('总功率') != -1
                     ? (params[1].value ? params[1].value : 0) + "MW"
                     : (params[1].value ? params[1].value : 0) + "片"
                 }</span>`;

src/views/report/produceConversion.vue

@@ -215,7 +215,7 @@ export default {
             barWidth: 20,
             label: {
               show: true,
-              position: [0, -16],
+              position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
                 return params.value
@@ -230,7 +230,7 @@ export default {
             barWidth: 20,
             label: {
               show: true,
-              position: [0, -16],
+              position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
                 return params.value
@@ -290,7 +290,7 @@ export default {
             barWidth: 20,
             label: {
               show: true,
-              position: [-0, -16],
+              position: [-20, -16],
               color: "#68C483",
               formatter: function (params) {
                 return params.value.toFixed(2)
@@ -305,7 +305,7 @@ export default {
             barWidth: 20,
             label: {
               show: true,
-              position: [0, -16],
+              position: [10, -16],
               color: "#288AFF",
               formatter: function (params) {
                 return params.value.toFixed(2)