小浪底问题修改

src/views/assembly/item/AssemblyData.vue

@@ -10,7 +10,7 @@
             <div><img :src="i.url" srcset=""></div>
             <b>{{ i.servicename }}</b>
             <p class="bottomBut">
-              <span><a :href="[`./map${i.SFJRSQK == '审核通过'?'view':'see'}.html?onlineIde_${i.servicealiasname}`]"
+              <span><a :href="[`./map${i.SFJRSQK == '审核通过' ? 'view' : 'see'}.html?onlineIde_${i.servicealiasname}`]"
                   target="_blank" rel="noopener noreferrer">浏览</a></span>
               <!-- <span @click="showDrawer(i)">详细</span> -->
               <span @click="handleDetailInfo(i)" style="color: #2D74E7;">详细</span>
@@ -19,7 +19,11 @@
               <!-- <span v-else style="cursor: not-allowed;background: rgb(232, 232, 232) !important;">{{ i.SFJRSQK }}申请库</span> -->
               <!-- <span v-else style="cursor: not-allowed;background: rgb(232, 232, 232) !important;">{{ i.SFJRSQK == '已加入' ?
                 '已加入申请库' : i.SFJRSQK }}</span> -->
-              <span v-if="i.SFJRSQK != '未加入'"
+              <span class="operation-item" v-else-if="i.SFJRSQK === '审核通过'"
+                style="background-color: #05B069;color: #ffffff;cursor: pointer;" @click="showEmpowerInfo(i)">
+                已申请信息
+              </span>
+              <span v-else
                 :style="{ color: i.SFJRSQK == '已加入' ? '#999999' : '#ffffff', background: i.SFJRSQK == '已加入' ? '#E8E8E8' : i.SFJRSQK == '审核中' ? '#ED9C23' : i.SFJRSQK == '审核不通过' ? '#FA5151' : '' }">{{
                   i.SFJRSQK == '已加入' ? '已加入申请库' :
                   i.SFJRSQK }}</span>
@@ -45,6 +49,7 @@
     <AssemblyDrawer @register="registerModal" />
     <!-- 弹出框 -->
     <DetailModal v-if="showResDeatil" :nowAss="nowAss" @closeModal="showResDeatil = false" :resId="detailResId" />
+    <EmpowerInfo title="组件资源申请信息" ref="infoRef"></EmpowerInfo>
   </div>
 </template>
 <script lang="ts">
@@ -65,11 +70,13 @@ import interfaceImg from '/@/assets/images/interface.jpg';
 // 导入子页面【详情】
 import DetailModal from './child/DetailModal.vue';
 import eventBus from '/@/utils/eventBus';
