Merge branch 'projects/mescc/develop' into projects/mescc/zhp

修改bug
Merge pull request 'projects/mescc/zhp' (#74 ) from projects/mescc/zhp into projects/mescc/develop
2024-06-28 14:42:26 +08:00 · 2024-06-28 14:41:50 +08:00 · 2024-06-28 13:22:49 +08:00 · 2024-06-28 13:16:07 +08:00 · 2024-06-28 13:15:43 +08:00 · 2024-06-28 11:10:40 +08:00
14 changed files with 233 additions and 122 deletions
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -92,7 +92,7 @@ const actions = {
  /** 初始化首页数据 */
  async initHome({ commit }) {
    const dataArr = await getHomeInfo();
-    console.log('dataArr', dataArr);
+    // console.log('dataArr', dataArr);
      let preData = dataArr.previousProdOutputOutDO
      let preFtoData = dataArr.previousProdOutputFtoDO
    // const targetArr = await getHomeInfo();
@@ -127,7 +127,7 @@ const actions = {
    //   const payload = handler(factoryData)
    //   commit("SET_COPILOT_INFO", { type, payload });
    // } else {
-      console.log('factoryList',factoryList)
+      // console.log('factoryList',factoryList)
      let factoryData = factoryList.prodOutputOutDO ? factoryList.prodOutputOutDO : factoryList.prodOutputRateDO
      let preData = factoryList.previousProdOutputOutDO ? factoryList.previousProdOutputOutDO : factoryList.previousProdOutputRateDO
      let preFtoData = factoryList.previousProdOutputFtoDO ? factoryList.previousProdOutputFtoDO : []
@@ -289,7 +289,7 @@ function splitCurrentAndPreviousB(factoryListResponse) {
 }

 function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
-  console.log('工厂',preData);
+  // console.log('工厂',preData);

  // 初始数据
  const { chipOeeRate, transformRate, chipRate, stdRate } = initA();
@@ -346,7 +346,7 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
  if (preData) {
    for (const factory of preData) {
      const fId = getPreFactoryId(factory)
-      console.log('factory',factory.previousYearOee);
+      // console.log('factory',factory.previousYearOee);
        //  chipInvest.previous[fId] = factory.previousYearInputNumber;
      // chipOeeRate.current[fId] = factory.oee;
      if (factory.previousGlassType === 0) {
@@ -400,7 +400,7 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
      _t.current[fId] = factory.yieldRate ;
      // _t.previous[fId] = factory.previousYearYieldRate ;
    }
-    console.log('chipOeeRate',stdRate);
+    // console.log('chipOeeRate',stdRate);
    // console.log('chipOeeRate',chipOeeRate);
    return {
      chipOeeRate,
@@ -412,12 +412,12 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
 }

 function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
-  console.log('prodOutputFtoListRes',preFtoData);
+  // console.log('prodOutputFtoListRes',preFtoData);
  // 初始数据
  const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init()
   if (prodOutputFtoListRes.length !== 0 ) {
    for (const factory of prodOutputFtoListRes) {
-      console.log(factory);
+      // console.log(factory);
      const fId = getFactoryId(factory);
      // const preFId = getPreFactoryId(factory);
      // if (fId) {
@@ -430,7 +430,7 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
   }
   if (preFtoData) {
    for (const factory of preFtoData) {
-      console.log(factory);
+      // console.log(factory);
      const fId = getPreFactoryId(factory);
      // const preFId = getPreFactoryId(factory);
      // if (fId) {
@@ -463,7 +463,7 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
  if (factoryListResponse) {
    for (const factory of factoryListResponse) {
      const fId = getFactoryId(factory);
-      console.log('factory.inputNumber', factory, fId);
+      // console.log('factory.inputNumber', factory, fId);
      if (factory.glassType === 0) {
      chipInvest.current[fId] = factory.inputNumber
      }
@@ -484,7 +484,7 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
      const _t = [chipOutput, stdOutput, bipvOutput][factory.glassType];
        _t.current[fId] = factory.outputNumber;
    }
-    console.log('chipInvest',ftoInvest);
+    // console.log('chipInvest',ftoInvest);
    return {
      chipInvest,
      // ftoInvest,
--- a/src/views/dashboard/charts/Fto.vue
+++ b/src/views/dashboard/charts/Fto.vue
@@ -1,16 +1,10 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-05-31 16:11:06
+ * @LastEditTime: 2024-06-27 16:30:58
 * @LastEditors: zhp
 * @Description:
 -->
-<!--
-    filename: fto.vue
-    author: liubin
-    date: 2024-04-10 08:59:28
-    description:
-->

 <template>
  <left-chart-base
--- a/src/views/dashboard/charts/LeftChartBase.vue
+++ b/src/views/dashboard/charts/LeftChartBase.vue
@@ -12,7 +12,7 @@
        v-for="item in legend"
        :key="item.label"
        class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }"
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }"
        >{{ item.label }}</span
      >
    </div>
@@ -65,7 +65,36 @@ export default {
          top: "15%",
          containLabel: true,
        },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          // backgroundColor: '#000000',
+          // textStyle: {
+          //   color: '#ffff'
+          // }
+          formatter: params => {
+            // console.log(params);
+            // 获取xAxis data中的数据
+            let dataStr = `<div><p style="font-weight:bold;margin:0 8px 15px;">${params[0].name}</p></div>`
+            params.forEach(item => {
+              let color = item.color.colorStops ? item.color.colorStops[0].color : ''
+              console.log(item.color, color);
+              dataStr += `<div>
+          <div style="margin: 0 8px;">
+            <span style="display:inline-block;margin-right:5px;width:10px;height:10px;background-color:${item.color.colorStops[0].color};"></span>
+            <span>${item.seriesName}</span>
+            <span style="float:right;color:#000000;margin-left:20px;">${item.data}</span>
+          </div>
+        </div>`
+            })
+            return dataStr
+          }
+        },
        xAxis: {
          axisTick: {
            show: false,
@@ -77,15 +106,16 @@ export default {
          },
          axisLabel: {
            color: "#fff",
-            fontSize: 12,
+            fontSize: 14,
          },
          data: this.xAxis,
        },
        yAxis: {
          name: "单位/片",
+          position:'left',
          nameTextStyle: {
            color: "#fff",
-            fontSize: 12,
+            fontSize: 14,
            align:'right'
          },
          axisTick: {
@@ -93,7 +123,7 @@ export default {
          },
          axisLabel: {
            color: "#fff",
-            fontSize: 12,
+            fontSize: 14,
          },
          axisLine: {
            show: true,
@@ -118,7 +148,7 @@ export default {
              position: 'top', //在上方显示
              textStyle: { //数值样式
                color: '#DFF1FE',
-                fontSize: 12
+                fontSize: 14
              }
            },
            itemStyle: {
@@ -162,7 +192,7 @@ export default {
              position: 'top', //在上方显示
              textStyle: { //数值样式
                color: '#DFF1FE',
-                fontSize: 12
+                fontSize: 14
              }
            },
            itemStyle: {
@@ -201,9 +231,9 @@ export default {
      this.actualOptions.series.map((item) => {
        item.barWidth = val ? 18 : 12;
      });
-      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.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 14;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 14;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 14;
      this.initOptions(this.actualOptions);
    },
    series(val) {
--- 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-06-21 15:02:27
+ * @LastEditTime: 2024-06-28 09:28:56
 * @LastEditors: zhp
 * @Description:
 -->
@@ -19,7 +19,7 @@
        v-for="item in legend"
        :key="item.label"
        class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }"
+        :style="{ fontSize: isFullscreen ? '0.72vw' : '0.7vw' }"
        >{{ item.label }}</span
      >
    </div>
@@ -71,7 +71,31 @@ export default {
          top: "18%",
          containLabel: true,
        },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          formatter: params => {
+            // 获取xAxis data中的数据
+            let dataStr = `<div><p style="font-weight:bold;margin:0 8px 15px;">${params[0].name}</p></div>`
+            params.forEach(item => {
+              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);
+              dataStr += `<div>
+          <div style="margin: 0 8px;">
+            <span style="display:inline-block;margin-right:5px;width:10px;height:10px;background-color:${color};"></span>
+            <span>${item.seriesName}</span>
+            <span style="float:right;color:#000000;margin-left:20px;">${item.data}</span>
+          </div>
+        </div>`
+            })
+            return dataStr
+          }
+        },
        xAxis: {
          axisTick: {
            show: false,
@@ -83,15 +107,16 @@ export default {
          },
          axisLabel: {
            color: "#fff",
-            fontSize: 12,
+            fontSize: 14,
          },
          data: this.xAxis,
        },
        yAxis: {
          name: "单位/片",
+          position: 'left',
          nameTextStyle: {
            color: "#fff",
-            fontSize: 12,
+            fontSize: 14,
            align: 'right'
          },
          axisTick: {
@@ -99,7 +124,7 @@ export default {
          },
          axisLabel: {
            color: "#fff",
-            fontSize: 12,
+            fontSize: 14,
          },
          axisLine: {
            show: true,
@@ -227,9 +252,9 @@ export default {
      this.actualOptions.series.map((item) => {
        item.barWidth = val ? 18 : 12;
      });
-      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.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 14;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 14;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 14;
      this.initOptions(this.actualOptions);
    },
    series(val) {
--- a/src/views/dashboard/components/CompanyInfo.vue
+++ b/src/views/dashboard/components/CompanyInfo.vue
@@ -83,7 +83,7 @@ export default {
  // backdrop-filter: blur(2px);
  // border-radius: 4px;
  transform: translate(-50%, -100%);
-  box-shadow: inset 0 0 12px 2px #fff3;
+  // box-shadow: inset 0 0 12px 2px #fff3;
  background: url(../../../assets/images/homeindex/info.png) no-repeat 0 0 / 100% 100%;
    // background: radial-gradient(circle farthest-corner at bottom center,rgba(255,239,162,.7)  10%, #021842 30%);
  // 在这里设置一个总的字体大小 不失为一个好的选择
--- a/src/views/dashboard/components/Container.vue
+++ b/src/views/dashboard/components/Container.vue
@@ -38,7 +38,7 @@
      class="container-head"
      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
    >
-      <Icon :icon="icon"></Icon>
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
      <h2 class="container-title">{{ title }}</h2>
    </div>
    <div
@@ -105,7 +105,7 @@ export default {

  .container-head {
    // height: 40px;
-    height: 3.8vh;
+    height:4vh;
    padding: 8px;
    display: flex;
    align-items: center;
--- a/src/views/report/components/produceLineBarTarget.vue
+++ b/src/views/report/components/produceLineBarTarget.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-20 16:13:36
- * @LastEditTime: 2024-06-27 09:51:43
+ * @LastEditTime: 2024-06-28 14:34:13
 * @LastEditors: zhp
 * @Description:
 -->
@@ -36,7 +36,7 @@ export default {
        color: [],
        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
        grid: {
-          left: 20,
+          left: '12%',
          right: 0,
          bottom: 31,
          top: 30,
@@ -51,7 +51,7 @@ export default {
            },
          },
          formatter: function (params) {
-            console.log('params', params.data)
+            // console.log('params', params.data)
            var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
            for (var i = 0, l = params.length; i < l; i++) {
              res +=
@@ -172,10 +172,14 @@ export default {
      },

    },
-    // gridLeft(val) {
-    //   console.log(val)
-
-    // },
+    gridLeft(val) {
+      if (val === false) {
+        this.option.grid.left = '12%'
+      } else {
+        this.option.grid.left = -80
+      }
+      this.canvasReset()
+    },
    type() {
      this.canvasReset();
    },
@@ -201,7 +205,7 @@ export default {
    getMes() {
      console.log(this.gridLeft)
      if (this.gridLeft === false) {
-        this.option.grid.left = 20
+        this.option.grid.left = '12%'
      } else {
        this.option.grid.left = -80
      }
--- a/src/views/report/components/produceLineBarYearTarget.vue
+++ b/src/views/report/components/produceLineBarYearTarget.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-20 16:13:52
- * @LastEditTime: 2024-06-27 09:55:02
+ * @LastEditTime: 2024-06-28 13:45:53
 * @LastEditors: zhp
 * @Description:
 -->
--- a/src/views/report/components/produceLineYieldBarTarget.vue
+++ b/src/views/report/components/produceLineYieldBarTarget.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-06-21 09:05:14
- * @LastEditTime: 2024-06-27 10:59:40
+ * @LastEditTime: 2024-06-28 13:46:00
 * @LastEditors: zhp
 * @Description:
 -->
@@ -55,34 +55,32 @@ export default {
            let arr = []
            var res = ``;
            // for (var i = 0, l = params.length; i < l; i++) {
-            console.log()
+            // console.log()
            if (params[0].axisValue === 'FTO投入' || params[0].axisValue === '芯片产量' || params[0].axisValue === '标准组件产量') {
              res +=
-                "<br/>" +
-                `<span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params[0].color}'></span>` +
+                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[0].color}'></span>` +
              `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[0].axisValueLabel}</span>` +
              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[0].name === "综合良率"
                  ? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
                : params[0].name === "转化效率"
                    ? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
-                  : params[i].seriesName.search('总功率') != -1
-                    ? (params[i].value ? params[i].value : 0) + "MW"
-                    : (params[i].value ? params[i].value : 0) + "片"
+                  : params[0].seriesName.search('总功率') != -1
+                    ? (params[0].value ? params[0].value : 0) + "MW"
+                    : (params[0].value ? params[0].value : 0) + "片"
                }</span>`;
              // }
            }
            if (params[1].axisValue === '综合良率' || params[1].axisValue === '转化效率') {
              res +=
-                "<br/>" +
-                `<span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params[1].color}'></span>` +
+                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[1].color}'></span>` +
              `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[1].axisValueLabel}</span>` +
              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[1].name === "综合良率"
                ? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
                : params[1].name === "转化效率"
                  ? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
-                  : params[i].seriesName.search('总功率') != -1
-                    ? (params[i].value ? params[i].value : 0) + "MW"
-                    : (params[i].value ? params[i].value : 0) + "片"
+                  : params[1].seriesName.search('总功率') != -1
+                    ? (params[i].value ? params[1].value : 0) + "MW"
+                    : (params[1].value ? params[1].value : 0) + "片"
                }</span>`;
            }
            return res;
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-25 08:39:48
+ * @LastEditTime: 2024-06-28 14:40:15
 * @LastEditors: zhp
 * @Description:
 -->
@@ -14,7 +14,7 @@
    <div class="app-container" style="margin-top: 8px;flex-grow: 1; height: auto;">
      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
        <el-form-item label="时间维度" prop="type">
-          <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
+          <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
            <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
@@ -207,6 +207,13 @@ export default {
    this.getDataList()
  },
  methods: {
+    handleChange() {
+      this.listQuery.reportTime = []
+      this.listQuery.end = null
+      this.listQuery.start = null
+      this.listQuery.startDate = null
+      this.listQuery.endDate = null
+    },
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      let spanOneArr = [], concatOne = 0;
      // let spanTwoArr = [], concatTwo = 0;
@@ -463,30 +470,32 @@ export default {
          // dataArr[0].factory = item.factory === 1 ? '邯郸' : '瑞昌'
          // dataArr[1].factory = item.factory === 1 ? '邯郸' : '瑞昌'
          // dataArr[2].factory = item.factory === 1 ? '邯郸' : '瑞昌'
-          // dataArr[3].factory = item.factory === 1 ? '邯郸' : '瑞昌'
-          dataArr[1]['' + m + ''] = item.chipYield
-          dataArr[2]['' + m + ''] = item.chipAveragePower
-          dataArr[4]['' + m + ''] = item.chipTotalPower
-          dataArr[5]['' + m + ''] = item.chipCssMarriageRate
-          dataArr[6]['' + m + ''] = item.chipOee
-          dataArr[7]['' + m + ''] = item.chipCapacityUtilizationRate
-          dataArr[8]['' + m + ''] = item.chipAnnualAverageProduction
-          dataArr[9]['' + m + ''] = item.chipBom
-          dataArr[10]['' + m + ''] = item.componentYield
-          dataArr[11]['' + m + ''] = item.componentAveragePower
-          dataArr[12]['' + m + ''] = item.componentYieldRate
-          dataArr[13]['' + m + ''] = item.componentTotalPower
-          dataArr[14]['' + m + ''] = item.componentOee
-          dataArr[15]['' + m + ''] = item.componentCapacityUtilizationRate
-          dataArr[16]['' + m + ''] = item.componentAnnualAverageProduction
-          dataArr[17]['' + m + ''] = item.componentBom
-          dataArr[18]['' + m + ''] = item.bipvChipUsage
-          dataArr[19]['' + m + ''] = item.bipvProductOutput
-          dataArr[20]['' + m + ''] = item.bipvChipUtilizationRate
-          dataArr[21]['' + m + ''] = item.bipvAnnualAverageProduction
-          dataArr[22]['' + m + ''] = item.bipvOeeMaterialCost
-          dataArr[23]['' + m + ''] = item.bipvInsideMaterialCost
-          dataArr[24]['' + m + ''] = item.bipvComprehensiveMaterialCost
+        // dataArr[3].factory = item.factory === 1 ? '邯郸' : '瑞昌'
+          dataArr[1]['' + m + ''] = item.chipInput
+          dataArr[2]['' + m + ''] = item.chipYield
+          dataArr[3]['' + m + ''] = item.chipAveragePower
+          dataArr[4]['' + m + ''] = item.chipYieldRate
+          dataArr[5]['' + m + ''] = item.chipTotalPower
+          dataArr[6]['' + m + ''] = item.chipCssMarriageRate
+          dataArr[7]['' + m + ''] = item.chipOee
+          dataArr[8]['' + m + ''] = item.chipCapacityUtilizationRate
+          dataArr[9]['' + m + ''] = item.chipAnnualAverageProduction
+          dataArr[10]['' + m + ''] = item.chipBom
+          dataArr[11]['' + m + ''] = item.componentYield
+          dataArr[12]['' + m + ''] = item.componentAveragePower
+          dataArr[13]['' + m + ''] = item.componentYieldRate
+          dataArr[14]['' + m + ''] = item.componentTotalPower
+          dataArr[15]['' + m + ''] = item.componentOee
+          dataArr[16]['' + m + ''] = item.componentCapacityUtilizationRate
+          dataArr[17]['' + m + ''] = item.componentAnnualAverageProduction
+          dataArr[18]['' + m + ''] = item.componentBom
+          dataArr[19]['' + m + ''] = item.bipvChipUsage
+          dataArr[20]['' + m + ''] = item.bipvProductOutput
+          dataArr[21]['' + m + ''] = item.bipvChipUtilizationRate
+          dataArr[22]['' + m + ''] = item.bipvAnnualAverageProduction
+          dataArr[23]['' + m + ''] = item.bipvOeeMaterialCost
+          dataArr[24]['' + m + ''] = item.bipvInsideMaterialCost
+          dataArr[25]['' + m + ''] = item.bipvComprehensiveMaterialCost

        // })
        // ele.titleValue
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -7,7 +7,7 @@
    <div class="search">
      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
        <el-form-item label="时间维度" prop="date">
-          <el-select size="small" clearable v-model="listQuery.date" placeholder="请选择">
+          <el-select size="small" clearable v-model="listQuery.date" placeholder="请选择" @change="handleChange">
            <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
@@ -402,6 +402,13 @@ export default {
    this.getDataList()
  },
  methods: {
+    handleChange() {
+      this.listQuery.reportTime = []
+      this.listQuery.end = null
+      this.listQuery.start = null
+      this.listQuery.endTime = null
+      this.listQuery.beginTime = null
+    },
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      let spanOneArr = [], concatOne = 0;
      // let spanTwoArr = [], concatTwo = 0;
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -5,7 +5,7 @@
    <div class="search">
      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
        <el-form-item label="时间维度" prop="type">
-          <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
+          <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
            <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
@@ -226,6 +226,7 @@ export default {
          show: true,
          type: "value",
          name: "单位/MW",
+          position:'left',
          // splitNumber: 4,
          nameTextStyle: {
            fontSize: 12,
@@ -240,10 +241,11 @@ export default {
      chartMsg: {
        color: ["#8EF0AB", "#288AFF"],
        xData: [],
-        yName: "单位/MW",
+        // yName: "单位/MW",
        yAxis:{
          type: "value",
          name: "单位/MW",
+
          // splitNumber: 4,
          nameTextStyle: {
            fontSize: 12,
@@ -369,6 +371,13 @@ export default {
    this.getDataList()
  },
  methods: {
+    handleChange() {
+      this.listQuery.reportTime = []
+      this.listQuery.end = null
+      this.listQuery.start = null
+      this.listQuery.startDate = null
+      this.listQuery.endDate = null
+    },
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      let spanOneArr = [], concatOne = 0;
      // let spanTwoArr = [], concatTwo = 0;
@@ -511,7 +520,7 @@ export default {
        let i = index + 1
        let m = 'value' + i
        ele.productionSituationPowerDataVOList.forEach((item) => {
-          maxData.push(item.chipTotalPower, item.componentTotalPower)
+          // maxData.push(item.chipTotalPower, item.componentTotalPower)
          this.dataArr[0]['' + m + ''] = item.chipTotalPower
          // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
          this.dataArr[1]['' + m + ''] = item.componentTotalPower
@@ -523,10 +532,23 @@ export default {
        //   props: 'value' + index + 1,
        // })
      })
-      this.chartMsg.yAxis.max = Math.ceil(Math.max(...maxData) / 100) * 100
-      this.chartMsgTarget.yAxis.max = Math.ceil(Math.max(...maxData) / 100) * 100
-      this.chartMsg.yAxis.min = Math.ceil(Math.min(...maxData) / 100) * 100
-      this.chartMsgTarget.yAxis.min = Math.ceil(Math.min(...maxData) / 100) * 100
+      if (this.listQuery.type === 2) {
+        res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
+          ele.productionSituationPowerDataVOList.forEach((item) => {
+            maxData.push(item.chipTotalPower, item.componentTotalPower)
+          })
+        })
+      } else {
+        res.data.list.forEach((ele, index) => {
+          ele.productionSituationPowerDataVOList.forEach((item) => {
+            maxData.push(item.chipTotalPower, item.componentTotalPower)
+          })
+        })
+      }
+      this.chartMsg.yAxis.max = Math.ceil(Math.max(...maxData))
+      this.chartMsgTarget.yAxis.max = Math.ceil(Math.max(...maxData))
+      this.chartMsg.yAxis.min = Math.ceil(Math.min(...maxData) )
+      this.chartMsgTarget.yAxis.min = Math.ceil(Math.min(...maxData))
      this.chartMsg.yAxis.interval = (this.chartMsg.yAxis.max - this.chartMsg.yAxis.min) / 4
      this.chartMsgTarget.yAxis.interval = (this.chartMsgTarget.yAxis.max - this.chartMsgTarget.yAxis.min) / 4
      if (this.listQuery.type === 2) {
@@ -550,7 +572,7 @@ export default {
            })
          })
        })
-        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 2].titleValue)
+        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 2].titleValue.slice(0, res.data.list[res.data.list.length - 2].titleValue.length - 3))
        // this.chartMsgTarget.series = [{
        //   name: "FTO投入",
        //   data: [
@@ -718,7 +740,7 @@ export default {
            })
          })
        })
-        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 1].titleValue)
+        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 1].titleValue.slice(0, res.data.list[res.data.list.length - 1].titleValue.length - 3))
        // this.chartMsgTarget.series = [{
        //   name: "FTO投入",
        //   data: [
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -448,7 +448,7 @@ export default {
      this.tableData = val
    },
    currentMenu(val) {
-      console.log(val)
+      // console.log(val)
      if (val === '瑞昌') {
        this.legendList = [
          { id: 1, name: "FTO投入", type: 1, color: "#8EF0AB" },
@@ -499,6 +499,8 @@ export default {
      this.listQuery.reportTime = []
      this.listQuery.end = null
      this.listQuery.start = null
+      this.listQuery.startDate = null
+      this.listQuery.endDate = null
    },
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      let spanOneArr = [], concatOne = 0;
@@ -552,12 +554,12 @@ export default {
    onValueChange(picker, k) { // 选中近k周后触发的操作
      // console.log(this.listQuery.reportTime[0], this.listQuery.reportTime[1])
      if (this.listQuery.start && this.listQuery.end) {
-        console.log(this.listQuery.reportTime)
+        // console.log(this.listQuery.reportTime)
        this.date1 = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
        this.date2 = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
        const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
        if (numDays > 168) {
-          console.log(numDays)
+          // console.log(numDays)
          this.$message({
            message: '周范围不能超过24周',
            type: 'warning'
@@ -576,7 +578,7 @@ export default {
      if (this.listQuery.reportTime) {
        // this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
        // this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
-        console.log(this.listQuery.reportTime[1])
+        // console.log(this.listQuery.reportTime[1])
        const numDays = (this.listQuery.reportTime[1] - this.listQuery.reportTime[0]) / (24 * 3600 * 1000);
        if (numDays > 30) {
          this.$message({
@@ -629,7 +631,7 @@ export default {
      if (this.chartMsgYearTarget.series[3]) {
        this.chartMsgYearTarget.series[3].data = []
      }
-      console.log(this.listQuery);
+      // console.log(this.listQuery);
      if (!this.listQuery.startDate && !this.listQuery.endDate) {
        return this.$message('请选择起止时间')
      }
@@ -650,7 +652,7 @@ export default {
        let i = index + 1
        let m = 'value' + i
        ele.productionSituationDataVOList.forEach((item) => {
-          maxData.push(item.ftoInput, item.chipYield, item.componentYield)
+          // maxData.push(item.ftoInput, item.chipYield, item.componentYield)
          this.dataArr[0]['' + m + ''] = item.ftoInput
          // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
          this.dataArr[1]['' + m + ''] = item.chipYield
@@ -661,26 +663,39 @@ export default {
            this.dataArr[3]['' + m + ''] = item.bipvProductOutput
          }
        })
-        this.chartMsg.yAxis.max = Math.ceil(Math.max(...maxData) / 100) * 100
-        this.chartMsgTarget.yAxis.max = Math.ceil(Math.max(...maxData) / 100) * 100
-        this.chartMsg.yAxis.min = Math.ceil(Math.min(...maxData) / 100) * 100
-        this.chartMsgTarget.yAxis.min = Math.ceil(Math.min(...maxData) / 100) * 100
-        this.chartMsg.yAxis.interval = (this.chartMsg.yAxis.max - this.chartMsg.yAxis.min) / 4
-        this.chartMsgTarget.yAxis.interval = (this.chartMsgTarget.yAxis.max - this.chartMsgTarget.yAxis.min) / 4
-
        // ele.titleValue
        // .push({
        //   label: ele.titleValue,
        //   props: 'value' + index + 1,
        // })
      })
+      if (this.listQuery.type === 2) {
+        res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
+          ele.productionSituationDataVOList.forEach((item) => {
+            maxData.push(item.ftoInput, item.chipYield, item.componentYield)
+          })
+        })
+      } else {
+        res.data.list.forEach((ele, index) => {
+          ele.productionSituationDataVOList.forEach((item) => {
+            maxData.push(item.ftoInput, item.chipYield, item.componentYield)
+         })
+        })
+      }
+
+        this.chartMsg.yAxis.max = Math.ceil(Math.max(...maxData))
+        this.chartMsgTarget.yAxis.max = Math.ceil(Math.max(...maxData))
+        this.chartMsg.yAxis.min = Math.ceil(Math.min(...maxData))
+        this.chartMsgTarget.yAxis.min = Math.ceil(Math.min(...maxData))
+        this.chartMsg.yAxis.interval = (this.chartMsg.yAxis.max - this.chartMsg.yAxis.min) / 4
+        this.chartMsgTarget.yAxis.interval = (this.chartMsgTarget.yAxis.max - this.chartMsgTarget.yAxis.min) / 4
      if (this.listQuery.type === 2) {
        if (res.data.list.length === 3) {
          this.gridLeft = false
        } else {
          this.gridLeft = true
        }
-        console.log(res.data.list.length);
+        // console.log(res.data.list.length);
        // res.data.list.forEach((ele) => {
        res.data.list.slice(0, res.data.list.length - 3).forEach((ele, index) => {
          // let i = index + 1
@@ -706,7 +721,7 @@ export default {
            }
          })
        })
-        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 2].titleValue)
+        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 2].titleValue.slice(0, res.data.list[res.data.list.length - 2].titleValue.length - 3))
        // this.chartMsgTarget.series = [{
        //   name: "FTO投入",
        //   data: [
@@ -734,7 +749,7 @@ export default {
        let targetObj = {}
        let obj = {}
        res.data.list.slice(res.data.list.length - 3, res.data.list.length - 1).forEach((ele, index) => {
-          console.log("ele",ele.titleValue);
+          // console.log("ele",ele.titleValue);
          // let i = index + 1
          // this.chartMsgTarget.xData.push(ele.titleValue)
          if (ele.titleValue.search('完成') == -1) {
@@ -744,7 +759,7 @@ export default {
            targetObj.componentYield = item.componentYield
            targetObj.bipvProductOutput = this.currentMenu == '瑞昌' ? null : item.bipvProductOutput
          })
-            console.log("fto",ele.titleValue,fto);
+            // console.log("fto",ele.titleValue,fto);
          } else {
            ele.productionSituationDataVOList.forEach((item) => {
              obj.ftoInput = item.ftoInput
@@ -924,7 +939,7 @@ export default {
          },)
        // }
        this.chartMsgTarget.series = [...fto, ...chip, ...std, ...bipv]
-        console.log('arr', this.chartMsgTarget.series)
+        // console.log('arr', this.chartMsgTarget.series)
        // arr.forEach((ele) => {

        // })
@@ -986,8 +1001,8 @@ export default {
            }
          })
        })
-        console.log(this.chartMsg.series[0]);
-        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 1].titleValue)
+        // console.log(this.chartMsg.series[0]);
+        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 1].titleValue.slice(0, res.data.list[res.data.list.length - 1].titleValue.length - 3))
        // this.chartMsgTarget.series = [{
        //   name: "FTO投入",
        //   data: [
@@ -1015,7 +1030,7 @@ export default {
        let targetObj = {}
        let obj = {}
        res.data.list.slice(res.data.list.length - 2, res.data.list.length).forEach((ele, index) => {
-          console.log("ele", ele.titleValue);
+          // console.log("ele", ele.titleValue);
          // let i = index + 1
          // this.chartMsgTarget.xData.push(ele.titleValue)
          ele.productionSituationDataVOList.forEach((item) => {
@@ -1024,7 +1039,7 @@ export default {
              targetObj.chipYield = item.chipYield
              targetObj.componentYield = item.componentYield
              targetObj.bipvProductOutput = this.currentMenu == '瑞昌' ? null : item.bipvProductOutput
-            console.log("fto", ele.titleValue, fto);
+            // console.log("fto", ele.titleValue, fto);
          } else {

              obj.ftoInput = item.ftoInput
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -7,7 +7,7 @@
    <div class="search">
      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
        <el-form-item label="时间维度" prop="type">
-          <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
+          <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
            <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
@@ -422,6 +422,13 @@ export default {
    this.getDataList()
  },
  methods: {
+    handleChange() {
+      this.listQuery.reportTime = []
+      this.listQuery.end = null
+      this.listQuery.start = null
+      this.listQuery.endTime = null
+      this.listQuery.beginTime = null
+    },
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      let spanOneArr = [], concatOne = 0;
      // let spanTwoArr = [], concatTwo = 0;
Author	SHA1	Message	Date
‘937886381’	242e42a56a	Merge branch 'projects/mescc/develop' into projects/mescc/zhp	2024-06-28 14:42:26 +08:00
‘937886381’	2ab541d4c1	修改bug	2024-06-28 14:41:50 +08:00
juzi	95d530e5f1	Merge pull request 'projects/mescc/zhp' (#74 ) from projects/mescc/zhp into projects/mescc/develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #74	2024-06-28 13:22:49 +08:00
‘937886381’	83b9867c2a	Merge branch 'projects/mescc/develop' into projects/mescc/zhp	2024-06-28 13:16:07 +08:00
‘937886381’	7b8f4cac21	修改bug	2024-06-28 13:15:43 +08:00
juzi	7886d5ad5a	Merge pull request 'projects/mescc/zjl' (#73 ) from projects/mescc/zjl into projects/mescc/develop Some checks are pending continuous-integration/drone/push Build is pending Details Reviewed-on: #73	2024-06-28 11:10:40 +08:00