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