Merge branch 'v1.8.1' of http://192.168.0.115:3000/bill/public-fuse into v1.8.1

package.json

@@ -14,7 +14,7 @@
     "build-xmfire": "vite build ./ --mode=xmfire",
     "build-cjzfire": "vite build ./ --mode=cjzfire",
     "build-ga": "vite build ./ --mode=ga",
-    "build-all": "npm-run-all --parallel build-fire build-criminal build-xmfire build-ga",
+    "build-all": "npm-run-all --parallel build-fire build-criminal build-xmfire build-ga build-cjzfire",
     "preview": "vite preview"
   },
   "dependencies": {

src/app/cjzfire/constant.ts

@@ -1,14 +1,17 @@
 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,
 };
+// const link = document.querySelector<HTMLLinkElement>("#app-icon")!;
+// link.setAttribute("href", ico);
+// console.log('link1', link);

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/criminal/constant.ts

@@ -16,5 +16,6 @@ export const appConstant: AppConstant = {
   deptId: criminalDeptId,
 };
 
-const link = document.querySelector<HTMLLinkElement>("#app-icon")!;
-link.setAttribute("href", linkIco);
+// const link = document.querySelector<HTMLLinkElement>("#app-icon")!;
+// link.setAttribute("href", linkIco);
+// console.log('link3', link);

src/app/ga/constant.ts

@@ -15,5 +15,6 @@ export const appConstant: AppConstant = {
   deptId: policeDeptId,
 };
 
-const link = document.querySelector<HTMLLinkElement>("#app-icon")!;
-link.setAttribute("href", linkIco);
+// const link = document.querySelector<HTMLLinkElement>("#app-icon")!;
+// link.setAttribute("href", linkIco);
+// console.log('link2', link);

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,

src/constant/scene.ts

@@ -26,7 +26,7 @@ export const SceneTypePaths: { [key in SceneType]: string[] } = {
   [SceneType.SWKK]: [
     "/swkk/spg.html",
     "/swkk/epg.html",
-    `/swkk/livestream/fd/${appConstant.name}.html`,
+    `/swkk/livestream/fd/${appConstant.name=='cjzfire'?'fire':appConstant.name}.html`,
   ],
   [SceneType.SWKJ]: ["/swkk/spg.html", "/swkk/epg.html"],
   [SceneType.SWSS]: ["/swss/index.html", "/swss/index.html"],
@@ -44,6 +44,7 @@ export const QuoteSceneStatusDesc: { [key in QuoteSceneStatus]: string } = {
   [QuoteSceneStatus.ERR]: "计算失败",
   [QuoteSceneStatus.SUCCESS]: "计算成功",
   [QuoteSceneStatus.ARCHIVE]: "封存",
+  [QuoteSceneStatus.QUEUE]: "排队中",
   [QuoteSceneStatus.RERUN]: "重新计算中",
 };
 

src/main.ts

@@ -20,8 +20,8 @@ app.use(ElementPlus);
 app.use(router);
 setApp(app);
 app.mount("#app");
-
-const $ico = document.createElement("link");
+console.log("appConstant", appConstant, document.querySelector<HTMLLinkElement>("#app-icon"));
+const $ico = document.querySelector<HTMLLinkElement>("#app-icon")!//document.createElement("link");
 $ico.setAttribute("rel", "icon");
 $ico.setAttribute("type", "image/svg+xml");
 $ico.setAttribute("href", appConstant.ico);

src/store/system.ts

@@ -19,7 +19,7 @@ export type LoginProps = {
 
 export const title = ref(appConstant.title);
 export const desc = ref(appConstant.desc);
-
+console.log('appConstant', appConstant, title.value + (desc.value ? " | " + desc.value : ""));
 watchEffect(
   () => (document.title = title.value + (desc.value ? " | " + desc.value : ""))
 );
@@ -31,8 +31,8 @@ const refreshUserInfo = async (data: any) => {
 
 export const login = async (props: LoginProps) => {
   const res = await axios.post(userLogin, {
-    ...props,
     deptId: appConstant.deptId,
+    ...props,
     password: encodePwd(props.password),
   });
   user.value.token = res.data.token;