一图作战右侧

src/components/Dialog/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="modelValue || customShow" class="common-dialog" :style="{ width: computedWidth, height: computedHeight }">
+  <div v-if="modelValue || customShow" class="common-dialog" :style="{ width: computedWidth }">
     <div :class="type === 'xs' ? 'dialog-header2' : 'dialog-header'">
       <div v-if="!hideTitle" class="dialog-title">
         {{ title ? title : '弹窗' }}
@@ -52,15 +52,15 @@ const computedWidth = computed(() => {
   if (!!props.width) {
     return props.width;
   } else if (props.type === 'xs') {
-    return '1080px';
+    return '404px';
   } else if (props.type === 'sm') {
-    return '1569px';
+    return '584px';
   } else if (props.type === 'lg') {
-    return '2839px';
+    return '744px';
   } else if (props.type === 'xl') {
-    return '3400px';
+    return '1024px';
   } else {
-    return '2000px';
+    return '1270px';
   }
 });
 const computedHeight = computed(() => {
@@ -130,8 +130,8 @@ const confirm = () => {
       position: absolute;
       top: 20px;
       right: 60px;
-      width: 32px;
-      height: 32px;
+      width: 20px;
+      height: 20px;
       background: url('@/assets/images/common/close.png') no-repeat;
       background-size: 100% 100%;
       cursor: pointer;

src/types/components.d.ts

@@ -52,6 +52,8 @@ declare module 'vue' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
+    ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']

src/utils/request.ts

@@ -202,14 +202,7 @@ export function download(url: string, params: any, fileName: string) {
 export function download2(url: string, fileName: string) {
   downloadLoadingInstance = ElLoading.service({ text: '正在下载数据，请稍候', background: 'rgba(0, 0, 0, 0.7)' });
   return service
-    .get(
-      url,
-      {},
-      {
-        headers: { 'Content-Type': 'application/octet-stream' },
-        responseType: 'blob'
-      }
-    )
+    .get(url, { responseType: 'blob' })
     .then(async (resp: any) => {
       const isLogin = blobValidate(resp);
       if (isLogin) {

src/views/duty/eventing/eventDetails.vue

@@ -7,7 +7,7 @@
     <div class="common-header">
       <div class="common-header-left">
         <i class="common-title-icon" />
-        <div class="common-title">{{ detailData.event_title }}</div>
+        <div>{{ detailData.event_title }}</div>
       </div>
       <div class="common-header-right">
         <el-button type="primary" :disabled="detailData.del_flag == '2'" @click="handleUpdate">
@@ -113,7 +113,7 @@
       </div>
       <div v-if="!!summaryFiles && summaryFiles.length > 0" class="common-info-content">
         <div class="list2">
-          <div v-for="(item, index) in summaryFiles" :key="index" class="list-item" @click="downloadSummaryFile(item.url)">
+          <div v-for="(item, index) in summaryFiles" :key="index" class="list-item" @click="downloadSummaryFile(item)">
             <div class="link">{{ item.file_name }}</div>
             <el-icon class="icon"><Download /></el-icon>
           </div>
@@ -161,6 +161,7 @@ import StartEventDialog from './StartEventDialog.vue';
 import CloseEventDialog from './CloseEventDialog.vue';
 import EventEditDialog from './EventEditDialog.vue';
 import EditCasualtiesDialog from './EditCasualtiesDialog.vue';
+import { download2 } from '@/utils/request';
 
 const props = defineProps({
   eventId: String
@@ -186,8 +187,10 @@ const handleEventLevelClose = () => {
 
 // 下载总结报告
 let summaryFiles = ref([]);
-const downloadSummaryFile = (url) => {
-  window.open(url);
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+// 下载方法
+const downloadSummaryFile = (file: any) => {
+  download2(baseUrl + '/file/download/' + file.url, file.file_name);
 };
 
 // 事件跟踪数据

src/views/emergencyCommandMap/LeftSection/Communication.vue

@@ -296,7 +296,7 @@ const deleteItem = (item) => {
       .search-box {
         display: flex;
         .custom-input {
-          width: 118px;
+          width: 140px;
         }
         .select-box {
           width: 77px !important;

src/views/emergencyCommandMap/RightSection/RightTop.vue

@@ -126,21 +126,22 @@ watch(
   display: flex;
   justify-content: flex-start; /* 选项卡靠左对齐 */
   padding: 0;
-  margin-left: 80px;
-  margin-top: 75px;
-
+  margin-left: 10px;
+  margin-top: 47px;
   .active {
     background: url('@/assets/images/emergencyCommandMap/tabActive.png') no-repeat;
+    background-size: 100% 100%;
   }
 
   li {
     cursor: pointer;
-    padding: 20px;
-    font-size: 44px;
+    padding: 10px;
+    font-size: 16px;
     color: #fff;
-    width: 349px;
-    height: 118px;
+    width: 114px;
+    height: 28px;
     background: url('@/assets/images/emergencyCommandMap/tab.png') no-repeat;
+    background-size: 100% 100%;
     display: flex;
     justify-content: center;
     align-items: flex-end;
@@ -148,6 +149,7 @@ watch(
 
     &:hover {
       background: url('@/assets/images/emergencyCommandMap/tabActive.png') no-repeat;
+      background-size: 100% 100%;
     }
   }
 }
@@ -257,9 +259,10 @@ watch(
 }
 
 .duty-card {
-  width: 1968px;
-  height: 812px;
+  width: 526px;
+  height: 388px;
   background: url('@/assets/images/commandDynamic/dialog.png') no-repeat;
+  background-size: 100% 100%;
   position: relative;
   color: #fff;
   animation-name: slideRight;
@@ -277,7 +280,7 @@ watch(
   display: flex;
   justify-content: center;
   align-items: center;
-  font-size: 36px;
+  font-size: 14px;
   color: #fff;
 }
 .tip {

src/views/emergencyCommandMap/RightSection/index.vue

@@ -33,8 +33,8 @@
       </div>
     </div>
     <RightTop :event-id="eventId" />
-    <PublicOpinionSupervision />
-    <JointDuty />
+<!--    <PublicOpinionSupervision />-->
+<!--    <JointDuty />-->
     <StartPlan v-if="startPlanState.show" v-model:show="startPlanState.show" :title="startPlanState.title" :event-id="startPlanState.eventId" />
     <SelectPlan v-model="selectPlanState.show" :title="selectPlanState.title" :temp-event-id="eventId" @update-plan="updatePlan" />
     <RenWuDengJi v-if="renWuDengJiState.show" v-model:show="renWuDengJiState.show" :event-id="eventId" />
@@ -163,7 +163,7 @@ const updatePlan = (data: { eventId: string }) => {
 
 <style lang="scss" scoped>
 .right-section {
-  width: 1965px;
+  width: 530px;
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -187,8 +187,8 @@ const updatePlan = (data: { eventId: string }) => {
       cursor: pointer;
       .icon {
         position: relative;
-        width: 170px;
-        height: 170px;
+        width: 50px;
+        height: 50px;
         //padding-left: 60px;
       }
       .icon1,
@@ -197,8 +197,8 @@ const updatePlan = (data: { eventId: string }) => {
       .icon4,
       .icon5 {
         position: absolute;
-        width: 223px;
-        height: 238px;
+        width: 64px;
+        height: 68px;
       }
       .icon1 {
         background: url('@/assets/images/emergencyCommandMap/icon1.png') no-repeat;
@@ -221,7 +221,7 @@ const updatePlan = (data: { eventId: string }) => {
         background-size: 100% 100%;
       }
       .task-text {
-        font-size: 48px !important;
+        font-size: 16px !important;
       }
     }
   }

src/views/emergencyCommandMap/index.vue

@@ -8,7 +8,7 @@
 <!--          <i :class="showLeftSection ? 'arrow-icon left-icon' : 'arrow-icon right-icon'" @click="handleTelescoping('left')" />-->
 <!--          <i :class="showRightSection ? 'arrow-icon2 right-icon' : 'arrow-icon2 left-icon'" @click="handleTelescoping('right')" />-->
 <!--        </MiddleSection>-->
-<!--        <RightSection v-show="showRightSection" />-->
+        <RightSection v-show="showRightSection" />
       </div>
       <FooterSection style="position: absolute; bottom: 0; left: 0" />
     </div>

src/views/knowledge/knowledge-management/detail.vue

@@ -7,7 +7,7 @@
     <div class="common-header">
       <div class="common-header-left">
         <i class="common-title-icon" />
-        <div class="common-title">{{ report.title }}</div>
+        <div>{{ report.title }}</div>
       </div>
       <div class="common-header-right">
         <el-button type="primary" @click="handleEdit"> <i class="edit-icon2" />编辑</el-button>