From 5e703350e1a3449398ab3b5c1b9c640c34a4a46b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 24 Jun 2024 10:39:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/comprehensiveData.vue        |  4 +-
 src/views/report/produceConversion.vue        | 12 +++--
 src/views/report/productionSituationMW.vue    | 10 ++--
 .../report/productionSituationTablets.vue     | 49 ++++++++++++++++---
 src/views/report/productionYield.vue          |  8 +--
 5 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index 2d9ab0d..92fe0a3 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -27,11 +27,11 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           至
           <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 6787cd9..50477f9 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -20,11 +20,11 @@
         </el-form-item>
         <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           至
           <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@@ -84,7 +84,7 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
+      <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
         :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
@@ -107,7 +107,8 @@ export default {
     return {
       otherProps: [],
       title: '',
-      currentMenu:'邯郸',
+      currentMenu: '邯郸',
+      showTable:false,
       listQuery: {
         start: undefined,
         end: undefined,
@@ -652,7 +653,8 @@ export default {
       //     })
       //   }
       // }
-      this.tableData =res.data[0].list.length !== 0? dataArr : []
+      this.tableData = res.data[0].list.length !== 0 ? dataArr : []
+      this.showTable = !this.showTable
     },
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index a35f402..fc03753 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -18,11 +18,11 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           至
           <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@@ -103,7 +103,7 @@
           :chartId="chartId" :chartNum="chartNum" />
         <!-- </el-col> -->
       </el-row>
-      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
+      <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
         :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
@@ -126,6 +126,7 @@ export default {
     return {
       otherProps: [],
       start: undefined,
+      showTable:false,
       currentMenu: '邯郸',
       end: undefined,
       title: '',
@@ -897,6 +898,7 @@ export default {
         }
       }
       this.tableData = res.data.length != 0 ? this.dataArr : []
+      this.showTable = !this.showTable
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
       //   console.log(ele);
@@ -914,7 +916,7 @@ export default {
       // })
       // console.log(dataArr)
       // this.tableProps.push()
-      this.listQuery.total = res.data.total
+      // 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] : '--'
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index c33d94c..372370d 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -18,11 +18,11 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           至
           <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@@ -103,7 +103,7 @@
           :chartId="chartId" :chartNum="chartNum" />
         <!-- </el-col> -->
       </el-row>
-      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
+      <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
         :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
@@ -128,7 +128,8 @@ export default {
       start: undefined,
       currentMenu:'邯郸',
       end: undefined,
-      title:'',
+      title: '',
+      showTable:false,
       listQuery: {
         pageNo: 1,
         pageSize:999,
@@ -425,6 +426,9 @@ export default {
   },
   watch: {
     // 监听左侧菜单栏是否展开
+    dataArr(val) {
+      this.tableData = val
+    },
     isOpen(val) {
       if (this.$route.name === "productionSituationTablets") {
         this.chartNum++;
@@ -902,6 +906,30 @@ export default {
             prop: 'value' + i
           })
         })
+        res.data.list.forEach((ele, index) => {
+          let i = index + 1
+          let m = 'value' + i
+          ele.productionSituationDataVOList.forEach((item) => {
+            this.dataArr[0]['' + m + ''] = item.ftoInput
+            this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1]['' + m + ''] = item.chipYield
+            this.dataArr[2]['' + m + ''] = item.componentYield
+            // this.dataArr[3]['' + m + ''] = item.bipvProductOutput
+            if (this.dataArr[3]) {
+              this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+              this.dataArr[3]['' + m + ''] = item.bipvProductOutput
+            }
+          })
+          // ele.titleValue
+          // .push({
+          //   label: ele.titleValue,
+          //   props: 'value' + index + 1,
+          // })
+        })
+
         // res.data.list.forEach((ele) => {
         res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
           // let i = index + 1
@@ -1048,7 +1076,7 @@ export default {
               // } else {
               // }
             })
-            console.log("fto", ele.titleValue, fto);
+
           } else {
             ele.productionSituationDataVOList.forEach((item) => {
               console.log(item);
@@ -1239,8 +1267,13 @@ export default {
           }
           }
       }
-      console.log(this.dataArr[0]['item'],this.chartMsg.series[0].data)
-      this.tableData = res.data.length != 0 ? this.dataArr : []
+      console.log(this.dataArr)
+      console.log(this.tableData);
+      // this.$nextTick(() => {
+      this.tableData = this.dataArr
+      this.showTable = !this.showTable
+      // })
+      // this.$forceUpdate()
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
       //   console.log(ele);
@@ -1258,7 +1291,7 @@ export default {
       // })
       // console.log(dataArr)
       // this.tableProps.push()
-      this.listQuery.total = res.data.total
+      // 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] : '--'
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index 7bdfbf2..61a3176 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -20,11 +20,11 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           至
           <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@@ -84,7 +84,7 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
+      <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
         :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
@@ -108,6 +108,7 @@ export default {
       start: undefined,
       end: undefined,
       title: '',
+      showTable:false,
       listQuery: {
         pageNo: 1,
         pageSize: 999,
@@ -729,6 +730,7 @@ export default {
 
       console.log(dataArr)
       this.tableData = res.data.length != 0 ? dataArr : []
+      this.showTable = !this.showTable
       // this.tableProps.push()
     },
     _setTableHeight() {
-- 
2.24.3


From 196a615f610802e98f38367c084c0aac62cd5bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 24 Jun 2024 10:44:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/productionSituationTablets.vue     | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 372370d..04247e1 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -906,30 +906,6 @@ export default {
             prop: 'value' + i
           })
         })
-        res.data.list.forEach((ele, index) => {
-          let i = index + 1
-          let m = 'value' + i
-          ele.productionSituationDataVOList.forEach((item) => {
-            this.dataArr[0]['' + m + ''] = item.ftoInput
-            this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-            this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-            this.dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-            // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-            this.dataArr[1]['' + m + ''] = item.chipYield
-            this.dataArr[2]['' + m + ''] = item.componentYield
-            // this.dataArr[3]['' + m + ''] = item.bipvProductOutput
-            if (this.dataArr[3]) {
-              this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-              this.dataArr[3]['' + m + ''] = item.bipvProductOutput
-            }
-          })
-          // ele.titleValue
-          // .push({
-          //   label: ele.titleValue,
-          //   props: 'value' + index + 1,
-          // })
-        })
-
         // res.data.list.forEach((ele) => {
         res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
           // let i = index + 1
-- 
2.24.3