From 963a2313f4f8959715293d38f69894078150d508 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 14 六月 2024 11:29:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/components/Shift.vue | 72 ++++++++++++++---------------------
1 files changed, 29 insertions(+), 43 deletions(-)
diff --git a/src/views/mdc/components/Shift.vue b/src/views/mdc/components/Shift.vue
index a0a6a2e..692a0eb 100644
--- a/src/views/mdc/components/Shift.vue
+++ b/src/views/mdc/components/Shift.vue
@@ -1,15 +1,15 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-20 19:51:13
+ * @LastEditTime: 2024-06-04 21:40:52
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Shift.vue
-->
<template>
<el-row>
<el-col>
<el-button-group>
- <el-button @click="btnListActive = item.id" :type="btnListActive == item.id ? 'primary' : ''"
- v-for="item in btnList" :key="item.id">{{
+ <el-button size="small" @click="btnListActive = item.id"
+ :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id">{{
item.title }}</el-button>
</el-button-group>
</el-col>
@@ -30,7 +30,7 @@
<span>{{ scope.row.nameData['1'] }}</span>
</template>
</el-table-column>
- <el-table-column prop="" label="鏁堢巼">
+ <el-table-column prop="" :label="colname">
<template #default="scope">
<span>{{ scope.row.data['1'] }}</span>
</template>
@@ -40,7 +40,7 @@
<span>{{ scope.row.nameData['2'] }}</span>
</template>
</el-table-column>
- <el-table-column prop="" label="鏁堢巼">
+ <el-table-column prop="" :label="colname">
<template #default="scope">
<span>{{ scope.row.data['2'] }}</span>
</template>
@@ -53,6 +53,25 @@
<script>
import scEcharts from '@/components/scEcharts';
export default {
+ props: {
+ url: {
+ default: '/api/blade-mdc/efficiency-analysis',
+ type: String,
+ },
+ colname: {
+ default: '',
+ type: String,
+ },
+ options: {
+ default() {
+ return {}
+ },
+ },
+ datasetNum: {
+ type: Number,
+ default: 100
+ }
+ },
components: {
scEcharts
},
@@ -107,7 +126,7 @@
...data
}).then(res => {
if (res.code === 200) {
- this.btnList = res.data
+ this.btnList = res.data.reverse()
this.btnListActive = res?.data?.[0]?.id
}
})
@@ -121,47 +140,14 @@
queryType: 0,
statisticalMethod: this.statisticalMethod
}
- return this.$HTTP.post('/api/blade-mdc/efficiency-analysis', dataSend, { params }).then(res => {
+ return this.$HTTP.post(this.url, dataSend, { params }).then(res => {
this.chartsData = res.data.items.records
let option2 = {
- legend: {
- type: 'plain',
- },
- title: {
- text: '缁熻鍥捐〃',
- subtext: '',
- },
- grid: {
- top: '80px'
- },
- tooltip: {
- trigger: 'axis'
- },
- xAxis: {
- type: 'category',
- },
- yAxis: {
- type: 'value'
- },
- dataZoom: [
- { type: 'slider' }
- ],
- dataset: {
- source: [
- ['product', '鐝1', '鐝2'],
-
- ]
- },
- series: [{
- type: 'bar',
- },
- {
- type: 'bar',
- }]
+ ...this.options
}
option2.dataset.source = [['product', '鐝1', '鐝2']]
res.data.items.records.forEach(v => {
- option2.dataset.source.push([v.workstationName, v.data[1] === '-' ? 0 : v.data[1], v.data[2] === '-' ? 0 : v.data[1]])
+ option2.dataset.source.push([v.workstationName, v.data[1] === '-' ? 0 : v.data[1] * this.datasetNum, v.data[2] === '-' ? 0 : v.data[2] * this.datasetNum])
});
this.option2 = option2
console.log(option2)
@@ -184,7 +170,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 => {
return {
...res,
data: res.data.items
--
Gitblit v1.9.3