test #47

Merged
gtz217 merged 273 commits from test into master 2023-10-17 08:53:54 +08:00
2 changed files with 27 additions and 8 deletions
Showing only changes of commit 27ebe39a96 - Show all commits

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 KiB

View File

@ -11,6 +11,16 @@
:formConfigs="[{ label: '设备近24小时生产记录', type: 'title' }]"
ref="search-bar" />
<el-skeleton v-if="initing" :rows="6" animated />
<div v-else>
<div
v-if="noData"
style="
height: 240px;
background: url(../../../assets/images/no-data-bg.png) 100% / contain
no-repeat;
">
没有数据
</div>
<base-table
v-else
:span-method="mergeColumnHandler"
@ -20,6 +30,7 @@
<!-- :page="queryParams.pageNo"
:limit="queryParams.pageSize" -->
</div>
</div>
</template>
<script>
@ -37,6 +48,7 @@ export default {
list: [],
tableProps: [],
spanInfo: {},
noData: true,
};
},
computed: {},
@ -138,6 +150,13 @@ export default {
// console.log('recent-24', data);
this.initing = true;
if (!data || !data.length) {
this.initing = false;
this.noData = true;
return;
}
this.noData = false;
this.buildProps(data[0]);
this.buildData(data);
this.queryParams.pageSize = this.list.length;