Compare commits

..

No commits in common. "bbf1da34931b39f3311599b216ee3414719494d6" and "e0a63a53304ced354a8ad2450979a35acd83746c" have entirely different histories.

6 changed files with 5 additions and 39 deletions

View File

@ -78,11 +78,6 @@ const locationInfo = [
min-width: 248px; min-width: 248px;
max-width: 100%; max-width: 100%;
// min-height: 160px; // min-height: 160px;
&:hover {
// border: 2px solid rgba(255, 80, 80, 0.6);
box-shadow: 0 0 10px rgba(255, 80, 80, 0.6), 0 0 20px rgba(255, 0, 0, 0.4),
0 0 35px rgba(255, 0, 0, 0.25);
}
} }
// 2x2 // 2x2

View File

@ -173,7 +173,7 @@ const handleQuickResponseToggle = () => {
box-sizing: border-box; box-sizing: border-box;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: vw(0); width: vw(6);
} }
&::-webkit-scrollbar-track { &::-webkit-scrollbar-track {

View File

@ -1,6 +1,5 @@
<template> <template>
<div class="right-panel"> <div class="right-panel">
<div class="right-panel__content">
<CollapsiblePanel title="快速处置" subtitle="「调度指挥」"> <CollapsiblePanel title="快速处置" subtitle="「调度指挥」">
<DispatchCommand /> <DispatchCommand />
</CollapsiblePanel> </CollapsiblePanel>
@ -19,7 +18,6 @@
<!-- <CollapsiblePanel title="协同信息" subtitle="「多部门联动」"> <!-- <CollapsiblePanel title="协同信息" subtitle="「多部门联动」">
</CollapsiblePanel> --> </CollapsiblePanel> -->
<CollaborationInfo /> <CollaborationInfo />
</div>
</div> </div>
</template> </template>
@ -44,18 +42,10 @@ import CollaborationInfo from './CollaborationInfo.vue'
overscroll-behavior: contain; overscroll-behavior: contain;
padding-right: vw(40); // padding-right: vw(40); //
padding-top: var(--sa-header-height); padding-top: var(--sa-header-height);
padding-left: 10px;
box-sizing: border-box; box-sizing: border-box;
&__content {
&:hover {
// border: 2px solid rgba(255, 80, 80, 0.6);
box-shadow: 0 0 10px rgba(255, 80, 80, 0.6), 0 0 20px rgba(255, 0, 0, 0.4),
0 0 35px rgba(255, 0, 0, 0.25);
}
}
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: vw(0); width: vw(6);
} }
&::-webkit-scrollbar-track { &::-webkit-scrollbar-track {

View File

@ -160,9 +160,7 @@ function onAfterLeave(el) {
.collapsible-panel { .collapsible-panel {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
&:not(:last-child) { margin-bottom: vh(17);
margin-bottom: vh(17);
}
border: 2px solid transparent; /* 防止 hover 时抖动 */ border: 2px solid transparent; /* 防止 hover 时抖动 */
&__header { &__header {

View File

@ -15,9 +15,6 @@
<div class="stretchable-modal__header"> <div class="stretchable-modal__header">
<slot name="header"> <slot name="header">
<h3 class="stretchable-modal__title">{{ title }}</h3> <h3 class="stretchable-modal__title">{{ title }}</h3>
<div class="stretchable-modal__extra">
<slot name="extraButtons"></slot>
</div>
</slot> </slot>
<button <button
v-if="showClose" v-if="showClose"
@ -39,7 +36,7 @@
</div> </div>
<!-- 底部大弹窗bottom切图.png --> <!-- 底部大弹窗bottom切图.png -->
<div class="stretchable-modal__footer"> <div v-if="$slots.footer" class="stretchable-modal__footer">
<slot name="footer"></slot> <slot name="footer"></slot>
</div> </div>
</div> </div>
@ -215,20 +212,6 @@ onUnmounted(() => {
margin: 0; margin: 0;
} }
&__extra {
position: absolute;
right: 125px;
top: 18px;
display: flex;
align-items: center;
justify-content: center;
&:hover {
// border: 2px solid rgba(255, 80, 80, 0.6);
box-shadow: 0 0 10px rgba(255, 80, 80, 0.6), 0 0 20px rgba(255, 0, 0, 0.4),
0 0 35px rgba(255, 0, 0, 0.25);
}
}
&__close { &__close {
position: absolute; position: absolute;
top: 34px; top: 34px;

View File

@ -204,7 +204,7 @@
/> />
<!-- 底部一键启动按钮 --> <!-- 底部一键启动按钮 -->
<template #extraButtons> <template #footer>
<ActionButton <ActionButton
text="响应调度" text="响应调度"
type="inModal" type="inModal"