修改编辑工作台

This commit is contained in:
2024-09-03 16:10:52 +08:00
parent 982a3313e8
commit 5a670be729
11 changed files with 1371 additions and 37 deletions

View File

@@ -1,5 +1,5 @@
<template>
<div class="container" style="padding-bottom: 50px; width: 100%; height: auto">
<div class="container" style="padding-bottom: 50px; width: 100%; height: 100%" v-loading="loading" >
<div style="width: 100%; height: 38vh; margin-bottom: 2vh; position: relative">
<i class="el-icon-refresh refresh" @click="getCharts('year')"></i>
<div id="yearchart" style="width: 100%; height: 100%"></div>
@@ -8,10 +8,41 @@
<i class="el-icon-refresh refresh" @click="getCharts('month')"></i>
<div id="monthchart" style="width: 100%; height: 100%"></div>
</div>
<div style="width: 100%; height: auto; margin-bottom: 50px">
<div
style="
width: 100%;
height: auto;
margin-bottom: 20px;
background-color: #f4f4f5;
padding: 10px;
font-size: 12px;
color: #909399;
"
>
{{ $t('journalArticleCount.info') }} : {{ $t('journalArticleCount.dataTitle') }} /
{{ $t('journalArticleCount.transferQuantity') }}
</div>
<div style="width: 100%; height: auto; margin-bottom: 20px">
<jAtableY type="year" ref="yearTableData"></jAtableY>
</div>
<div style="width: 100%; height: auto; margin-bottom: 50px !important">
<div
style="
width: 100%;
height: auto;
margin-top: 50px;
margin-bottom: 20px;
background-color: #f4f4f5;
padding: 10px;
font-size: 12px;
color: #909399;
"
>
{{ $t('journalArticleCount.info') }} : {{ $t('journalArticleCount.dataTitle') }} /
{{ $t('journalArticleCount.transferQuantity') }}
</div>
<div style="width: 100%; height: auto; margin-bottom: 20px !important">
<jAtableM type="month" ref="monthTableData"></jAtableM>
</div>
</div>
@@ -24,7 +55,7 @@ const jAtableM = () => import('@/components/common/journalArticleTable');
export default {
data() {
return {
loading: null
loading: false
};
},
components: {
@@ -32,12 +63,13 @@ export default {
jAtableM
},
async created() {
this.loading = this.$loading({
lock: true,
text: 'Loading...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.loading = true;
// this.loading = this.$loading({
// lock: true,
// text: 'Loading...',
// spinner: 'el-icon-loading',
// background: 'rgba(0, 0, 0, 0.7)'
// });
await this.getCharts('year');
await this.getCharts('month');
await this.getTableData();
@@ -226,7 +258,7 @@ export default {
}
})
.catch((err) => {
console.log(err);
console.log(err, '989898');
this.loading = false;
});
console.log(data, type, '98999');
@@ -235,8 +267,8 @@ export default {
} else if (type == 'month') {
this.$refs.monthTableData.getTableInfo(type, data);
setTimeout(() => {
that.loading.close();
}, 100);
that.loading = false;
}, 50);
}
return data;
@@ -259,4 +291,4 @@ export default {
right: 0px;
z-index: 10;
}
</style>
</style>