| src/components/map/components/mapPopup.vue | ●●●●● patch | view | raw | blame | history | |
| src/styles/media/index.scss | ●●●●● patch | view | raw | blame | history | |
| src/views/home/components/bottomContainer.vue | ●●●●● patch | view | raw | blame | history |
src/components/map/components/mapPopup.vue
@@ -1,8 +1,7 @@ <template> <div> <div v-if="detailsPopup" id="divFormsDomBox" class="container"> <div v-if="detailsPopup" class="divForms-dom" id="divFormsDomBox"> <div class="box"> <div style="width: 100%; height: 100%; transform: translate(0, 50%);"> <div class="divForms divForms-theme"> <div class="divForms-wrap"> <div class="area"> @@ -69,7 +68,6 @@ </div> </div> </div> </div> </template> <script> @@ -91,107 +89,60 @@ </script> <style lang="scss" scoped> .container { position: fixed; left: 0; z-index: 1 !important; width: 280px; height: 360px; // background: $bg-color; color: #fff; display: flex; flex-direction: row; flex-wrap: wrap; justify-self: flex-start; align-content: flex-start; .title { height: 40px; line-height: 42px; width: 100%; position: relative; background-image: linear-gradient( 135deg, transparent 25px, #29baf1 25px ); .close { position: absolute; right: 5px; top: -2px; } .close::before { font-family: element-icons; content: '\e6db'; cursor: pointer; font-size: 16px; } .close:hover::before { color: #3d95f3; } } .item { display: flex; flex-direction: row; width: calc(100% - 20px); height: 30px; line-height: 30px; margin: 0 10px; text-align: left; // .item { // display: flex; // flex-direction: row; // width: calc(100% - 20px); // height: 30px; // line-height: 30px; // margin: 0 10px; // text-align: left; & > div:first-child { width: 100px; text-align: justify; display: inline-block; text-align-last: justify; margin-right: 20px; } // &>div:first-child { // width: 100px; // text-align: justify; // display: inline-block; // text-align-last: justify; // margin-right: 20px; // } & > div:nth-of-type(2) { width: calc(100% - 120px); } } // &>div:nth-of-type(2) { // width: calc(100% - 120px); // } // } .divForms-dom { position: fixed; left: 0; z-index: 1 !important; } .box { width: 100%; height: 100%; transform: translate(0, 25%); } .divForms .arrow { position: absolute; bottom: 40%; left: 0; bottom: 50%; left: -8px; width: 45px; height: 2px; transform: rotate(-45deg) translate(5px, -15px); transform: rotate(-45deg); background-color: #28bbf0; } .divForms-theme .area { background-image: linear-gradient( 135deg, background-image: linear-gradient(135deg, transparent 30px, #1831a79a 30px, #3f487ba6 50%, transparent 50% ), linear-gradient( -45deg, transparent 50%), linear-gradient(-45deg, transparent 30px, #1831a79a 30px, #3f487ba6 50.1%, transparent 50% ); transparent 50%); } .divForms .area { position: relative; min-width: 320px; min-width: 420px; } .divForms-wrap { @@ -274,20 +225,35 @@ overflow: hidden; } .divForms-theme .title { background-image: linear-gradient( 135deg, transparent 25px, #1c309e9a 25px ); } .divForms .title { position: relative; margin-top: 20px; padding: 0 12px 0 30px; height: 36px; line-height: 36px; position: relative; .close { position: absolute; right: 5px; top: -2px; } .close::before { font-family: element-icons; content: '\e6db'; cursor: pointer; font-size: 16px; } .close:hover::before { color: #3d95f3; } } .divForms-theme .title { background-image: linear-gradient(135deg, transparent 25px, #1c309e9a 25px); } .divForms .label-content { @@ -307,6 +273,5 @@ right: 0; z-index: 10; height: 2px; } } </style> src/styles/media/index.scss
@@ -2161,18 +2161,72 @@ } #divFormsDomBox { width: countSizeVw(280, 1920); height: countSizeVh(360); .divForms { .arrow { left: countSizeVw(-8, 1920); width: countSizeVw(45, 1920); height: countSizeVh(2); transform: rotate(-45deg); } .area { min-width: countSizeVw(420, 1920); } .b-t { left: countSizeVh(44); height: countSizeVh(1); } .b-r { bottom: countSizeVh(44); width: countSizeVh(1); } .b-l { top: countSizeVh(44); width: countSizeVh(1); } .b-b { right: countSizeVh(44); height: countSizeVh(1); } .b-b-r { width: countSizeVh(1); height: countSizeVh(62); transform: rotate(45deg) translate(countSizeVw(-52, 1920), countSizeVh(22)); } .b-t-l { width: countSizeVh(1); height: countSizeVh(62); transform: rotate(45deg) translate(countSizeVw(52, 1920), countSizeVh(-22)); } .label-content { padding: countSizeVh(4) 0; } .label-wrap { padding: 0 countSizeVw(12, 1920); font-size: countSizeVh(16); .title { height: countSizeVh(40); line-height: countSizeVh(42); background-image: linear-gradient(135deg, transparent countSizeVh(25), #29baf1 countSizeVh(25)); margin-top: countSizeVh(20); padding: 0 countSizeVw(12, 1920) 0 countSizeVw(30, 1920); height: countSizeVh(36); line-height: countSizeVh(36); &::before { bottom: countSizeVh(-4); height: countSizeVh(2); } .close { right: countSizeVh(5); right: countSizeVw(5, 1920); top: countSizeVh(-2); } @@ -2180,118 +2234,25 @@ font-size: countSizeVh(16); } } .item { width: calc(100% - 20px); height: countSizeVh(30); line-height: countSizeVh(30); margin: 0 countSizeVw(10, 1920); &>div:first-child { width: countSizeVw(100, 1920); margin-right: countSizeVw(20, 1920); } &>div:nth-of-type(2) { width: calc(100% - countSizeVw(120, 1920)); } } .divForms .arrow { width: countSizeVw(24, 1920); height: countSizeVh(2); transform: rotate(-45deg) translate(countSizeVh(5), countSizeVh(-15)); } .divForms-theme .area { background-image: linear-gradient(135deg, transparent countSizeVw(30, 1920), #1831a79a countSizeVw(30, 1920), transparent countSizeVh(30), #1831a79a countSizeVh(30), #3f487ba6 50%, transparent 50%), linear-gradient(-45deg, transparent countSizeVw(30, 1920), #1831a79a countSizeVw(30, 1920), transparent countSizeVh(30), #1831a79a countSizeVh(30), #3f487ba6 50.1%, transparent 50%); } .divForms .area { // min-width: countSizeVw(320,1920); min-width: countSizeVw(260, 1920); } .divForms-wrap { padding: countSizeVh(30); } .divForms-theme .b-b, .divForms-theme .b-b-r, .divForms-theme .b-l, .divForms-theme .b-r, .divForms-theme .b-t, .divForms-theme .b-t-l { box-shadow: 0 0 countSizeVh(10) countSizeVh(2) #1831a7; } .divForms .b-t { left: countSizeVh(84); height: countSizeVh(1); } .divForms .b-r { bottom: countSizeVh(84); width: countSizeVh(1); } .divForms .b-l { top: countSizeVh(84); width: countSizeVh(1); } .divForms .b-b { right: countSizeVh(84); height: countSizeVh(1); } .divForms .b-b-r { width: countSizeVw(1, 1920); height: countSizeVh(150); transform: rotate(45deg) translate(-52px, 22px); } .divForms .b-t-l { width: countSizeVw(1, 1920); height: countSizeVh(62); transform: rotate(45deg) translate(countSizeVw(52, 1920), countSizeVw(-22, 1920)); } .divForms .label-wrap { padding: 0 countSizeVw(12, 1920); font-size: countSizeVh(16); } .divForms-theme .title { background-image: linear-gradient(135deg, transparent countSizeVw(25, 1920), #1c309e9a countSizeVw(25, 1920)); } .divForms .title { margin-top: countSizeVh(20); padding: 0 countSizeVh(12) 0 countSizeVw(30, 1920); height: countSizeVh(36); line-height: countSizeVh(36); } .divForms .label-content { padding: countSizeVh(4) 0; } .divForms .title::before { bottom: countSizeVh(-4); height: countSizeVh(2); padding: countSizeVh(30) countSizeVw(30, 1920); } } } src/views/home/components/bottomContainer.vue
@@ -25,14 +25,14 @@ <ul class="title-header"> <li> <span class="num">序号</span> <span class="type">警情类别</span> <span class="dealTime">接警时间</span> <span class="state">警情状态</span> <span class="dealPolice">经办民警</span> <span class="callPeople">报警人</span> <span class="comingPhone">报警电话</span> <span class="callPhone">报警人联系人</span> <span class="callContent">报警内容</span> <span class="type">报警类别</span> <span class="out-people">出动人员</span> <span class="out-car">出动车辆</span> <span class="receiving-alarm-time">接警时间</span> <span class="arrive-time">到达现场时间</span> <span class="dispose-time">处理完毕时间</span> <span class="police-unit">处警单位</span> <span class="out-police-bz">备注</span> </li> </ul> <vue-seamless-scroll :data="historytype == 0 ? policeSituationRealtimeArr : policeSituationHistoryArr" @@ -43,13 +43,13 @@ <!-- <span class="num" v-text="item.num"></span> --> <span class="num" v-text="index + 1"></span> <span class="type" v-text="item.type"></span> <span class="dealTime" v-text="item.dealTime"></span> <span class="state" v-text="item.state"></span> <span class="dealPolice" v-text="item.dealPolice"></span> <span class="callPeople" v-text="item.callPeople"></span> <span class="comingPhone" v-text="item.comingPhone"></span> <span class="callPhone" v-text="item.callPhone"></span> <span class="callContent" v-text="item.callContent"></span> <span class="out-people" v-text="item.dealTime"></span> <span class="out-car" v-text="item.state"></span> <span class="receiving-alarm-time" v-text="item.dealPolice"></span> <span class="arrive-time" v-text="item.callPeople"></span> <span class="dispose-time" v-text="item.comingPhone"></span> <span class="police-unit" v-text="item.callPhone"></span> <span class="out-police-bz" v-text="item.callContent"></span> </li> </ul> </vue-seamless-scroll> @@ -407,38 +407,38 @@ cursor: pointer; .num { width: 8%; width: 6%; } .type { width: 10%; } .state { width: 8%; .out-people { width: 10%; } .comingPhone { width: 14%; .out-car { width: 10%; } .dealTime { width: 14%; .receiving-alarm-time { width: 12%; } .dealPolice { width: 8%; .arrive-time { width: 12%; } .callPeople { width: 8%; .dispose-time { width: 12%; } .callPhone { width: 14%; .police-unit { width: 12%; } .callContent { .out-police-bz { flex: 1; } }