wangfumin 2 місяців тому
батько
коміт
fa7475269e

+ 4 - 0
src/constant/caseFile.ts

@@ -4,6 +4,7 @@ export const FileDrawType = 1;
 export const DrawFormats = [".jpg", ".jpeg", ".png"];
 export const photoFormats = [".jpg", ".jpeg", ".png"];
 export const OtherFormats = [".pdf", ".jpeg", ".doc", ".docx", ".jpg", ".png", ".raw", ".dcm"];
+export const kanyanFormats = [".pdf", ".jpeg", ".doc", ".docx", ".jpg", ".png", ];
 export const BoardTypeDesc = {
   [BoardType.scene]: "平面图",
   [BoardType.map]: "方位图",
@@ -11,6 +12,9 @@ export const BoardTypeDesc = {
 export const DrawFormatDesc = "jpg、png等格式的文件";
 export const OtherFormatDesc = "pdf、word、jpg、jpeg、png、 raw、dcm等格式的文件";
 export const photoFormatDesc = "jpg、jpeg、png等格式的文件";
+export const kanyanFormatDesc = "pdf、word、jpg、jpeg、png等格式的文件";
+
+
 
 export const maxFileSize = 100 * 1024 * 1024;
 export const maxAppFileSize = 300 * 1024 * 1024;

+ 6 - 3
src/view/case/addCaseFile.vue

@@ -53,6 +53,8 @@ import {
   FileDrawType,
   OtherFormatDesc,
   OtherFormats,
+  kanyanFormats,
+  kanyanFormatDesc,
 } from "@/constant/caseFile";
 import { maxFileSize } from "@/constant/caseFile";
 import { useUpload } from "@/hook/upload";
@@ -63,7 +65,7 @@ import { QuiskExpose } from "@/helper/mount";
 
 const props = defineProps<{
   caseId: number;
-  fileType: number;
+  fileType: any;
   imgType?: number; // 0: 平面图, 1: 方位图(根据业务要求)
 }>();
 
@@ -76,12 +78,13 @@ const caseFile = ref<CaseFile>({
 
 const { size, fileList, upload, removeFile, previewFile, file, accept } = useUpload({
   maxSize: maxFileSize,
-  formats: props.fileType === FileDrawType ? DrawFormats : OtherFormats,
+  formats: props.fileType === FileDrawType ? DrawFormats : ([3, 4].includes(props.fileType) ? kanyanFormats : OtherFormats),
 });
 
 const formatDesc = computed(() =>
-  props.fileType === FileDrawType ? DrawFormatDesc : OtherFormatDesc
+  props.fileType === FileDrawType ? DrawFormatDesc : ([3, 4].includes(props.fileType) ? kanyanFormatDesc : OtherFormatDesc)
 );
+console.log(formatDesc.value)
 
 watchEffect(() => {
   if (file.value?.name) {

+ 0 - 1
src/view/newFireCase/newFireDetails/components/otherFiles.vue

@@ -221,7 +221,6 @@ onMounted(async () => {
   color: #606266;
   .upload-icon {
     font-size: 24px;
-    color: #d23c3c;
     margin-bottom: 8px;
   }
   .tip-title {

+ 18 - 30
src/view/newFireCase/newFireDetails/components/siteInspection.vue

@@ -42,21 +42,15 @@
                 >
                   <span class="name">{{ img.name }}</span>
                   <div class="header-actions" v-if="editOrShow === 'edit'">
-                    <el-tooltip content="重命名" placement="top">
-                      <span class="action-icon" @click="renameSelected">
-                        <el-icon><EditPen /></el-icon>
-                      </span>
-                    </el-tooltip>
-                    <el-tooltip content="编辑" placement="top" v-if="canEditOrientation(idx)">
-                      <span class="action-icon" @click="editSelected('tabulation')">
-                        <el-icon><Edit /></el-icon>
-                      </span>
-                    </el-tooltip>
-                    <el-tooltip content="删除" placement="top">
-                      <span class="action-icon" @click="deleteSelected">
-                        <el-icon><CircleClose /></el-icon>
-                      </span>
-                    </el-tooltip>
+                    <span class="action-icon" @click="renameSelected">
+                      <el-icon><EditPen /></el-icon>
+                    </span>
+                    <span class="action-icon" @click="editSelected('tabulation')">
+                      <el-icon><Edit /></el-icon>
+                    </span>
+                    <span class="action-icon" @click="deleteSelected">
+                      <el-icon><CircleClose /></el-icon>
+                    </span>
                   </div>
                 </div>
                 <div v-if="!orientationImages.length" class="empty-tip">暂无方位图</div>
@@ -89,21 +83,15 @@
                   >
                     <span class="name">{{ img.name }}</span>
                     <div class="header-actions" v-if="editOrShow === 'edit'">
-                      <el-tooltip content="重命名" placement="top">
-                        <span class="action-icon" @click="renameSelected">
-                          <el-icon><EditPen /></el-icon>
-                        </span>
-                      </el-tooltip>
-                      <el-tooltip content="编辑" placement="top" v-if="canEditPlane(idx)">
-                        <span class="action-icon" @click="editSelected('overview')">
-                          <el-icon><Edit /></el-icon>
-                        </span>
-                      </el-tooltip>
-                      <el-tooltip content="删除" placement="top">
-                        <span class="action-icon" @click="deleteSelected">
-                          <el-icon><CircleClose /></el-icon>
-                        </span>
-                      </el-tooltip>
+                      <span class="action-icon" @click="renameSelected">
+                        <el-icon><EditPen /></el-icon>
+                      </span>
+                      <span class="action-icon" @click="editSelected('overview')">
+                        <el-icon><Edit /></el-icon>
+                      </span>
+                      <span class="action-icon" @click="deleteSelected">
+                        <el-icon><CircleClose /></el-icon>
+                      </span>
                     </div>
                   </div>
                   <div v-if="!planeImages.length" class="empty-tip">暂无平面图</div>