Przeglądaj źródła

修改时间 排序

“yueshang” 1 rok temu
rodzic
commit
f630e9ad9b

+ 8 - 4
src/views/biz/bluetoothINfo/index.vue

@@ -83,8 +83,9 @@
           clearable
           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="结束日期"
@@ -162,6 +163,7 @@
       v-loading="loading"
       :data="bluetoothINfoList"
       @selection-change="handleSelectionChange"
+      :sort-default-order="['time', 'desc']"
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="信息ID" align="center" prop="bInfoId" /> -->
@@ -190,9 +192,11 @@
         align="center"
         prop="time"
         width="180"
+        sortable
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.time, "{y}-{m}-{d}") }}</span>
+          <!-- <span>{{ parseTime(scope.row.time, "{y}-{m}-{d}") }}</span> -->
+          <span>{{ parseTime(scope.row.time)}}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -267,8 +271,8 @@
           <el-date-picker
             clearable
             v-model="form.time"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择数据采集时间"
           >
           </el-date-picker>

+ 8 - 6
src/views/biz/deviceInfo/index.vue

@@ -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>

+ 9 - 4
src/views/biz/wifiInfo/index.vue

@@ -67,11 +67,13 @@
           clearable
           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="结束日期"
+       
         >
         </el-date-picker>
       </el-form-item>
@@ -146,6 +148,7 @@
       v-loading="loading"
       :data="wifiInfoList"
       @selection-change="handleSelectionChange"
+      :sort-default-order="['time', 'desc']"
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="信息ID" align="center" prop="wifiInfoId" /> -->
@@ -168,9 +171,11 @@
         align="center"
         prop="time"
         width="180"
+        sortable
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.time, "{y}-{m}-{d}") }}</span>
+          <!-- <span>{{ parseTime(scope.row.time, "{y}-{m}-{d}") }}</span> -->
+          <span>{{ parseTime(scope.row.time)}}</span>
         </template>
       </el-table-column>
       <el-table-column label="认证页面" align="center" prop="authPage">
@@ -259,8 +264,8 @@
           <el-date-picker
             clearable
             v-model="form.time"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择数据采集时间"
           >
           </el-date-picker>