1

src/i18n/weblate/en.json

@@ -1142,7 +1142,11 @@
         "searchData": "Search Results",
         "yctips": "Unable to remove. The scene has been added to the multi-fusion. Please delete the scene from the multi-fusion before trying again.",
         "nameSearch": "Search by name",
-        "selectAdd": "Select Address"
+        "selectAdd": "Select Address",
+        "errCode": {
+            "-1": "Request failed",
+            "8032": "Upload failed. Check file format."
+        }
     },
     "mediaLibrary": {
         "title": "Media Library",
@@ -1174,7 +1178,8 @@
             "2": "Video",
             "3": "Audio",
             "4": "Model",
-            "5": "Other"
+            "5": "Other",
+            "6": "document"
         },
         "tips": {
             "dictId": "Please select a group",

src/i18n/weblate/ja.json

@@ -1142,7 +1142,11 @@
         "yctips": "削除できません。シーンはすでにマルチフュージョンに追加されています。マルチフュージョンに移動してシーンを削除してから、もう一度お試しください。",
         "yctipsErr": "削除できません。シーンはすでにマルチフュージョンに追加されています。マルチフュージョンに移動してシーンを削除してから、もう一度お試しください。",
         "nameSearch": "名前を入力して検索",
-        "selectAdd": "住所を選択"
+        "selectAdd": "住所を選択",
+        "errCode": {
+            "-1": "要求が失敗しました",
+            "8032": "アップロード失敗。ファイル形式を確認してください"
+        }
     },
     "mediaLibrary": {
         "Modeling": "傾斜撮影",
@@ -1159,7 +1163,8 @@
             "5": "その他",
             "4": "モデル",
             "2": "動画",
-            "3": "オーディオ"
+            "3": "オーディオ",
+            "6": "ドキュメント"
         },
         "dictName": "グループ",
         "tips": {

src/i18n/weblate/kr.json

@@ -1131,7 +1131,8 @@
             "5": "기타",
             "4": "모델",
             "2": "비디오",
-            "3": "오디오"
+            "3": "오디오",
+            "6": "문서"
         },
         "dictName": "그룹",
         "tips": {

src/i18n/weblate/zh.json

@@ -1253,7 +1253,8 @@
             "2": "视频",
             "3": "音频",
             "4": "模型",
-            "5": "其他"
+            "5": "其他",
+            "6": "文档"
         },
         "tips": {
             "dictId": "请选择分组",

src/request/index.ts

@@ -115,8 +115,7 @@ const responseInterceptor = (res: AxiosResponse<any, any>) => {
   console.log("responseInterceptor", res);
   if (!successCode.includes(res.data.code) && res.config.responseType != "blob") {
     let code = res.data.code || res.data.message;
-    openErrorMsg(ui18n.t(`sceneHome.errCode.${errMsg}`));
-
+    openErrorMsg(ui18n.t(`sceneHome.errCode.${code}`));
     if (
       ~unAuthCode.indexOf(res.data.code) ||
       errMsg === "token已经失效，请重新登录"

src/store/case.ts

@@ -410,16 +410,18 @@ export const getUrlSrc = (item, caseId) => {
   param.ossRoot = `${ip}${params.laserServicePort}${params.static}`;
   param.serviceUrl = `${ip}${params.servicePort}/fusion`;
   param.laserRoot = param.root;
-  console.log('param', param, ip);
   param.swssUrl = `${params.swssUrl}?lang=${langKey}&serve_link=${param.laserRoot}&basePath=${param.laserRoot}&m=${item.num}`;
   param.swssmxUrl = `${params.swssUrl}?lang=${langKey}&serve_link=${param.laserRoot}&basePath=${param.laserRoot}&m=${item.num}`;
   param.swkkUrl = `${params.swkkUrl}?lang=${langKey}&app_server=${params.ip}:${params.swkkPort}&m=${item.num}&app_resource=${param.root}/${item.mapping}`;
-  param.fuse = `${params.fuse}?caseId=${caseId}&ip=${params.ip}&ga=${params.ga}&swkkPort=${params.swkkPort}&swssUrl=${params.swssUrl }&swkkUrl=${params.swkkUrl && params.swkkUrl.replace('epg','spg')}&laserServicePort=${params.laserServicePort}&servicePort=${params.servicePort}&lang=${langKey}&app_server=${ip}${params.swkkPort}&testMap=1&static=${params.static||''}&`;
+  param.fuse = `${params.fuse}?caseId=${caseId}&ip=${params.ip}&ga=${params.ga}&swkkPort=${params.swkkPort}&swssUrl=${params.swssUrl }&swkkUrl=${params.swkkUrl && params.swkkUrl.replace('epg','spg')}&laserServicePort=${params.laserServicePort}&servicePort=${params.servicePort}&lang=${langKey}&app_server=${ip}${params.swkkPort}&static=${params.static||''}&`;
   let param101 = ''
   if(item.type == 101){
     param101 = `title=${item.fileName}&single&type=${item.fileFormat}&fileUrl=${item.fileUrl}&convertType =${item.convertType}`
-    item.wgs84 && (param101 + `&wgs84=${item.wgs84}&gcj02=${item.gcj02}`)
   }
+  if(item.wgs84){
+    param101 = param101 + `&wgs84=${item.wgs84}&gcj02=${item.gcj02}`
+  }
+  console.log('param101', param101, item);
   let SceneType = {
     0: param.swkkUrl,//`/spg.html?m=${item.num}`,
     1: param.swkkUrl,//`/spg.html?m=${item.num}`,

src/view/mediaLibrary/TableComponent.vue

@@ -97,6 +97,17 @@
           >
         </template>
       </el-table-column>
+      
+      <el-table-column
+        prop="fileTypeStr"
+        :label="ui18n.t('mediaLibrary.fileTypeStr')"
+        min-width="100px"
+        show-overflow-tooltip
+      >
+        <template #default="scope">
+          {{$t(`mediaLibrary.fileType.${scope.row.fileType+1}`)}}
+        </template>
+      </el-table-column>
       <el-table-column
         v-for="column in columns"
         :key="column.prop"

src/view/mediaLibrary/index.vue

@@ -25,8 +25,8 @@ const mockData = [
 // 定义表格列
 const columns = [
   // { prop: 'name', label: '名称', width: 150, },
-  { prop: 'fileTypeStr', label: ui18n.t('mediaLibrary.fileTypeStr'),  },
-  { prop: 'fileFormat', label: ui18n.t('mediaLibrary.fileFormat'), },
+  // { prop: 'fileTypeStr', label: ui18n.t('mediaLibrary.fileTypeStr'),  },
+  { prop: 'fileFormat',width: '100px', label: ui18n.t('mediaLibrary.fileFormat'), },
   { prop: 'dictName', label: ui18n.t('mediaLibrary.dictName'), },
   { prop: 'statusStr', label: ui18n.t('mediaLibrary.statusStr'), },
   { prop: 'createTime', label: ui18n.t('mediaLibrary.createTime'), width: 200, },