diff --git a/src/views/data/photo/index.vue b/src/views/data/photo/index.vue
index e9ce0e5..32ff9b2 100644
--- a/src/views/data/photo/index.vue
+++ b/src/views/data/photo/index.vue
@@ -217,7 +217,7 @@ export default {
.card {
margin-bottom: 20px;
- margin-right: 10px;
+ margin-right: 6px;
box-shadow: 2px 2px 8px #ccc;
}
@@ -254,4 +254,7 @@ img {
line-height: 200px;
font-size: 25px;
}
+.pagination-container{
+ margin-right: 20px;
+}
diff --git a/src/views/web/camera/index.vue b/src/views/web/camera/index.vue
index 36cd9ae..20bf086 100644
--- a/src/views/web/camera/index.vue
+++ b/src/views/web/camera/index.vue
@@ -95,7 +95,7 @@
查看日志
- 查看时间
+ 补光时间
重启
@@ -276,7 +276,6 @@
size="small"
align="center"
style="width: 150px"
- arrow-control
v-model="updateDate.queryForm.endTime1"
:picker-options="{
selectableRange: '00:00:00 - 23:59:59'
@@ -299,7 +298,6 @@
size="small"
align="center"
style="width: 150px"
- arrow-control
v-model="updateDate.queryForm.endTime2"
:picker-options="{
selectableRange: '00:00:00 - 23:59:59'
@@ -667,7 +665,7 @@ export default {
//发送自动重启配置表单
async restartcfgConfirm() {
-
+
this.restartcfg.form.bEnable = this.restartcfg.run ? 1 : 0;
this.restartcfg.form.uHour = this.restartcfg.form.uHour.substring(0, 2)
let res = await this.$axiosPost('/web/camera/setautocfg', this.restartcfg.form);
@@ -678,6 +676,11 @@ export default {
},
// 显示时间
showDate(row){
+ const status = row.status;
+ if (status != 1) {
+ this.$modal.msg("设备未在线");
+ return;
+ }
// 重置表单
this.updateDateReset()
this.updateDate.queryForm.id = row.id;