修改bug 2.1.0

package.json

@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite --mode=fire",
+    "dev": "vite --mode=criminal",
     "devxm": "vite --mode=xmfire",
     "devcjz": "vite --mode=cjzfire",
     "dev-offline": "vite --mode=offline",

src/store/case.ts

@@ -205,8 +205,15 @@ export const saveCaseImgTagData = (params: any) =>
   axios.post(saveCaseImgTag, { ...params });
 
 // 获取照片卷标注信息：支持按案件ID与可选的图片ID查询
-export const getCaseImgTagData = (caseId: number, imgId?: number) =>
-  axios.get(getCaseImgTag, { params: { caseId, imgId } });
+export const getCaseImgTagData = async (caseId: number, imgId?: number) => {
+  let res = await axios.get(getCaseImgTag, { params: { caseId, imgId } });
+  console.log("getCaseImgTagData11", res);
+  res.data = res.data[0];
+  console.log("getCaseImgTagData22", res);
+  return res
+
+}
+  
 
 export const getFfmpegImageList = (caseId: any) =>
   axios.get(getFfmpegImage, { params: { caseId } });

src/view/case/drawMap/creatMap.vue

@@ -276,7 +276,7 @@ const locateByCoordinates = (lat: number, lng: number) => {
     if (searchResults) {
       searchResults.innerHTML = `
         <div style="padding: 16px; text-align: center; color: #606266;width:345px;height: 106px;border: 1px solid #D9D9D9;">
-          <div style="font-weight: 500; margin-bottom: 8px;color:#67C23A;">经纬度定位成功2</div>
+          <div style="font-weight: 500; margin-bottom: 8px;color:#67C23A;">经纬度定位成功</div>
           <div style="font-size: 14px;color: #A7A7A7;">
             纬度: ${lat}<br/>
             经度: ${lng}

src/view/case/newphotos/index.vue

@@ -150,10 +150,9 @@ const changeList = async (list) => {
   if (!loadedDrawData.value) {
     const imgId = typeof route.query.imgId === 'string' ? Number(route.query.imgId) : undefined;
     const res = await getCaseImgTagData(caseId.value, imgId);
-    console.log("getCaseImgTagData2", res);
     if (res.data) {
-      if (res.data[0] && imgId) {
-        loadedDrawData.value = res.data[0]?.data;
+      if (res.data && imgId) {
+        loadedDrawData.value = res.data?.data;
       }
       if ("isHorizontal" in res.data) {
         // console.error("sortType.value", sortType.value, !res.data.isHorizontal);

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

@@ -278,7 +278,7 @@ const locateByCoordinates = (lat: number, lng: number) => {
     if (searchResults) {
       searchResults.innerHTML = `
         <div style="padding: 16px; text-align: center; color: #606266;width:345px;height: 106px;border: 1px solid #D9D9D9;">
-          <div style="font-weight: 500; margin-bottom: 8px;color:#67C23A;">经纬度定位成功1</div>
+          <div style="font-weight: 500; margin-bottom: 8px;color:#67C23A;">经纬度定位成功</div>
           <div style="font-size: 14px;color: #A7A7A7;">
             纬度: ${lat}<br/>
             经度: ${lng}

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

@@ -186,8 +186,9 @@ watch(activeId, (newVal, oldVal) => {
       // 离线模式
       if (isOfflineMode()) {
         let filename = [0, 1, 3, 4, 6].includes(Number(scene.sceneType)) ? 'swkk' : 'swss';
+        let filewww = [0, 1, 3, 4, 6].includes(Number(scene.sceneType)) ? 'wwwroot' : 'www';
         let HtmlName = [0, 1, 3, 4, 6].includes(Number(scene.sceneType)) ? 'spg.html' : 'offline.html';
-        activeWebSite.value = `./${filename}/${scene.num}/wwwroot/${HtmlName}?m=${scene.num}`
+        activeWebSite.value = `./${filename}/${scene.num}/${filewww}/${HtmlName}?m=${scene.num}`
       } else {
         activeWebSite.value = scene.webSite || '';
       }

src/view/newFireCase/newFireDetails/photoEdit.vue

@@ -30,7 +30,7 @@ const loadTagInfo = async () => {
   if (!caseId.value) return;
   try {
     const res: any = await getCaseImgTagData(caseId.value!, imgId.value);
-    const data = res?.data || {};
+    const data = res.data || {};
     console.log("getCaseImgTagData3", res, data);
     tagId.value = (data?.id as number) || undefined;
     if (typeof data?.isHorizontal === 'boolean') {
@@ -62,7 +62,7 @@ const handleSave = async () => {
     if(imgId.value){
       await saveCaseImgTagData({
         caseId: caseId.value!,
-        id: tagId.value,
+        // id: tagId.value,
         imgId: imgId.value,
         data,
         isHorizontal: isHorizontal.value,

src/view/newFireCase/newdispatch/editCrimical.vue

@@ -4,7 +4,7 @@
     <el-form-item label="案件名称" class="mandatory">
       <el-input v-model="bindExample.caseTitle" maxlength="100" placeholder="请输入案件名称" />
     </el-form-item>
-    <el-form-item label="详细地址">
+    <el-form-item label="详细地址" class="mandatory">
       <el-input v-model="bindExample.mapUrl" placeholder="输入名称搜索" clearable disabled>
         <template #append>
           <el-button :icon="Search" @click="searchAMapAddress" />

src/view/newFireCase/newdispatch/editFire.vue

@@ -71,7 +71,7 @@
                 {{ row.deptName }}
               </template>
             </el-table-column>
-            <el-table-column label="拍摄时间" width="160">
+            <el-table-column :label="query.type !== 2?'拍摄时间':'创建时间'" width="160">
               <template #default="{ row }">
               {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
               </template>
@@ -370,8 +370,8 @@ defineExpose<QuiskExpose>({
         ElMessage.error("起火对象不能为空！");
         throw "起火对象不能为空！";
       } else if (!selectedRows.value || selectedRows.value.length === 0) {
-        ElMessage.error("请至少添加一个场景");
-        throw "请至少添加一个场景";
+        ElMessage.error("请至少添加一个场景/多元融合");
+        throw "请至少添加一个场景/多元融合";
       }
 
       const mergedList = Array.from(selectedRows.value || []) as any[];

src/view/newFireCase/newdispatch/example.vue

@@ -4,7 +4,7 @@
       <el-form-item label="标题：">
         <el-input v-model="state.query.caseTitle" placeholder="请输入"></el-input>
       </el-form-item>
-      <el-form-item label="承办单位：">
+      <el-form-item label="承办单位：" v-if="state.query.searchType == '1'">
         <com-company v-model="state.query.deptId" />
       </el-form-item>
       <el-form-item class="searh-btns" style="grid-area: 1 / 4 / 2 / 6">