新开分支 云南

src/app/index.ts

@@ -4,7 +4,7 @@ import { appConstant as criminalConstant } from "./criminal/constant";
 import {
   routes as cRoutes,
   menuRouteNames as cMenuRouteNames,
-  menuRouteNames as menuyunnanRouteNames,
+  menuyunnanRouteNames,
 } from "./criminal/routeConfig";
 
 import { appConstant as fireConstant } from "./fire/constant";

src/router/index.ts

@@ -78,7 +78,7 @@ router.beforeEach((to, from, next) => {
       }
 
       // 在线模式：调用后端接口获取主题色
-      const data: any = await axios.get(getSysSetting, { params: { platformKey: appId } });
+      const data: any = await axios.get(getSysSetting, { params: { platformKey: appId == 'yunnan'?'criminal':appId } });
       localStorage.setItem('f-themeColour', data.data.themeColour);
       const key = Object.keys(modules).find((key) => key.includes(data.data.themeColour));
       if (key) {

src/store/organization.ts

@@ -26,8 +26,8 @@ export type Organization = {
   remark: string;
 };
 
-export const getOrganizationTree = async (type?: string) =>
-  (await axios.get<Organization[]>(getTreeselect, { params: { type } })).data;
+export const getOrganizationTree = async (type?: string, deptId?:string) =>
+  (await axios.get<Organization[]>(getTreeselect, { params: { type, deptId } })).data;
 
 export const addOrganization = async (
   dept: Omit<Organization, "id">,

src/view/case/drawMap/creatMap.vue

@@ -549,7 +549,7 @@ const handleConfirm = async () => {
     console.log('方位图保存成功:', response)
     if(appId === 'fire'){
       window.open(`${url}/draw/fire/index.html#/tabulation?caseId=${props.caseId}&tabulationId=${response.data.id}&token=${user.value.token}`, '_blank')
-    } else if(appId === 'criminal'){
+    } else if(appId === 'criminal' || appId === 'yunnan'){
       window.open(`${url}/draw/criminal/index.html#/tabulation?caseId=${props.caseId}&tabulationId=${response.data.id}&token=${user.value.token}`, '_blank')
     } else if(appId === 'cjzfire'){
       window.open(`${url}/draw/cjzfire/index.html#/tabulation?caseId=${props.caseId}&tabulationId=${response.data.id}&token=${user.value.token}`, '_blank')

src/view/case/moreMenu.vue

@@ -33,6 +33,7 @@ const props = defineProps<{
   lastMenu?: any;
   searchType?: string;
 }>();
+const appId = import.meta.env.VITE_APP_APP;
 const emit = defineEmits(['copy', 'refresh']);
 const menus = computed(() => {
   if (!props.caseId) {
@@ -73,6 +74,11 @@ const menus = computed(() => {
       ...item,
       onClick: () => item.onClick(caseId),
     })),
-  ];
+  ].filter(item => {
+    if(appId === 'yunnan'){
+      return item.key !== 'download'
+    }
+    return true
+  });
 });
 </script>

src/view/case/newCaseFile.vue

@@ -523,7 +523,7 @@ const handleEdit = (file: CaseFileEx) => {
     // tabulation 类型的编辑链接
     if(appId === 'fire'){
       window.open(`${url}/draw/fire/index.html#/tabulation?caseId=${caseId.value}&tabulationId=${file.tabulationId}&token=${user.value.token}`, '_blank');
-    } else if(appId === 'criminal'){
+    } else if(appId === 'criminal' || appId === 'yunnan'){
       window.open(`${url}/draw/criminal/index.html#/tabulation?caseId=${caseId.value}&tabulationId=${file.tabulationId}&token=${user.value.token}`, '_blank');
     } else if(appId === 'cjzfire'){
       window.open(`${url}/draw/cjzfire/index.html#/tabulation?caseId=${caseId.value}&tabulationId=${file.tabulationId}&token=${user.value.token}`, '_blank');
@@ -536,7 +536,7 @@ const handleEdit = (file: CaseFileEx) => {
     // overview 类型的编辑链接
     if(appId === 'fire'){
       window.open(`${url}/draw/fire/index.html#/overview?caseId=${caseId.value!}&overviewId=${file.overviewId}&token=${user.value.token}`, '_blank');
-    } else if(appId === 'criminal'){
+    } else if(appId === 'criminal' || appId === 'yunnan'){
       window.open(`${url}/draw/criminal/index.html#/overview?caseId=${caseId.value!}&overviewId=${file.overviewId}&token=${user.value.token}`, '_blank');
     } else if(appId === 'cjzfire'){
       window.open(`${url}/draw/cjzfire/index.html#/overview?caseId=${caseId.value!}&overviewId=${file.overviewId}&token=${user.value.token}`, '_blank');
@@ -564,7 +564,7 @@ const openOverView = () => {
   console.log('appId', appId)
   if(appId === 'fire'){
     window.open(`${url}/draw/fire/index.html#/overview?caseId=${caseId.value!}&token=${user.value.token}`, '_blank')
-  } else if(appId === 'criminal'){
+  } else if(appId === 'criminal' || appId === 'yunnan'){
     window.open(`${url}/draw/criminal/index.html#/overview?caseId=${caseId.value!}&token=${user.value.token}`, '_blank')
   } else if(appId === 'cjzfire'){
     window.open(`${url}/draw/cjzfire/index.html#/overview?caseId=${caseId.value!}&token=${user.value.token}`, '_blank')

src/view/layout/top/index.vue

@@ -7,7 +7,7 @@
       </h2>
     </div>
     <div class="right-top">
-      <div class="screen-url" @click="openMap(user.info.deptId)">大屏链接</div>
+      <div class="screen-url" v-if="appId != 'yunnan'" @click="openMap(user.info.deptId)">大屏链接</div>
       <div class="org-name"><img :src="user.info.avatar ? user.info.avatar : defAvatar" />{{ user.info.deptName }}</div>
       <div class="oper-btns" v-if="user.info">
         <div class="user-menu">
@@ -42,6 +42,7 @@ import { confirm } from "@/helper/message";
 import { updatePwd } from "@/view/system/quisk";
 import { title, desc } from "@/store/system";
 
+const appId = import.meta.env.VITE_APP_APP
 refreshRole();
 console.log('user', user)
 const openMap = (deptId) => {

src/view/newFireCase/newFireDetails/components/siteInspection.vue

@@ -690,7 +690,7 @@ const editSelected = (type) => {
   if (type === 'overview' && file.overviewId) {
     if (appId === 'fire') {
       window.open(`${url}/draw/fire/index.html#/overview?caseId=${caseId.value!}&overviewId=${file.overviewId}&token=${user.value.token}`, '_blank');
-    } else if (appId === 'criminal') {
+    } else if (appId === 'criminal' || appId === 'yunnan') {
       window.open(`${url}/draw/criminal/index.html#/overview?caseId=${caseId.value!}&overviewId=${file.overviewId}&token=${user.value.token}`, '_blank');
     } else if (appId === 'cjzfire') {
       window.open(`${url}/draw/cjzfire/index.html#/overview?caseId=${caseId.value!}&overviewId=${file.overviewId}&token=${user.value.token}`, '_blank');
@@ -1140,7 +1140,7 @@ watch(activeTab, (val) => {
 const openTabulation = (tabulationId?: string | number) => {
   if (!caseId.value) return;
   const extra = tabulationId ? `&tabulationId=${tabulationId}` : '';
-  window.open(`${url}/draw/${appId || 'fire'}/index.html#/tabulation?caseId=${caseId.value!}&token=${user.value.token}${extra}`, '_blank');
+  window.open(`${url}/draw/${appId=='yunnan'?'criminal':appId || 'fire'}/index.html#/tabulation?caseId=${caseId.value!}&token=${user.value.token}${extra}`, '_blank');
   // if (appId === 'fire') {
   //   window.open(`${url}/draw/fire/index.html#/tabulation?caseId=${caseId.value!}&token=${user.value.token}${extra}`, '_blank');
   // } else if (appId === 'criminal') {