From 1cc2bba0c5cfd27e0744f1df8c5bbd41135ae817 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 28 九月 2022 16:02:53 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/intellectInspect/intelligentLine/index.vue | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index bfb9b95..66dd212 100644
--- a/src/views/intellectInspect/intelligentLine/index.vue
+++ b/src/views/intellectInspect/intelligentLine/index.vue
@@ -17,6 +17,7 @@
<div class="blocks">
<div>
<div class="star-pic">
+ <dv-decoration-12 scanDur="5" haloDur="4" class="scan"/>
<div class="star-bg"><img src="../../../assets/loginPage/star-bg.png" /></div>
<div class="star"><img src="../../../assets/loginPage/device-pic.png" /></div>
</div>
@@ -150,7 +151,7 @@
alert('您的浏览器不支持socket');
} else {
// 实例化socket
- // debugger
+ debugger
let uid = userInfos.value.uid.toString()
var url = state.path + uid + '*' + id;
console.log(url,'url',uid,'uid')
@@ -186,6 +187,7 @@
// 接口获取数据
const getLine = async (id:string) => {
+ debugger
let res = await lineApi().getLine({ id: id });
if (res.data.code === '200') {
userInfos.value.dataList = res.data.data;
@@ -237,7 +239,7 @@
};
</script>
-<!-- Add "scoped" attribute to limit CSS to this component only -->
+<!-- Add "scoped" attribute to limit CSS to this components only -->
<style scoped lang="scss">
@media screen and (min-width: 1366px) {
.big-title {
@@ -1004,9 +1006,10 @@
display: flex;
justify-content: center;
align-items: flex-start;
- overflow: hidden;
- overflow-x: auto;
- overflow-y: auto;
+ overflow: auto;
+
+ &::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
+ &::scrollbar { width: 0; height: 0; color: transparent; }
}
.line-map {
@@ -1365,15 +1368,28 @@
position: absolute;
width: calc((100vw - 120px) / 7);
height: calc((100vw - 120px) / 7);
- z-index: 999999999;
+ z-index: 9999;
bottom: 40px;
right: 40px;
padding: 20px;
+
+ .scan{
+ position: inherit;
+ width: 65%;
+ height: 65%;
+ z-index: 99997;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ margin: auto;
+ }
.star-bg {
position: inherit;
width: 100%;
height: 100%;
+ z-index: 99998;
left: 0;
top: 0;
img {
@@ -1382,11 +1398,11 @@
animation: circle 30s linear infinite;
}
}
-
.star {
position: inherit;
width: 100%;
height: 100%;
+ z-index: 99999;
left: 0;
top: 0;
img {
--
Gitblit v1.9.2