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

Reviewed-on: #60

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: zhp
  # @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-06-21 13:40:38
+ # @LastEditTime: 2024-06-24 08:29:45
  # @LastEditors: zhp
  # @Description:
 ###

src/views/report/components/produceLineBar.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-06-21 14:37:44
+ * @LastEditTime: 2024-06-24 08:46:34
  * @LastEditors: zhp
  * @Description:
 -->
@@ -83,7 +83,7 @@ export default {
         dataZoom: [//滚动条
           {
             // 设置滚动条的隐藏与显示
-            show: true,
+            show: false,
             // 设置滚动条类型
             type: "slider",
             // 设置背景颜色

src/views/report/components/produceLineBarTarget.vue

@@ -1,14 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:36
- * @LastEditTime: 2024-06-21 14:37:56
+ * @LastEditTime: 2024-06-24 08:46:42
- * @LastEditors: zhp
- * @Description:
--->
-<!--
- * @Author: zhp
- * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-06-20 16:02:21
  * @LastEditors: zhp
  * @Description:
 -->
@@ -90,7 +83,7 @@ export default {
         dataZoom: [//滚动条
           {
             // 设置滚动条的隐藏与显示
-            show: true,
+            show: false,
             // 设置滚动条类型
             type: "slider",
             // 设置背景颜色

src/views/report/components/produceLineBarYearTarget.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:52
- * @LastEditTime: 2024-06-21 14:37:59
+ * @LastEditTime: 2024-06-24 08:46:46
  * @LastEditors: zhp
  * @Description:
 -->
@@ -83,7 +83,7 @@ export default {
         dataZoom: [//滚动条
           {
             // 设置滚动条的隐藏与显示
-            show: true,
+            show: false,
             // 设置滚动条类型
             type: "slider",
             // 设置背景颜色

src/views/report/components/produceLineYieldBarTarget.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-21 09:05:14
- * @LastEditTime: 2024-06-21 14:38:06
+ * @LastEditTime: 2024-06-24 08:46:49
  * @LastEditors: zhp
  * @Description:
 -->
@@ -101,7 +101,7 @@ export default {
         dataZoom: [//滚动条
           {
             // 设置滚动条的隐藏与显示
-            show: true,
+            show: false,
             // 设置滚动条类型
             type: "slider",
             // 设置背景颜色

src/views/report/comprehensiveData.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-21 15:18:20
+ * @LastEditTime: 2024-06-24 09:39:27
  * @LastEditors: zhp
  * @Description:
 -->
@@ -58,7 +58,7 @@
         </el-form-item>
       </el-form>
       <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.pageNo"
-        :limit="listQuery.pageSize" :table-data="tableData">
+        :limit="listQuery.pageSize" :table-data="tableData" :max-height="tableH">
       </base-table>
     </div>
   </div>
@@ -101,6 +101,7 @@ export default {
         end: undefined,
         reportTime: []
       },
+      tableH: this.tableHeight(269),
       timeList: [
         {
           value: 0,
@@ -191,6 +192,7 @@ export default {
   //   this.changeTime()
   // },
   mounted() {
+    this.tableH = this.tableHeight(269);
     // this.getOverView()
     const today = new Date()
     const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
@@ -489,7 +491,7 @@ export default {
       if (res.data.length === 0) {
         this.tableData = []
       } else {
-        if (this.currentMenu !== '瑞昌') {
+        if (this.currentMenu != '瑞昌') {
           this.tableData = dataArr
         } else {
           this.tableData = dataArr.filter(function (item) {
@@ -497,13 +499,6 @@ export default {
           });
         }
       }
-      this.listQuery.total = res.data.total
-      if (this.listQuery.total > 0) {
-        this.tableData.forEach(item => {
-          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
-          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
-        })
-      }
     },
     buttonClick(val) {
       this.listQuery.factorys = val.factory?.length > 0 ? val.factory : undefined

src/views/report/produceConversion.vue

@@ -195,26 +195,7 @@ export default {
           {
             name: "",
             // yAxisIndex: 0,
-            data: [
+            data: [],
-              {
-                value: 1,
-                itemStyle: {
-                  color: '#8EF0AB'
-                }
-              },
-              {
-                value: 2,
-                itemStyle: {
-                  color: '#288AFF'
-                }
-              },
-              {
-                value: 0,
-                yAxisIndex: 1,
-                itemStyle: {
-                  color: '#64BDFF'
-                }
-              }],
             type: "bar",
             barWidth: 20,
             label: {
@@ -229,13 +210,7 @@ export default {
           {
             name: '',
             type: 'bar',
-            data: [0, 0, 0,
+            data: [],
-              {
-                value: 5,
-                itemStyle: {
-                  color: '#68C483'
-                }
-              }],
             type: "bar",
             barWidth: 20,
             label: {
@@ -370,7 +345,7 @@ export default {
   watch: {
     // 监听左侧菜单栏是否展开
     isOpen(val) {
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "produceConversion") {
         this.chartNum++;
       }
     },
@@ -385,7 +360,7 @@ export default {
   },
   activated() {
     // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
-    if (this.$route.name === "ChipYieldBM") {
+    if (this.$route.name === "produceConversion") {
       this.chartNum++;
     }
   },
@@ -513,6 +488,12 @@ export default {
     async getDataList() {
       this.otherProps = []
       this.chartMsg.xData = []
+      this.chartMsg.series[0].data = []
+      this.chartMsg.series[1].data = []
+      this.chartMsg.series[2].data = []
+      this.chartMsgYearTarget.series[0].data = []
+      this.chartMsgYearTarget.series[1].data = []
+
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
         this.listQuery.beginTime = this.listQuery.reportTime[0]
@@ -676,7 +657,7 @@ export default {
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
       this.chartHeight = this.tableHeight(137) / 2 - 111;
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "produceConversion") {
         this.chartNum++;
       }
     },

src/views/report/productionSituationMW.vue

@@ -95,6 +95,9 @@
         </el-col> -->
       </el-row>
       <el-row v-else>
+        <div class="blueTip">
+          生产情况对比
+        </div>
         <!-- <el-col :span="12"> -->
         <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
           :chartId="chartId" :chartNum="chartNum" />
@@ -291,7 +294,7 @@ export default {
   },
   computed: {
     dataArr() {
-      if (this.currentMenu != '瑞昌') {
+      // if (this.currentMenu != '瑞昌') {
         return [{
           factory: null,
           item: '芯片总功率',
@@ -302,7 +305,7 @@ export default {
           item: '	标准组件总功率',
           unit: 'MW'
         }]
-      }
+      // }
     },
     tableProps() {
       return [
@@ -484,6 +487,11 @@ export default {
       this.chartMsg.xData = []
       this.chartMsgTarget.xData = []
       this.chartMsgYearTarget.xData = []
+      this.chartMsg.series[0].data = []
+      this.chartMsg.series[1].data = []
+      this.chartMsgTarget.series = []
+      this.chartMsgYearTarget.series[0].data = []
+      this.chartMsgYearTarget.series[1].data = []
       console.log(this.listQuery);
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)

src/views/report/productionSituationTablets.vue

@@ -95,6 +95,9 @@
         </el-col> -->
       </el-row>
       <el-row v-else>
+        <div class="blueTip">
+          生产情况对比
+        </div>
         <!-- <el-col :span="12"> -->
         <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
           :chartId="chartId" :chartNum="chartNum" />
@@ -257,9 +260,7 @@ export default {
           },
           axisLabel: {},
         },
-        series: [
+        series: [],
-
-        ],
       },
       chartMsg: {
         color: ["#8EF0AB", "#288AFF", "#64BDFF", '#7164FF'],
@@ -425,7 +426,7 @@ export default {
   watch: {
     // 监听左侧菜单栏是否展开
     isOpen(val) {
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "productionSituationTablets") {
         this.chartNum++;
       }
     },
@@ -440,7 +441,7 @@ export default {
   },
   activated() {
     // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
-    if (this.$route.name === "ChipYieldBM") {
+    if (this.$route.name === "productionSituationTablets") {
       this.chartNum++;
     }
   },
@@ -570,6 +571,19 @@ export default {
       this.chartMsg.xData = []
       this.chartMsgTarget.xData = []
       this.chartMsgYearTarget.xData = []
+      this.chartMsg.series[0].data = []
+      this.chartMsg.series[1].data = []
+      this.chartMsg.series[2].data = []
+      if (this.chartMsg.series[3]) {
+        this.chartMsg.series[3].data = []
+      }
+      this.chartMsgTarget.series = []
+      this.chartMsgYearTarget.series[0].data = []
+      this.chartMsgYearTarget.series[1].data = []
+      this.chartMsgYearTarget.series[2].data = []
+      if (this.chartMsgYearTarget.series[3]) {
+        this.chartMsgYearTarget.series[3].data = []
+      }
       console.log(this.listQuery);
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
@@ -1187,7 +1201,8 @@ export default {
           })
         for (let i in this.dataArr[0]) {
             this.chartMsg.series[0].name = this.dataArr[0]['item']
-            if (i.search('value') === 0) {
+          if (i.search('value') === 0) {
+            console.log("this.dataArr[0]['item']", this.dataArr[0]['item'], this.dataArr[0][i]);
               this.chartMsg.series[0].data.push({
                 name: this.dataArr[0]['item'],
                 value: this.dataArr[0][i]
@@ -1224,6 +1239,7 @@ export default {
           }
           }
       }
+      console.log(this.dataArr[0]['item'],this.chartMsg.series[0].data)
       this.tableData = res.data.length != 0 ? this.dataArr : []
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
@@ -1253,7 +1269,7 @@ export default {
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
       this.chartHeight = this.tableHeight(137) / 2 - 111;
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "productionSituationTablets") {
         this.chartNum++;
       }
     },

src/views/report/productionYield.vue

@@ -364,7 +364,7 @@ export default {
 
     },
     isOpen(val) {
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "productionYield") {
         this.chartNum++;
       }
     },
@@ -507,6 +507,12 @@ export default {
     async getDataList() {
       this.otherProps = []
       this.chartMsg.xData = []
+      this.chartMsg.series[0].data = []
+      this.chartMsg.series[1].data = []
+      this.chartMsg.series[2].data = []
+      this.chartMsg.series[3].data = []
+      this.chartMsgYearTarget.series[0].data = []
+      this.chartMsgYearTarget.series[1].data = []
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
@@ -660,7 +666,7 @@ export default {
           }
         }
       } else {
-        res.data.list.slice.forEach((ele, index) => {
+        res.data.list.forEach((ele, index) => {
           let i = index + 1
           this.chartMsg.xData.push(ele.titleValue)
           this.otherProps.push({
@@ -724,18 +730,11 @@ export default {
       console.log(dataArr)
       this.tableData = res.data.length != 0 ? dataArr : []
       // this.tableProps.push()
-      this.listQuery.total = res.data.total
-      if (this.listQuery.total > 0) {
-        this.tableData.forEach(item => {
-          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
-          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
-        })
-      }
     },
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
       this.chartHeight = this.tableHeight(137) / 2 - 111;
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "productionYield") {
         this.chartNum++;
       }
     },