tangning пре 1 недеља
родитељ
комит
1a67a00e75

+ 2 - 2
index.html

@@ -14,8 +14,8 @@
       securityJsCode: "fbf0a0f9d5cf8a65b385822dd98536b8",
     };
   </script>
-  <script type="text/javascript" src='//webapi.amap.com/maps?v=2.0&key=9282fa28a0363ba8a7b3c6f7d10ee4b1'></script>
-  <script src="//webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
+  <script type="text/javascript" src='//webapi.amap.com/maps?v=2.0&key=655ac083de961ed970f2be4ba23b3c9f'></script>
+  <script src="//webapi.amap.com/ui/1.1/main.js?v=1.1.1&key=655ac083de961ed970f2be4ba23b3c9f"></script>
   <div id="app"></div>
   <script type="module" src="/src/main.ts"></script>
 </body>

+ 1 - 1
src/app/map/App.vue

@@ -337,7 +337,7 @@ const initKeywordMakers = async () => {
 const loadMap = async () => {
   AMap = await AMapLoader.load({
     plugins: ["AMap.PlaceSearch"],
-    key: "e661b00bdf2c44cccf71ef6070ef41b8",
+    key: "655ac083de961ed970f2be4ba23b3c9f",
     version: "2.0",
   });
 

+ 1 - 0
src/view/camera/bind.vue

@@ -79,6 +79,7 @@ defineExpose<QuiskExpose>({
       ElMessage.error("请选择管理员");
       throw "请选择管理员";
     } else {
+      bindCamera.value.deptId = '2'
       if (bindCamera.value.id) {
         await editCamera(bindCamera.value);
       } else {

+ 4 - 1
src/view/case/draw/selectMapImage.vue

@@ -54,10 +54,13 @@ watchEffect(async (onCleanup) => {
   if (!mapEl.value || !resultEl.value) {
     return;
   }
+  window._AMapSecurityConfig = {
+    securityJsCode: "83f86b85dc8700d4f38c42423cbebc39",
+  };
   AMapLoader.reset()
   const AMap = await AMapLoader.load({
     plugins: ["AMap.PlaceSearch", "AMap.Event"],
-    key: "9282fa28a0363ba8a7b3c6f7d10ee4b1",
+    key: "655ac083de961ed970f2be4ba23b3c9f",
     version: "2.0",
   });
 

+ 1 - 1
src/view/case/drawMap/creatMap.vue

@@ -93,7 +93,7 @@ let currentMarker: any = null
 let poiPicker: any = null
 
 // 高德地图配置
-const AMAP_KEY = '2ae5a7713612a8d5a65cfd54c989c969'
+const AMAP_KEY = '655ac083de961ed970f2be4ba23b3c9f'
 const selectedSearchAdress = ref('1')
 const searchInputValue = ref('')
 // 根基app打开不同地址

+ 1 - 2
src/view/newFireCase/dyManager/sceneContent.vue

@@ -63,8 +63,7 @@
   </el-table>
   <uploadScene
     v-model:visible="uploadVisible"
-    :groupList="groupList"
-    @refresh="refreshList"
+    @refresh="pagging.refresh"
   />
 </template>
 

+ 15 - 9
src/view/newFireCase/dyManager/uploadScene.vue

@@ -18,7 +18,7 @@
         <p class="upload-title"><span class="required">*</span>文件</p>
         <el-upload
           class="upload-box"
-          action="/api/fusion/scene/uploadSceneFile"
+          action="/fusion/scene/uploadSceneFile"
           :data="{sourceType}"
           limit="1"
           :headers="{Token: user.token}"
@@ -55,10 +55,6 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
-  groupList: {
-    type: Array,
-    default: () => []
-  }
 });
 
 const selectedGroup = ref('');
@@ -82,10 +78,18 @@ const changeGroup = (value) => {
   fileList.value = [];
 };
 // 处理文件变化
-const handleChange = (file, files) => {
+const handleChange = async (file, files) => {
+  console.log(file, files);
   if(file.data){
     // 检查文件类型和大小
-    filePath.value = file.data?.url;
+      if (file.data.code != 0 && await confirm(file.data.data ||'确定要上传该文件吗?')) {
+          filePath.value = file.data?.url;
+      }else{
+        files.status = 'fail'
+        fileList.value = [];
+        filePath.value = null;
+      }
+
   } else {
     ElMessage.error(file.message || `不支持的文件类型`);
     files.status = 'fail'
@@ -129,9 +133,9 @@ const validateFile = (file) => {
     }
     
     // 检查文件大小,不能超过 5MB
-    const maxSize = 5 * 1024 * 1024; // 5MB
+    const maxSize = 5 * 1024 * 1024 * 1024; // 5MB
     if (fileSize > maxSize) {
-      ElMessage.error(`上传文件不能超过 5MB`);
+      ElMessage.error(`上传文件不能超过 5 GB`);
       return false;
     }
     return true;
@@ -172,6 +176,8 @@ const handleUpload = async () => {
     emit('refresh');
   } catch (error) {
     console.error('上传失败:', error);
+    fileList.value = [];
+    filePath.value = null;
   }
 };
 </script>

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

@@ -93,7 +93,7 @@ let currentMarker: any = null
 let poiPicker: any = null
 
 // 高德地图配置
-const AMAP_KEY = '2ae5a7713612a8d5a65cfd54c989c969'
+const AMAP_KEY = '655ac083de961ed970f2be4ba23b3c9f'
 const selectedSearchAdress = ref('1')
 const searchInputValue = ref('')
 // 根基app打开不同地址

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

@@ -117,7 +117,7 @@ onMounted(() => {
   const sc: any = (window as any).scene;
   if (sc && typeof sc.on === 'function') {
     sc.on('loaded', () => { isSenseLoaded.value = true; });
-    sc.on('submitScreenshot', () => { isSenseLoaded.value = true; });
+    // sc.on('submitScreenshot', () => { isSenseLoaded.value = true; });
     sc.on('devicePixelRatio', () => { isSenseLoaded.value = true; });
   }
 });