Explorar el Código

Merge branch 'master' of http://git.nzklabs.com:3000/huangyuanhao/jfcloud-coldchain

jackzhou hace 6 meses
padre
commit
dcaa279cab

+ 2 - 1
snowy-admin-web/src/components/HomeCard/SysWarningCard/index.vue

@@ -13,7 +13,8 @@
 			:loading="loading"
 			@resizeColumn="handleResizeColumn"
 		>
-			<template #bodyCell="{ column, record }">
+			<template #bodyCell="{ column, record, index }">
+				<template v-if="column.dataIndex === 'index'">{{ index + 1 }} </template>
 				<template v-if="column.dataIndex === 'action'">
 					<!-- <a-button type="link" size="small" @click="handlerEdit(record)">编辑</a-button> -->
 					<a-divider type="vertical" />

+ 1 - 1
snowy-admin-web/src/views/auth/login/login.vue

@@ -253,7 +253,7 @@
 <style lang="less" scoped>
 	.login-wrapper {
 		width: 100%;
-		min-height: 850px;
+		min-height: 900px;
 		height: 100vh;
 		display: flex;
 		position: relative;

+ 7 - 0
snowy-admin-web/src/views/biz/monitor/point/index.vue

@@ -128,6 +128,13 @@
 			ellipsis: true,
 			resizable: true
 		},
+		{
+			title: '创建时间',
+			dataIndex: 'createTime',
+			align: 'center',
+			ellipsis: true,
+			resizable: true
+		},
 
 		{
 			title: '操作',