1

src/app/cjzfire/constant.ts

@@ -1,13 +1,13 @@
 import { AppConstant } from "..";
 import banner from "@/app/cjzfire/images/bg@2x.jpg";
-import ico from "@/assets/image/jmlogo.png";
+import ico from "@/assets/image/logo_big.ico";
 import { cjzcriminalDeptId } from "@/constant/appDeptId";
 
 export const appConstant: AppConstant = {
   title: "火灾调查三维远程勘验平台",
   desc: "Three-dimensional remote prospecting platform for fire scenes",
   ico,
-  name: "fire",
+  name: "cjzfire",
   banner,
   loginComponent: () => import("./view/login/index.vue"),
   deptId: cjzcriminalDeptId,

src/app/cjzfire/routeConfig.ts

@@ -5,18 +5,21 @@ export const FireRouteName = {
   ...RouteName,
   dispatch: "dispatch",
   teaching: "teaching",
+  recycle: "caseRecovery",
 } as const;
 
 export const menuRouteNames = [
-  FireRouteName.statistics,
-  FireRouteName.downloadLog,
   FireRouteName.vrmodel,
   FireRouteName.camera,
   FireRouteName.dispatch,
   FireRouteName.teaching,
+  FireRouteName.statistics,
   FireRouteName.organization,
+  FireRouteName.downloadLog,
   FireRouteName.role,
   FireRouteName.user,
+  FireRouteName.setting,
+  FireRouteName.recycle
 ];
 
 export const routes: Routes = [
@@ -32,4 +35,10 @@ export const routes: Routes = [
     component: () => import("../fire/view/dispatch/index.vue"),
     meta: { title: "教学平台", icon: "iconfire_study" },
   },
+  {
+    name: FireRouteName.recycle,
+    path: "recycle",
+    component: () => import("../fire/view/dispatch/index.vue"),
+    meta: { title: "回收站", icon: "icon-del" },
+  },
 ];

src/app/cjzfire/view/login/index.vue

@@ -178,7 +178,10 @@ const submitClick = async () => {
   background: no-repeat left bottom;
   background-size: cover;
 }
-
+.el-input__inner {
+  height   : 50px;
+  font-size: 1.14rem;
+}
 .content {
   display: flex;
   justify-content: space-between;
@@ -411,3 +414,9 @@ input[type="password"]::-ms-reveal {
   display: none;
 }
 </style>
+<style lang="scss">
+.panel-form-item .el-input__inner {
+  height   : 50px;
+  font-size: 1.14rem;
+}
+</style>

src/app/map/App.vue

@@ -262,7 +262,7 @@ const initMakers = async () => {
   //   bubble: true, //事件穿透到地图
   // });
   // var overlaysList = map.getAllOverlays("polygon"); //获取多边形图层
-  map.setFitView(); //自适应显示
+  map && map.setFitView(); //自适应显示
 };
 
 const initKeywordMakers = async () => {
@@ -316,7 +316,7 @@ const initKeywordMakers = async () => {
   //   bubble: true, //事件穿透到地图
   // });
   // var overlaysList = map.getAllOverlays("polygon"); //获取多边形图层
-  map.setFitView(); //自适应显示
+  map && map.setFitView(); //自适应显示
 };
 const loadMap = async () => {
   AMap = await AMapLoader.load({

src/assets/style/public.scss

@@ -421,7 +421,7 @@ body {
 
   .input-inner-btn {
     position   : absolute;
-    right      : 0;
+    right      : 7px;
     top        : 50%;
     height     : 36px;
     line-height: 36px;

src/constant/appDeptId.ts

@@ -2,7 +2,7 @@ export const fireDeptId = 1;
 export const criminalDeptId = 2;
 export const xmfireDeptId = 3;
 export const policeDeptId = 4;
-export const cjzcriminalDeptId = 'DEP000011734134901809483776';
+export const cjzcriminalDeptId = 2;
 
 export const topDeptIds = [
   fireDeptId,