mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test #47

Merged
gtz217 merged 273 commits from test into master 2023-10-17 08:53:54 +08:00
Conversation 0 Commits 273 Files Changed 256 +188 -116
3 changed files with 188 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a12530b835 - Show all commits

228
src/views/quality/monitoring/qualityStatistics/components/graphs/line.vue
View File

@ -96,8 +96,8 @@ export default {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
type: 'shadow',
},
},
legend: {
data: this.legend,
@ -121,29 +121,29 @@ export default {
// color: 'red'
},
},
// data: this.xProps,
data: [
'设备1',
'设备2',
'设备3',
'设备4',
'设备5',
'设备6',
'设备7',
'设备8',
'设备9',
'设备10',
'设备11',
'设备12',
'设备13',
'设备14',
'设备15',
'设备16',
'设备17',
'设备18',
'设备19',
'设备20',
],
data: this.xProps,
// data: [
// '设备1',
// '设备2',
// '设备3',
// '设备4',
// '设备5',
// '设备6',
// '设备7',
// '设备8',
// '设备9',
// '设备10',
// '设备11',
// '设备12',
// '设备13',
// '设备14',
// '设备15',
// '设备16',
// '设备17',
// '设备18',
// '设备19',
// '设备20',
// ],
},
yAxis: {
type: 'value',
@ -161,95 +161,95 @@ export default {
dataZoom: {
type: 'inside',
},
// series: this.series,
series: [
{
name: '上片数',
type: 'bar',
// barWidth: 12,
data: [
10,
12,
43,
4,
22,
32,
12,
8,
122,
0,
,
43,
4,
22,
32,
12,
8,
122,
77,
99,
],
},
{
name: '下片数',
type: 'bar',
// barWidth: 12,
data: [
10,
12,
43,
4,
22,
32,
12,
8,
122,
0,
4,
22,
32,
12,
8,
122,
0,
,
43,
4,
22,
32,
],
},
{
name: '检测数',
type: 'bar',
// barWidth: 12,
barCategoryGap: 12,
data: [
10,
12,
43,
4,
22,
4,
22,
32,
12,
8,
122,
0,
,
43,
4,
22,
32,
32,
12,
8,
122,
0,
],
},
],
series: this.series,
// series: [
// {
// name: '上片数',
// type: 'bar',
// // barWidth: 12,
// data: [
// 10,
// 12,
// 43,
// 4,
// 22,
// 32,
// 12,
// 8,
// 122,
// 0,
// ,
// 43,
// 4,
// 22,
// 32,
// 12,
// 8,
// 122,
// 77,
// 99,
// ],
// },
// {
// name: '下片数',
// type: 'bar',
// // barWidth: 12,
// data: [
// 10,
// 12,
// 43,
// 4,
// 22,
// 32,
// 12,
// 8,
// 122,
// 0,
// 4,
// 22,
// 32,
// 12,
// 8,
// 122,
// 0,
// ,
// 43,
// 4,
// 22,
// 32,
// ],
// },
// {
// name: '检测数',
// type: 'bar',
// // barWidth: 12,
// barCategoryGap: 12,
// data: [
// 10,
// 12,
// 43,
// 4,
// 22,
// 4,
// 22,
// 32,
// 12,
// 8,
// 122,
// 0,
// ,
// 43,
// 4,
// 22,
// 32,
// 32,
// 12,
// 8,
// 122,
// 0,
// ],
// },
// ],
};
},
},

10
src/views/quality/monitoring/qualityStatistics/graphPage.vue
View File

@ -15,7 +15,12 @@
</DetailGraph> -->
<!-- <DetailGraph id="dg3" key="dg3" ref="dg3" />
<DetailGraph id="dg4" key="dg4" ref="dg4" /> -->
<LineGraph :x-props="lineData.xProps" :legend="legend" :series="series" />
<div v-if="!series || series.length == 0" style="color: #777; font-size: 16px; letter-spacing: 1px; text-align: center; padding-top: 56px; text-decoration: underline;">暂无数据</div>
<LineGraph
v-else
:x-props="lineData.xProps"
:legend="legend"
:series="series" />
</div>
</template>
@ -56,7 +61,8 @@ export default {
console.log('this.list', this.lineData.list, this.lineData.xProps);
const seriesItem = {
name: item.inspectionContent,
type: 'line',
type: 'bar',
barCategoryGap: 12,
data: [],
};

66
src/views/quality/monitoring/qualityStatistics/index.vue
View File

@ -99,11 +99,55 @@
import GraphPage from './graphPage.vue';
import summaryTable from './components/summaryTable.vue';
class DateGetter {
constructor() {
this.today = new Date();
this.y = this.today.getFullYear();
this.m = this.today.getMonth();
this.d = this.today.getDate();
}
getWeekRange() {
const weekStart = new Date(this.y, this.m, this.d - this.today.getDay());
const weekEnd = new Date(
this.y,
this.m,
this.d + (6 - this.today.getDay()),
23,
59,
59
);
// console.log('week', [weekStart, weekEnd]);
return [weekStart, weekEnd];
}
getMonthRange() {
const monthStart = new Date(this.y, this.m, 1);
const monthEnd = new Date(this.y, this.m + 1, 0, 23, 59, 59);
// console.log('month', [monthStart, monthEnd]);
return [monthStart, monthEnd];
}
getQuarterRange() {
const quarterStart = new Date(this.y, this.m - (this.m % 3), 1);
const quarterEnd = new Date(
this.y,
this.m - (this.m % 3) + 3,
0,
23,
59,
59
);
// console.log('quarter', [quarterStart, quarterEnd]);
return [quarterStart, quarterEnd];
}
}
export default {
name: 'QualityStatistics',
components: { GraphPage, summaryTable },
props: {},
data() {
const dateGetter = new DateGetter();
return {
// mode: 'table', // defaults to 'table'
activeName: 'table', // defaults to 'table'
@ -121,6 +165,28 @@ export default {
endPlaceholder: '结束日期',
defaultTime: ['00:00:00', '23:59:59'],
param: 'timerange',
pickerOptions: {
shortcuts: [
{
text: '本周',
onClick(picker) {
picker.$emit('pick', dateGetter.getWeekRange());
},
},
{
text: '本月',
onClick(picker) {
picker.$emit('pick', dateGetter.getMonthRange());
},
},
{
text: '本季',
onClick(picker) {
picker.$emit('pick', dateGetter.getQuarterRange());
},
},
],
},
},
{
type: 'button',