修改了很多

src/api/resource/plat.ts

@@ -9,7 +9,8 @@ enum Api {
     Apply = '/base-center/resources/addResToCar',
     SelectUserRes = '/base-center/resources/selectUserRes',
     ClearUserResCar = '/base-center/resources/clearUserResCar',
-    DeleteUserRes = '/base-center/resources/deleteUserRes'
+    DeleteUserRes = '/base-center/resources/deleteUserRes',
+    DeleteBussinfo = '/base-center/flow/deleteBussinfo'
 }
 
 const client = {
@@ -130,8 +131,6 @@ export function platList(text) {
     "DR":{"index":${text?.pageIndex || 0},"total":0,"filterField":"SERVICETYPE,SERVICENAME,DESCRIPTION,UPDATEDATE"},
     "DT":{"index":${text?.pageIndex || 0},"total":0,"filterField":"R_NAME,R_TABLENAME,COORDINATENAME,DATAFORMAT,CREATTIME"},
     "keywords":"${text?.keywords || ""}","sqkzt":"${text?.sqkzt || ""}","type":"all","isShowUnLinked":false,"text":"${text?.filterValue || ""}"}`);
-
-
     return new Promise<void>((resolve, reject) => {
         defHttp.post({ url: Api.CallProvider, params: f, ...interfaceType })
             .then((r) => {
@@ -139,7 +138,7 @@ export function platList(text) {
                 console.log("资源中心列表:", list)
                 if (list?.length) {
                     resolve(list);
-                    session.setItem("zyCenter", JSON.parse(JSON.stringify(list)).map(i => { i.items = []; return i }));
+                    session.setItem("zyCenter", JSON.parse(JSON.stringify(list)).map(i => { i.items = [], i.count = 0; return i }));
                 } else {
                     resolve(session.getItem("zyCenter"));
                 }
@@ -266,14 +265,37 @@ export function clearResInCar(params) {
 /**
  * @description:移除已加入申请库的资源
  */
-export function deleteResInCar(params) {
+export async function deleteResInCar(params, obj) {
+    console.log("移除已加入申请库的资源:", obj);
+    var res = true;
+    if (obj.shzt == "审核不通过") {
+        res = await deleteBussinfo({ id: obj.resInCarId })
+    }
+    if (res) {
+        return new Promise<void>((resolve, reject) => {
+            defHttp.post({ url: Api.DeleteUserRes, params, })
+                .then((r) => {
+                    resolve(r);
+                }).
+                catch((e) => {
+                    reject(e);
+                })
+        })
+    }
+}
+
+/**
+ * @description:删除审核业务信息
+ */
+export function deleteBussinfo(params) {
     return new Promise<void>((resolve, reject) => {
-        defHttp.post({ url: Api.DeleteUserRes, params, })
+        defHttp.post({ url: Api.DeleteBussinfo, params, })
             .then((r) => {
-                resolve(r);
+                resolve(true);
             }).
             catch((e) => {
-                reject(e);
+                reject(false);
             })
     })
 }
+

src/views/assembly/library/index.vue

@@ -183,7 +183,7 @@ export default defineComponent({
         onOk: (() => {
           deleteResInCar({
             idList: [record.applyCarInfo.id]
-          }).then(() => applyHandleSuccess())
+          }, { resInCarId: record.applyCarInfo.id }).then(() => applyHandleSuccess())
         })
       });
     }

src/views/dataAdmin/dataAdmin/fileResourceUpload/AddMethod.vue

@@ -195,15 +195,13 @@ export default defineComponent({
           metadata.serviceid = serviceid.value;
         }
 
-        var dataVersionConf = null;
-        if (servicebase.vid || metadata.vid) {
-          dataVersionConf = {
-            active: "Y",
-            versionNum: servicebase.versionNum || metadata.versionNum,
-            vid: servicebase.vid || metadata.vid
-          }
-          if (unref(isUpdate)) dataVersionConf.rid = serviceid.value;
+        var dataVersionConf = {
+          active: metadata.isnew || servicebase.isnew,
+          versionNum: servicebase.versionNum || metadata.versionNum,
+          vid: servicebase.vid || metadata.vid
         }
+        if (unref(isUpdate)) dataVersionConf.rid = serviceid.value;
+
 
         fileList.value.map((item) => {
           var n = {

src/views/dataAdmin/dataAdmin/fileResourceUpload/fileUploadData.js

@@ -87,7 +87,7 @@ export const searchFormSchema = [
   },
 ]
 
-// 新增表单配置
+// 新增表单配置---用的这个
 export const accountFormSchema = [
   {
     field: 'title',
@@ -395,7 +395,7 @@ export const accountFormSchema = [
     label: "是否最新版本", //状态
     component: 'RadioButtonGroup',
     colProps: { span: 8 },
-    defaultValue: '1',
+    defaultValue: '0',
     componentProps: {
       options: [
         { label: "是", value: '1' },
@@ -455,8 +455,8 @@ export const accountFormSchema2 = [
     defaultValue: '0',
     componentProps: {
       options: [
-        { label: "是", value: '0' },
-        { label: "否", value: '1' },
+        { label: "是", value: '1' },
+        { label: "否", value: '0' },
       ],
     },
   },

src/views/dataAdmin/dataAdmin/fileResourceUpload/index.vue

@@ -198,6 +198,10 @@ export default defineComponent({
     async function handleView(record) {
       const res = await queryResourceById(record?.serviceid);
       if (res) {
+        console.log('文件资源查看某个res:', res);
+        if (res.dataVersionConf) {
+          res.metadata.isnew = res.servicebase.isnew = res.dataVersionConf.active == 'Y' ? "1" : "0";
+        }
         const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {});
         if (record.bussid) result.bussid = record.bussid;
         openModal(true, {
@@ -243,6 +247,10 @@ export default defineComponent({
     async function handleEdit(record) {
       const res = await queryResourceById(record?.serviceid);
       if (res) {
+        console.log('文件资源查看某个res:', res);
+        if (res.dataVersionConf) {
+          res.metadata.isnew = res.servicebase.isnew = res.dataVersionConf.active == 'Y' ? "1" : "0";
+        }
         const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {});
         if (record.bussid) result.bussid = record.bussid;
         openModal(true, {

src/views/minWidgets/CommonWay.js

@@ -0,0 +1,40 @@
+import { getImgUrl } from '/@/api/dataAdmin/assembly';
+import { img } from '/@/api/resource/plat';
+
+
+
+
+//获取图片
+function reqGetImg(i, d) {
+    if (i) {
+        var arr = i.split(',')
+        arr.length > 1 && getImgUrl(arr[0], arr[1]).then(r => d.src = r)
+    }
+}
+
+
+function setHtmlImg(j, n) {
+    img(j.SERVICEID).then(r => {
+        if (r && r.length) {
+            var i = r[0];
+            var dom = document.getElementById(`${i.serviceid}${n}`)
+            if (i.thumbnail.indexOf(",") > -1) {
+                if (i.thumbnail.indexOf("base64") > -1) {
+                    dom.src = i.thumbnail ? i.thumbnail : './static/img/default-dr3.jpg';
+                } else {
+                    reqGetImg(i.thumbnail, dom)
+                }
+            } else {
+                var uri = "http://192.168.119.143:8080/onemapV5.0/";
+                dom.src = i.thumbnail ? (uri + i.thumbnail) : './static/img/default-dr3.jpg';
+            }
+        }
+    })
+}
+
+
+
+export {
+    reqGetImg,
+    setHtmlImg,
+}

src/views/resource/examine/index.vue

@@ -19,18 +19,15 @@
           <TableAction :actions="[
             {
               label: '浏览',
-              icon: '' /**clarity:note-edit-line*/,
               ifShow: current == 'DR' ? false : true,
               onClick: handleVliew.bind(null, record),
             },
             {
               label: '查看',
-              icon: '' /**clarity:note-edit-line*/,
               onClick: handleDetail.bind(null, record),
             },
             {
               label: '审核',
-              icon: '' /**clarity:note-edit-line*/,
               disabled: statusShow == 1 ? false : true,
               color: 'warning',
               onClick: handleEdit.bind(null, record),
@@ -48,48 +45,38 @@
         <template #status="{ record }">
           <Tag :style="`color:${record.status === 3 || record.status === 3 ? 'red' : ''};`">
             {{
-              // record.status === 0
-              // ? '待审核'
-              // : record.status === 1
-              // ? '审核通过'
-              // : record.status === 2
-              // ? '审核不通过'
-              // : record.status === 3
-              // ? '被驳回'
-              // : '未提交'
-
               !record.status ? '待审核' : record.status == 2 ? '审核不通过' : record.status ? '审核通过' : ''
-
             }}
           </Tag>
         </template>
         <template #BLZT="{ record }">
           <Tag :style="`color:${record.status === 3 || record.status === 3 ? 'red' : ''};`">
             {{
-              // record.BLZT == '在办' ? '审核中' : record.BLZT == '已办结' ? '审核完' : ''
               record.BLZT
             }}
           </Tag>
         </template>
       </BasicTable>
-      <check v-if="ischect" @register="registerModal1" @success="handleSuccess" />
-      <map-resource-upload v-if="!ischect && current === 'MR'" @register="registerModalMR"
+      <check v-if="ischect" @register="registerModal" @success="handleSuccess" />
+      <map-resource-upload v-if="!ischect && current === 'MR'" @register="registerModal"
         @success="handleSuccess"></map-resource-upload>
-      <scene-resource-upload v-if="!ischect && current === 'ER'" @register="registerModalER"
+      <scene-resource-upload v-if="!ischect && current === 'ER'" @register="registerModal"
         @success="handleSuccess"></scene-resource-upload>
-      <file-resource-upload v-if="!ischect && current === 'DR'" @register="registerModalDR"
+      <file-resource-upload v-if="!ischect && current === 'DR'" @register="registerModal"
         @success="handleSuccess"></file-resource-upload>
+      <ass-resource-upload v-if="!ischect && current === 'SR'" @register="registerModal"
+        @success="handleSuccess"></ass-resource-upload>
     </div>
   </div>
 </template>
 <script lang="ts">
-import { defineComponent, nextTick, onBeforeMount, ref, watch } from 'vue';
+import { defineComponent, nextTick, ref, watch } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { delRole, setRoleStatus } from '/@/api/system/system';
-// import { useDrawer } from '/@/components/Drawer';
 import MapResourceUpload from '/@/views/dataAdmin/dataAdmin/mapUpload/MapSourceModal.vue';
 import FileResourceUpload from '/@/views/dataAdmin/dataAdmin/fileResourceUpload/AddMethod.vue';
 import SceneResourceUpload from '/@/views/dataAdmin/dataAdmin/sceneResourceUpload/AddMethod.vue';
+import AssResourceUpload from '/@/views/dataAdmin/assembly/MapSourceModal.vue';
 import check from './check.vue';
 import { getFileUrl } from '/@/api/resource/files';
 import { session } from '/@/utils/Memory.js';
@@ -107,9 +94,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
 import { Switch, Popconfirm } from 'ant-design-vue';
 import { queryResourceById } from '/@/api/resource/map';
 import Moment from 'moment';
-import { getResourceGroup } from '/@/api/resource/examine';
 import { updateExamine } from '/@/api/resource/updateExamine';
-import { onMounted } from 'vue';
 import { useModal } from '/@/components/Modal';
 
 
@@ -124,24 +109,12 @@ export default defineComponent({
     Popconfirm,
     MapResourceUpload,
     FileResourceUpload,
+    AssResourceUpload,
     SceneResourceUpload,
   },
   setup() {
     let current = ref('MR');
     let statusShow = ref(1);
-    //const [registerDrawer, { openDrawer }] = useDrawer();
-    const [registerModal, { openModal }] = useModal();
-    const registerModal1 = registerModal,
-      openModal1 = openModal;
-    const registerModalMR = registerModal,
-      openModalMR = openModal;
-    const registerModalDR = registerModal,
-      openModalDR = openModal;
-    const registerModalER = registerModal,
-      openModalER = openModal;
-
-    const registerModalSR = registerModal,
-      openModalSR = openModal;
     const [registerTable, { getSelectRows, setProps, reload, setSelectedRowKeys }] = useTable({
       title: '地图资源审核列表',
       api: (param) => {
@@ -151,7 +124,7 @@ export default defineComponent({
       }, //求接口
       //dataSource: dataSources, //表格的数据
       columns,
-      rowKey: 'serviceid',
+      rowKey: 'SERVICEID',
       formConfig: {
         labelWidth: 90,
         schemas: searchFormSchemaMR,
@@ -180,6 +153,7 @@ export default defineComponent({
         fullScreen: false,
       },
     });
+
     const moment = Moment;
     const ischect = ref(true)
     const sourceTypes = ref([
@@ -198,9 +172,9 @@ export default defineComponent({
       //   return { disabled: false };
       // }
     };
+    const [registerModal, { openModal }] = useModal();
     watch(
-      () => current.value,
-      (val) => {
+      () => current.value, (val) => {
         let searchFormSchema = searchFormSchemaMR;
         let title = '地图资源审核列表';
         if (val === 'MR') {
@@ -241,27 +215,16 @@ export default defineComponent({
       ischect.value = false;
       const res = (await queryResourceById(record?.SERVICEID)) as any;
       if (res) {
-        const result = Object.assign(res.metadata, res.servicebase);
-        if (current.value === 'MR') {
-          openModalMR(true, {
-            record: result,
-            isUpdate: true,
-          });
-        }
-
-        if (current.value === 'DR') {
-          openModalDR(true, {
-            record: result,
-            isUpdate: true,
-          });
-        }
-
-        if (current.value === 'ER') {
-          openModalER(true, {
-            record: result,
-            isUpdate: true,
-          });
+        if (res.dataVersionConf) {
+          res.metadata.isnew = res.servicebase.isnew = res.dataVersionConf.active == 'Y' ? "1" : "0";
         }
+        const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {});
+        if (record.bussid) res.bussid = record.BUSSID;
+        openModal(true, {
+          record: result,
+          isUpdate: true,
+          isView: true,
+        });
       }
     }
 
@@ -270,10 +233,12 @@ export default defineComponent({
      */
     function handleEdit(record: Recordable) {
       ischect.value = true;
-      openModal1(true, {
-        record,
-        isUpdate: true,
-      });
+      setTimeout(() => {
+        openModal(true, {
+          record,
+          isUpdate: true,
+        });
+      }, 100);
     }
     /**
      * 浏览
@@ -281,19 +246,19 @@ export default defineComponent({
     async function handleVliew(record: Recordable) {
       //场景资源
       if (current.value === 'ER') {
-        window.open(
-          `http://192.168.119.143:8080/onemapV5.0/sceneview.html?${record.SERVICEID}`,
-          'target',
-          ''
-        );
+        window.open(`http://192.168.119.143:8080/onemapV5.0/sceneview.html?${record.SERVICEID}`, 'target', '');
       }
       //地图资源
       if (current.value === 'MR') {
-        window.open(
-          `http://192.168.119.143:8080/onemapV5.0/mapview.html?${record.SERVICEID}`,
-          'target',
-          ''
-        );
+        window.open(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${record.SERVICEID}`, 'target', '');
+      }
+      //地图资源
+      if (current.value === 'SR') {
+        var res = (await queryResourceById(record?.SERVICEID)) as any;
+        res = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {});
+        if (res) {
+          window.open(`./mapview.html?onlineIde_${res.servicealiasname}`, 'target', '');
+        }
       }
       //文件资源
       if (current.value === 'DR') {
@@ -348,20 +313,6 @@ export default defineComponent({
       console.log('审核数据', getSelectRows());
     };
 
-    onBeforeMount(async () => { });
-    onMounted(() => {
-      getResourceGroupTotal();
-    })
-
-    //分组统计所有资源数量
-    function getResourceGroupTotal() {
-      getResourceGroup().then((r) => {
-        if (r.resp_code == 1 && r.resp_msg == '查询成功') {
-          r.datas.map(i => i.name = i.SERVICETYPE == 'MR' ? '地图资源' : i.SERVICETYPE == 'ER' ? '场景资源' : i.SERVICETYPE == 'DR' ? '文件资源' : '组件资源')
-          sourceTypes.value = r.datas;
-        }
-      })
-    }
 
     return {
       statusShow,
@@ -371,11 +322,6 @@ export default defineComponent({
       sourceTypes,
       registerTable,
       registerModal,
-      registerModal1,
-      registerModalMR,
-      registerModalDR,
-      registerModalER,
-      registerModalSR,
       handleVliew,
       handleDetail,
       handleEdit,

src/views/resource/plat/index.vue

@@ -79,7 +79,18 @@ export default defineComponent({
     });
 
     eventBus.on('platListCenter', (o) => {
-      platList(o).then((r) => { if (r) achieveList.value = r });
+      var type = null;
+      if (o && o.type) type = o.type == 'MAP' ? 'MR' : o.type == 'SCENE' ? 'ER' : 'DR';
+      platList(o).then((r) => {
+        if (r) {
+          if (type) {
+            var list = JSON.parse(JSON.stringify(achieveList.value))
+            achieveList.value = list.map(i => { if (i.type == type) { i = r.find(j => j.type == type) } return i; })
+          } else {
+            achieveList.value = r;
+          }
+        }
+      });
     });
 
     const resAddToCar = () => {

src/views/resource/plat/item/FileData.vue

@@ -8,7 +8,7 @@
           <div class="mapItem-top-box">
             <div class="item-top">
               <div class="img_container" data-num="1">
-                <img class="tab-list-icon-img-MR00001936 img_mr MR00001936" :id="i.SERVICEID" :src="getImg(i)"
+                <img class="tab-list-icon-img-MR00001936 img_mr MR00001936" :id="i.SERVICEID + n" :src="setHtmlImg(i, n)"
                   alt="文件预览图">
               </div>
             </div>
@@ -33,7 +33,7 @@
                   <span>浏览</span>
                 </a>
               </div>
-              <div class="operation-item" @click="handleQuery(i)">
+              <div class="operation-item" @click="handleQuery(i, n)">
                 <a href="javascript:void(0)" class="">
                   <span>详细</span>
                 </a>
@@ -69,6 +69,7 @@ import { platList, img, apply, tagAjax } from '/@/api/resource/plat';
 import { session } from '/@/utils/Memory';
 import { message } from 'ant-design-vue';
 import MyPage from './child/MyPage.vue';
+import { setHtmlImg } from '/@/views/minWidgets/CommonWay.js';
 
 const props = {
   listData: {
@@ -103,16 +104,6 @@ export default defineComponent({
       immediate: true
     })
 
-    function getImg(i) {
-      img(i.SERVICEID).then(r => {
-        if (r && r.length) {
-          var i = r[0];
-          var uri = "http://192.168.119.143:8080/onemapV5.0/";
-          document.querySelector(`#${i.serviceid}`).src = i.thumbnail ? (uri + i.thumbnail) : './static/img/default-dr3.jpg';
-        }
-      })
-    }
-
     //获取资源标签
     function getTag(i, id) {
       //判断是不是数组
@@ -148,16 +139,17 @@ export default defineComponent({
       })
     }
 
