修改bug

2024-06-18 15:55:48 +08:00
parent d95853dec2
commit 41d554f897
9 changed files with 139 additions and 94 deletions
--- a/src/views/copilot/factoryData/components/BarChartBase.vue
+++ b/src/views/copilot/factoryData/components/BarChartBase.vue
@@ -73,12 +73,25 @@ export default {
            },
          },
          axisLabel: {
-            // rotate:45,
+            interval: 0,//设置横坐标为斜
+            rotate:45,
            color: "rgba(255, 255, 255, 0.7)",
            fontSize: 12,
+            // formatter: function (value) {
+            //   console.log(value);
+
+            //   return value;
+            // },
          },
          data: [],
        },
+        // dataZoom: [
+        //   {
+        //     // show: true,
+        //     start: 0,
+        //     end: 50
+        //   }
+        //   ],
        yAxis: {
            type: "value",
            name: "单位/片",
@@ -92,7 +105,7 @@ export default {
            },
            axisLabel: {
              color: "rgba(255, 255, 255, 0.7)",
-              fontSize: 12,
+              fontSize: 10,
            },
            axisLine: {
              show: true,
@@ -226,9 +239,9 @@ export default {
    //   this.actualOptions = actualOptions;
    //   this.initOptions(actualOptions);
    // },
-    energyCockpits() {
-      this.initChart();
-    },
+    // energyCockpits() {
+    //   this.initChart();
+    // },
    isOpen(val) {
      this.canvasReset();
    },
@@ -263,6 +276,9 @@ export default {
        if (this.energyCockpits) {
          this.energyCockpits.forEach(ele => {
            this.data.push(ele.targetProduction)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
            this.orderXAxis.push(ele.workOrderNumber)
          });
        }
@@ -273,6 +289,9 @@ export default {
        if (this.energyCockpits) {
          this.energyCockpits.forEach(ele => {
            this.data.push(ele.plannedInvestment)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
            this.orderXAxis.push(ele.workOrderNumber)
          });
        }
@@ -282,6 +301,9 @@ export default {
        if (this.energyCockpits) {
          this.energyCockpits.forEach(ele => {
            this.data.push(ele.actualInvestment)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
            this.orderXAxis.push(ele.workOrderNumber)
          });
        }
@@ -291,6 +313,9 @@ export default {
        if (this.energyCockpits) {
          this.energyCockpits.forEach(ele => {
            this.data.push(ele.actualProduction)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
            this.orderXAxis.push(ele.workOrderNumber)
          });
        }
@@ -300,6 +325,9 @@ export default {
        if (this.energyCockpits) {
          this.energyCockpits.forEach(ele => {
            this.data.push(ele.wasteNum)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
            this.orderXAxis.push(ele.workOrderNumber)
          });
        }
@@ -310,6 +338,9 @@ export default {
          this.energyCockpits.forEach(ele => {
            console.log(ele.reworkNum);
            this.data.push(ele.reworkNum)
+            if (ele.workOrderNumber.length > 4) {
+              ele.workOrderNumber = ele.workOrderNumber.substring(0, 4) + "..";
+            }
            this.orderXAxis.push(ele.workOrderNumber)
          });
        }
--- a/src/views/copilot/factoryData/components/ChipOee.vue
+++ b/src/views/copilot/factoryData/components/ChipOee.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-29 14:48:06
- * @LastEditTime: 2024-06-17 16:40:15
+ * @LastEditTime: 2024-06-18 14:49:25
 * @LastEditors: zhp
 * @Description:
 -->
@@ -173,8 +173,11 @@ function getTemplate(period, dataList, than) {
  // console.log('dataList',dataList);
  let items = [];
  var day1 = new Date();
-  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+  var day2 = new Date();
+  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
+  day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
  var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+  var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
  //今天的时间
  // var day2 = new Date();
  // day2.setTime(day2.getTime());
@@ -187,11 +190,11 @@ function getTemplate(period, dataList, than) {
  if (period === 1 && than === '同比') {
    items = [
      {
-        name: `${year-1}年${month}月${today}日`,
+        name: `${year - 1}年${yesterday}日`,
        data: dataList ? dataList[0] : [],
      },
      {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
        data: dataList ? dataList[1] : [],
        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
      },
@@ -199,11 +202,11 @@ function getTemplate(period, dataList, than) {
  } else if (period ===1 && than === '环比') {
    items = [
      {
-        name: `${yesterday}日`,
+        name: `${dayBeYes}日`,
        data: dataList ? dataList[0] : [],
      },
      {
-        name: `${month}月${today}日`,
+        name: `${yesterday}日`,
        data: dataList ? dataList[1] : [],
        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
      },
--- a/src/views/copilot/factoryData/components/Order.vue
+++ b/src/views/copilot/factoryData/components/Order.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="order-container">
    <div class="table">
-      <dv-scroll-board v-if="showTable" :config="config" style="width: 100%; height: 100%" ref="orderScrollBoard" />
+      <dv-scroll-board v-if="showTable" :config="config" style="width: 100%; height: 100%; color: rgba(255, 255, 255, .6);" ref="orderScrollBoard" />
    </div>
    <div class="chart">
      <div class="chart-title">
@@ -42,7 +42,7 @@ export default {
        rowNum: 12,
        waitTime: 3000,
        columnWidth: [150],
-        align: ["center"],
+        align: ["left"],
        carousel: "page",
      },
    };
@@ -101,51 +101,37 @@ export default {
          arr.push(
            `<span title=${this.prodOrder[i].workOrderNumber || ""}>${
            this.prodOrder[i].workOrderNumber || ""
-            }</span>`
-          );
-          arr.push(
-            `<span title=${this.prodOrder[i].orderStatus || ""}>${
-            this.prodOrder[i].orderStatus === 1 ? '未开始' : this.prodOrder[i].orderStatus === 2 ? '进行中' : '已完成' || ""
-            }</span>`
-          );
-          arr.push(
-            `<span title=${this.prodOrder[i].plannedInvestment || ""}>${
-            this.prodOrder[i].plannedInvestment || ""
-            }</span>`
-          );
-          arr.push(
-            `<span title=${this.prodOrder[i].actualInvestment || ""}>${this.prodOrder[i].actualInvestment || ""
-            }</span>`
-          );
-          arr.push(
-            `<span title=${this.prodOrder[i].targetProduction || ""}>${this.prodOrder[i].targetProduction || ""
-            }</span>`
-          );
-          arr.push(
-            `<span title=${this.prodOrder[i].actualProduction || ""}>${this.prodOrder[i].actualProduction || ""
-            }</span>`
-          );
-          arr.push(`<span style="display:inline-block;width:45px;">${
-            this.prodOrder[i].productionProgress
-            ? this.prodOrder[i].productionProgress.toFixed(0) + "%"
-              : "0%"
-          }</span>
+            }</span>`,
+              `<span title=${this.prodOrder[i].orderStatus || ""}>${this.prodOrder[i].orderStatus === 1 ? '未开始' : this.prodOrder[i].orderStatus === 2 ? '进行中' : '已完成' || ""
+              }</span>`,
+              `<span title=${this.prodOrder[i].plannedInvestment || ""}>${this.prodOrder[i].plannedInvestment || ""
+              }</span>`,
+              `<span title=${this.prodOrder[i].actualInvestment || ""}>${this.prodOrder[i].actualInvestment || ""
+              }</span>`,
+              `<span title=${this.prodOrder[i].targetProduction || ""}>${this.prodOrder[i].targetProduction || ""
+              }</span>`,
+              `<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) + "%"
+                : "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) *
-                      37.68 *
-                      0.01 +
-                    "," +
-                    (1 -
-              this.prodOrder[i].productionProgress.toFixed(0) * 0.01) *
-                      37.68
-                  : 0 + "," + 37.68
+              <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) *
+                37.68 *
+                0.01 +
+                "," +
+                (1 -
+                  this.prodOrder[i].productionProgress.toFixed(0) * 0.01) *
+                37.68
+                : 0 + "," + 37.68
              }"/>
            </svg>
-          </div>`);
+          </div>`
+          )
          outArr.push(arr);
        }
        this.config.data = outArr;