Pārlūkot izejas kodu

舆情监测、视频弹窗调整

Hwf 7 mēneši atpakaļ
vecāks
revīzija
c42fb74548

BIN
src/assets/images/commandDynamic/rect.png


BIN
src/assets/images/emergencyCommandMap/supervision/box.png


+ 0 - 0
src/assets/images/commandDynamic/line.png → src/assets/images/emergencyCommandMap/supervision/line.png


+ 8 - 4
src/assets/styles/element-ui.scss

@@ -369,7 +369,7 @@
     border: 4px solid rgba(26, 144, 255, 0.15) !important;
   }
   .el-input__inner {
-    font-size: 32px;
+    font-size: 38px;
     color: #a0c7dc;
     font-family: PingFang SC;
     height: 72px;
@@ -477,7 +477,7 @@
 
 .common-date-picker {
   position: relative;
-  height: 55px !important;
+  height: 80px !important;
   .el-input__wrapper {
     box-shadow: none;
     background-color: #0d2f5d;
@@ -487,8 +487,8 @@
     font-size: 32px;
     color: #a0c7dc;
     font-family: PingFang SC;
-    height: 55px;
-    line-height: 55px;
+    height: 80px;
+    line-height: 80px;
     &::placeholder {
       color: #a0c7dc;
     }
@@ -589,3 +589,7 @@
     color: #8fa4b7;
   }
 }
+.el-form-item--default .el-form-item__label {
+  height: 88px !important;
+  line-height: 88px !important;
+}

+ 2 - 0
src/assets/styles/index.scss

@@ -337,6 +337,7 @@ aside {
   margin-left: 28px;
   .table-header {
     width: 100%;
+    min-height: 88px;
     background: url('@/assets/images/map/rightMenu/rainMonitor/header.png') no-repeat;
     background-size: 100% 100%;
     display: flex;
@@ -348,6 +349,7 @@ aside {
   }
   .tr {
     width: 100%;
+    min-height: 88px;
     background: url('@/assets/images/map/rightMenu/rainMonitor/tr.png') no-repeat;
     background-size: 100% 100%;
     display: flex;

+ 3 - 3
src/components/Dialog/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div v-if="modelValue || customShow" class="common-dialog" :style="{ width: computedWidth, height: computedHeight }">
-    <div class="dialog-header">
+  <div v-if="modelValue || customShow" :class="type === 'xs' ? 'common-dialog2' : 'common-dialog'" :style="{ width: computedWidth, height: computedHeight }">
+    <div :class="type === 'xs' ? 'dialog-header2' : 'dialog-header'">
       <div class="dialog-title">
         {{ title ? title : '弹窗' }}
       </div>
@@ -108,7 +108,7 @@ const confirm = () => {
   font-size: 38px;
   display: flex;
   flex-direction: column;
-  .dialog-header {
+  .dialog-header, dialog-header2 {
     position: relative;
     min-height: 175px;
     line-height: 135px;

+ 7 - 2
src/views/emergencyCommandMap/LeftSection/VideoMonitor.vue

@@ -11,7 +11,7 @@
       </div>
     </div>
   </div>
-  <Dialog v-model="showListDialog" type="xl" title="视频监控" hide-footer @close="reset">
+  <Dialog v-model="showListDialog" type="xl" title="视频监控" class="dialog" hide-footer @close="reset">
     <div class="search-box">
       <div class="box-left">
         <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="200px" label-position="left">
@@ -29,7 +29,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="name">
-            <el-input class="custom-input2" placeholder="请输入摄像头名称" size="large" style="width: 300px" />
+            <el-input class="custom-input2" placeholder="请输入摄像头名称" size="large" style="width: 500px" />
           </el-form-item>
           <el-form-item>
             <div class="common-btn-primary" @click="handleQuery">搜索</div>
@@ -461,4 +461,9 @@ const handleSave = () => {
   right: 30px;
   z-index: 9;
 }
+.dialog {
+  :deep(.dialog-header) {
+    min-height: 150px;
+  }
+}
 </style>

+ 8 - 14
src/views/emergencyCommandMap/RightSection/PublicOpinionSupervision.vue

@@ -8,7 +8,7 @@
         </div>
         <div :class="item.type === '1' ? 'icon1' : 'icon2'"></div>
         <div class="text-box">
-          <div v-if="item.type === '2'" class="icon3"></div>
+          <div class="icon3"></div>
           <div class="text1">{{ item.content }}</div>
           <div class="text2">{{ item.time }}</div>
         </div>
@@ -60,12 +60,7 @@ const dataList = ref([
         margin-top: 0;
       }
       .title-box {
-        width: 493px;
-        height: 50px;
-        line-height: 50px;
-        //background: url('@/assets/images/emergencyCommandMap/supervision/titleBg.png') no-repeat;
-        margin-left: 20px;
-        padding: 0 30px;
+        width: 100%;
         .title2 {
           font-size: 44px;
           /* 设置字体透明 */
@@ -79,14 +74,13 @@ const dataList = ref([
           /* 把当前元素设置为行内块,以便能够应用背景 */
           display: inline-block;
           font-family: 'YouSheBiaoTiHei';
-          text-shadow: 0 0 10px #eef8ff;
         }
       }
       .icon1,
       .icon2 {
         position: absolute;
-        top: 4px;
-        left: -85px;
+        top: 47px;
+        left: -110px;
       }
       .icon1 {
         width: 107px;
@@ -100,8 +94,7 @@ const dataList = ref([
       }
       .text-box {
         width: 1762px;
-        height: 69px;
-        line-height: 69px;
+        height: 115px;
         background: url('@/assets/images/emergencyCommandMap/supervision/box.png') no-repeat;
         display: flex;
         justify-content: space-between;
@@ -112,9 +105,10 @@ const dataList = ref([
           flex: 1;
           color: #fff;
           font-size: 38px;
-          white-space: nowrap;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
           overflow: hidden;
-          text-overflow: ellipsis;
         }
         .text2 {
           width: 167px;

+ 1 - 2
src/views/routineCommandMap/LeftSection/index.vue

@@ -81,7 +81,7 @@
       </div>
     </div>
     <!--巡查消息弹窗-->
-    <Dialog v-model="inspectionNewsState.showListDialog" title="巡查消息列表" width="70%"></Dialog>
+    <Dialog v-model="inspectionNewsState.showListDialog" type="xl" title="巡查消息列表" hide-footer />
     <!--事件接报弹窗-->
     <EventManage v-model="eventManageState.showListDialog" />
   </div>
@@ -92,7 +92,6 @@ import Dialog from '@/components/Dialog/index.vue';
 import EventManage from '@/views/routineCommandMap/LeftSection/EventManage.vue';
 import { ref, reactive, toRefs } from 'vue';
 import { getEvent } from '@/api/duty/eventing';
-import eventDetails from '../eventing/eventDetails.vue';
 const eventList = ref([]);
 const loading = ref(true);
 const total = ref(0);