pdf

2023-10-08 16:59:09 +08:00
parent 699810f40a
commit 96d52fafee
10 changed files with 552 additions and 302 deletions
--- a/src/views/core/analysis/LineChart.vue
+++ b/src/views/core/analysis/LineChart.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zhp
 * @Date: 2023-09-13 09:02:25
- * @LastEditTime: 2023-09-13 10:33:20
- * @LastEditors: zhp
+ * @LastEditTime: 2023-10-08 15:39:38
+ * @LastEditors: DY
 * @Description:
 -->
 <template>
@@ -61,11 +61,12 @@ export default {
  // },
  methods: {
    initChart(xData, yData,lineName) {
-      console.log(xData,yData);
+      console.log( '打印结果', xData,yData, lineName);
      this.chart = echarts.init(this.$el, 'macarons')
      this.setOptions(xData, yData, lineName)
    },
    setOptions(xData, yData, lineName) {
+      console.log('da', lineName)
      let seriesData = []
        lineName.forEach((item,index) => {
          seriesData.push({
@@ -86,7 +87,7 @@ export default {
          type: 'value'
        },
        series: seriesData
-      })
+      }, true)
    }
  }
 }
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -228,7 +228,14 @@ export default {
          this.listQuery.lineId = val.lineIds
          this.listQuery.startTime = val.time ? String(new Date(val.time[0]).getTime()) : undefined;
          this.listQuery.endTime = val.time ? String(new Date(val.time[1]).getTime()) : undefined;
-          this.getData()
+          if (val.time) {
+            this.getData()
+          } else {
+            this.$message({
+              message: '请选择时间',
+              type: 'warning'
+            });
+          }
          break;
        case 'reset':
          this.$refs.searchBarForm.resetForm();
--- a/src/views/core/analysis/balanceChart.vue
+++ b/src/views/core/analysis/balanceChart.vue
@@ -1,14 +1,14 @@
 <!--
 * @Author: zhp
 * @Date: 2023-09-13 09:02:25
- * @LastEditTime: 2023-09-20 09:29:40
+ * @LastEditTime: 2023-10-08 16:36:37
 * @LastEditors: DY
 * @Description:
 -->
 <template>
  <div>
    <div style="margin: 20px">
-      <el-button v-for="(item, index) in dataArray" :key="index" @click="changeChart(index)">{{ item.name }}</el-button>
+      <el-button v-for="(item, index) in buttonList" :key="index" :class="[item.actived ? 'activeButton': 'normalButton']" @click="changeChart(index)">{{ item.name }}</el-button>
    </div>
    <div ref="chartDiv" :class="className" :style="{height:height,width:width}" />
  </div>
@@ -43,7 +43,8 @@ export default {
    return {
      chart: null,
      dataArray: [],
-      xDatas: []
+      xDatas: [],
+      buttonList: []
    }
  },
  mounted() {
@@ -51,12 +52,34 @@ export default {
  methods: {
    changeChart(index) {
      this.setOptions(this.xDatas, this.dataArray[index])
+      this.buttonList.forEach((item, s) => {
+        if (index === s) {
+          // item.actived = true
+          this.$nextTick(() =>{
+            // item.actived = true
+            this.$set(item, 'actived', true)
+          })
+        } else {
+          // item.actived = false
+          this.$nextTick(() =>{
+            // item.actived = false
+            this.$set(item, 'actived', false)
+          })
+          // this.$set(item, 'actived', false)
+        }
+      })
+      console.log('看一下数22222据', this.dataArray)
    },
    initChart(xData, yData, lineName) {
      this.dataArray = yData
+      this.buttonList = this.dataArray.map((item, index) => {
+        return {
+          'name': item.name,
+          'actived': index === 0 ? true : false
+        }
+      })
+      console.log('看一下数据', this.dataArray)
      this.xDatas = xData
-      console.log(xData,yData);
-      console.log('zale', yData[0].eqData)
      this.chart = echarts.init(this.$refs.chartDiv, 'macarons')
      this.setOptions(xData, yData[0], lineName)
    },
@@ -100,3 +123,12 @@ export default {
  }
 }
 </script>
+
+<style scoped>
+.activeButton {
+  background-color: rgb(93,159,255);
+}
+.normalButton {
+  background-color: none;
+}
+</style>
--- a/src/views/core/analysis/yieldAnalysis/index.vue
+++ b/src/views/core/analysis/yieldAnalysis/index.vue
@@ -57,8 +57,7 @@ export default {
        lineIds: [],
        time: ''
      },
-      xData: [],
-      yData:[],
+      dateLabelList: [],
      optionArrUrl: [getProductionLinePage ],
 			formConfig: [
 				{
@@ -113,75 +112,101 @@ export default {
        let arr = [
          	{
              prop: 'lineName',
-          		label: '产线',
-          		align: 'center',
+          		label: '产线'
          	},
            {
              prop: 'sum',
-              label: '合计',
-              align: 'center',
+              label: '合计'
            },
            {
-              prop: res.data.nameData[0].name,
-              label: res.data.nameData[0].name,
+              prop: res.data ? res.data.nameData[0].name : undefined,
+              label: res.data ? res.data.nameData[0].name : undefined,
              align: 'center',
              children:[

              ]
            }
        ]
-        console.log(res.data.nameData.slice(1))
-        res.data.nameData.slice(1).forEach(item => {
-          const props = {
-            'prop': item.name,
-            'label': item.name,
-            'align': 'center'
-          }
-          arr[2].children.push(props)
-        })
-        let tableDataArr =[]
-        res.data.data.forEach(item => {
-          let obj = {}
-          obj.lineName= item.lineName,
-           obj.sum= item.sum,
-          item.data.forEach((ele, index) => {
-            // console.log(ele)
-            ele.children.forEach((e) => {
-              console.log(e.dynamicName)
-              obj['' + e.dynamicName + ''] = e.dynamicValue
-              console.log(obj['' + e.dynamicName + '']);
-            })
-          })
-          tableDataArr.push(obj)
-        });
-        this.tableData = tableDataArr
-        console.log(this.tableData)
-        console.log(arr)
-        this.tableProps = arr
+        // console.log(res.data.nameData.slice(1))
        let xData = []
-
-        res.data.nameData.slice(1).forEach(item => {
-          xData.push(item.name)
-          // arr[2].children.push(props)
-        })
        let yAllData = []
        let lineName = []
-        res.data.data.forEach(item => {
-          let yData = []
-          lineName.push(item.lineName)
-          // let obj = {}
-          // obj.lineName = item.lineName,
-          //   obj.sum = item.sum,
-          item.data.forEach((ele, index) => {
+        if (res.data) {
+          let tempDateList = []
+          res.data.nameData.forEach(date => {
+            tempDateList.push(date.name)
+          })
+          this.dateLabelList = Array.from(new Set(tempDateList))
+
+          this.dateLabelList.forEach(item => {
+            if (item.indexOf('年') === -1) {
+              // 构造表头
+              const props = {
+                'prop': item,
+                'label': item
+              }
+              arr[2].children.push(props)
+
+              // 构造echarts横坐标
+              xData.push(item)
+            }
+          })
+          // res.data.nameData.slice(1).forEach(item => {
+          //   const props = {
+          //     'prop': item.name,
+          //     'label': item.name,
+          //     'align': 'center'
+          //   }
+          //   arr[2].children.push(props)
+          // })
+          let tableDataArr =[]
+          res.data.data.forEach(item => {
+            let obj = {}
+            obj.lineName= item.lineName,
+            obj.sum= item.sum,
+            item.data.forEach((ele, index) => {
              // console.log(ele)
-            ele.children.forEach((e) => {
-              // let yData = []
-              yData.push(e.dynamicValue)
+              ele.children.forEach((e) => {
+                console.log(e.dynamicName)
+                obj['' + e.dynamicName + ''] = e.dynamicValue
+                console.log(obj['' + e.dynamicName + '']);
              })
            })
-          yAllData.push(yData)
-        });
-        console.log(lineName)
+            tableDataArr.push(obj)
+          });
+          this.tableData = tableDataArr
+          this.tableProps = arr
+          
+          // let tempList = []
+          // res.data.nameData.slice(1).forEach(item => {
+          //   tempList.push(item.name)
+          //   // arr[2].children.push(props)
+          // })
+          // xData = Array.from(new Set(tempList))
+          
+          res.data.data.forEach(item => {
+            let yData = []
+            lineName.push(item.lineName)
+            // let obj = {}
+            // obj.lineName = item.lineName,
+            //   obj.sum = item.sum,
+            item.data.forEach((ele, index) => {
+                // console.log(ele)
+              ele.children.forEach((e) => {
+                // let yData = []
+                yData.push(e.dynamicValue)
+                })
+              })
+            yAllData.push(yData)
+          });
+          console.log(lineName)
+        } else {
+          this.tableProps = arr
+          this.tableData = []
+          xData = []
+          yAllData = []
+          lineName = []
+        }
        // res.data.data[0].data[0].children.forEach((item, index) => {
        //   // console.log(item)
        //   yData.push(item.dynamicValue)
@@ -203,7 +228,14 @@ export default {
          this.listQuery.time = val.time ? new Date(val.time).getTime() : undefined
 					// this.listQuery.pageNo = 1;
          // this.listQuery.pageSize = 10;
-          this.getData()
+          if (val.time) {
+            this.getData()
+          } else {
+            this.$message({
+              message: '请选择时间',
+              type: 'warning'
+            });
+          }
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();