|
@@ -37,8 +37,9 @@
|
|
|
<el-date-picker
|
|
|
v-model="daterangeRegisterTime"
|
|
|
style="width: 240px"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
type="daterange"
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
|
range-separator="-"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
@@ -96,16 +97,17 @@
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row> -->
|
|
|
|
|
|
- <el-table v-loading="loading" :data="deviceInfoList" @selection-change="handleSelectionChange">
|
|
|
+ <el-table v-loading="loading" :data="deviceInfoList" @selection-change="handleSelectionChange" :sort-default-order="['registerTime', 'desc']">
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<!-- <el-table-column label="租户号" align="center" prop="autoId" /> -->
|
|
|
<el-table-column label="设备ID" align="center" prop="deviceId" />
|
|
|
<el-table-column label="设备品牌" align="center" prop="deviceBrand" />
|
|
|
<el-table-column label="设备型号" align="center" prop="deviceModel" />
|
|
|
<el-table-column label="备注" align="center" prop="deviceDesc" />
|
|
|
- <el-table-column label="注册时间" align="center" prop="registerTime" width="180">
|
|
|
+ <el-table-column label="注册时间" align="center" prop="registerTime" width="180" sortable>
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.registerTime, '{y}-{m}-{d}') }}</span>
|
|
|
+ <!-- <span>{{ parseTime(scope.row.registerTime, '{y}-{m}-{d}') }}</span> -->
|
|
|
+ <span>{{ parseTime(scope.row.registerTime)}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
@@ -154,8 +156,8 @@
|
|
|
<el-form-item label="注册时间" prop="registerTime">
|
|
|
<el-date-picker clearable
|
|
|
v-model="form.registerTime"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
+ type="datetime"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
placeholder="请选择注册时间">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|