From d567a0a023ff72d2dc58a9bb8dd2e08cb3aaac1f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Feb 2021 09:18:20 +0800
Subject: [PATCH] 整体修改
---
src/views/realTimePolice/real.vue | 15 ++++++---------
src/views/realTimePolice/realHistory.vue | 12 ++++++------
src/views/home/home.vue | 6 +++---
src/views/clientManagement/clientManagement.vue | 10 +++++-----
src/page/index/logo.vue | 3 +++
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 06f09ad..285ec7a 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -72,6 +72,9 @@
<el-input disabled="true" v-model="form.alarmTime" autocomplete="off"></el-input>
</el-form-item>
</el-col>
+
+
+
</el-row>
<el-row>
<el-form-item label="报警内容" >
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 1943b1c..a4da94f 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -152,8 +152,8 @@
label: "到期时间",
prop: "releaseTimeRange",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
searchRange: true,
searchSpan: 5,
hide: true,
@@ -272,7 +272,7 @@
prop: "stime",
type: "datetime",
format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
width: 130
}, {
label: "到期时间",
@@ -280,14 +280,14 @@
type: "datetime",
slot: true,
format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
width: 150
}, {
label: "最后上传时间",
prop: "heartbeat",
type: "datetime",
format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
width: 130
},
diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index c61ec8e..2b7e467 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -1,6 +1,6 @@
<!--
- * @Descripttion:
- * @version:
+ * @Descripttion:
+ * @version:
* @Author: song
* @Date: 2021-01-26 08:56:33
* @LastEditors: song
@@ -8,7 +8,7 @@
-->
<template>
<iframe v-show="iframeState" id="show-iframe" frameborder=0 name="showHere" scrolling=auto
- src="http://s16s652780.51mypc.cn/bigScreen/view/1349193280059879426"></iframe>
+ src="https://s16s652780.51mypc.cn/bigScreen/view/1349193280059879426"></iframe>
</template>
<script>
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 186e280..fb6aaa2 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -37,21 +37,18 @@
<el-button
size="small"
type="primary"
- icon="el-icon-search"
@click="getBZdata"
>本周
</el-button>
<el-button
size="small"
type="primary"
- icon="el-icon-search"
@click="getBYdata"
>本月
</el-button>
<el-button
size="small"
type="primary"
- icon="el-icon-search"
@click="getQBdata"
>全部
</el-button>
@@ -346,16 +343,16 @@
label: "报警时间",
type: "datetime",
width: 130,
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
prop: "alarmTime"
},
{
label: "报警时间",
prop: "releaseTimeRange",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
searchRange: true,
searchSpan: 5,
hide: true,
@@ -391,8 +388,8 @@
{
label: "接警时间",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
width: 130,
prop: "jjTime"
},
diff --git a/src/views/realTimePolice/realHistory.vue b/src/views/realTimePolice/realHistory.vue
index 7f4b515..0975e36 100644
--- a/src/views/realTimePolice/realHistory.vue
+++ b/src/views/realTimePolice/realHistory.vue
@@ -81,16 +81,16 @@
label: "报警时间",
type: "datetime",
width:130,
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
prop: "alarmTime",
},
{
label: "报警时间",
prop: "releaseTimeRange",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
searchRange: true,
searchSpan: 5,
hide: true,
@@ -120,8 +120,8 @@
}, {
label: "接警时间",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
width:130,
prop: "jjTime",
}, {
--
Gitblit v1.9.3