From ec166120887d35436e59bb1b4936d50b0c6ab255 Mon Sep 17 00:00:00 2001
From: yx <yx1534838662@163.com>
Date: Tue, 12 Jul 2022 13:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/web/camera/index.vue | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/views/web/camera/index.vue b/src/views/web/camera/index.vue
index 4582df2..82bee99 100644
--- a/src/views/web/camera/index.vue
+++ b/src/views/web/camera/index.vue
@@ -212,9 +212,9 @@
     </el-dialog>
     <!-- 日志详情对话框 -->
     <el-dialog title="日志查询" :visible.sync="logform.open">
-      <div class="container">
+      <div >
         <!-- 表单 -->
-        <el-form :model="logform.queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form :model="logform.queryForm" ref="queryForm" size="small" :inline="true" label-width="200px">
 
           <el-date-picker v-model="timeStage" type="datetimerange" range-separator="至" start-placeholder="开始日期"
             end-placeholder="结束日期" @change="chooseTimeRange" :picker-options="setDateRange">
@@ -222,22 +222,18 @@
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
           </el-form-item>
+          <el-table :data="logInfoList" stripe style="width: 100%">
 
+            <el-table-column label="记录时间" align="center" prop="clogTime" />
+            <el-table-column label="用户名" align="center" prop="coperUserName" />
+            <el-table-column label="主类型" align="center" prop="cmainType" />
+            <el-table-column label="次类型" align="center" prop="csubType" />
+            <el-table-column label="远程IP" align="center" prop="cremoteIP" />
 
-        </el-form>
-        <el-table :data="logInfoList" stripe style="width: 100%">
-
-          <el-table-column label="记录时间" align="center" prop="clogTime" />
-          <el-table-column label="用户名" align="center" prop="coperUserName" />
-          <el-table-column label="主类型" align="center" prop="cmainType" />
-          <el-table-column label="次类型" align="center" prop="csubType" />
-          <el-table-column label="远程IP" align="center" prop="cremoteIP" />
-          <el-table-column label="客户端类型" align="center" prop="cclientType" />
-
-
-        </el-table>
+          </el-table>
 
 
+        </el-form>
 
       </div>
 
@@ -538,6 +534,11 @@ export default {
       if (res.code === 0) {
 
         this.restartcfg.form = res.data;
+        if(this.restartcfg.form.uHour <10){
+          this.restartcfg.form.uHour="0"+this.restartcfg.form.uHour+":00"
+        }else{
+           this.restartcfg.form.uHour+=":00"
+        }
         this.restartcfg.form.id = row.id;
         this.restartcfg.run = this.restartcfg.form.bEnable == 1;
         this.restartcfg.open = true;
@@ -619,8 +620,6 @@ export default {
 
       if (res.code === 0) {
         this.logInfoList = res.data;
-
-        console.log(this.logInfoList)
       }
     },
     async register() {