XiaXxxxxx hai 1 ano
pai
achega
460f4bf624

+ 2 - 2
src/views/dataAdmin/dataAdmin/resVersion/AssemblyDetailModal.vue

@@ -14,10 +14,10 @@
                             <div class="update-time">更新时间:{{ baseInfo.updatedate }}</div>
                             <div class="service-type">服务类型:组件工具</div>
                         </div>
-                        <div class="look">
+                        <!-- <div class="look">
                             <a :href="[`./map${baseInfo.SFJRSQK == '审核通过' ? 'view' : 'see'}.html?onlineIde_${baseInfo.servicealiasname}`]"
                                 target="_blank" rel="opener">浏览</a>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
                 <div class="base-info info-item">

+ 5 - 8
src/views/dataAdmin/dataAdmin/resVersion/ResDetailModal.vue

@@ -14,11 +14,11 @@
                             <div class="update-time">更新时间:{{ baseInfo.updatedate }}</div>
                             <div class="service-type">服务类型:{{ baseInfo.servicetype }}</div>
                         </div>
-                        <div class="look">
+                        <!-- <div class="look">
                             <a target="_blank" :href="`./mapview.html?${baseInfo.serviceid}`" rel="opener">
                                 <span>浏览</span>
                             </a>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
                 <div class="base-info info-item">
@@ -33,16 +33,14 @@
                                 <a-row>
                                     <a-col :span="6" class="form-item-title form-title"
                                         style="border-top: none;">资源名称</a-col>
-                                    <a-col :span="18" class="form-item-value form-title" style="border-top: none;">{{
-        baseInfo.servicename }}</a-col>
+                                    <a-col :span="18" class="form-item-value form-title" style="border-top: none;">{{ baseInfo.servicename }}</a-col>
                                 </a-row>
                             </a-col>
                             <a-col :span="12">
                                 <a-row>
                                     <a-col :span="6" class="form-item-title form-title"
                                         style="border-top: none;border-left: none;">资源别名</a-col>
-                                    <a-col :span="18" class="form-item-value form-title" style="border-top: none;">{{
-        baseInfo.servicealiasname }}</a-col>
+                                    <a-col :span="18" class="form-item-value form-title" style="border-top: none;">{{ baseInfo.servicealiasname }}</a-col>
                                 </a-row>
                             </a-col>
                         </a-row>
@@ -53,8 +51,7 @@
                         </a-row>
                         <a-row>
                             <a-col :span="3" class="form-item-title form-title" style="border-top: none;">资源描述</a-col>
-                            <a-col :span="21" class="form-item-value form-title" style="border-top: none;">{{
-        baseInfo.description }}</a-col>
+                            <a-col :span="21" class="form-item-value form-title" style="border-top: none;">{{ baseInfo.description }}</a-col>
                         </a-row>
                     </div>
                 </div>

+ 30 - 7
src/views/dataAdmin/dataAdmin/resVersion/index.vue

@@ -91,6 +91,7 @@ import { session } from '/@/utils/Memory';
 import uiTool from '/@/utils/uiTool';
 import { getResViewInfo } from '/@/api/resource/plat';
 import { listApproved } from '/@/api/dataAdmin/assembly';
