修复bug 防御备战调整处理

.env.development

@@ -23,7 +23,7 @@ VITE_APP_SNAILJOB_ADMIN = 'http://localhost:8800/snail-job'
 YZY_REDIRECT_URI = 'http://19.155.220.206:8086/tyrz/login'
 YZY_TYRZ_URL = 'https://xtbg.digitalgd.com.cn/zwrz/rz/sso/oauth/authorize?response_type=code&scope=all&client_id=zwrz_mmzhyj&redirect_uri='
 
-VITE_APP_PORT = 8086
+VITE_APP_PORT = 8088
 
 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
 VITE_APP_ENCRYPT = false

src/layout/components/Sidebar/SidebarItem.vue

@@ -81,6 +81,9 @@ const hasOneShowingChild = (parent: RouteRecordRaw, children?: RouteRecordRaw[])
 };
 
 const resolvePath = (routePath: string, routeQuery?: string): any => {
+  if (props.basePath === '/routineCommandMap') {
+    return window.location.origin + import.meta.env.VITE_APP_CONTEXT_PATH + '#' + props.basePath;
+  }
   if (isExternal(routePath)) {
     return routePath;
   }

src/router/index.ts

@@ -72,6 +72,16 @@ export const constantRoutes: RouteRecordRaw[] = [
     component: () => import('@/views/error/401.vue'),
     hidden: true
   },
+  {
+    path: '/riskPrevention/censusDataAnalysis/index',
+    component: () => import('@/views/censusDataAnalysis/index.vue'),
+    hidden: true
+  },
+  {
+    path: '/routineCommandMap',
+    component: () => import('@/views/routineCommandMap/index.vue'),
+    hidden: true
+  },
   {
     path: '',
     component: Layout,

src/types/components.d.ts

@@ -42,23 +42,31 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     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']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
+    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     ExcelEditor: typeof import('./../components/ExcelEditor/index.vue')['default']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
@@ -70,6 +78,8 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
+    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

src/views/duty/eventing/index.vue

@@ -44,7 +44,7 @@
                 <el-col :span="6">
                   <el-form-item label="行政区划：" prop="region_code">
                     <el-select v-model="queryParams.region_code" clearable>
-                      <el-option v-for="item in region" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                      <el-option v-for="item in region" :key="item.value" :label="item.label" :value="item.value"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>

src/views/emergencyCommandMap/LeftSection/CloseCommand.vue

@@ -3,12 +3,13 @@
     custom-show
     :type="props.flag ? 'xs' : 'sm'"
     :title="title"
+    :height="props.flag ? '150px' : '200px'"
     confirm-text="结束指挥"
     confirm-class="common-btn-danger"
     @close="closeDialog"
     @confirm="endProcess"
   >
-    <el-form v-if="!props.flag" ref="eventFormRef" :model="form" :rules="rules" label-width="190px">
+    <el-form v-if="!props.flag" ref="eventFormRef" :model="form" :rules="rules" label-width="80px">
       <el-form-item label="灾害事件" prop="event_title">
         <el-select
           v-model="form.event_title"
@@ -295,6 +296,12 @@ const selectEvent = (eventTitle) => {
 };
 </script>
 <style lang="scss" scoped>
+:deep(.dialog-content) {
+  overflow: unset !important;
+}
+:deep(.el-form-item__label) {
+  color: #fff !important;
+}
 .dialog-footer {
   height: 150px;
   display: flex;

src/views/routineCommandMap/LeftSection/RealSituation.vue

@@ -14,7 +14,7 @@
     <!--      </div>-->
     <!--      <i class="decoration2" />-->
     <!--    </div>-->
-    <Dialog v-model="liveMapState.show" :title="tabs[tabActive].name" hide-footer>
+    <Dialog v-model="liveMapState.show" :title="tabs[tabActive].name" height="425px" hide-footer>
       <div class="img-box2">
         <img v-show="liveMapState.activeIndex > -1" :src="liveMapState.data[liveMapState.activeIndex]?.pic_url" />
       </div>
@@ -260,4 +260,7 @@ onMounted(() => {
     }
   }
 }
+:deep(.dialog-content) {
+  overflow: unset !important;
+}
 </style>

src/views/routineCommandMap/RightSection/EventReport/EventManage.vue

@@ -60,7 +60,7 @@
                   clearable
                 >
                   <el-option label="全部" value=""></el-option>
-                  <el-option v-for="item in region" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                  <el-option v-for="item in region" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>

src/views/routineCommandMap/RightSection/EventReport/index.vue

@@ -7,19 +7,19 @@
     <!-- 表格组件 -->
     <div class="common-table">
       <div class="table-header">
-        <div class="td">事件标题</div>
         <div class="td">事发地点</div>
+        <div class="td">事件标题</div>
         <div class="td">事发状态</div>
         <div class="td">操作</div>
       </div>
       <div v-for="(item, index) in eventList" :key="index" class="tr">
-        <div class="td" :title="item.event_title" @click="handleShowDetail(item)">{{ item.event_title }}</div>
         <div class="td" :title="item.address">
           <div class="address-box">
             <i class="address-icon" />
             <div class="address-text">{{ item.address }}</div>
           </div>
         </div>
+        <div class="td text1" :title="item.event_title" @click="handleShowDetail(item)">{{ item.event_title }}</div>
         <div class="td">
           <dict-tag :class="getEventStatusClass(item.event_status)" :options="mm_event_state" :value="item.event_status" />
         </div>
@@ -148,6 +148,10 @@ const getEventStatusClass = (value) => {
       width: 90px;
     }
   }
+  .text1 {
+    color: #00e8ff;
+    cursor: pointer;
+  }
   .address-box {
     display: flex;
     align-items: center;
@@ -163,7 +167,6 @@ const getEventStatusClass = (value) => {
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
-      color: #00e8ff;
     }
   }
 }