tangning 2 settimane fa
parent
commit
678ed0890f

+ 1 - 1
src/app/criminal/view/example/edit.vue

@@ -2,7 +2,7 @@
   <el-form ref="form" label-width="84px">
     <!-- {{ bindExample }} -->
     <el-form-item label="案件名称">
-      <el-input v-model="bindExample.caseTitle" maxlength="50" placeholder="请输入案件名称" />
+      <el-input v-model="bindExample.caseTitle" maxlength="100" placeholder="请输入案件名称" />
     </el-form-item>
     <el-form-item label="详细地址">
       <el-input v-model="bindExample.mapUrl" placeholder="输入名称搜索" clearable disabled>

+ 1 - 1
src/app/ga/view/example/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form ref="form" label-width="84px">
     <el-form-item label="案件名称">
-      <el-input v-model="bindExample.caseTitle" maxlength="50" placeholder="请输入案件名称" />
+      <el-input v-model="bindExample.caseTitle" maxlength="100" placeholder="请输入案件名称" />
     </el-form-item>
     <el-form-item label="详细地址">
       <el-input v-model="bindExample.mapShow" placeholder="输入名称搜索" clearable disabled>

+ 5 - 0
src/store/editCsae.ts

@@ -352,6 +352,11 @@ export const getMix3dPaggingOffline = async (params: ScenePaggingParams): Promis
 };
 
 // =============== 现场勘验:照片制卷列表(离线支持) ===============
+/**
+ * 获取FFmpeg图片列表(支持离线模式)
+ * @param caseId 案件ID
+ * @returns 图片列表数据
+ */
 export const getFfmpegImageListOffline = async (caseId: number): Promise<any[]> => {
   if (isOfflineMode()) {
     try {

+ 1 - 1
src/view/newFireCase/newFireDetails/components/mix3d.vue

@@ -161,7 +161,7 @@ const activeNum = computed(() => (activeScene.value as any)?.num || '');
 const editVisible = ref(false);
 const editingScene = ref<Scene | null>(null);
 // mix3d 弹窗查询与表格
-const query = ref<{ searchType: string; fusionTitle: string }>({ searchType: '2', fusionTitle: '' });
+const query = ref<{ searchType: string; fusionTitle: string }>({ searchType: '0', fusionTitle: '' });
 const tableLoading = ref(false);
 const tableRef = ref<any>(null);
 const tableData = ref<any[]>([]);

+ 4 - 3
src/view/newFireCase/newFireDetails/components/siteInspection.vue

@@ -1157,8 +1157,9 @@ const openTabulation = (tabulationId?: string | number) => {
 // 新增平面图(overview)
 const openOverView = async () => {
   const fusionList = (await getFusionAndSceneList({ caseId: caseId.value, type: 'scene' })) as unknown as any[];
-  let itme = fusionList.find((ele) => [0, 1, 3, 4, 6].includes(ele.sceneType));
-  console.log(fusionList, itme, 'openOverView')
+  const sceneList = fusionList.filter((ele) => [0, 1, 3, 4, 6].includes(ele.sceneType)) || []
+  let itme = sceneList[0];
+  console.log(sceneList, itme, 'openOverView')
   if (!caseId.value) return;
   let openUrl = `${url}/draw/${appId || 'fire'}/index.html#/overview?caseId=${caseId.value!}&token=${user.value.token}`
   // if (appId === 'fire') {
@@ -1177,7 +1178,7 @@ const openOverView = async () => {
   //   openUrl = `${url}/draw/fire/index.html#/overview?caseId=${caseId.value!}&token=${user.value.token}`;
   //   // window.open(`${url}/draw/fire/index.html#/overview?caseId=${caseId.value!}&token=${user.value.token}`, '_blank');
   // }
-  if(itme && itme.num){
+  if(sceneList.length == 1 && itme && itme.num){
     openUrl += `&m=${itme.num}`
   }
   window.open(openUrl, '_blank');

+ 4 - 3
src/view/newFireCase/newFireDetails/index.vue

@@ -41,7 +41,7 @@ import editIndex from './editIndex.vue';
 import { copyCase, updateCaseInfo, exportCaseDetailInfo, getCaseDetailInfo, getCaseInquestInfo, exportCaseInquestInfo } from "@/store/case";
 import { getCaseInfoOffline as getCaseInfo, getCaseSceneListOffline as getCaseSceneList, uploadRecordFragments, getUploadRecordProgress } from "@/store/editCsae";
 import { RouteName, router } from "@/router";
-import { getFusionAndSceneList, caseFilesTypeGetTree, getRecordCaseVideo } from '@/store/editCsae';
+import { getFusionAndSceneList, caseFilesTypeGetTree, getRecordCaseVideo, getFfmpegImageList } from '@/store/editCsae';
 import shot from './components/shot.vue';
 import headerTop from './components/headerTop.vue';
 import editFilePage from './editFilePage.vue';
@@ -154,9 +154,10 @@ const initData = async () => {
       showObj.value.mix3d = res.length
     })
     
-    caseFilesTypeGetTree(caseId.value).then(res => {
-      showObj.value.siteInspection = recursiveSearch(res.filter(item => item.filesTypeName != '其他资料'))
+    caseFilesTypeGetTree(caseId.value).then(async res => {
       showObj.value.otherFiles = recursiveSearch(res.filter(item => item.filesTypeName == '其他资料'))
+      const FfmpegList: any = await getFfmpegImageList(caseId.value!);
+      showObj.value.siteInspection = FfmpegList.length || recursiveSearch(res.filter(item => item.filesTypeName != '其他资料'))
       console.log('caseFilesTypeGetTree', res, showObj.value)
       // fusionList.value = res || []
     })

+ 1 - 1
src/view/newFireCase/newdispatch/editCrimical.vue

@@ -2,7 +2,7 @@
   <el-form ref="form" label-width="84px">
     <!-- {{ bindExample }} -->
     <el-form-item label="案件名称">
-      <el-input v-model="bindExample.caseTitle" maxlength="50" placeholder="请输入案件名称" />
+      <el-input v-model="bindExample.caseTitle" maxlength="100" placeholder="请输入案件名称" />
     </el-form-item>
     <el-form-item label="详细地址">
       <el-input v-model="bindExample.mapUrl" placeholder="输入名称搜索" clearable disabled>