صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
bill
/
public-fuse
1
0
انشعاب 1
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

修改需求

bill 2 سال پیش
والد
ee927e044f
کامیت
fe43a97816
12فایلهای تغییر یافته به همراه35 افزوده شده و 18 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 0 1
      index.html
  2. 4 2
      src/app/criminal/constant.ts
  3. 3 1
      src/app/fire/constant.ts
  4. 1 1
      src/app/fire/routeConfig.ts
  5. 4 3
      src/app/fire/view/dispatch/index.vue
  6. 1 0
      src/app/index.ts
  7. BIN
      src/assets/image/criminal.ico
  8. BIN
      src/assets/image/fire.ico
  9. 7 0
      src/main.ts
  10. 13 8
      src/view/case/editMenu.vue
  11. 1 1
      src/view/organization/index.vue
  12. 1 1
      src/view/user/edit.vue

+ 0 - 1
index.html
مشاهده فایل 

@@ -3,7 +3,6 @@
 
 
 <head>
 
   <meta charset="UTF-8" />
 
-  <link rel="icon" type="image/svg+xml" href="./favicon.ico" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
   <title></title>
 
 </head>

+ 4 - 2
src/app/criminal/constant.ts
مشاهده فایل 

@@ -1,9 +1,11 @@
 
 import { AppConstant } from "../";
 
 import banner from "@/assets/image/criminalBanner.png";
 
+import ico from "@/assets/image/criminal.ico";
 
 
 export const appConstant: AppConstant = {
 
-  title: "刑侦三维远程勘验平台",
 
-  desc: "dimensional remote prospecting platform of fire scene of Fire Rescue",
 
+  title: "刑事现场三维远程勘验平台",
 
+  desc: "Three-dimensional remote prospecting platform for criminal scenes",
 
+  ico,
 
   banner,
 
   deptId: 2,
 
 };

+ 3 - 1
src/app/fire/constant.ts
مشاهده فایل 

@@ -1,9 +1,11 @@
 
 import { AppConstant } from "../";
 
 import banner from "@/assets/image/fireBanner.png";
 
+import ico from "@/assets/image/fire.ico";
 
 
 export const appConstant: AppConstant = {
 
   title: "消防火调三维远程勘验平台",
 
-  desc: "dimensional remote prospecting platform of fire scene of Fire Rescue",
 
+  desc: "Three-dimensional remote prospecting platform for fire scenes",
 
+  ico,
 
   banner,
 
   deptId: 1,
 
 };

+ 1 - 1
src/app/fire/routeConfig.ts
مشاهده فایل 

@@ -12,8 +12,8 @@ export const menuRouteNames = [
 
   FireRouteName.vrmodel,
 
   FireRouteName.camera,
 
   FireRouteName.dispatch,
 
-  FireRouteName.organization,
 
   FireRouteName.teaching,
 
+  FireRouteName.organization,
 
   FireRouteName.role,
 
   FireRouteName.user,
 
 ];

+ 4 - 3
src/app/fire/view/dispatch/index.vue
مشاهده فایل 

@@ -32,12 +32,14 @@
 
       </template>
 
       <template v-else>
 
         <CaseEditMenu
 
-          :menus="[
 
+          :last-menu="[
 
             {
 
               key: 'shapre',
 
               label: '分享',
 
               onClick: () => shareCase({ caseId: row.caseId }),
 
             },
 
+          ]"
 
