Merge branch 'master' of http://221.182.8.141:11666/sujunlin/xld-gis-admin

.env.development

@@ -10,8 +10,10 @@ VITE_GLOB_PUBLIC_PATH = /
 # 本地
 # VITE_PROXY = [["/api","http://192.168.2.225/api"]]
 
-# 线上演示环境
-VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
+# 测试环境
+# VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
+#现场环境
+VITE_PROXY = [["/api","http://192.168.119.143:9200"],["/agent","http://192.168.119.143:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"],["/xldAnalysisApi","http://192.168.119.47:2214/xldanalyst"]]
 # VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:20043"],["/agent","http://127.0.0.1:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]

index.html

@@ -15,6 +15,10 @@
   <title>空间数据管理平台</title>
   <link rel="icon" href="/favicon.ico" />
   <style>
+    .vben-basic-table .ant-table-fixed-header>.ant-table-content>.ant-table-scroll>.ant-table-body {
+      overflow: auto auto !important;
+    }
+
     .ant-select-disabled.ant-select-multiple .ant-select-selection-item,
     .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector,
     .ant-input[disabled] {

public/mapsee.html

@@ -72,10 +72,10 @@
                     if (arr[1].indexOf("onlineIde_") > -1) {
                         // 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/online.html#${arr[1].replace("onlineIde_", "")}`)
+                        creteIframe(`http://192.168.119.143/examples/webgl/online.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/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]}`)
                     }

public/mapview.html

@@ -45,7 +45,7 @@
                     if (arr[1].indexOf("onlineIde_") > -1) {
                         // 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.119.143/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_", "")}`)

public/sceneview.html

@@ -45,7 +45,7 @@
                     if (arr[1].indexOf("onlineIde_") > -1) {
                         // 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.119.143/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]}`)

src/api/dataAdmin/assembly.ts

@@ -164,7 +164,7 @@ export function getAssemblyLibs(params) {
             .then((res) => {
                 if (res?.datas?.length) {
                     var list = res.datas.filter(i => i.applyCarInfo.workflowType === 'ASSEMBLY');
-                    list.map(i => i.id = i.resInfo.SERVICEID)
+                    list.map(i => i.id = i?.resInfo?.SERVICEID)
                     console.log("申请库中的组件", list)
                     resolve(list);
                 } else {
@@ -191,6 +191,7 @@ export function getAssemblyLibsTotal() {
             .then((res) => {
                 if (res?.datas?.length) {
                     var list = res.datas.filter(i => i.applyCarInfo.workflowType === 'ASSEMBLY');
+                    console.log("申请库中的组件:", list)
                     resolve(list.length);
                 } else {
                     resolve(0)

src/layouts/default/header/index.vue

@@ -191,6 +191,7 @@ export default defineComponent({
 
     const ifShowTips = ref(appStore.tipsShowFlag)
     const tipsNum = ref('0')
+    eventBus.on('shsqUpdate', ()=> getSmsNum());
     const getSmsNum = () => {
       let params = {
         keyStr: "",

src/utils/http/axios/index.ts

@@ -144,6 +144,10 @@ const transform: AxiosTransform = {
         window.sessionStorage.clear();
         router.push(PageEnum.BASE_HOME);
       }
+      if ((response?.data?.resp_code == '500'  || response?.data?.status == '500') && response.config.url.indexOf('file/download') > -1) {
+        console.log('文件下载失败!');
+        return Promise.reject(error);
+      }
       if (code === 'ECONNABORTED' && message.indexOf('timeout') !== -1) {
         errMessage = t('sys.api.apiTimeoutMessage');
       }

src/views/assembly/item/EmpowerInfo.vue

@@ -8,9 +8,10 @@
                 <p>案例地址:{{ info.assUrl }}</p>
             </li>
             <li>
-                <p>授权文件下载:<a :id="info.MAPINGURL" :href="getImg(info.MAPINGURL)" target="downloadFile" download>
-                            <button v-if="info?.bz?.indexOf(',') > -1">下载文件</button>
-                        </a>
+                <p>文件下载:
+                    <a style="color: rgb(45, 116, 231);" target="downloadFild" v-if="info?.resInfo?.BZ?.indexOf(',') > -1" :id="info?.resInfo?.BZ" :href="getImg(info?.resInfo?.BZ)" download="grant.js">
+                        下载文件
+                    </a>
                 </p>
             </li>
         </ul>

src/views/assembly/library/index.vue

@@ -369,6 +369,6 @@ export default defineComponent({
 </script>
 <style>
 .zjsqkList .ant-table-fixed-header .ant-table-scroll .ant-table-header{
-    width: 1404px !important;
+    width: 1411px !important;
 }
 </style>

src/views/authorize/empower/AuditModal.vue

@@ -83,6 +83,7 @@ import moment from 'moment';
 import { subminExamineResult } from '/@/api/resource/examine';
 import { structureList } from '/@/api/sys/menu';
 import { list } from '/@/api/authorize/authorize';
+import eventBus from '/@/utils/eventBus';
 
 
 const props = {
@@ -179,6 +180,7 @@ export default defineComponent({
                         message.error('审核失败')
                     }
                     emit('onSubmit', Number(form.ispass))
+                    eventBus.on('shsqUpdate')
                 })
             }
         }

src/views/dashboard/workbench/component/SpatialAnnlysis.vue

@@ -48,20 +48,20 @@ export default defineComponent({
     const queryData = async () => {
       // const res = await GetXldAnalysisStatistics()
       let seriesData = [0, 0, 0, 0];
-      // const res = await queryBusinessStatistics({
-      //   startTime: "2000-01-01",
-      //   endTime: moment().format('YYYY-MM-DD'),
-      // });
-      // if (res) {
-      //   // NSFX：泥沙分析
-      //   // YMFX：淹没分析
-      //   // YLFX：雨量分析
-      //   // YBFX： 预报分析
-      //   seriesData[0] = res?.NSFX ? res?.NSFX["1"] + res?.NSFX["2"] : 0;//1是成功，2是失败
-      //   seriesData[1] = res?.YMFX ? res?.YMFX["1"] + res?.YMFX["2"] : 0;
-      //   seriesData[2] = res?.YLFX ? res?.YLFX["1"] + res?.YLFX["2"] : 0;
-      //   seriesData[3] = res?.YBFX ? res?.YBFX["1"] + res?.YBFX["2"] : 0;
-      // }
+      const res = await queryBusinessStatistics({
+        startTime: "2000-01-01",
+        endTime: moment().format('YYYY-MM-DD'),
+      });
+      if (res) {
+        // NSFX：泥沙分析
+        // YMFX：淹没分析
+        // YLFX：雨量分析
+        // YBFX： 预报分析
+        seriesData[0] = res?.NSFX ? res?.NSFX["1"] + res?.NSFX["2"] : 0;//1是成功，2是失败
+        seriesData[1] = res?.YMFX ? res?.YMFX["1"] + res?.YMFX["2"] : 0;
+        seriesData[2] = res?.YLFX ? res?.YLFX["1"] + res?.YLFX["2"] : 0;
+        seriesData[3] = res?.YBFX ? res?.YBFX["1"] + res?.YBFX["2"] : 0;
+      }
       const option = getOption(seriesData);
       mychart.value.setOption(option);
     };

src/views/dashboard/workbench/component/SupportModule.vue

@@ -41,6 +41,13 @@ export default defineComponent({
       title: '组件支撑次数',
       interval: null,
       allTimes: ref(0),
+      objTypes: [
+        { type: '地图浏览工具', includes: ['地图浏览工具'], times: 0 },
+        { type: '服务加载工具', includes: ['服务加载工具'], times: 0 },
+        { type: 'GIS功能工具', includes: ['地图基础工具','GIS功能工具','测量工具','绘制工具'], times: 0 },
+        { type: '空间分析工具', includes: ['空间分析工具','空间分析'], times: 0 },
+        { type: '三维可视化效果工具', includes: ['底图和模型加载','覆盖物','天气效果','三维可视化效果工具'], times: 0 },
+      ],
     });
     const domRef = ref(null);
     const { proxy } = getCurrentInstance();
@@ -54,21 +61,21 @@ export default defineComponent({
       let sum = 0;
       let xAxisData = [],
         seriesData = [];
-      //const res = await queryApiUseCountDays()
-      // if(res.dateArr){
-      //   res.dateArr.map(item=>{
-      //     const Arr = item.split('-')
-      //     xAxisData.push(`${Arr[1]}/${Arr[2]}`)
-      //   })
-      //   res.list.map(item=>{
-      //     seriesData.push(parseInt(item))
-      //   })
-      // }
       res.map((item) => {
-        xAxisData.push(item['SOURCE']);
-        seriesData.push(parseInt(item['SUM(NUM)']));
+        // xAxisData.push(item['SOURCE']);
+        // seriesData.push(parseInt(item['SUM(NUM)']));
         sum += parseInt(item['SUM(NUM)']);
       });
+      data.objTypes.map(item=>{
+        const objData = res.filter(re=>item.includes.indexOf(re['SOURCE']))
+        let times = 0
+        objData.map(od=>{
+          times+=parseInt(od['SUM(NUM)'])
+        })
+        xAxisData.push(item['type']);
+        seriesData.push(times);
+      })
+
       data.allTimes = sum;
       if (seriesData.length < 1 || xAxisData.length < 1) return;
       const option = getOption(seriesData, xAxisData);
@@ -172,7 +179,7 @@ export default defineComponent({
               interval: 0,
               formatter: (value) => {
                 var ret = ''; //拼接加\n返回的类目项
-                var maxLength = 2; //每项显示文字个数
+                var maxLength = 10; //每项显示文字个数
                 var valLength = value.length; //X轴类目项的文字个数
                 var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
                 if (rowN > 1) {

src/views/dashboard/workbench/component/UnstructuredStatistic.vue

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-09-13 10:06:22
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2024-03-01 20:54:24
+ * @LastEditTime: 2024-03-07 10:16:30
  * @FilePath: \xld-gis-admin\src\views\dashboard\workbench\component\TopCardStatistic.vue
  * @Description: 统计卡片
 -->
@@ -10,7 +10,7 @@
   <div class="ust-statistic">
     <div class="title">{{ title }}</div>
     <!-- autoplay -->
-    <a-carousel style="height: calc(100% - 40px); width: 100%" autoplay dotsClass="dotsClassBottom">
+    <a-carousel ref="domRef" style="height: calc(100% - 40px); width: 100%" dotsClass="dotsClassBottom">
       <!-- 第一页 -->
       <div class="indiv">
         <a-row :gutter="[16, 16]" class="cards">
@@ -20,14 +20,14 @@
                 <div class="img1"></div>
               </div>
               <div class="contenter">
-                <div class="res-title">DOM影像(L1级)</div>
+                <div class="res-title">DOM数据(L1级)</div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[0].sum}}</div>
                   <div class="name">文件个数</div>
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[0].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -39,14 +39,14 @@
                 <div class="img1"></div>
               </div>
               <div class="contenter">
-                <div class="res-title">DOM影像(L2级)</div>
+                <div class="res-title">DOM数据(L2级)</div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[1].sum}}</div>
                   <div class="name">文件个数</div>
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[1].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -58,14 +58,14 @@
                 <div class="img1"></div>
               </div>
               <div class="contenter">
-                <div class="res-title">DOM影像(L3级)</div>
+                <div class="res-title">DOM数据(L3级)</div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[2].sum}}</div>
                   <div class="name">文件个数</div>
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[2].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -77,14 +77,14 @@
                 <div class="img2"></div>
               </div>
               <div class="contenter">
-                <div class="res-title">DEM高程数据(L1级)</div>
+                <div class="res-title">DEM数据(L1级)</div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[3].sum}}</div>
                   <div class="name">文件个数</div>
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[3].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -96,14 +96,14 @@
                 <div class="img2"></div>
               </div>
               <div class="contenter">
-                <div class="res-title">DEM高程数据(L2级)</div>
+                <div class="res-title">DEM数据(L2级)</div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[4].sum}}</div>
                   <div class="name">文件个数</div>
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[4].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -115,14 +115,14 @@
                 <div class="img2"></div>
               </div>
               <div class="contenter">
-                <div class="res-title">DEM高程数据(L3级)</div>
+                <div class="res-title">DEM数据(L3级)</div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[5].sum}}</div>
                   <div class="name">文件个数</div>
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[5].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -141,7 +141,7 @@
                   </div>
                   <div class="res-file">
                     <div class="num">{{item.size}} GB</div>
-                    <div class="name">文件总大小</div>
+                    <div class="name">文件大小</div>
                   </div>
                 </div>
               </div>
@@ -159,14 +159,14 @@
                 <div class="img3"></div>
               </div>
               <div class="contenter">
-                <div class="res-title">BIM数据(L1级)</div>
+                <div class="res-title">BIM数据(L2级)</div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[6].sum}}</div>
                   <div class="name">文件个数</div>
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[6].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -178,14 +178,14 @@
                 <div class="img3"></div>
               </div>
               <div class="contenter">
-                <div class="res-title">BIM数据(L2级)</div>
+                <div class="res-title">BIM数据(L3级)</div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[7].sum}}</div>
                   <div class="name">文件个数</div>
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[7].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -197,14 +197,14 @@
                 <div class="img3"></div>
               </div>
               <div class="contenter">
-                <div class="res-title">BIM数据(L3级)</div>
+                <div class="res-title">BIM数据(L3+)</div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[8].sum}}</div>
                   <div class="name">文件个数</div>
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[8].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -216,14 +216,14 @@
                 <div class="img5"></div>
               </div>
               <div class="contenter">
-                <div class="res-title">文件数据</div>
+                <div class="res-title">工程图纸</div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[9].sum}}</div>
                   <div class="name">文件个数</div>
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[9].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -242,7 +242,7 @@
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[10].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -260,7 +260,7 @@
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[11].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -279,7 +279,7 @@
                   </div>
                   <div class="res-file">
                     <div class="num">{{item.size}} GB</div>
-                    <div class="name">文件总大小</div>
+                    <div class="name">文件大小</div>
                   </div>
                 </div>
               </div>
@@ -304,7 +304,7 @@
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[12].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -323,7 +323,7 @@
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[13].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -341,7 +341,7 @@
                 </div>
                 <div class="res-file">
                   <div class="num">{{dataTypeStatistic[14].size}}GB</div>
-                  <div class="name">文件总大小</div>
+                  <div class="name">文件大小</div>
                 </div>
               </div>
             </div>
@@ -360,7 +360,7 @@
                   </div>
                   <div class="res-file">
                     <div class="num">{{item.size}} GB</div>
-                    <div class="name">文件总大小</div>
+                    <div class="name">文件大小</div>
                   </div>
                 </div>
               </div>
@@ -372,10 +372,9 @@
   </div>
 </template>
     <script lang="ts">
-import { defineComponent, onMounted, toRefs, onUnmounted, nextTick, reactive } from 'vue';
+import { defineComponent, onMounted, toRefs, onUnmounted, nextTick, reactive,ref } from 'vue';
 import {
   DataStoreGroupByStatistics,
-  QueryDataStoreData,
   QueryDRResourceFileSize,
 } from '/@/api/interface/interface';
 
@@ -390,6 +389,8 @@ export default defineComponent({
   },
 
   setup(props) {
+    const domRef=ref(null)
+    const intervalId = ref()
     const data = reactive({
       statisticData: props.statisticData,
       title: '非结构化统计',
@@ -407,7 +408,7 @@ export default defineComponent({
         { typeName: 'BIM数据(L2级)', typeAlias: 'BIML2', sum: 0, size: 0, imgClass: 'img3' },
         { typeName: 'BIM数据(L3级)', typeAlias: 'BIML3', sum: 0, size: 0, imgClass: 'img3' },
         { typeName: 'BIM数据(L3+)', typeAlias: 'BIML3+', sum: 0, size: 0, imgClass: 'img3' },
-        { typeName: '文件数据', typeAlias: 'pdf文件', sum: 0, size: 0, imgClass: 'img5' },
+        { typeName: '工程图纸', typeAlias: 'jpg文件', sum: 0, size: 0, imgClass: 'img5' },
         { typeName: '倾斜摄影', typeAlias: '倾斜摄影', sum: 0, size: 0, imgClass: 'img6' },
         { typeName: '激光点云', typeAlias: '激光点云', sum: 0, size: 0, imgClass: 'img4' },
         { typeName: '矢量数据', typeAlias: 'shp文件', sum: 0, size: 0, imgClass: 'img4' },
@@ -445,12 +446,19 @@ export default defineComponent({
     };
     onMounted(() => {
       queryData();
+      intervalId.value = setInterval(()=>{
+        if(domRef.value)domRef.value.next()
+      },6000)
     });
 
-    onUnmounted(() => {});
+    onUnmounted(() => {
+      if(intervalId.value) clearInterval(intervalId.value)
+    });
 
     return {
+      domRef,
       ...toRefs(data),
+      intervalId,
       queryData,
     };
   },

src/views/dashboard/workbench/index.vue

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-15 11:20:48
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-09-14 11:49:35
+ * @LastEditTime: 2024-03-06 22:36:30
  * @FilePath: \xld-gis-admin\src\views\dashboard\workbench\index.vue
  * @Description: 数据监控
 -->
@@ -23,7 +23,7 @@
         </div>
         <div class="item-statistic" style="padding-bottom: 1rem;">
           <div class="item">
-            <interface-everyday/>
+            <res-type-statistic/>
           </div>
         </div>
         <div class="item-statistic" style="padding-right:1rem;">
@@ -34,7 +34,7 @@
         </div>
         <div class="item-statistic">
           <div class="item">
-            <res-type-statistic/>
+            <interface-everyday/>
           </div>
         </div>
       </div>

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

@@ -27,7 +27,7 @@
                 </div>
             </div>
             <div class="bottom-table">
-                <BasicTable @register="registerTable" class="basic-table">
+                <BasicTable @register="registerTable" class="basic-table sqkList">
                     <!-- <template #OPT="{ record }">
                     <span>{{ record.OPT==='login' ? '登录' : '退出' }}</span>
                 </template> -->
@@ -35,6 +35,12 @@
                         <a-button style="background-color: #fc8b01;color: #fff;" @click="handleAdd"
                             :disabled="hasSelected">提交申请</a-button>
                     </template>
+                    <template #index="{ index }">
+                        {{ index + 1 }}
+                    </template>
+                    <template #tjsqsj="{ record }">
+                        {{ record?.tjsqsj?.replace('.0', '') }}
+                    </template>
                     <template #action="{ record }">
                         <TableAction :actions="[
                             {
@@ -131,7 +137,8 @@ export default defineComponent({
         const appOptions = []
         const [registerModal, { openModal }] = useModal();
         // 请求所有申请库中的资源
-        const getAllData = () => {
+        const getAllData = async () => {
+            var appList = await list();
             return new Promise((resolve) => {
                 getResInCar({
                     keyword: searchValue.value,
@@ -145,13 +152,14 @@ export default defineComponent({
                         res.datas.forEach(item => {
                             //筛掉接口服务
                             if (item.applyCarInfo.workflowType === 'INTERFACE') {
+                                var app = appList.find((i) => i.KEY == item.systemkey);
                                 resData.push({
                                     resInCarId: item.applyCarInfo.id,
                                     serviceid: item.applyCarInfo.resId,
                                     zylx: '接口服务',
                                     // zymc: item.resInfo.SERVICENAME,
                                     zymc: item.applyCarInfo.resName,
-                                    yyxt: "",
+                                    yyxt: app?.NAME || '',
                                     // sqdz: "",
                                     sqsj: item.applyCarInfo.createtime,
                                     sqr: item.sqrname,
@@ -173,9 +181,15 @@ export default defineComponent({
         }
         //表格列
         const columns = [
+            {
+              title: '序号',
+              slots: { customRender: 'index' },
+              width: 50,
+            },
             {
                 title: '资源类型',
                 align: 'center',
+                width: 100,
                 dataIndex: 'zylx',
                 key: 'zylx'
             },
@@ -183,18 +197,22 @@ export default defineComponent({
                 title: '资源名称',
                 align: 'center',
                 dataIndex: 'zymc',
+                width: 200,
                 key: 'zymc'
             },
             {
                 title: '应用系统',
                 align: 'center',
                 dataIndex: 'yyxt',
+                width: 100,
                 key: 'yyxt'
             },
             {
                 title: '申请时间',
                 align: 'center',
                 dataIndex: 'tjsqsj',
+                slots: { customRender: 'tjsqsj' },
+                width: 170,
                 key: 'tjsqsj'
             },
             {
@@ -206,12 +224,14 @@ export default defineComponent({
             {
                 title: '审核状态',
                 align: 'center',
+                 width: 100,
                 dataIndex: 'shzt',
                 key: 'shzt'
             },
             {
                 title: '审核人',
                 align: 'center',
+                width: 160,
                 dataIndex: 'shr',
                 key: 'shr'
             },
@@ -227,11 +247,11 @@ export default defineComponent({
             title: '资源列表',
             api: getAllData,
             columns: columns,        //表头配置
-            bordered: false,
+            bordered: true,
             striped: false,
             useSearchForm: false,     //开启搜索区域
             actionColumn: {
-                width: 100,
+                // width: 100,
                 title: '操作',
                 dataIndex: 'action',
                 slots: { customRender: 'action' },
@@ -259,7 +279,7 @@ export default defineComponent({
                 setting: false,
                 fullScreen: false
             },
-            showIndexColumn: true,
+            showIndexColumn: false,
             indexColumnProps: { fixed: 'left' },
         });
         //判断是否选中数据
@@ -399,6 +419,11 @@ export default defineComponent({
     },
 });
 </script>
+<style>
+.sqkList .ant-table-fixed-header .ant-table-scroll .ant-table-header{
+    width: 1403px !important;
+}
+</style>
 <style lang="less" scoped>
 .modal-wrap {
     .action-content {

src/views/resource/examine/check.vue

@@ -84,8 +84,10 @@ export default defineComponent({
         if (res && res.resp_code === 0) {
           var type = res.resp_code == 0 ? 'success' : 'error';
           createMessage[type](res.resp_msg);
+          eventBus.on('shsqUpdate')
           return true
         } else {
+          eventBus.on('shsqUpdate')
           return false
         }
       } finally {

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

@@ -28,9 +28,9 @@
           <div class="operation-box">
             <div class="left">
               <div class="operation-item browse-item-btn browse-item-MR00001936" v-if="i.SFJRSQK === '审核通过'">
-                <a target="_blank"
+                <a target="_blank" 
                   :href="(i.info && i.info.length && i.info[0].thumbnail) || './static/img/default-dr3.jpg'">
-                  <span style="color: #2D74E7;">浏览</span>
+                  <span style="color: #2D74E7;" rel="opener">浏览</span>
                 </a>
               </div>
               <div class="operation-item" @click="handleQuery(i, n)">

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

@@ -28,7 +28,7 @@
             <div class="left">
               <div class="operation-item browse-item-btn browse-item-MR00001936"
                 style="background: #E1EBFB;color: #2D74E7;">
-                <a target="_blank" :href="`./mapview.html?${i.SERVICEID}`">
+                <a target="_blank" :href="`./mapview.html?${i.SERVICEID}`" rel="opener">
                   <span style="color: #2D74E7;">浏览</span>
                 </a>
               </div>

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

@@ -28,7 +28,7 @@
           <div class="operation-box">
             <div class="left">
               <div class="operation-item browse-item-btn browse-item-MR00001936">
-                <a target="_blank" :href="`./sceneview.html?${i.SERVICEID}`">
+                <a target="_blank" :href="`./sceneview.html?${i.SERVICEID}`" rel="opener">
                   <span style="color: #2D74E7;">浏览</span>
                 </a>
               </div>

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

@@ -14,7 +14,7 @@
                         <div class="service-type">服务类型：{{ baseInfo.servicetype }}</div>
                     </div>
                     <div class="look" v-if="seeShow">
-                        <a target="_blank" :href="`./mapview.html?${baseInfo.serviceid}`">
+                        <a target="_blank" :href="`./mapview.html?${baseInfo.serviceid}`" rel="opener">
                             <span>浏览</span>
                         </a>
                     </div>

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

@@ -363,7 +363,7 @@ export default defineComponent({
 </script>
 <style>
 .sqkList .ant-table-fixed-header .ant-table-scroll .ant-table-header{
-    width: 1396px !important;
+    width: 1403px !important;
 }
 </style>
 <style lang="less" scoped>