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

修改bug
Merge pull request 'projects/mescc/dy' (#70 ) from projects/mescc/dy into projects/mescc/develop
2024-06-27 15:47:28 +08:00 · 2024-06-27 15:47:07 +08:00 · 2024-06-27 14:59:19 +08:00 · 2024-06-27 14:56:47 +08:00 · 2024-06-27 14:53:37 +08:00 · 2024-06-27 14:53:11 +08:00
5 changed files with 144 additions and 82 deletions
--- a/src/views/copilot/factoryData/hdIndex.vue
+++ b/src/views/copilot/factoryData/hdIndex.vue
@ -134,11 +134,11 @@ export default {
        if (preData && preData[0] != null) {
          for (const factory of preData) {
            if (factory.previousGlassType === 0) {
-              preDataDetail[1] = factory.previousYearOutputNumber
+              preDataDetail[1] = factory.previousOutputNumber
            } else if (factory.previousGlassType === 1) {
-              preDataDetail[2] = factory.previousYearOutputNumber
-            } else if (factory.previousYearOutputNumber === 2) {
-              currentDataDetail[3] = factory.outputNumber
+              preDataDetail[2] = factory.previousOutputNumber
+            } else if (factory.previousGlassType === 2) {
+              preDataDetail[3] = factory.previousOutputNumber
            }
          }
        }
--- a/src/views/copilot/factoryData/index.vue
+++ b/src/views/copilot/factoryData/index.vue
@ -132,16 +132,17 @@ export default {
            // }
          }
        }
-        if (preData && preData[0] != null) {
+        if (preData) {
          for (const factory of preData) {
            if (factory.previousGlassType === 0) {
-              preDataDetail[1] = factory.previousYearOutputNumber
+              console.log('factory', factory)
+              preDataDetail[1] = factory.previousOutputNumber
            } else if (factory.previousGlassType === 1) {
-              preDataDetail[2] = factory.previousYearOutputNumber
+              preDataDetail[2] = factory.previousOutputNumber
            }
          }
        }
-        if (targetListResponse && targetListResponse[0] != null) {
+        if (targetListResponse) {
          for (const factory of targetListResponse) {
            targetDataDetail[0] = factory.ftoInput
            // if (factory.previousGlassType === 0) {
@ -153,7 +154,7 @@ export default {
          }
        }
        // console.log('ftoInvest',ftoInvest)
-        if (factoryListResponse && factoryListResponse[0] != null) {
+        if (factoryListResponse) {
          for (const factory of factoryListResponse) {
            // targetDataDetail[0] = factory.ftoInput
            if (factory.glassType === 0) {
@ -163,6 +164,7 @@ export default {
            }
          }
        }
+        console.log('  this.factoryData.preDataDetail', preDataDetail);
        this.factoryData.preDataDetail = preDataDetail
        this.factoryData.currentDataDetail = currentDataDetail
        this.factoryData.targetDataDetail = targetDataDetail
--- a/src/views/produce/data/add-or-updata.vue
+++ b/src/views/produce/data/add-or-updata.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-25 08:59:33
+ * @LastEditTime: 2024-06-26 13:39:22
 * @LastEditors: DY
 * @Description:
 -->
@ -116,6 +116,8 @@
            <p class="title">标准组件平均功率(W)</p>
            <p class="text">{{ dataForm.componentAveragePower }}</p>
          </el-col>
+        </el-row>
+        <el-row :gutter="24">
          <el-col :span="6">
            <p class="title">标准组件转化效率</p>
            <p class="text">{{ dataForm.componentTransRate }}</p>
--- a/src/views/produce/data/index.vue
+++ b/src/views/produce/data/index.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-26 11:00:11
- * @LastEditors: zhp
+ * @LastEditTime: 2024-06-27 14:56:20
+ * @LastEditors: DY
 * @Description:
 -->
 <template>
@ -210,7 +210,7 @@ export default {
        {
          prop: 'factory',
          label: '工厂名称',
-          filter: (val) =>  [val],
+          filter: (val) =>  factoryList[val],
          minWidth: 180,
          showOverflowtooltip: true
        },
--- a/src/views/produce/workOrder/add-or-updata.vue
+++ b/src/views/produce/workOrder/add-or-updata.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-17 17:03:17
+ * @LastEditTime: 2024-06-27 14:50:21
 * @LastEditors: DY
 * @Description:
 -->
@ -76,15 +76,44 @@
          <p class="text">{{ dataForm.endDate?.length > 0 ? dataForm.endDate[0] + '-' + dataForm.endDate[1] + '-' + dataForm.endDate[2] : '' }}</p>
        </el-col>
      </el-row>
-      <el-divider></el-divider>
-      <div class="chartDiv">
-        <div ref="bar" :style="{ height: '30vh', width: '40vw' }" />
-        <div ref="pie" :style="{ height: '30vh', width: '40vw' }" />
-      </div>
-      <div class="chartDiv">
-        <div ref="equipmentLine" :style="{ height: '30vh', width: '40vw' }" />
-        <div ref="line" v-show="dataForm.orderStatus === 2" :style="{ height: '30vh', width: '40vw' }" />
-      </div>
+      <div style="width: 100%; padding: 0 32px"><el-divider style="margin: 0"></el-divider></div>
+      <el-row :gutter="0" style="margin: 20px 32px">
+        <el-col :span="8">
+          <div>
+            <small-title slot="title" :no-padding="true">
+              产品良率
+            </small-title>
+            <div ref="pie" :style="{ height: '40vh', width: '100%' }" />
+          </div>
+        </el-col>
+        <el-col :span="16">
+          <div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
+            <small-title slot="title" :no-padding="true">
+              历史趋势
+            </small-title>
+            <div ref="line" v-show="dataForm.orderStatus === 2" :style="{ height: '40vh', width: '50vw' }" />
+          </div>
+        </el-col>
+      </el-row>
+      <div style="width: 100%; padding: 0 32px"><el-divider style="margin: 0"></el-divider></div>
+      <el-row :gutter="0" style="margin: 20px 32px">
+        <el-col :span="8">
+          <div>
+            <small-title slot="title" :no-padding="true">
+              生产明细
+            </small-title>
+            <div ref="bar" :style="{ height: '40vh', width: '100%' }" />
+          </div>
+        </el-col>
+        <el-col :span="16">
+          <div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
+            <small-title slot="title" :no-padding="true">
+              待制品分布
+            </small-title>
+            <div ref="equipmentLine" :style="{ height: '40vh', width: '50vw' }" />
+          </div>
+        </el-col>
+      </el-row>
    </div>
  </el-drawer>

@ -118,7 +147,8 @@ export default {
      barChart: null,
      equipmentLineChart: null,
      visible: false,
-      dataForm: {}
+      dataForm: {},
+      colorList: ['#3E8EF7', '#69E6D8', '#F7C739'] // pie颜色
    }
  },
  beforeDestroy() {
@ -227,38 +257,47 @@ export default {
    initChart(barData) {
      this.barChart = echarts.init(this.$refs['bar'])
      this.barChart.setOption({
-        title: {
-          text: '生产明细',
-          left: 'center'
-          // subtext: 'Fake Data'
-        },
+        // title: {
+        //   text: '生产明细',
+        //   left: 'center'
+        //   // subtext: 'Fake Data'
+        // },
+        color: ['#3E8EF7'],
        tooltip: {
          trigger: 'axis'
        },
        grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
        calculable: true,
        grid: {
-          top: '20%',
-          left: "1%",
-          right: "3%",
-          bottom: "1%",
+          top: '15%',
+          left: 0,
+          right: '10%',
+          bottom: 0,
          containLabel: true
        },
        xAxis: {
          type: 'category',
          data: ['目标产量', '计划投入量', '实际投入', '实际产出', '废品数量', '待再加工数量'],
          axisLabel: {
-            rotate:45
+            rotate: 25
          }
        },
        yAxis: {
-          type: 'value'
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
        },
        series: [
          {
            data: barData,
            type: 'bar',
-            barWidth: '40%'
+            barWidth: '40%',
+            label: {
+              show: true,
+              position: 'top'
+            }
          }
        ]
      }, true)
@ -266,8 +305,9 @@ export default {
    initPieChart(pieData) {
      this.pieChart = echarts.init(this.$refs['pie'])
      this.pieChart.setOption({
+        color: ['#3E8EF7', '#69E6D8', '#F7C739'],
        title: {
-          text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -',
+          // text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -',
          left: 'center'
          // subtext: 'Fake Data'
        },
@ -275,31 +315,31 @@ export default {
          trigger: 'item'
        },
        legend: {
-          top: '5%',
-          left: 'right',
-          orient: 'vertical'
+          bottom: 0,
+          left: 'center'
        },
        series: [
          {
            // name: 'Access From',
            type: 'pie',
-            radius: ['40%', '70%'],
+            radius: ['50%', '70%'],
            avoidLabelOverlap: false,
+            data: pieData,
            label: {
-              show: false,
-              position: 'center'
-            },
-            emphasis: {
-              label: {
-                show: false,
-                fontSize: 40,
-                fontWeight: 'bold'
+              show: true,
+              position: 'outside',
+              formatter: '{d|{d}%} \n {b|{b}}',
+              rich: {
+                d: {
+                  color: 'inherit', // 系列色
+                  verticalAlign: 'top'
+                },
+                b: {
+                  color: '#8C8C8C',
+                  verticalAlign: 'top'
+                }
              }
-            },
-            labelLine: {
-              show: false
-            },
-            data: pieData
+            }
          }
        ]
      }, true)
@ -307,39 +347,48 @@ export default {
    initEqLineChart(xAxisList, yAxisList) {
      this.equipmentLineChart = echarts.init(this.$refs['equipmentLine'])
      this.equipmentLineChart.setOption({
-        title: {
-          text: '待制品分布',
-          left: 'center'
-          // subtext: 'Fake Data'
-        },
+        // title: {
+        //   text: '待制品分布',
+        //   left: 'center'
+        //   // subtext: 'Fake Data'
+        // },
+        color: ['#3E8EF7'],
        tooltip: {
          trigger: 'axis'
        },
        grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
        calculable: true,
        grid: {
-          top: '20%',
-          left: "1%",
-          right: "3%",
-          bottom: "1%",
+          top: '15%',
+          left: 0,
+          right: 0,
+          bottom: 0,
          containLabel: true
        },
        xAxis: {
          type: 'category',
          data: xAxisList,
          axisLabel: {
-            rotate:45,
+            rotate: 25
            // width: '10%'
          }
        },
        yAxis: {
-          type: 'value'
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
        },
        series: [
          {
            data: yAxisList,
            type: 'bar',
-            barWidth: '50%'
+            barWidth: '50%',
+            label: {
+              show: true,
+              position: 'top'
+            }
          }
        ]
      }, true)
@ -347,27 +396,39 @@ export default {
    initLineChart(xAxisList, seriesList) {
      this.lineChart = echarts.init(this.$refs['line'])
      this.lineChart.setOption({
-        title: {
-          text: '历史趋势',
-          left: 'center' // 设置标题居中
-        },
+        color: ['#3E8EF7'],
        tooltip: {
          trigger: 'item'
        },
+        grid: {
+          top: '15%',
+          left: 0,
+          right: 0,
+          bottom: 0,
+          containLabel: true
+        },
        xAxis: {
          type: 'category',
          data: xAxisList,
          axisLabel: {
-            rotate:45
+            rotate: 25
          }
        },
        yAxis: {
-          type: 'value'
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
        },
        series: [
          {
            data: seriesList,
-            type: 'line'
+            type: 'line',
+            label: {
+              show: true,
+              position: 'top'
+            }
          }
        ]
      }, true)
@ -381,14 +442,8 @@ export default {
  },
 };
 </script>
+
 <style scoped>
-.chartDiv {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  padding: 5px;
-  padding-left: 30px;
-}
  .drawer >>> .el-drawer {
  border-radius: 8px 0 0 8px;
 }
@ -405,7 +460,8 @@ export default {
 }
 .detailBox p {
  margin: 0;
-  padding: 0 32px;
+  padding-left: 32px;
+  /* padding: 0 32px; */
 }
 .detailBox .title {
  /* width: 56px; */
@ -427,6 +483,8 @@ export default {
 }
 .detailBox {
  padding-top: 30px;
-  width: 99%;
+  overflow-x: hidden;
+  overflow-y: auto;
+  /* width: 99%; */
 }
 </style>
Author	SHA1	Message	Date
‘937886381’	445ebe339d	Merge branch 'projects/mescc/develop' into projects/mescc/zhp	2024-06-27 15:47:28 +08:00
‘937886381’	353e3e0f35	修改bug	2024-06-27 15:47:07 +08:00
juzi	ea29a33c2a	Merge pull request 'projects/mescc/dy' (#70 ) from projects/mescc/dy into projects/mescc/develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #70	2024-06-27 14:59:19 +08:00
helloDy	d5673f3c9f	工厂更改	2024-06-27 14:56:47 +08:00
helloDy	3064722052	Merge branch 'projects/mescc/develop' into projects/mescc/dy	2024-06-27 14:53:37 +08:00
helloDy	dfe52cbac5	工单管理详情ui	2024-06-27 14:53:11 +08:00
juzi	68e386333b	Merge pull request 'projects/mescc/zhp' (#69 ) from projects/mescc/zhp into projects/mescc/develop Some checks are pending continuous-integration/drone/push Build is pending Details Reviewed-on: #69	2024-06-27 14:43:32 +08:00