+          :prev-menu="[
 
             {
 
               key: 'editInfo',
 
               label: '火调信息',
 
@@ -75,6 +77,7 @@ import { shareCase } from "@/view/case/quisk";
 
 import { ElMessage } from "element-plus";
 
 
 const { pagging, isTeached } = useFirePagging();
 
+
 
 // 撤销教学
 
 const revokeTeaching = async (row?: Fire) => {
 
   if (!(await confirm("撤销教学，火调项目将不再显示在教学平台。（火调项目不会删除）"))) {
 
@@ -114,8 +117,6 @@ const setTeaching = async () => {
 
   );
 
 };
 
 
-const takeLook = (fire: Fire) => {};
 
-
 
 const editHandler = async (row: Fire) => {
 
   (await editFire({ fire: row })) && pagging.refresh();
 
 };

+ 1 - 0
src/app/index.ts
مشاهده فایل 

@@ -13,6 +13,7 @@ import {
 
 
 export type AppConstant = {
 
   title: string;
 
+  ico: string;
 
   desc: string;
 
   banner: string;
 
   deptId: number;

BIN
src/assets/image/criminal.ico
مشاهده فایل


BIN
src/assets/image/fire.ico
مشاهده فایل


+ 7 - 0
src/main.ts
مشاهده فایل 

@@ -7,6 +7,7 @@ import App from "./App.vue";
 
 import ElementPlus from "element-plus";
 
 import { setApp } from "@/helper/mount";
 
 import { router } from "./router";
 
+import { appConstant } from "./app";
 
 
 const app = createApp(App);
 
 
@@ -18,3 +19,9 @@ app.use(ElementPlus);
 
 app.use(router);
 
 setApp(app);
 
 app.mount("#app");
 
+
 
+const $ico = document.createElement("link");
 
+$ico.setAttribute("rel", "icon");
 
+$ico.setAttribute("type", "image/svg+xml");
 
+$ico.setAttribute("href", appConstant.ico);
 
+document.head.appendChild($ico);

+ 13 - 8
src/view/case/editMenu.vue
مشاهده فایل 

@@ -22,22 +22,23 @@ import { getFuseCodeLink, checkScenesOpen, MenuItem } from "./help";
 
 import { showCaseScenes, addCaseScenes } from "./quisk";
 
 import { RouteName, router } from "@/router";
 
 
-const props = defineProps<{ caseId: number; menus?: MenuItem[] }>();
 
+const props = defineProps<{
 
+  caseId: number;
 
+  prevMenu?: MenuItem[];
 
+  lastMenu?: MenuItem[];
 
+}>();
 
 const menus = computed(() => {
 
   if (!props.caseId) {
 
     return [];
 
   }
 
   const caseId = props.caseId;
 
   const fuseLink = getFuseCodeLink(caseId);
 
-  const append = (props.menus || []).map((item) => ({
 
-    ...item,
 
-    onClick: () => {
 
-      item.onClick(caseId);
 
-    },
 
-  }));
 
 
   return [
 
-    ...append,
 
+    ...(props.prevMenu || []).map((item) => ({
 
+      ...item,
 
+      onClick: () => item.onClick(caseId),
 
+    })),
 
     {
 
       key: "sceneManage",
 
       label: "场景管理",
 
@@ -69,6 +70,10 @@ const menus = computed(() => {
 
         router.push({ name: RouteName.caseFile, params: { caseId: caseId } });
 
       },
 
     },
 
+    ...(props.lastMenu || []).map((item) => ({
 
+      ...item,
 
+      onClick: () => item.onClick(caseId),
 
+    })),
 
   ];
 
 });
 
 </script>

+ 1 - 1
src/view/organization/index.vue
مشاهده فایل 

@@ -9,7 +9,7 @@
 
       </div>
 
       <div class="tree">
 
         <div class="treeTile">
 
-          <span>全国消防火调组织架构</span>
 
+          <span>组织架构</span>
 
           <span style="padding-right: 100px">操作</span>
 
         </div>
 
         <div class="treeList">

+ 1 - 1
src/view/user/edit.vue
مشاهده فایل 

@@ -130,7 +130,7 @@ defineExpose<QuiskExpose>({
 
         throw EPSW.tip;
 
       }
 
     }
 
-    if (isAdd) {
 
+    if (isAdd.value) {
 
       await addUser(bindUser.value, deptPath.value);
 
     } else {
 
       await setUser(bindUser.value, deptPath.value);