很多问题的修改

public/mapsee.html

@@ -61,14 +61,14 @@
             var arr = obj.split("?")
             if (arr.length && arr[1]) {
                 if (arr[1].indexOf("onlineIde_") > -1) {
-                    creteIframe(`http://106.12.170.138:4001/examples/online.html#${arr[1].replace("onlineIde_", "")}`)
+                    // creteIframe(`http://106.12.170.138:4001/examples/online.html#${arr[1].replace("onlineIde_", "")}`)
                     // creteIframe(`http://127.0.0.1:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
-                    // creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
+                    creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
                 } else {
                     // creteIframe(arr[1])
                     // creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
-                    // creteIframe(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${arr[1]}`)
-                    creteIframe(`http://106.12.170.138:8080/onemapV5.0/mapview.html?${arr[1]}`)
+                    creteIframe(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${arr[1]}`)
+                    // creteIframe(`http://106.12.170.138:8080/onemapV5.0/mapview.html?${arr[1]}`)
                 }
             }
         }

public/mapview.html

@@ -34,14 +34,14 @@
             var arr = obj.split("?")
             if (arr.length && arr[1]) {
                 if (arr[1].indexOf("onlineIde_") > -1) {
-                    creteIframe(`http://106.12.170.138:4001/examples/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
+                    // creteIframe(`http://106.12.170.138:4001/examples/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
                     // creteIframe(`http://127.0.0.1:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
-                    // creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
+                    creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
                 } else {
                     // creteIframe(arr[1])
                     // creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
-                    // creteIframe(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${arr[1]}`)
-                    creteIframe(`http://106.12.170.138:8080/onemapV5.0/mapview.html?${arr[1]}`)
+                    creteIframe(`http://192.168.119.143:8080/onemapV5.0/mapview.html?${arr[1]}`)
+                    // creteIframe(`http://106.12.170.138:8080/onemapV5.0/mapview.html?${arr[1]}`)
                 }
             }
         }

public/sceneview.html

@@ -39,8 +39,8 @@
                     creteIframe(`http://192.168.193.88:8080/examples/webgl/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
                 } else {
                     // creteIframe(arr[1])
-                    // creteIframe(`http://192.168.119.143:8080/onemapV5.0/sceneview.html?${arr[1]}`)
-                    creteIframe(`http://106.12.170.138:8080/onemapV5.0/sceneview.html?${arr[1]}`)
+                    creteIframe(`http://192.168.119.143:8080/onemapV5.0/sceneview.html?${arr[1]}`)
+                    // creteIframe(`http://106.12.170.138:8080/onemapV5.0/sceneview.html?${arr[1]}`)
                 }
             }
         }

src/api/authorize/authorize.ts

@@ -29,11 +29,18 @@ export function list(data) {
         page: 1,
         rows: 1000
     }
