lb #36

Merged
g7hoo merged 13 commits from lb into test 2023-09-27 17:00:53 +08:00
Showing only changes of commit fe0b5538a8 - Show all commits

View File

@ -24,6 +24,7 @@
:formConfigs="searchBarFormConfig" :formConfigs="searchBarFormConfig"
ref="search-bar" ref="search-bar"
:remove-blue="true" :remove-blue="true"
@select-changed="handleSearchBarChanged"
@headBtnClick="handleSearchBarBtnClick" /> @headBtnClick="handleSearchBarBtnClick" />
</el-row> </el-row>
@ -73,7 +74,6 @@
<script> <script>
import LineChart from './components/lineChart.vue'; import LineChart from './components/lineChart.vue';
import response from './response.json'; import response from './response.json';
export default { export default {
@ -82,16 +82,7 @@ export default {
props: {}, props: {},
data() { data() {
return { return {
startTime: new Date( startTime: null, // new Date(2023, 8, 26, 0, 0, 0, 0).getTime(),
(() => {
const date = new Date();
date.setHours(0);
date.setMinutes(0);
date.setSeconds(0);
date.setMilliseconds(0);
return date;
})()
).getTime(),
accumulators: new Map(), accumulators: new Map(),
searchBarFormConfig: [ searchBarFormConfig: [
{ {
@ -100,7 +91,7 @@ export default {
placeholder: '请选择产线', placeholder: '请选择产线',
selectOptions: [], selectOptions: [],
param: 'lineId', param: 'lineId',
required: true, onchange: true,
}, },
{ {
type: 'select', type: 'select',
@ -108,7 +99,6 @@ export default {
placeholder: '请选择工段', placeholder: '请选择工段',
selectOptions: [], selectOptions: [],
param: 'sectionId', param: 'sectionId',
required: true,
}, },
// //
{ {
@ -154,7 +144,18 @@ export default {
eqList: [], eqList: [],
graphList: [], graphList: [],
templateConfig: { templateConfig: {
color: ['#283D68', '#FFB61F', '#4481FF', '#5AD8A6', '#E97466'], color: [
'#283D68',
'#FFB61F',
'#4481FF',
'#5AD8A6',
'#E97466',
'#ccc', //<===
'#ccc',
'#ccc',
'#ccc',
'#ccc',
],
grid: { grid: {
top: 48, top: 48,
left: 48, left: 48,
@ -178,11 +179,26 @@ export default {
show: true, show: true,
trigger: 'axis', trigger: 'axis',
formatter: function (params) { formatter: function (params) {
// const content = '' return `
// params.forEach(({ value, seriesName }) => { <div style="margin-bottom: 8px;">${new Date(
// content += `${seriesName}: ${value}\n`; +params[0].name
// }); ).toLocaleTimeString()}</div>
// return content ${params
.map(({ seriesName, color, data }) =>
data != null
? `
<div style="min-width: 160px; display: flex; justify-content: space-between; align-items: center;">
<span style="display: flex; align-items: center;">
<span style="display: inline-block; margin-right: 8px; width: 12px; height: 12px; background: ${color}"></span>
<span style="">${seriesName}</span>
</span>
<span style="color: #c7c7c7; text-align: right;">${data}</span>
</div>
`
: ''
)
.join('')}
`;
}, },
}, },
xAxis: null, xAxis: null,
@ -245,15 +261,18 @@ export default {
this.initProductline(); this.initProductline();
this.initWorksection(); this.initWorksection();
this.initEquipment(); this.initEquipment();
this.getList(); // this.getList();
},
mounted() {
console.log('this.startTIme', this.startTime);
}, },
methods: { methods: {
handleSearchBarBtnClick({ btnName, ...payload }) { handleSearchBarBtnClick({ btnName, ...payload }) {
switch (btnName) { switch (btnName) {
case 'search': case 'search':
if (!payload.recordTime || payload.recordTime.length <= 0) {
this.$message.error('请选择时间段');
return;
}
this.startTime = new Date(payload.recordTime).getTime();
this.queryParams.lineId = payload.lineId || null; this.queryParams.lineId = payload.lineId || null;
this.queryParams.sectionId = payload.sectionId || null; this.queryParams.sectionId = payload.sectionId || null;
this.queryParams.equipmentId = payload.equipmentId || null; this.queryParams.equipmentId = payload.equipmentId || null;
@ -271,6 +290,18 @@ export default {
} }
}, },
handleSearchBarChanged({ param, value }) {
if (!value) {
this.searchBarFormConfig[1].selectOptions = [];
return;
}
switch (param) {
case 'lineId':
this.getWorksectionById(value);
break;
}
},
/** 重置查询条件 */ /** 重置查询条件 */
initQuery() { initQuery() {
this.queryParams.lineId = null; this.queryParams.lineId = null;
@ -296,41 +327,19 @@ export default {
async getList() { async getList() {
this.initState(); this.initState();
// const { code, data } = await this.$axios({ const { code, data } = await this.$axios({
// url: '/analysis/equipment-analysis/quantity', url: '/analysis/equipment-analysis/quantity',
// method: 'get', method: 'get',
// params: this.queryParams, params: this.queryParams,
// }); });
const { code, data } = response; // const { code, data } = response;
if (code == 0) { if (code == 0) {
this.graphList = this.objectToArray(data); this.graphList = this.objectToArray(data);
console.log('this graphList', this.graphList);
// const eq1 = [
// { totalQuantity: 20, startTime: 1693964578000 },
// { totalQuantity: 43, startTime: 1693964678000 },
// { totalQuantity: 12, startTime: 1693964778000 },
// { totalQuantity: 11, startTime: 1693964878000 },
// { totalQuantity: 98, startTime: 1693965478000 },
// { totalQuantity: 87, startTime: 1693965578000 },
// ];
// eq1.key = 'SS1';
// const eq2 = [
// { totalQuantity: 23, startTime: 1693961578000 },
// { totalQuantity: 42, startTime: 1693964578000 },
// { totalQuantity: 51, startTime: 1693965578000 },
// { totalQuantity: 18, startTime: 1693966578000 },
// { totalQuantity: 77, startTime: 1693966778000 },
// { totalQuantity: 38, startTime: 1693967578000 },
// { totalQuantity: 57, startTime: 1693969578000 },
// ];
// eq2.key = 'SS2';
// this.graphList = [eq1, eq2];
this.setXaxis(); this.setXaxis();
this.graphList.forEach(this.setSeries); this.graphList.forEach(this.setSeries);
} else { } else {
this.graphList = []; this.graphList = [];
this.graphList.forEach(this.setSeries);
} }
}, },
@ -346,7 +355,6 @@ export default {
}, },
axisLabel: { axisLabel: {
formatter: function (value, index) { formatter: function (value, index) {
console.log('value', value, new Date(value));
return new Date(+value) return new Date(+value)
.toLocaleTimeString() .toLocaleTimeString()
.split(':') .split(':')
@ -362,7 +370,6 @@ export default {
setYaxis() {}, setYaxis() {},
setSeries(list) { setSeries(list) {
console.log('set series');
const data = Array(24).fill(null); const data = Array(24).fill(null);
list.map((item, index) => { list.map((item, index) => {
const idx = this.timeArr.indexOf(item.startTime); const idx = this.timeArr.indexOf(item.startTime);
@ -454,6 +461,25 @@ export default {
} }
}, },
/** 根据产线获取工段 */
async getWorksectionById(lineId) {
const { code, data } = await this.$axios({
url: '/base/workshop-section/listByParentId',
method: 'get',
params: {
id: lineId,
},
});
if (code == 0) {
this.searchBarFormConfig[1].selectOptions = data.map((item) => {
return {
name: item.name,
id: item.id,
};
});
}
},
async submitForm() { async submitForm() {
const { code, data } = await this.$axios({ const { code, data } = await this.$axios({
url: '/analysis/equipment-analysis/quantity', url: '/analysis/equipment-analysis/quantity',