From 3931e2728f618d0090f129b2665bc1285c4440c3 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 03 十一月 2024 17:27:32 +0800
Subject: [PATCH] update
---
src/views/mdc/components/Time.vue | 143 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 110 insertions(+), 33 deletions(-)
diff --git a/src/views/mdc/components/Time.vue b/src/views/mdc/components/Time.vue
index 30cccbf..63ad963 100644
--- a/src/views/mdc/components/Time.vue
+++ b/src/views/mdc/components/Time.vue
@@ -1,22 +1,21 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-20 20:26:30
+ * @LastEditTime: 2024-06-21 00:15:44
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Time.vue
-->
<template>
<el-row>
<el-col>
<el-button-group>
- <el-button @click="statisticalMethod = item.value"
- :type="statisticalMethod == item.value ? 'primary' : ''" v-for="item in btnList"
- :key="item.value">{{
+ <el-button size="small" @click="change(item)" :type="statisticalMethod == item.value ? 'primary' : ''"
+ v-for="item in btnList" :key="item.value">{{
item.label }}</el-button>
</el-button-group>
</el-col>
<el-col style="margin-top: 12px;">
<el-card shadow="never">
- <scEcharts height="300px" :option="option2"></scEcharts>
+ <scEcharts height="300px" :option="option2" v-if="option2.title" />
</el-card>
</el-col>
<el-col>
@@ -26,9 +25,9 @@
<scTable ref="table" row-key="id" border :params="params" :apiObj="apiObj" stripe>
<el-table-column prop="workstationCode" label="宸ヤ綅缂栫爜" />
<el-table-column prop="workstationName" label="宸ヤ綅鍚嶇О" />
- <el-table-column prop="" :label="item" v-for="item in cols">
+ <el-table-column prop="" :label="item" v-for="item in cols" :key="item">
<template #default="scope">
- <span>{{ scope.row.data[item] }}</span>
+ <span>{{ colnameFn(scope.row.data[item]) }}</span>
</template>
</el-table-column>
@@ -39,7 +38,33 @@
<script>
import scEcharts from '@/components/scEcharts';
+import moment from 'moment'
export default {
+ props: {
+ url: {
+ default: '/api/mdc/efficiency-analysis',
+ type: String,
+ },
+ options: {
+ default() {
+ return {}
+ },
+ },
+ colnameFn: {
+ type: Function,
+ default: val => {
+ if (isNaN(val)) return '-'
+ return `${(val ? val * 100 : 0).toFixed(2)}%`
+ }
+ },
+ resFn: {
+ type: Function,
+ default: val => {
+ if (isNaN(val)) return 0
+ return (val - 0) * 100
+ }
+ }
+ },
components: {
scEcharts
},
@@ -64,20 +89,27 @@
],
cols: [],
chartsData: [],
- option2: null,
+ option2: {},
+ btnListNew: []
}
},
watch: {
statisticalMethod(val) {
- this.query({
- ...this.params,
- })
- this.queryChart({
- ...this.params,
- })
+ // this.query({
+ // ...this.params,
+ // })
+ // this.queryChart({
+ // ...this.params,
+ // })
}
},
methods: {
+ change(item) {
+ this.statisticalMethod = item.value
+ this.init({
+ ...this.params
+ })
+ },
init(params) {
this.params = params
this.getTime({
@@ -85,26 +117,61 @@
startDate: params.startDate,
statisticalMethod: this.statisticalMethod
}).then(res => {
- this.query({
+ if (!res?.length) return
+ let startDate = Math.min(...res?.map(v => new Date(v.startDate).getTime()))
+ let endDate = Math.max(...res?.map(v => new Date(v.endDate).getTime()))
+ console.log('------')
+ let data = {
...params,
statisticalMethod: this.statisticalMethod
+ }
+ if (this.statisticalMethod !== 'Day') {
+ data = {
+ ...data,
+ startDate: moment(startDate).format('YYYY-MM-DD'),
+ endDate: moment(endDate).format('YYYY-MM-DD'),
+ statisticalMethod: this.statisticalMethod
+ }
+ }
+ console.log(startDate, endDate)
+ this.query({
+ ...data
})
this.queryChart({
- ...params,
- statisticalMethod: this.statisticalMethod
+ ...data,
+ // statisticalMethod: this.statisticalMethod
})
})
},
getTime(data) {
- return Promise.resolve()
- // return this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
- // ...data
- // }).then(res => {
- // if (res.code === 200) {
- // this.btnList = res.data
- // }
- // })
+ //return Promise.resolve()
+ return this.$HTTP.post('/api/mdc/efficiency-analysis/interval', {
+ ...data
+ }).then(res => {
+ if (res.code === 200) {
+ this.btnListNew = res.data
+ if (data.statisticalMethod === 'MONTH') {
+ return res?.data?.map(v => {
+ return {
+ ...v,
+ startDate: moment(v.id).startOf('month').format('YYYY-MM-DD'),
+ endDate: moment(v.id).endOf('month').format('YYYY-MM-DD')
+ }
+ })
+ } else if (data.statisticalMethod === 'DAY') {
+ return res?.data?.map(v => {
+ return {
+ ...v,
+ startDate: v.id,
+ endDate: v.id
+ }
+ })
+ } else {
+ return res.data
+ }
+ }
+ })
},
queryChart(data) {
let params = {
@@ -115,7 +182,8 @@
queryType: 0,
statisticalMethod: this.statisticalMethod
}
- return this.$HTTP.post('/api/blade-mdc/efficiency-analysis', dataSend, { params }).then(res => {
+ this.option2 = {}
+ return this.$HTTP.post(this.url, dataSend, { params }).then(res => {
this.chartsData = res.data.items.records
let option2 = {
// legend: {
@@ -133,9 +201,17 @@
},
xAxis: {
type: 'category',
+ axisLabel: {
+ interval: 'auto',
+ }
},
yAxis: {
- type: 'value'
+ type: 'value',
+ axisLabel: {
+ formatter: (value) => {
+ return value + '%'
+ }
+ },
},
dataZoom: [
{ type: 'slider' }
@@ -143,7 +219,8 @@
dataset: {
source: []
},
- series: []
+ ...this.options,
+ series: [],
}
let source1 = ['product']
let row = res.data.items.records[0]
@@ -157,7 +234,8 @@
res.data.items.records.forEach(v => {
let current = [v.id]
Object.keys(v.nameData).forEach(key => {
- current.push(row.data[key] || 0)
+ current.push(this.resFn(v.data[key]))
+ // current.push((v.data[key] - 0) * 100)
})
option2.dataset.source.push(current)
});
@@ -165,8 +243,7 @@
console.log(option2)
})
},
- query(params) {
- this.params = params
+ query(res) {
this.apiObj = {
get: async (data) => {
let params = {
@@ -174,7 +251,7 @@
size: data.size
}
let dataSend = {
- ...data,
+ ...res,
queryType: 1,
statisticalMethod: this.statisticalMethod
}
@@ -182,7 +259,7 @@
delete dataSend.size
delete dataSend.order
delete dataSend.prop
- return await this.$HTTP.post('/api/blade-mdc/efficiency-analysis', dataSend, { params }).then(res => {
+ return await this.$HTTP.post(this.url, dataSend, { params }).then(res => {
let row = res.data.items?.records[0]?.data || {}
this.cols = Object.keys(row)
console.log(this.cols)
--
Gitblit v1.9.3