+    var name = JSON.stringify(params);
+    if (session.getItem(name)) {
+        return new Promise<void>((resolve, reject) => {
+            resolve(session.getItem(name))
+        })
+    }
     return new Promise<void>((resolve, reject) => {
         defHttp.post({ url: Api.List, params })
             .then((r) => {
                 if (r.resp_code == 0 && r.datas && r.datas.records.length) {
                     resolve(r.datas.records);
+                    session.setItem(name, r.datas.records);
                 } else {
                     resolve([]);
                 }

src/api/resource/plat.ts

@@ -291,6 +291,8 @@ export function apply(params) {
  * @description:查询已加入申请库的资源
  */
 export function getResInCar(params) {
+    params.Index = 1;
+    params.Size = 100;
     return new Promise<void>((resolve, reject) => {
         defHttp.post({ url: Api.SelectUserRes, params })
             .then((r) => {

src/views/assembly/library/index.vue

@@ -72,6 +72,9 @@
           }}
         </Tag>
       </template>
+      <template #systemkey="{ record }">
+        <span :id="'zjsqk' + record.id">{{ getAppName(record.systemkey, `zjsqk${record.id}`) }}</span>
+      </template>
       <template #status="{ record }">
         <Tag :style="`color:${record.shzt == '未提交' ? 'red' : '#05B069'};`">
           {{
@@ -106,6 +109,7 @@ import { queryFlowInfoPage, submitExamine } from '/@/api/resource/examine';
 import { deleteResInCar } from '/@/api/resource/plat';
 import eventBus from '/@/utils/eventBus';
 import ApplyModal from './applyModal/ApplyModal.vue';
+import { list } from '/@/api/authorize/authorize';
 
 export default defineComponent({
   name: 'RoleManagement',
@@ -280,7 +284,22 @@ export default defineComponent({
       })
     }
 
+    function getAppName(name, id) {
+      list().then((r) => {
+        if (r && r.length) {
+          var app = r.find((i) => i.KEY == name);
+          if (app) {
+            var dom = document.getElementById(id);
+            if (dom) {
+              dom.innerHTML = app.NAME;
+            }
+          }
+        }
+      })
+    }
+
     return {
+      getAppName,
       applyHandleEdit,
       applyHandleSuccess,
       submitApply,

src/views/assembly/library/lib.data.ts

@@ -130,15 +130,16 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '应用系统',
-    dataIndex: 'servicename',
-    width: 160,
-  },
-  {
-    title: '申请单位',
-    dataIndex: 'servicename2',
+    dataIndex: 'systemkey',
+    slots: { customRender: 'systemkey' },
     width: 160,
   },
   // {
+  //   title: '申请单位',
+  //   dataIndex: 'servicename2',
+  //   width: 160,
+  // },
+  // {
   //   title: '发布人',
   //   dataIndex: 'publisher',
   //   width: 120,
@@ -151,12 +152,13 @@ export const columns: BasicColumn[] = [
   // },
   {
     title: '申请时间',
-    dataIndex: 'applyCarInfo.createtime',
+    // dataIndex: 'applyCarInfo.createtime',
+    dataIndex: 'tjsqsj',
     width: 170
   },
   {
     title: '申请人',
-    dataIndex: 'curHandler',
+    dataIndex: 'sqrname',
     width: 100,
   },
   {

src/views/authorize/empower/AuditModal.vue

@@ -14,7 +14,8 @@
                             <p><span>资源名称:</span><i>{{ record?.SERVICENAME || '暂无' }}</i></p>
                         </li>
                         <li>
-                            <p><span>应用系统:</span><i>{{ record?.SQYT || '暂无' }}</i></p>
+                            <p><span>应用系统:</span><i :id="'jksh' + record?.SYSTEMKEY">{{
+                                getAppName(record?.SYSTEMKEY, `jksh${record?.SYSTEMKEY}`) || '暂无' }}</i></p>
                             <p><span>应用IP地址:</span><i>{{ record?.SYSTEMIP || '暂无' }}</i></p>
                         </li>
                         <li>
@@ -81,6 +82,8 @@ import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import moment from 'moment';
 import { subminExamineResult } from '/@/api/resource/examine';
 import { structureList } from '/@/api/sys/menu';
+import { list } from '/@/api/authorize/authorize';
+
 
 const props = {
     bussInfo: {
@@ -180,9 +183,24 @@ export default defineComponent({
             }
         }
 
+        function getAppName(name, id) {
+            list().then((r) => {
+                if (r && r.length) {
+                    var app = r.find((i) => i.KEY == name);
+                    if (app) {
+                        var dom = document.getElementById(id);
+                        if (dom) {
+                            dom.innerHTML = app.NAME;
+                        }
+                    }
+                }
+            })
+        }
+
 
 
         return {
+            getAppName,
             changeIspass,
             record,
             formRef,

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

@@ -154,8 +154,9 @@ export default defineComponent({
                                     yyxt: "",
                                     // sqdz: "",
                                     sqsj: item.applyCarInfo.createtime,
-                                    sqr:  item.sqrname,
+                                    sqr: item.sqrname,
                                     shzt: item.shzt,
+                                    tjsqsj: item.tjsqsj,
                                     shr: "",
                                     shyj: ""
                                 })
@@ -193,8 +194,8 @@ export default defineComponent({
             {
                 title: '申请时间',
                 align: 'center',
-                dataIndex: 'sqsj',
-                key: 'sqsj'
+                dataIndex: 'tjsqsj',
+                key: 'tjsqsj'
             },
             {
                 title: '申请人',

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

@@ -98,7 +98,8 @@ export default defineComponent({
             getResInCar({
                 userId: session.getItem('userId'),
             }).then((res) => {
-                if (res.datas) {
+                console.log(res);
+                if (res.datas && res.datas.filter) {
                     let resData = res.datas.filter(item => item.applyCarInfo.workflowType === 'INTERFACE')
                     resNum.value = resData.length
                 }

src/views/resource/examine/check.vue

@@ -1,5 +1,5 @@
 <template>
-  <BasicModal title="审核管理" @register="registerModal">
+  <BasicModal title="审核管理" @register="registerModal" @ok="handleSubmit">
     <div style="height: 80px;">
       <BasicForm @register="registerForm">
         <template #descinfo>
@@ -20,6 +20,7 @@ import { TOption } from '/@/views/rule/linkedge/config/config.data';
 import { PlusOutlined } from '@ant-design/icons-vue';
 import { subminExamineResult } from '/@/api/resource/examine';
 import { session } from '/@/utils/Memory.js';
+import eventBus from '/@/utils/eventBus';
 
 export default defineComponent({
   name: 'AccountModal',
@@ -69,14 +70,16 @@ export default defineComponent({
       }
     });
     const getTitle = '审核';
-    async function handleSubmit(bussid) {
+    async function handleSubmit() {
+      var id = bussid.value;
+      console.log('审核', id);
       //setModalProps({ confirmLoading: true });
       try {
         const { createMessage } = useMessage();
         const values = await validate(); //validate(['parentId']);
         console.log('userinfo', userinfo)
         const params = {
-          bussInfoId: bussid,    //业务id
+          bussInfoId: id,    //业务id
           ispass: values.ispass,       //是否通过
           opinion: values.opinion,      //意见
         }
@@ -84,6 +87,8 @@ export default defineComponent({
         if (res && res.resp_code === 0) {
           var type = res.resp_code == 0 ? 'success' : 'error';
           createMessage[type](res.resp_msg);
+          closeModal()
+          eventBus.emit('sjscshsj');
           return true
         } else {
           return false

src/views/resource/examine/index.vue

@@ -111,6 +111,7 @@ import { updateExamine } from '/@/api/resource/updateExamine';
 import { useModal } from '/@/components/Modal';
 import { useRouter } from 'vue-router';
 import { useAppStore } from '/@/store/modules/app';
+import eventBus from '/@/utils/eventBus';
 
 export default defineComponent({
   name: 'RoleManagement',
@@ -274,6 +275,7 @@ export default defineComponent({
      * 审核
      */
     async function handleEdit(record: Recordable) {
+      appStore.setRouterPushAuditFlag(false)
       ischect.value = true;
       showAuditModal.value = true;
 
@@ -377,6 +379,8 @@ export default defineComponent({
       console.log('审核数据', getSelectRows());
     };
 
+    eventBus.one('sjscshsj', () => reload())
+
 
     return {
       statusShow,

src/views/resource/plat/item/child/ResCarModal.data.ts

@@ -34,8 +34,8 @@ export const columns = [
   {
     title: '申请时间',
     align: 'center',
-    dataIndex: 'sqsj',
-    key: 'sqsj',
+    dataIndex: 'tjsqsj',
+    key: 'tjsqsj',
     width: 170
   },
   {

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

@@ -1,7 +1,7 @@
 <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-search">
                 <div class="left-search-input">
@@ -138,6 +138,7 @@ export default defineComponent({
                                         sqsj: sqsj,//item?.applyCarInfo?.createtime,
                                         sqr: item?.sqrname,
                                         shzt: item?.shzt,
+                                        tjsqsj: item.tjsqsj,
                                         shr: shr.join(','),
                                         shyj: shyj.join(','),
                                     })

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

@@ -66,7 +66,7 @@ export default defineComponent({
             getResInCar({
                 userId: session.getItem('userId'),
             }).then((r) => {
-                if (r.datas) {
+                if (r.datas && r.datas.filter) {
                     resNum.value = r.datas.filter(i => i.applyCarInfo.workflowType == props.type && i?.resInfo?.SERVICEID).length;
                 }
             })