Merge pull request 'projects/mescc/zhp' (#103) from projects/mescc/zhp into projects/mescc/develop

Reviewed-on: #103
2024-07-22 08:36:42 +08:00 · 2024-07-22 08:36:42 +08:00 · 71f548cb3b
commit 71f548cb3b
parent 9b8c090f7e 8ecf281f08
16 changed files with 54 additions and 42 deletions
--- a/src/views/components/ChartContainer.vue
+++ b/src/views/components/ChartContainer.vue
@ -1,10 +1,11 @@
 <!--
 * @Author: zhp
- * @Date: 2024-06-03 15:38:31
- * @LastEditTime: 2024-07-09 15:59:41
+ * @Date: 2024-07-10 15:17:28
+ * @LastEditTime: 2024-07-19 15:18:00
 * @LastEditors: zhp
 * @Description:
 -->
+
 <!--
    filename: ChartContainer.vue
    author: liubin
--- a/src/views/copilot/components/BarChartBase.vue
+++ b/src/views/copilot/components/BarChartBase.vue
@ -9,7 +9,7 @@
  <chart-container class="bar-chart-base">
    <div class="legend">
      <span v-for="item in legend" :key="item.label" class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
    </div>
    <div ref="chart" style="height:94%;width:100%"></div>
  </chart-container>
--- a/src/views/copilot/components/Container.vue
+++ b/src/views/copilot/components/Container.vue
@ -73,6 +73,7 @@ export default {
 </script>

 <style scoped lang="scss">
+
 .copilot-container {
  height: 0;
  flex: 1;
@ -142,8 +143,8 @@ export default {
    position: absolute;
    // width: 16px;
    // height: 16px;
-    width: 0.95vw;
-    height: 0.95vw;
+    width: 0.7vw;
+    height: 0.7vw;
  }

  .corner.tl {
--- a/src/views/copilot/components/button.vue
+++ b/src/views/copilot/components/button.vue
@ -75,8 +75,8 @@ button {
 .copilot-btn::after {
  content: "";
  position: absolute;
-  width: 16px;
-  height: 16px;
+  width: 0.7vw;
+  height: 0.7vw;
  top: 0;
  background: transparent;
  border-style: solid;
--- a/src/views/copilot/components/efficiencyLeftContainer.vue
+++ b/src/views/copilot/components/efficiencyLeftContainer.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-07-09 15:15:00
- * @LastEditTime: 2024-07-09 15:36:49
+ * @LastEditTime: 2024-07-19 16:11:37
 * @LastEditors: zhp
 * @Description:
 -->
@ -73,6 +73,7 @@ export default {
 </script>

 <style scoped lang="scss">
+
 .copilot-container {
  height: 0;
  flex: 1;
@ -146,8 +147,8 @@ export default {
    position: absolute;
    // width: 16px;
    // height: 16px;
-    width: 0.95vw;
-    height: 0.95vw;
+    width: 0.7vw;
+    height: 0.7vw;
  }

  .corner.tl {
--- a/src/views/copilot/components/efficiencyRightContainer.vue
+++ b/src/views/copilot/components/efficiencyRightContainer.vue
@ -74,6 +74,7 @@ export default {

 <style scoped lang="scss">

+
 .copilot-container {
  height: 0;
  flex: 1;
@ -147,8 +148,8 @@ export default {
    position: absolute;
    // width: 16px;
    // height: 16px;
-    width: 0.95vw;
-    height: 0.95vw;
+    width: 0.7vw;
+    height: 0.7vw;
  }

  .corner.tl {
--- a/src/views/copilot/components/ftoBarChartBase.vue
+++ b/src/views/copilot/components/ftoBarChartBase.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-23 15:49:14
- * @LastEditTime: 2024-07-18 15:43:56
+ * @LastEditTime: 2024-07-19 16:08:27
 * @LastEditors: zhp
 * @Description:
 -->
@ -10,7 +10,7 @@
  <chart-container class="bar-chart-base">
    <div class="legend">
      <span v-for="item in legend" :key="item.label" class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
    </div>
    <div ref="ftoChart" style="height:94%;width:100%"></div>
  </chart-container>
--- a/src/views/copilot/components/leftContainer.vue
+++ b/src/views/copilot/components/leftContainer.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-05 09:43:51
- * @LastEditTime: 2024-07-09 15:35:19
+ * @LastEditTime: 2024-07-19 16:11:59
 * @LastEditors: zhp
 * @Description:
 -->
@ -73,6 +73,7 @@ export default {
 </script>

 <style scoped lang="scss">
+
 .copilot-container {
  height: 0;
  flex: 1;
@ -144,8 +145,8 @@ export default {
    position: absolute;
    // width: 16px;
    // height: 16px;
-    width: 0.95vw;
-    height: 0.95vw;
+    width: 0.7vw;
+    height: 0.7vw;
  }

  .corner.tl {
--- a/src/views/copilot/components/rightContainer.vue
+++ b/src/views/copilot/components/rightContainer.vue
@ -74,6 +74,7 @@ export default {

 <style scoped lang="scss">

+
 .copilot-container {
  height: 0;
  flex: 1;
@ -147,8 +148,8 @@ export default {
    position: absolute;
    // width: 16px;
    // height: 16px;
-    width: 0.95vw;
-    height: 0.95vw;
+    width: 0.7vw;
+    height: 0.7vw;
  }

  .corner.tl {
--- a/src/views/copilot/components/twoContainer.vue
+++ b/src/views/copilot/components/twoContainer.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-05 09:48:37
- * @LastEditTime: 2024-07-09 15:35:04
+ * @LastEditTime: 2024-07-19 16:14:07
 * @LastEditors: zhp
 * @Description:
 -->
@ -100,6 +100,7 @@ export default {

 <style scoped lang="scss">

+
 .copilot-container {
  height: 0;
  flex: 1;
@ -171,8 +172,8 @@ export default {
    position: absolute;
    // width: 16px;
    // height: 16px;
-    width: 0.95vw;
-    height: 0.95vw;
+    width: 0.7vw;
+      height: 0.7vw;
  }

  .corner.tl {
--- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue
+++ b/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-19 10:57:26
+ * @LastEditTime: 2024-07-19 16:10:10
 * @LastEditors: zhp
 * @Description:
 -->
@ -9,7 +9,7 @@
  <chart-container class="bar-chart-base">
    <div class="legend">
      <span v-for="(item,index) in legend" :key="index" class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
    </div>
    <div ref="oeeChart" style="height:94%;width:100%"></div>
  </chart-container>
@ -81,13 +81,13 @@ export default {
              res +=
                "<br/>" +
                `${params[i].seriesType === "line"
-                ? `<span style='display:inline-block; width: 20px;height: 2px;background-color: #f3c000;position: absolute;top:76.3%;left:4.2%;'></span>
-                <span style='display:inline-block;width: 10px;height: 10px;border-radius: 100%;background-color: #f3c000;position: absolute;top:72.8%;left:5.75%;'></span>
+                ? `<span style='display:inline-block; width: 20px;height: 2px;background-color: #f3c000;position: absolute;top:76.3%;left:3.5%;'></span>
+                <span style='display:inline-block;width: 10px;height: 10px;border-radius: 100%;background-color: #f3c000;position: absolute;top:72.6%;left:4.8%;'></span>
                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;margin-left:20px'>${params[i].seriesName}</span>`
                  : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:${color}"></span>
                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px'>${params[i].seriesName}</span>`
                }` +
-                `<span style='display:inline-block;text-align: right;width:100px;color:rgba(255,255,255,0.65);;font-size:16px;letter-spacing: 2px;'>${params[i].value ? params[i].value + '%' : 0 + '%'}</span>`;
+                `<span style='display:inline-block;text-align: right;width:180px;color:rgba(255,255,255,0.65);;font-size:16px;letter-spacing: 2px;'>${params[i].value ? params[i].value + '%' : 0 + '%'}</span>`;
            }
            const htmlContent = `
              <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);">
--- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue
+++ b/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-19 10:58:32
+ * @LastEditTime: 2024-07-19 16:10:19
 * @LastEditors: zhp
 * @Description:
 -->
@ -9,7 +9,7 @@
  <chart-container class="bar-chart-base">
    <div class="legend">
      <span v-for="(item,index) in legend" :key="index" class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }">{{ item.label }}</span>
    </div>
    <div ref="oeeChart" style="height:94%;width:100%"></div>
  </chart-container>
@ -81,13 +81,13 @@ export default {
              res +=
                "<br/>" +
                `${params[i].seriesType === "line"
-                ? `<span style='display:inline-block; width: 20px;height: 2px;background-color: #f3c000;position: absolute;top:76.3%;left:4.2%;'></span>
-                <span style='display:inline-block;width: 10px;height: 10px;border-radius: 100%;background-color: #f3c000;position: absolute;top:72.8%;left:5.75%;'></span>
+                ? `<span style='display:inline-block; width: 20px;height: 2px;background-color: #f3c000;position: absolute;top:76.3%;left:3.5%;'></span>
+                <span style='display:inline-block;width: 10px;height: 10px;border-radius: 100%;background-color: #f3c000;position: absolute;top:72.6%;left:4.8%;'></span>
                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;margin-left:20px'>${params[i].seriesName}</span>`
                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:${color}"></span>
                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px'>${params[i].seriesName}</span>`
                }` +
-                `<span style='display:inline-block;text-align: right;width:100px;color:rgba(255,255,255,0.65);;font-size:16px;letter-spacing: 2px;'>${params[i].value ? params[i].value + '%' : 0 + '%'}</span>`;
+                `<span style='display:inline-block;text-align: right;width:180px;color:rgba(255,255,255,0.65);;font-size:16px;letter-spacing: 2px;'>${params[i].value ? params[i].value + '%' : 0 + '%'}</span>`;
            }
            const htmlContent = `
              <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);">
--- a/src/views/copilot/factoryData/components/leftContainer.vue
+++ b/src/views/copilot/factoryData/components/leftContainer.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-05 09:36:07
- * @LastEditTime: 2024-07-09 16:54:24
+ * @LastEditTime: 2024-07-19 16:16:02
 * @LastEditors: zhp
 * @Description:
 -->
@ -81,6 +81,7 @@ export default {

 <style scoped lang="scss">

+
 .copilot-container {
  height: 0;
  flex: 1;
@ -152,8 +153,8 @@ export default {
    position: absolute;
    // width: 16px;
    // height: 16px;
-    width: 0.95vw;
-    height: 0.95vw;
+    width: 0.7vw;
+    height: 0.7vw;
  }

  .corner.tl {
--- a/src/views/copilot/factoryData/components/rightContainer.vue
+++ b/src/views/copilot/factoryData/components/rightContainer.vue
@ -79,6 +79,7 @@ export default {

 <style scoped lang="scss">

+
 .copilot-container {
  height: 100%;
  flex: 1;
@ -147,8 +148,8 @@ export default {
    position: absolute;
    // width: 16px;
    // height: 16px;
-    width: 0.95vw;
-    height: 0.95vw;
+    width: 0.7vw;
+    height: 0.7vw;
  }

  .corner.tl {
--- 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-18 15:27:38
+ * @LastEditTime: 2024-07-19 16:05:46
 * @LastEditors: zhp
 * @Description:
 -->
@ -306,6 +306,7 @@ function calculateItems(period, valueTuple, than) {
 </script>

 <style scoped>
+
 .double-ring-chart {
  height: 98%;
  display: flex;
@ -331,6 +332,7 @@ function calculateItems(period, valueTuple, than) {

 .legend-item {
  display: flex;
+  /* font-size:16px; */
  flex-direction: column;
  align-items: flex-start;
 }
--- a/src/views/dashboard/charts/RightChartBase.vue
+++ b/src/views/dashboard/charts/RightChartBase.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-07-19 10:49:03
+ * @LastEditTime: 2024-07-19 15:25:37
 * @LastEditors: zhp
 * @Description:
 -->
@ -70,6 +70,7 @@ export default {
              color: "rgba(237,237,237,0.5)",
            },
          },
+          confine:true,
          backgroundColor: 'rgba(50,50,50,0)', // tooltip默认背景为白色，手动置为透明
          extraCssText: 'padding:0;border-width:0',
          formatter: params => {
@ -81,13 +82,13 @@ export default {
              res +=
                "<br/>" +
              `${params[i].seriesType === "line"
-                ? `<span style='display:inline-block; width: 20px;height: 2px;background-color: #f3c000;position: absolute;top:42.3%;left:4.46%;'></span>
-                <span style='display:inline-block;width: 10px;height: 10px;border-radius: 100%;background-color: #f3c000;position: absolute;top:38.82%;left:6.3%;'></span>
+                ? `<span style='display:inline-block; width: 20px;height: 2px;background-color: #f3c000;position: absolute;top:42.3%;left:4%;'></span>
+                <span style='display:inline-block;width: 10px;height: 10px;border-radius: 100%;background-color: #f3c000;position: absolute;top:38.82%;left:5%;'></span>
                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;margin-left:20px;letter-spacing: 2px;'>${params[i].seriesName}</span>`
                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:12px;height:12px;background-color:${color}"></span>
                <span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:16px;letter-spacing: 2px;'>${params[i].seriesName}</span>`
              }` +
-                `<span style='width:60px;display:inline-block;color:rgba(255,255,255,0.65);font-size:16px;text-align: right;letter-spacing: 2px;'>${params[i].value ? params[i].value : 0 }</span>`;
+                `<span style='width:180px;display:inline-block;color:rgba(255,255,255,0.65);font-size:16px;text-align: right;letter-spacing: 2px;'>${params[i].value ? params[i].value : 0 }</span>`;
            }
            const htmlContent = `
              <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);">