diff --git a/index.html b/index.html index 8c7dc69..73c9f6a 100644 --- a/index.html +++ b/index.html @@ -107,12 +107,12 @@ - + > --> diff --git a/src/components/TreeFilter/index.vue b/src/components/TreeFilter/index.vue index dc6eefa..aed874b 100644 --- a/src/components/TreeFilter/index.vue +++ b/src/components/TreeFilter/index.vue @@ -92,10 +92,11 @@ onMounted(async () => { } const res = await props.requestApi!(); console.log(res); - treeData.value = res?.result || []; // treeAllData.value = [{ id: "", [props.label]: "全部" }, ...result]; - - treeAllData.value = res ? [...res.result] : []; + setTimeout(function () { + treeData.value = res?.result || []; + // treeAllData.value = res ? [...res.result] : []; + }, 200); }); // onBeforeMount(async () => { // // 重新接收一下默认值 diff --git a/src/layouts/components/Header/components/Message.vue b/src/layouts/components/Header/components/Message.vue index bf19c76..aedad06 100644 --- a/src/layouts/components/Header/components/Message.vue +++ b/src/layouts/components/Header/components/Message.vue @@ -166,6 +166,7 @@ onBeforeUnmount(() => { .message-list { display: flex; flex-direction: column; + align-items: flex-end; height: 300px; overflow-y: scroll; /* 隐藏滚动条 */ @@ -173,15 +174,12 @@ onBeforeUnmount(() => { display: none; } .message-item { - width: 100%; + width: 96%; display: flex; align-items: center; - padding: 20px 0; + padding: 20px 0 15px 0; border-bottom: 1px solid var(--el-border-color-light); cursor: pointer; - &:last-child { - border: none; - } .message-content { display: flex; flex-direction: column; @@ -189,6 +187,7 @@ onBeforeUnmount(() => { display: flex; align-items: center; margin-bottom: 5px; + position: relative; .redCircle { display: inline-block; width: 5px; @@ -196,14 +195,20 @@ onBeforeUnmount(() => { border-radius: 50%; background-color: #e70000; margin-right: 5px; + position: absolute; + left: -10px; } .message-title { - color: #343434; - font-weight: 700; + font-size: 14px; + font-family: Source Han Sans CN-Regular, Source Han Sans CN; + font-weight: 400; + color: #333333; } } .message-date { - font-size: 12px; + font-size: 10px; + font-family: Source Han Sans CN-Regular, Source Han Sans CN; + font-weight: 400; color: #bababa; } } diff --git a/src/views/goverment/videoMonitor/HKVideo/index.scss b/src/views/goverment/videoMonitor/HKVideo/index.scss index f6a6e65..da85a1c 100644 --- a/src/views/goverment/videoMonitor/HKVideo/index.scss +++ b/src/views/goverment/videoMonitor/HKVideo/index.scss @@ -5,7 +5,7 @@ flex-direction: column; background-color: #f6f6f6; // padding: 0 20px; - // overflow: hidden; + overflow: hidden; .middle-video { margin: 0 20px; flex: 1; diff --git a/src/views/goverment/videoMonitor/HKVideo/index.vue b/src/views/goverment/videoMonitor/HKVideo/index.vue index 0caa9e3..78dbe15 100644 --- a/src/views/goverment/videoMonitor/HKVideo/index.vue +++ b/src/views/goverment/videoMonitor/HKVideo/index.vue @@ -1,7 +1,7 @@