修改ui

2024-07-19 08:37:54 +08:00
parent 5444ff92f7
commit 7d6a0e228f
16 changed files with 467 additions and 325 deletions
--- a/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
+++ b/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-20 13:32:59
- * @LastEditTime: 2024-07-09 08:58:47
+ * @LastEditTime: 2024-07-18 15:27:38
 * @LastEditors: zhp
 * @Description:
 -->
@@ -165,10 +165,15 @@ export default {
        subtitle =
          this.period == "日" ? `${yesterday}日累计完成值` : this.period == "周" ? `本周累计完成值` : this.period == "月" ? `${month}月累计完成值` : `${year}年累计完成值`;
      console.log('titleValue', items)
+      let titleSize = fontSize(0.35)
+      let subtitleSize = fontSize(0.14)
+
      // console.log(this.valueTuple[2]- this.valueTuple[1])
      return getOptions({
        titleValue,
        subtitle,
+        titleSize,
+        subtitleSize,
        currentName: items[0].label,
        preName: items[1].label,
        previousSum: this.valueTuple[0],
@@ -219,7 +224,12 @@ export default {
    // },
  },
 };
-
+function fontSize(res){
+  let clientWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+  if (!clientWidth) return;
+  let fontSize = 100 * (clientWidth / 1920);
+  return res * fontSize;
+}
 function calculateItems(period, valueTuple, than) {
  console.log('valueTuple', valueTuple);
  let items = [];
@@ -297,7 +307,7 @@ function calculateItems(period, valueTuple, than) {

 <style scoped>
 .double-ring-chart {
-  height: 100%;
+  height: 98%;
  display: flex;
  flex-direction: column;
 }
--- a/src/views/copilot/yield/options/double-ring-chart-options.js
+++ b/src/views/copilot/yield/options/double-ring-chart-options.js
@@ -3,6 +3,8 @@ export default ({
  subtitle,
  previousSum,
  currentSum,
+  subtitleSize,
+  titleSize,
  targetSum,
  currentName,
  preName,
@@ -16,25 +18,27 @@ export default ({
  },
  tooltip: {
    trigger: "item",
-    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',
+    // 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',
  },
  title: {
-    text: titleValue,
+    text: '99.99%',
    left: "48.5%",
-    top: "35%",
+    top: "middle",
+    itemGap: 12,
+    textVerticalAlign:'auto',
    textAlign: "center",
    textStyle: {
      fontWeight: 400,
-      fontSize: 32,
-      color: "#fffd",
+      fontSize: titleSize,
+      color: "rgba(223,241,254,.8)",
    },
    subtext: `\u2002${subtitle}\u2002`,
    subtextStyle: {
-      fontSize: 14,
+      fontSize: subtitleSize,
      fontWeight: 100,
-      color: "#fffd",
+      color: "rgba(255,255,255,.7)",
      align: "right",
    },
  },
@@ -43,7 +47,7 @@ export default ({
    {
      type: "pie",
      name: "当前目标",
-      radius: ["80%", "95%"],
+      radius: ["74%", "86%"],
      center: ["50%", "48%"],
      emptyCircleStyle: {
        color: "#042c5f33",
@@ -52,7 +56,7 @@ export default ({
    // 数据 series
    {
      type: "pie",
-      radius: ["80%", "95%"],
+      radius: ["74%", "86%"],
      center: ["50%", "48%"],
      avoidLabelOvervlap: false,
      label: {
@@ -66,9 +70,16 @@ export default ({
          value: currentSum,
          name: currentName,
          selected: false,
-           tooltip: {
-           formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${currentName}</span>` +
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${currentSum}</span>`
+          tooltip: {
+          backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+          extraCssText: 'padding:0;border-width:0',
+          formatter:`
+              <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#4CF0E8'></span>
+              <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${currentName}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${currentSum}</span>
+              </div>
+              `
          },
          itemStyle: {
            borderJoin: "round",
@@ -91,9 +102,16 @@ export default ({
        {
          value:(targetSum - currentSum) === 0 ? 1 : (targetSum - currentSum),
          name: currentName,
-          tooltip: {
-            formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${currentName}</span>` +
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${currentSum}</span>`
+           tooltip: {
+              backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+            extraCssText: 'padding:0;border-width:0',
+            formatter:`
+                <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#4CF0E8'></span>
+                  <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${currentName}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${currentSum}</span>
+                </div>
+                `
          },
          itemStyle: { color: "transparent" },
          label: { show: false },
@@ -103,7 +121,7 @@ export default ({
    // 数据 series2 - 2023累计
    {
      type: "pie",
-      radius: ["65%", "80%"],
+      radius: ["61%", "74%"],
      center: ["50%", "48%"],
      avoidLabelOvervlap: false,
      label: {
@@ -114,12 +132,19 @@ export default ({
      },
      data: [
        {
-          value: previousSum,
+          value: 99.99,
          name: preName,
          selected: false,
          tooltip: {
-             formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${preName}</span>` +
-          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${previousSum}</span>`
+            backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+            extraCssText: 'padding:0;border-width:0',
+            formatter:`
+                <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#1065ff'></span>
+                  <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${preName}</span>
+                <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${previousSum}</span>
+                </div>
+                `
          },
          itemStyle: {
            borderJoin: "round",
@@ -143,9 +168,16 @@ export default ({

          value:previousSum === 0 ? 1 : 0,
          name: preName,
-           tooltip: {
-            formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${preName}</span>` +
-            `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${previousSum}</span>`
+          tooltip: {
+            backgroundColor: 'rgba(0,0,0,0)', // tooltip默认背景为白色，手动置为透明
+            extraCssText: 'padding:0;border-width:0',
+            formatter:`
+                <div style="padding: 12px 16px;background:rgba(0,24,41,.5);box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38);backdrop-filter: blur(10px);">
+                  <span style='display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:#1065ff'></span>
+                  <span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:16px;'>${preName}</span>
+                   <span style='color:rgba(255,255,255,0.65);font-size:16px;'>${previousSum}</span>
+                </div>
+                `
          },
          itemStyle: { color: "transparent" },
          label: { show: false },