bill 1 éve
szülő
commit
fb077e463b

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

@@ -8,7 +8,12 @@
       />
     </el-form-item>
     <el-form-item label="创建人">
-      <el-input v-model="bindExample.caseCreator" placeholder="请输入案件创建人" />
+      <el-input
+        v-model="bindExample.caseCreator"
+        placeholder="请输入案件创建人"
+        maxlength="255"
+        show-word-limit
+      />
     </el-form-item>
     <el-form-item label="案件信息">
       <el-input

+ 17 - 4
src/store/scene.ts

@@ -103,18 +103,31 @@ export const cancelUploadModelScene = (scene: ModelScene) =>
 export const delModelScene = (scene: ModelScene) =>
   axios.post(deleteModel, { modelId: scene.modelId });
 
-export const uploadModelScene = (
+export const uploadModelScene = async (
   file: File,
   progressCallback: (progress: number) => void
-) =>
-  axios<undefined>({
+) => {
+  let done = false;
+  await axios<undefined>({
     method: "POST",
     url: uploadModel,
     data: { file },
     onUploadProgress(event: any) {
-      progressCallback(Math.round((event.loaded / event.total) * 100) || 0);
+      if (!done) {
+        const p = Math.round((event.loaded / event.total) * 100);
+        if (p === 100) {
+          progressCallback(0);
+        } else {
+          progressCallback(p || 0);
+        }
+        console.log("进度:", p);
+      }
     },
   });
+  console.log("上传完成");
+  done = true;
+  progressCallback(0);
+};
 
 export const getModelSceneStatus = async (scene: ModelScene) => {
   const progress = (

+ 3 - 0
src/view/case/draw/c.ts

@@ -0,0 +1,3 @@
+import { ref } from "vue";
+
+export const inputIng = ref(false);

+ 7 - 4
src/view/case/draw/eshape.vue

@@ -38,13 +38,15 @@
 import { computed, onMounted, onUnmounted, reactive, ref, watchEffect } from "vue";
 import { BoardShape, compass, title } from "./board";
 import { editEshapeTable } from "@/view/case/quisk";
+import { inputIng } from "./c";
 
 const props = defineProps<{ shape: BoardShape }>();
 const emit = defineEmits<{
   (e: "update:shape", value: BoardShape | null): void;
 }>();
 
-const inputIng = ref(false);
+inputIng.value = false;
+
 const type = computed(() => props.shape.data.type);
 const textType = ["Tag", title];
 const CompassType = [compass];
@@ -104,9 +106,10 @@ const keydownHandler = (ev: KeyboardEvent) => {
   }
 };
 onMounted(() => document.documentElement.addEventListener("keydown", keydownHandler));
-onUnmounted(() =>
-  document.documentElement.removeEventListener("keydown", keydownHandler)
-);
+onUnmounted(() => {
+  inputIng.value = false;
+  document.documentElement.removeEventListener("keydown", keydownHandler);
+});
 </script>
 
 <style lang="scss" scoped>

+ 7 - 4
src/view/case/draw/header.vue

@@ -45,6 +45,7 @@
 import { BoardType } from "@/store/caseFile";
 import { BoardTypeDesc } from "@/constant/caseFile";
 import { onMounted, onUnmounted } from "vue";
+import { inputIng } from "./c";
 
 const props = defineProps<{
   type: BoardType;
@@ -67,10 +68,12 @@ const keydownHandler = (ev: KeyboardEvent) => {
   } else if (["Control", "Ctrl"].includes(ev.key)) {
     const downKey = ev.key;
     const secondaryHandler = (ev: KeyboardEvent) => {
-      if (ev.key.toUpperCase() === "Y" && !props.forwardDisabled) {
-        emit("forward");
-      } else if (ev.key.toUpperCase() === "Z" && !props.backDisabled) {
-        emit("back");
+      if (!inputIng.value) {
+        if (ev.key.toUpperCase() === "Y" && !props.forwardDisabled) {
+          emit("forward");
+        } else if (ev.key.toUpperCase() === "Z" && !props.backDisabled) {
+          emit("back");
+        }
       }
     };
     window.addEventListener("keydown", secondaryHandler);

+ 1 - 0
src/view/case/quisk.ts

@@ -34,6 +34,7 @@ export const editEshapeTable = (
 export const showCaseScenes = quiskMountFactory(SceneList, {
   title: "案件场景管理",
   width: 900,
+  notSubmit: true,
   hideFloor: true,
 });
 

+ 1 - 1
src/view/vrmodel/sceneContent.vue

@@ -74,7 +74,7 @@
         class="oper-span"
         v-pdpath="['download']"
         @click="sceneDownloadHandler(row)"
-        v-if="row.num"
+        v-if="row.status === QuoteSceneStatus.SUCCESS && row.num"
       >
         下载
       </span>