+import { getFileUrl } from '/@/api/resource/files';
 
 export default defineComponent({
     name: 'resVersion',
@@ -262,6 +263,7 @@ export default defineComponent({
         }
         // 浏览资源
         const handleFetchRes = (record) => {
+            // 组件
             if (currentResType.value === 'SR') {
                 listApproved('').then(res => {
                     res.forEach(async (item) => {
@@ -275,20 +277,41 @@ export default defineComponent({
                 //     window.open(`./mapview.html?onlineIde_${res.servicebase.servicealiasname}`, '_blank')
                 // })
             }
-            else if (currentResType.value === 'interface') {
-                
+            // 地图
+            else if (currentResType.value === 'MR') {
+                window.open(
+                    `http://192.168.119.143:8080/onemapV5.0/mapview.html?${record.SERVICEID}`,
+                    'target',
+                    ''
+                );
             }
+            // 文件
             else if (currentResType.value === 'DR') {
                 getResViewInfo(record.SERVICEID).then(res => {
                     console.log(res)
-                    window.open(res?.metadata?.thumbnail || './static/img/default-dr3.jpg', '_blank')
+                    const obj = {
+                        id: res.servicebase.fileid,
+                        userid: res.metadata.userid,
+                        parentId: session.getItem('sysFild').dirId,
+                    };
+                    handleUpload(obj)
                 })
             }
+            // 场景
             else {
-                getResViewInfo(record.SERVICEID).then(res => {
-                    console.log(res);
-                    window.open(`./mapview.html?${res.servicebase.serviceid}`, '_blank')
-                })
+                window.open(
+                    `http://192.168.119.143:8080/onemapV5.0/sceneview.html?${record.SERVICEID}`,
+                    'target',
+                    ''
+                );
+            }
+        }
+        async function handleUpload(obj) {
+            const res = await getFileUrl(obj);
+            if (res) {
+                const fileName = res.fileName;
+                const url = res.url;
+                window.open(url);
             }
         }
         // 查看资源

+ 2 - 2
src/views/dataAdmin/dataAdmin/version/AssemblyDetailModal.vue

@@ -14,10 +14,10 @@
                             <div class="update-time">更新时间:{{ baseInfo.updatedate }}</div>
                             <div class="service-type">服务类型:组件工具</div>
                         </div>
-                        <div class="look">
+                        <!-- <div class="look">
                             <a :href="[`./map${baseInfo.SFJRSQK == '审核通过' ? 'view' : 'see'}.html?onlineIde_${baseInfo.servicealiasname}`]"
                                 target="_blank" rel="opener">浏览</a>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
                 <div class="base-info info-item">

+ 2 - 2
src/views/dataAdmin/dataAdmin/version/ResDetailModal.vue

@@ -14,11 +14,11 @@
                             <div class="update-time">更新时间:{{ baseInfo.updatedate }}</div>
                             <div class="service-type">服务类型:{{ baseInfo.servicetype }}</div>
                         </div>
-                        <div class="look">
+                        <!-- <div class="look">
                             <a target="_blank" :href="`./mapview.html?${baseInfo.serviceid}`" rel="opener">
                                 <span>浏览</span>
                             </a>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
                 <div class="base-info info-item">

+ 36 - 10
src/views/dataAdmin/dataAdmin/version/VersionResModal.vue

@@ -66,6 +66,7 @@ import AssemblyDetailModal from './AssemblyDetailModal.vue';
 import InterfaceDetailModal from './InterfaceDetailModal.vue';
 import { getResViewInfo } from '/@/api/resource/plat';
 import { listApproved } from '/@/api/dataAdmin/assembly';
+import { getFileUrl } from '/@/api/resource/files';
 
 export default defineComponent({
     name: 'VersionResModal',
@@ -247,9 +248,8 @@ export default defineComponent({
         }
         // 浏览资源
         const handleFetchRes = (record) => {
-            // 浏览资源
-        const handleFetchRes = (record) => {
-            if (currentResType.value === 'SR') {
+            // 组件
+            if (currentType.value === 'SR') {
                 listApproved('').then(res => {
                     res.forEach(async (item) => {
                         if (item.SERVICEID == record.SERVICEID) {
@@ -262,28 +262,54 @@ export default defineComponent({
                 //     window.open(`./mapview.html?onlineIde_${res.servicebase.servicealiasname}`, '_blank')
                 // })
             }
-            else if (currentResType.value === 'interface') {
-                
+            // 地图
+            else if (currentType.value === 'MR') {
+                window.open(
+                    `http://192.168.119.143:8080/onemapV5.0/mapview.html?${record.SERVICEID}`,
+                    'target',
+                    ''
+                );
             }
-            else {
+            // 文件
+            else if (currentType.value === 'DR') {
                 getResViewInfo(record.SERVICEID).then(res => {
-                    console.log(res);
-                    window.open(`./mapview.html?${res.servicebase.serviceid}`, '_blank')
+                    console.log(res)
+                    const obj = {
+                        id: res.servicebase.fileid,
+                        userid: res.metadata.userid,
+                        parentId: session.getItem('sysFild').dirId,
+                    };
+                    handleUpload(obj)
                 })
             }
+            // 场景
+            else {
+                window.open(
+                    `http://192.168.119.143:8080/onemapV5.0/sceneview.html?${record.SERVICEID}`,
+                    'target',
+                    ''
+                );
+            }
         }
+        async function handleUpload(obj) {
+            const res = await getFileUrl(obj);
+            if (res) {
+                const fileName = res.fileName;
+                const url = res.url;
+                window.open(url);
+            }
         }
         // 查看资源
         const handleLookRes = (record) => {
             console.log(record)
             console.log(currentType.value)
             resId.value = record.SERVICEID || record.SERVERID
-            if (currentResType.value === 'SR') {
+            if (currentType.value === 'SR') {
                 openAssemblyDetailModal(true,{
                     resId: resId.value
                 })
             }
-            else if (currentResType.value === 'interface') {
+            else if (currentType.value === 'interface') {
                 openInterfaceModal(true,{
                     resId: resId.value
                 })