From d8bdecf455050bc6ba908cc2e61b07155d41057d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 28 Apr 2021 11:55:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
public/realVideo/realtime-view-videos.html | 17 +++++---
src/views/clientManagement/clientManagement.vue | 51 ++++++++++++++++++-------
src/page/index/logo.vue | 3 +
3 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/public/realVideo/realtime-view-videos.html b/public/realVideo/realtime-view-videos.html
index e1a7b28..2c0483f 100644
--- a/public/realVideo/realtime-view-videos.html
+++ b/public/realVideo/realtime-view-videos.html
@@ -9,14 +9,19 @@
<script src='./jquery.js'></script>
<script src="./hls.js"></script>
<script src='./realtime-view-video.js'></script>
+ <style>
+ video::-webkit-media-controls-timeline {
+ display: none;
+ }
+ </style>
</head>
<body>
-<div class='realtime-view-video-box'>
- <video src="movie.ogg" controls="controls" style="object-fit: fill;">
- 您的浏览器不支持 video 标签。
- </video>
-</div>
+ <div class='realtime-view-video-box'>
+ <video src="movie.ogg" controls="controls" style="object-fit: fill;">
+ 您的浏览器不支持 video 标签。
+ </video>
+ </div>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index bb26f87..52202cf 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -2,7 +2,8 @@
<div class="avue-logo">
<transition name="fade">
<span v-if="keyCollapse" class="avue-logo_subtitle" key="0">
- {{ website.logo }}
+<!-- {{ website.logo }}-->
+ <i class="icon-anbao"></i>
</span>
</transition>
<transition-group name="fade">
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index f63f9fd..a9781f7 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -74,9 +74,9 @@
</el-tag>
</template>
- <template slot-scope="{ row }" slot="jfzt">
- <i class="el-icon-check client-jf" v-if="row.type == 0"></i>
- <i class="el-icon-close client-qf" v-else-if="row.type == 1"></i>
+ <template slot-scope="{ row }" slot="type">
+ <i class="el-icon-check client-jf" v-if="row.type == '0' "></i>
+ <i class="el-icon-close client-qf" v-else-if="row.type == '1' "></i>
</template>
</avue-crud>
@@ -406,10 +406,29 @@
}],
}, {
label: "缴费状态",
- prop: "jfzt",
+ prop: "type",
slot: true,
+ sortable:true,
addDisplay: false,
editDisplay: false,
+ }, {
+ label: "设备厂商",
+ prop: "manufacturers",
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=manufacturers",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ search:true,
+ type:"select",
+ rules: [{
+ required: true,
+ message: "请选择设备厂商",
+ trigger: "blur"
+ }],
}, {
label: "布撤防状态",
prop: "devicestate",
@@ -436,6 +455,7 @@
label: "设备状态",
prop: "dxzt",
slot: true,
+ sortable:true,
addDisplay: false,
editDisplay: false,
},
@@ -450,17 +470,6 @@
prop: "reason",
addDisplay: false,
editDisplay: false
- },{
- label: "心跳时间",
- prop: "heartbeat",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- width: 130,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
},
{
label: "省份",
@@ -673,6 +682,18 @@
editDisplay: true,
viewDisplay: true,
},
+ {
+ label: "心跳时间",
+ prop: "heartbeat",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 130,
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ }
]
},
--
Gitblit v1.9.3