-    function handleQuery(record) {
+    function handleQuery(record, n) {
       //打开详情弹窗
+      session.setItem('thumbnail2', document.getElementById(record.SERVICEID + n).src);
       detailResId.value = record.SERVICEID
       showResDeatil.value = true
     }
 
     return {
+      setHtmlImg,
       getTag,
       tag,
-      getImg,
       total,
       showResDeatil,
       detailResId,

src/views/resource/plat/item/MapData.vue

@@ -8,7 +8,7 @@
           <div class="mapItem-top-box">
             <div class="item-top">
               <div class="img_container" data-num="1">
-                <img class="tab-list-icon-img-MR00001936 img_mr" :id="i.SERVICEID + '_' + n" :src="getImg(i, n)" alt="图片">
+                <img class="tab-list-icon-img-MR00001936 img_mr" :id="i.SERVICEID + n" :src="setHtmlImg(i, n)" alt="图片">
               </div>
             </div>
             <div class="item-title">
@@ -31,7 +31,7 @@
                   <span>浏览</span>
                 </a>
               </div>
-              <div class="operation-item" @click="handleQuery(i)">
+              <div class="operation-item" @click="handleQuery(i, n)">
                 <a href="javascript:void(0)" class="">
                   <span>详细</span>
                 </a>
@@ -66,6 +66,8 @@ import DetailModal from './child/DetailModal.vue';
 import Search from './child/Search.vue';
 import { session } from '/@/utils/Memory';
 import MyPage from './child/MyPage.vue';
+import { setHtmlImg } from '/@/views/minWidgets/CommonWay.js';
+
 
 
 export default defineComponent({
@@ -96,7 +98,8 @@ export default defineComponent({
       img(i.SERVICEID).then(r => {
         if (r && r.length) {
           var i = r[0];
-          document.querySelector(`#${i.serviceid}_${n}`).src = i.thumbnail ? i.thumbnail : './static/img/default-dr3.jpg';
+          console.log("122222:", i.thumbnail)
+          document.querySelector(`#${i.serviceid}${n}`).src = i.thumbnail ? i.thumbnail : './static/img/default-dr3.jpg';
         }
       })
     }
@@ -128,8 +131,9 @@ export default defineComponent({
       }
     )
 
-    function handleQuery(record) {
+    function handleQuery(record, n) {
       //打开详情弹窗
+      session.setItem('thumbnail2', document.getElementById(record.SERVICEID + n).src);
       detailResId.value = record.SERVICEID
       showResDeatil.value = true
     }
@@ -157,6 +161,7 @@ export default defineComponent({
 
 
     return {
+      setHtmlImg,
       getTag,
       tag,
       getImg,

src/views/resource/plat/item/SceneData.vue

@@ -8,7 +8,7 @@
           <div class="mapItem-top-box">
             <div class="item-top">
               <div class="img_container" data-num="1">
-                <img class="tab-list-icon-img-MR00001936 img_mr MR00001936" :id="i.SERVICEID" :src="getImg(i)"
+                <img class="tab-list-icon-img-MR00001936 img_mr MR00001936" :id="i.SERVICEID + n" :src="setHtmlImg(i, n)"
                   alt="场景预览图">
               </div>
             </div>
@@ -32,7 +32,7 @@
                   <span>浏览</span>
                 </a>
               </div>
-              <div class="operation-item" @click="handleQuery(i)">
+              <div class="operation-item" @click="handleQuery(i, n)">
                 <a href="javascript:void(0)" class="">
                   <span>详细</span>
                 </a>
@@ -74,6 +74,8 @@ import { session } from '/@/utils/Memory';
 import { message } from 'ant-design-vue';
 import MyPage from './child/MyPage.vue';
 import DetailModal from './child/DetailModal.vue';
+import { setHtmlImg } from '/@/views/minWidgets/CommonWay.js';
+
 
 
 const props = {
@@ -107,16 +109,6 @@ export default defineComponent({
       list.value = val;
     }
 
-    function getImg(i) {
-      img(i.SERVICEID).then(r => {
-        if (r && r.length) {
-          var i = r[0];
-          var uri = "http://192.168.119.143:8080/onemapV5.0/";
-          document.querySelector(`#${i.serviceid}`).src = i.thumbnail ? (uri + i.thumbnail) : './static/img/default-dr3.jpg';
-        }
-      })
-    }
-
     //获取资源标签
     function getTag(i, id) {
       //判断是不是数组
@@ -136,12 +128,13 @@ export default defineComponent({
       immediate: true
     })
 
-    function handleQuery(record) {
+    function handleQuery(record, n) {
       console.log("11111:", record)
       // openDrawer(true, {
       //   record,
       // });
       //打开详情弹窗
+      session.setItem('thumbnail2', document.getElementById(record.SERVICEID + n).src);
       detailResId.value = record.SERVICEID
       showResDeatil.value = true
     }
@@ -167,11 +160,11 @@ export default defineComponent({
     }
 
     return {
+      setHtmlImg,
       getTag,
       detailResId,
       showResDeatil,
       tag,
-      getImg,
       total,
       searchRef,
       // getDataList,

src/views/resource/plat/item/child/DetailModal.vue

@@ -1,10 +1,10 @@
 <template>
-    <a-modal :visible="true" :width="width" :maskClosable="false" :destroyOnClose="true" centered :title="title" :footer="null"
-        wrapClassName="modal-wrap" @cancel="onClose">
+    <a-modal :visible="true" :width="width" :maskClosable="false" :destroyOnClose="true" centered :title="title"
+        :footer="null" wrapClassName="modal-wrap" @cancel="onClose">
         <div class="action-content">
             <div class="top-header">
                 <div class="img-container">
-                    <img :src="baseInfo?.thumbnail || './static/img/default-dr3.jpg'" alt="">
+                    <img :src="baseInfo?.thumbnail2 || './static/img/default-dr3.jpg'" alt="">
                 </div>
                 <div class="res-title">
                     <div class="title">{{ baseInfo.servicename }}</div>
@@ -239,7 +239,7 @@ import { defineComponent, reactive, ref, onMounted, watch, toRefs } from 'vue';
 import { message } from 'ant-design-vue';
 import { session } from '/@/utils/Memory';
 import moment from 'moment';
-
+import { setHtmlImg } from '/@/views/minWidgets/CommonWay.js';
 import { getResViewInfo } from '/@/api/resource/plat';
 
 const props = {
@@ -257,6 +257,7 @@ export default defineComponent({
             width: '1200px',
             title: '资源详情',
         })
+
         // 关闭请求弹窗
         const onClose = (e) => {
             emit('closeModal')
@@ -270,11 +271,13 @@ export default defineComponent({
                 console.log(res);
                 baseInfo.value = res.servicebase;
                 baseInfo.value.thumbnail = res.metadata.thumbnail
+                baseInfo.value.thumbnail2 = session.getItem('thumbnail2');
                 baseInfo.value.updatedate = moment(baseInfo.value.updatedate).format('YYYY-MM-DD HH:mm:ss');
                 metaInfo.value = res.metadata
             })
         })
         return {
+            setHtmlImg,
             baseInfo,
             metaInfo,
             // formRef,

src/views/resource/plat/item/child/ResCarModal.vue

@@ -202,7 +202,7 @@ export default defineComponent({
                     let params = {
                         idList: [record.resInCarId]
                     }
-                    deleteResInCar(params).then(res => {
+                    deleteResInCar(params, record).then(res => {
                         reload();
                         eventBus.emit('platListCenter')
                         eventBus.emit('addResToCarEventBus')

src/views/resource/plat/item/child/Search.vue

@@ -71,7 +71,7 @@ export default defineComponent({
         ]);
 
         function onSearch(key) {
-            eventBus.emit('platListCenter', { sqkzt: statusValue.value, filterValue: keyWord.value });
+            eventBus.emit('platListCenter', { sqkzt: statusValue.value, filterValue: keyWord.value, type: props.type });
         }
 
         const visible = ref(false);

src/views/resource/plat/item/child/applyModal/ApplyModal.vue

@@ -11,6 +11,7 @@ import { BasicModal, useModalInner } from '/@/components/Modal';
 import { queryFlowInfoPage, submitExamine } from '/@/api/resource/examine';
 import { session } from '/@/utils/Memory';
 import { message } from 'ant-design-vue';
+import eventBus from '/@/utils/eventBus';
 
 export default defineComponent({
   name: 'MenuDrawer',
@@ -46,6 +47,9 @@ export default defineComponent({
       var id = JSON.stringify(id);
       return id.indexOf('MR') > -1 ? '地图资源授权' : id.indexOf('ER') > -1 ? '场景资源授权' : '文件资源授权';
     }
+    function getType(id) {
+      return JSON.stringify(id).indexOf('MR') > -1 ? 'MAP' : id.indexOf('ER') > -1 ? 'SCENE' : 'DR';
+    }
     //得到页面标题
     const getTitle = "提交申请";
     //提交按钮
@@ -71,6 +75,7 @@ export default defineComponent({
             submitExamine(params).then(res => {
               if (res.resp_code === 0 && res.resp_msg === '提交成功') {
                 message.success('申请成功')
+                eventBus.emit('platListCenter', { type: getType(ids) })
                 closeModal();
                 emit('success');
               } else {