lb #19

Merged
g7hoo merged 80 commits from lb into test 2023-09-11 15:05:16 +08:00
3 changed files with 80 additions and 31 deletions
Showing only changes of commit 4c829d21f5 - Show all commits

View File

@ -15,33 +15,42 @@ import * as echarts from 'echarts';
export default {
name: 'LineDataChart',
components: {},
props: {},
props: {
xProps: {
type: Array,
default: () => [],
},
legend: {
type: Array,
default: () => [],
}
},
data() {
return {
chart: null,
inspectionContents: [
'检测内容1',
'检测内容2',
'检测内容3',
'检测内容4',
'检测内容5',
'检测内容6',
'检测内容7',
'检测内容8',
'检测总数',
'比例%',
],
xProps: [
'产线1',
'产线2',
'产线3',
'产线4',
'产线5',
'产线6',
'产线7',
'产线8',
'产线9',
],
// inspectionContents: [
// '1',
// '2',
// '3',
// '4',
// '5',
// '6',
// '7',
// '8',
// '',
// '%',
// ],
// xProps: [
// '线1',
// '线2',
// '线3',
// '线4',
// '线5',
// '线6',
// '线7',
// '线8',
// '线9',
// ],
series: [
{
name: '检测内容1',
@ -106,6 +115,7 @@ export default {
this.setOption();
},
setOption(option) {
console.log("legend", this.legend)
const defaultOption = {
// title: {
// text: '线',
@ -121,7 +131,7 @@ export default {
trigger: 'axis',
},
legend: {
data: this.inspectionContents,
data: this.legend,
top: '5%',
icon: 'circle'
},

View File

@ -11,7 +11,10 @@
<TotalGraph :summary-list="summaryList" />
</DetailGraph>
<DetailGraph id="dg2" key="dg2" ref="dg2" title="检测内容数据">
<LineGraph />
<LineGraph
:x-props="lineData.xProps"
:legend="legend"
:series="lineData.list.map(buildSeries)" />
</DetailGraph>
<!-- <DetailGraph id="dg3" key="dg3" ref="dg3" />
<DetailGraph id="dg4" key="dg4" ref="dg4" /> -->
@ -21,7 +24,7 @@
<script>
import DetailGraph from './components/detailGraph.vue';
import TotalGraph from './components/graphs/total.vue';
import LineGraph from './components/graphs/line.vue'
import LineGraph from './components/graphs/line.vue';
export default {
name: 'GraphPage',
@ -31,12 +34,45 @@ export default {
type: Array,
default: () => [],
},
lineData: {
type: Object,
default: () => ({}),
},
},
data() {
return {};
return {
legend: [],
};
},
computed: {},
methods: {},
methods: {
buildSeries(item) {
if (!this.legend.length) this.buildLegend();
const data = [];
this.legend.forEach((key) => {
console.log('key item.key', item, key, item[key]);
if (item[key] == null) item[key] = null;
data.push(item[key]);
});
console.log('buildSeries', {
name: item.inspectionContent,
type: 'line',
data: data,
});
return {
name: item.inspectionContent,
type: 'line',
data: data,
};
},
buildLegend() {
this.legend = this.lineData.list
.map((item) => item.inspectionContent)
.sort();
// this.legend.push('', '%')
console.log('buliding legend', this.legend);
},
},
};
</script>

View File

@ -33,7 +33,10 @@
</base-table>
</template>
<GraphPage v-else :summary-list="summaryList" />
<GraphPage
v-else
:summary-list="summaryList"
:line-data="{ list: list, xProps: dynamicProps.map((v) => v.prop) }" />
</transition>
<!-- todo: 数据总览用弹窗包裹的 table 实现 -->