+import EmpowerInfo from './EmpowerInfo.vue';
+
 
 
 export default defineComponent({
   name: 'SmsLog',
-  components: { BasicTable, DetailModal, TableAction, Authority, Search, Popconfirm, Tooltip, AssemblyDrawer },
+  components: { BasicTable, DetailModal, EmpowerInfo, TableAction, Authority, Search, Popconfirm, Tooltip, AssemblyDrawer },
   props: {
     list: { type: Array, default: ref([]) }
   },
@@ -173,8 +180,15 @@ export default defineComponent({
       nowAss.value = record;
     }
 
+    //申请信息查看
+    const infoRef = ref(null);
+    function showEmpowerInfo(i) {
+      infoRef?.value?.showInfo(i);
+    }
 
     return {
+      infoRef,
+      showEmpowerInfo,
       nowAss,
       handleDetailInfo,
       detailResId,
@@ -227,7 +241,7 @@ div.assemblyModal {
 .bottomBut span:nth-child(4) {
   float: right;
   color: #fff;
-  background: #05B069;
+  background: #0671DD;
 }
 
 .bottomBut span:nth-child(3) {

src/views/assembly/item/EmpowerInfo.vue

@@ -0,0 +1,85 @@
+<template>
+    <a-modal v-model:visible="show" :width="900" @cancel="() => show = false" :title="props.title" :footer="null">
+        <ul class="info">
+            <li>
+                <span>审核结果:{{ info?.shzt }}</span><span>审核意见:{{ shyjInfo }}</span>
+            </li>
+            <li>
+                <p>访问地址:{{ info.assUrl }}</p>
+            </li>
+        </ul>
+    </a-modal>
+</template>
+
+<script>
+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 { getResInCar, getResViewInfo, queryServiceTags } from '/@/api/resource/plat';
+import { getAllTags } from '/@/api/sys/tag';
+
+
+export default defineComponent({
+    name: 'EmpowerInfo',
+    components: {},
+    props: {
+        title: {
+            type: String,
+            default: '资源申请信息'
+        }
+    },
+    setup(props, { emit }) {
+        const show = ref(false);
+        const info = ref({});
+        const shyjInfo = ref("");
+
+
+        function showInfo(e) {
+            show.value = !show.value;
+            if (e) getInfo(e);
+        }
+
+        function getInfo(e) {
+            console.log("1111:", e);
+            getResInCar({
+                keyword: e.SERVICENAME,
+                userId: session.getItem('userId')
+            }).then(r => {
+                if (r?.resp_code == 0 && r?.datas?.length) {
+                    var a = r.datas.find(i => i.resInfo.SERVICEID == e.SERVICEID);
+                    if (a) {
+                        var shyj = a?.shlc?.slice(1, -1).map(i => i.USER_NAME + ":" + i.CHECKINFO) || [];
+                        shyjInfo.value = shyj.join(";");
+                        a.assUrl = `${location.origin}/mapview.html?onlineIde_${a?.resInfo?.SERVICEALIASNAME}`
+                        info.value = a;
+                    }
+                }
+            })
+        }
+
+        return {
+            shyjInfo,
+            info,
+            showInfo,
+            show,
+            props,
+        };
+    },
+});
+</script>
+<style lang="less">
+.info {
+    padding: 20px;
+}
+
+.info li span {
+    display: inline-block;
+    width: 50%;
+}
+
+.info li {
+    margin-bottom: 20px;
+}
+</style>

src/views/authorize/empower/index.vue

@@ -70,14 +70,20 @@
     </div>
     <AuditModal v-if="ischect && showAuditModal" @closeModal="showAuditModal = false" :bussInfo="bussInfo"
       @onSubmit="onSubmit" />
-    <map-resource-upload v-if="!ischect && selectTypeValue === 'MR'" @register="registerModal"
+    <map-resource-upload v-if="!ischect && selectTypeValue === 'MR'" @register="registerModalMR"
       @success="handleSuccess"></map-resource-upload>
-    <scene-resource-upload v-if="!ischect && selectTypeValue === 'ER'" @register="registerModal"
+    <scene-resource-upload v-if="!ischect && selectTypeValue === 'ER'" @register="registerModalER"
       @success="handleSuccess"></scene-resource-upload>
-    <file-resource-upload v-if="!ischect && selectTypeValue === 'DR'" @register="registerModal"
+    <file-resource-upload v-if="!ischect && selectTypeValue === 'DR'" @register="registerModalDR"
       @success="handleSuccess"></file-resource-upload>
-    <ass-resource-upload v-if="!ischect && selectTypeValue === 'SR'" @register="registerModal"
+    <ass-resource-upload v-if="!ischect && selectTypeValue === 'SR'" @register="registerModalSR"
       @success="handleSuccess"></ass-resource-upload>
+    <a-modal wrapClassName="modal-wrap" title="接口详情" width="800px" v-model:visible="visible" @cancel="onClose" centered
+      :footer="null">
+      <div class="content">
+        <Details :action="action"></Details>
+      </div>
+    </a-modal>
   </div>
 </template>
 <script>
@@ -90,7 +96,6 @@ import moment from 'moment';
 import { session } from '/@/utils/Memory';
 import { queryTaskInfoPage, queryTaskYbInfoPage } from '/@/api/resource/examine';
 import { getAppDesign } from '/@/api/oem';
-// import { useRouter } from 'vue-router'
 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';
@@ -100,14 +105,24 @@ import { queryResourceById } from '/@/api/resource/map';
 import { useAppStore } from '/@/store/modules/app';
 import { useRouter } from 'vue-router';
 import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-
+import Details from '/@/views/interface/item/child/Details.vue';
 
 
 export default defineComponent({
   name: 'Empowerment',
-  components: { BasicTable, TableAction, AuditModal, MapResourceUpload, FileResourceUpload, SceneResourceUpload, AssResourceUpload },
+  components: { BasicTable, Details, TableAction, AuditModal, MapResourceUpload, FileResourceUpload, SceneResourceUpload, AssResourceUpload },
   setup() {
-    const [registerModal, { openModal }] = useModal();
+    const [registerModalMR, { openModal: openModalMR }] = useModal();
+    const [registerModalDR, { openModal: openModalDR }] = useModal();
+    const [registerModalER, { openModal: openModalER }] = useModal();
+    const [registerModalSR, { openModal: openModalSR }] = useModal();
+    var open = {
+      MR: openModalMR,
+      DR: openModalDR,
+      ER: openModalER,
+      SR: openModalSR,
+    }
+
     const ischect = ref(true)
     const appStore = useAppStore();
     const searchValue = ref('')
@@ -284,19 +299,26 @@ export default defineComponent({
 
     //资源详情
     const handleDetail = async (record) => {
-      ischect.value = false;
-      const res = await queryResourceById(record?.SERVICEID);
-      if (res) {
-        if (res.dataVersionConf) {
-          res.metadata.isnew = res.servicebase.isnew = res.dataVersionConf.active == 'Y' ? "1" : "0";
+      if (selectTypeValue.value == 'interface') {
+        showDrawer(record);
+      } else {
+        console.log("record:", record)
+        ischect.value = false;
+        const res = await queryResourceById(record?.SERVICEID);
+        console.log("资源详情:", res)
+        if (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) res.bussid = record.BUSSID;
+
+          open[selectTypeValue.value](true, {
+            record: result,
+            isUpdate: true,
+            isView: true,
+          });
         }
-        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,
-        });
       }
     }
     // 批量审核
@@ -338,7 +360,22 @@ export default defineComponent({
       });
     }
 
+    const visible = ref(false);
+    const action = ref({});
+    const showDrawer = (i) => {
+      i.id = i.SERVICEID;
+      action.value = i;
+      visible.value = true;
+    };
+    const onClose = () => {
+      visible.value = false;
+    };
+
     return {
+      visible,
+      action,
+      showDrawer,
+      onClose,
       changeStatus,
       ischect,
       handleTypeChange,
@@ -354,7 +391,10 @@ export default defineComponent({
       statusOptions,
       hasSelected,
       registerTable,
-      registerModal,
+      registerModalDR,
+      registerModalMR,
+      registerModalER,
+      registerModalSR,
       handleReset,
       handleSearch,
       handleAuditAll,

src/views/interface/item/child/Details.vue

@@ -86,7 +86,7 @@ export default defineComponent({
         const actionData = ref(null)
 
         // 四类数据
-        const baseData = ref(null)
+        const baseData = ref([])
         const reqData = ref(null)
         const resData = ref(null)
         const resExample = ref(null)
@@ -169,57 +169,63 @@ export default defineComponent({
         )
         const getActionData = (id) => {
             getInterfaceDetail(id).then(res => {
-                actionData.value = {
-                    ...res,
-                    queryParams: JSON.parse(res.queryParams),
-                    requestHeaders: JSON.parse(res.requestHeaders),
-                    responseParams: JSON.parse(res.responseParams),
-                    // successRespExample:JSON.parse(res.successRespExample),
+                if (JSON.stringify(res) == '{}') {
+                    actionData.value = '';
+                    baseData.value.map(i => i.value = '');
+                    resExample.value = '';
+                } else {
+                    actionData.value = {
+                        ...res,
+                        queryParams: JSON.parse(res.queryParams),
+                        requestHeaders: JSON.parse(res.requestHeaders),
+                        responseParams: JSON.parse(res.responseParams),
+                        // successRespExample:JSON.parse(res.successRespExample),
+                    }
+                    //组装四个需求的数据
+                    baseData.value = [
+                        {
+                            label: '接口名称',
+                            value: actionData.value.name || '',
+                        },
+                        {
+                            label: '接口地址',
+                            value: actionData.value.requestUrl || '',
+                        },
+                        {
+                            label: '请求方式',
+                            value: actionData.value.requestMethod ? actionData.value.requestMethod : '',
+                        },
+                        {
+                            label: '发布日期',
+                            value: actionData.value.publishTime || '',
+                        },
+                        {
+                            label: '版本号',
+                            value: actionData.value.version || ''
+                        },
+                        {
+                            label: '接口描述',
+                            value: actionData.value.remark || ''
+                        },
+                    ]
+                    reqData.value = actionData.value.queryParams
+                    reqData.value.unshift({
+                        description: '令牌',
+                        in: 'header',
+                        name: 'Authorization',
+                        required: false,
+                        type: 'string'
+                    })
+                    reqData.value.forEach((item, index) => {
+                        item.key = index
+                    })
+                    resData.value = actionData.value.responseParams
+                    resData.value.forEach((item, index) => {
+                        item.key = index
+                    })
+                    resExample.value = actionData.value.successRespExample
+                    console.log(actionData.value);
                 }
-                //组装四个需求的数据
-                baseData.value = [
-                    {
-                        label: '接口名称',
-                        value: actionData.value.name || '',
-                    },
-                    {
-                        label: '接口地址',
-                        value: actionData.value.requestUrl || '',
-                    },
-                    {
-                        label: '请求方式',
-                        value: actionData.value.requestMethod ? actionData.value.requestMethod : '',
-                    },
-                    {
-                        label: '发布日期',
-                        value: actionData.value.publishTime || '',
-                    },
-                    {
-                        label: '版本号',
-                        value: actionData.value.version || ''
-                    },
-                    {
-                        label: '接口描述',
-                        value: actionData.value.remark || ''
-                    },
-                ]
-                reqData.value = actionData.value.queryParams
-                reqData.value.unshift({
-                    description: '令牌',
-                    in: 'header',
-                    name: 'Authorization',
-                    required: false,
-                    type: 'string'
-                })
-                reqData.value.forEach((item, index) => {
-                    item.key = index
-                })
-                resData.value = actionData.value.responseParams
-                resData.value.forEach((item, index) => {
-                    item.key = index
-                })
-                resExample.value = actionData.value.successRespExample
-                console.log(actionData.value);
             })
         }
         const openActionRemark = () => {
@@ -264,6 +270,7 @@ export default defineComponent({
 
         .item-header {
             padding-left: 20px;
+            margin-top: 10px;
             height: 30px;
             display: flex;
             justify-content: space-between;

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

@@ -65,6 +65,7 @@
     <MyPage :total="total"></MyPage>
     <!-- 弹出框 -->
     <DetailModal v-if="showResDeatil" :type="'FILE'" @closeModal="showResDeatil = false" :resId="detailResId" />
+    <EmpowerInfo title="文件资源申请信息" ref="infoRef"></EmpowerInfo>
   </div>
 </template>
 <script>
@@ -77,6 +78,8 @@ import { session } from '/@/utils/Memory';
 import { message, Empty } from 'ant-design-vue';
 import MyPage from './child/MyPage.vue';
 import { setHtmlImg } from '/@/views/minWidgets/CommonWay.js';
+import EmpowerInfo from './EmpowerInfo.vue';
+
 
 const props = {
   listData: {
@@ -87,7 +90,7 @@ const props = {
 
 export default defineComponent({
   name: 'FileData',
-  components: { Search, DetailModal, MyPage },
+  components: { Search, DetailModal, MyPage, EmpowerInfo },
   props,
   emits: ['resAddToCar'],
   setup(props, { emit }) {
@@ -154,7 +157,15 @@ export default defineComponent({
       showResDeatil.value = true
     }
 
+    //申请信息查看
+    const infoRef = ref(null);
+    function showEmpowerInfo(i) {
+      infoRef?.value?.showInfo(i);
+    }
+
     return {
+      infoRef,
+      showEmpowerInfo,
       setHtmlImg,
       getTag,
       tag,

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

@@ -62,7 +62,8 @@
       </div>
     </div>
     <MyPage :total="total"></MyPage>
-    <DetailModal v-if="showResDeatil" :type="'MAP'" @closeModal="showResDeatil = false" :resId="detailResId" />
+    <DetailModal v-if="showResDeatil" :type="'MAP'" @closeModal="showResDeatil = false" :resId="detailResId"
+      :res="detailRes" />
     <EmpowerInfo title="地图资源申请信息" ref="infoRef"></EmpowerInfo>
   </div>
 </template>
@@ -142,11 +143,14 @@ export default defineComponent({
       }
     )
 
+    const detailRes = ref(null);
     function handleQuery(record, n) {
       //打开详情弹窗
+      console.log("打开详情弹窗:", record)
       session.setItem('thumbnail2', document.getElementById(record.SERVICEID + n).src);
-      detailResId.value = record.SERVICEID
-      showResDeatil.value = true
+      detailResId.value = record.SERVICEID;
+      detailRes.value = record;
+      showResDeatil.value = true;
     }
 
     function applyWay(i) {
@@ -185,6 +189,7 @@ export default defineComponent({
       tag,
       getImg,
       total,
+      detailRes,
       detailResId,
       searchRef,
       showResDeatil,

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

@@ -63,7 +63,9 @@
     </div>
     <MyPage :total="total"></MyPage>
     <!-- 弹出框 -->
-    <DetailModal v-if="showResDeatil" :type="'SCENE'" @closeModal="showResDeatil = false" :resId="detailResId" />
+    <DetailModal v-if="showResDeatil" :type="'SCENE'" @closeModal="showResDeatil = false" :resId="detailResId"
+      :res="detailRes" />
+    <EmpowerInfo title="场景资源申请信息" ref="infoRef"></EmpowerInfo>
   </div>
 </template>
 <script>
@@ -82,7 +84,7 @@ 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';
-
+import EmpowerInfo from './EmpowerInfo.vue';
 
 
 const props = {
@@ -94,7 +96,7 @@ const props = {
 
 export default defineComponent({
   name: 'SceneData',
-  components: { BasicTable, TableAction, Search, DetailModal, Authority, Popconfirm, Tooltip, SceneDrawer, MyPage },
+  components: { BasicTable, TableAction, EmpowerInfo, Search, DetailModal, Authority, Popconfirm, Tooltip, SceneDrawer, MyPage },
   props,
   emits: ['resAddToCar'],
   setup(props, { emit }) {
@@ -136,6 +138,7 @@ export default defineComponent({
       immediate: true
     })
 
+    const detailRes = ref(null);
     function handleQuery(record, n) {
       console.log("11111:", record)
       // openDrawer(true, {
@@ -144,6 +147,7 @@ export default defineComponent({
       //打开详情弹窗
       session.setItem('thumbnail2', document.getElementById(record.SERVICEID + n).src);
       detailResId.value = record.SERVICEID
+      detailRes.value = record;
       showResDeatil.value = true
     }
     function applyWay(i) {
@@ -167,9 +171,18 @@ export default defineComponent({
       })
     }
 
+    //申请信息查看
+    const infoRef = ref(null);
+    function showEmpowerInfo(i) {
+      infoRef?.value?.showInfo(i);
+    }
+
     return {
+      infoRef,
+      showEmpowerInfo,
       setHtmlImg,
       getTag,
+      detailRes,
       detailResId,
       showResDeatil,
       tag,

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

@@ -25,7 +25,8 @@
                 <div class="form-box">
                     <a-row>
                         <a-col :span="3" class="form-item-title form-title">资源地址</a-col>
-                        <a-col :span="21" class="form-item-value form-title">{{ '' }}</a-col>
+                        <a-col :span="21" class="form-item-value form-title">{{ urlShow ? baseInfo.publiccurl : ''
+                        }}</a-col>
                     </a-row>
                     <a-row>
                         <a-col :span="12">
@@ -251,6 +252,10 @@ const props = {
     resId: {
         type: String,
         default: ''
+    },
+    res: {
+        type: Object,
+        default: {}
     }
 }
 export default defineComponent({
@@ -270,6 +275,11 @@ export default defineComponent({
         const baseInfo = ref({})
         const metaInfo = ref({})
         const seeShow = ref(false);
+
+        var urlShow = ref(false);
+        onMounted(() => {
+            urlShow.value = props.res.SFJRSQK === '审核通过' ? true : false;
+        })
         //初始化请求所需数据
         onMounted(async () => {
             console.log(props.resId);
@@ -320,6 +330,7 @@ export default defineComponent({
             }
         })
         return {
+            urlShow,
             seeShow,
             // setHtmlImg,
             baseInfo,

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

@@ -74,7 +74,8 @@ export default defineComponent({
 
         const options = ref([
             { value: '', label: '全部' },
-            { value: '未加入', label: '加入申请库' },
+            // { value: '未加入', label: '加入申请库' },
+            { value: '未加入', label: '待申请' },
             { value: '已加入', label: '已加入申请库' },
             { value: '审核通过', label: '审核通过' },
             { value: '审核不通过', label: '审核不通过' },