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

public/mapsee.html

@@ -63,7 +63,7 @@
                 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/onlineIde.html#${arr[1].replace("onlineIde_", "")}`)
+                    creteIframe(`http://192.168.193.88:8080/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_", "")}`)

src/api/interface/interface.ts

@@ -364,10 +364,10 @@ export function QueryDRResourceFileSize(params) {
     return new Promise<void>((resolve) => {
         defHttp.get({ url: Api.getDRResourceFileSize, params })
             .then((r) => {
-                if (r.resp_code == 0 && r.datas && r.datas.length) {
+                if (r.resp_code === 1 && r.datas && r.datas.length) {
                     resolve(r.datas);
                 } else {
-                    resolve();
+                    resolve([]);
                 }
             })
     })

src/views/assembly/library/index.vue

@@ -75,6 +75,12 @@
       <template #systemkey="{ record }">
         <span :id="'zjsqk' + record.id">{{ getAppName(record.systemkey, `zjsqk${record.id}`) }}</span>
       </template>
+      <template #shr="{ record }">
+        <span :id="'shr' + record.id">{{ getUser(record, `shr${record.id}`) }}</span>
+      </template>
+      <template #shyj="{ record }">
+        <span :id="'shyj' + record.id">{{ getYJ(record, `shyj${record.id}`) }}</span>
+      </template>
       <template #status="{ record }">
         <Tag :style="`color:${record.shzt == '未提交' ? 'red' : '#05B069'};`">
           {{
@@ -298,7 +304,39 @@ export default defineComponent({
       })
     }
 
+    function getUser(item, id) {
+      var shr = [];
+      if (item?.shlc?.length > 1) {
+        item.shlc.map((i, index) => {
+          if (index != 0 && index != item.shlc.length - 1) {
+            shr.push(i.USER_NAME)
+          }
+        })
+        var dom = document.getElementById(id);
+        if (dom) {
+          dom.innerHTML = shr.join(',')
+        }
+      }
+    }
+
+    function getYJ(item, id) {
+      var shyj = [];
+      if (item?.shlc?.length > 1) {
+        item.shlc.map((i, index) => {
+          if (index != 0 && index != item.shlc.length - 1) {
+            shyj.push(i.CHECKINFO)
+          }
+        })
+        var dom = document.getElementById(id);
+        if (dom) {
+          dom.innerHTML = shyj.join(',')
+        }
+      }
+    }
+
     return {
+      getYJ,
+      getUser,
       getAppName,
       applyHandleEdit,
       applyHandleSuccess,

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

@@ -170,11 +170,13 @@ export const columns: BasicColumn[] = [
   {
     title: '审核人',
     dataIndex: 'shr',
+    slots: { customRender: 'shr' },
     width: 110,
   },
   {
     title: '审核意见',
     dataIndex: 'shyj',
+    slots: { customRender: 'shyj' },
     width: 110,
   },
 ];

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-02-29 21:21:09
+ * @LastEditTime: 2024-02-29 21:23:44
  * @FilePath: \xld-gis-admin\src\views\dashboard\workbench\component\TopCardStatistic.vue
  * @Description: 统计卡片
 -->
@@ -348,6 +348,7 @@ export default defineComponent({
       console.log('文件数据统计', res, data.file);
       const result = await QueryDataStoreData({})
       console.log('非结构化数据统计',result)
+      debugger
       const res2 = await QueryDRResourceFileSize({})
       console.log('非结构化数据分类统计',res2)
     };

src/views/dataAdmin/assembly/MapSourceModal.vue

@@ -3,7 +3,7 @@
   <BasicModal width="1200px" v-bind="$attrs" @register="registerModal" @cancel="handleCancel" :title="getTitle"
     @ok="handleSubmit">
     <div style="height: 60vh" class="res-form-container">
-      <a-tabs v-model:activeKey="activeKey" class="res-a-tabs">
+      <a-tabs :animated="false" v-model:activeKey="activeKey" class="res-a-tabs">
         <a-tab-pane key="1" tab="组件信息">
           <source-detail ref="refSourceDetail" @RtnMain="RtnMain" @closeModal="closeModal" :formData="formData"
             :isUpdate="isUpdate" :isView="isView"></source-detail>
@@ -26,7 +26,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
 import SourceDetail from './SourceDetail.vue';
 // import FlowStep from './flowStep/index.vue';
 import FlowStep from '../dataAdmin/flowStep/index.vue';
-import { queryFlowInfoPage } from '/@/api/resource/examine'; 
+import { queryFlowInfoPage } from '/@/api/resource/examine';
 import Check from '/@/views/resource/examine/check.vue';
 
 export default defineComponent({
@@ -83,7 +83,7 @@ export default defineComponent({
           closeModal();
           emit('success');
         }
-        else{
+        else {
           createMessage.error('审核失败!');
         }
       }

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

@@ -18,7 +18,7 @@
           <a-menu-item key="mail2"> 版本信息 </a-menu-item>
         </a-menu>
       </div> -->
-      <a-tabs v-model:activeKey="activeKey" class="res-a-tabs">
+      <a-tabs :animated="false" v-model:activeKey="activeKey" class="res-a-tabs">
         <a-tab-pane key="1" tab="基本信息">
           <BasicForm @register="registerForm" v-if="show1">
             <template #upload>

src/views/dataAdmin/dataAdmin/flowStep/index.vue

@@ -31,23 +31,16 @@
             </template>
             <template #icon>
               <div class="cicle-out">
-                <div
-                  class="cicle"
-                  :style="`border: 2px solid ${colors[step.status]};color:${colors[step.status]};`"
-                  >{{ index + 1 }}</div
-                >
+                <div class="cicle" :style="`border: 2px solid ${colors[step.status]};color:${colors[step.status]};`">{{
+                  index + 1 }}</div>
               </div>
             </template>
             <template #description>
               <!-- <div class="desc-step-name">{{ step.stepName }}</div> -->
               <div class="desc-handler">
                 <template v-for="user in step.handlers" :key="user.id">
-                  <span
-                    class="handler-name"
-                    :style="`background-color:${colors[user.status]};`"
-                    :title="user.handler"
-                    >{{ user.handler }}</span
-                  >
+                  <span class="handler-name" :style="`background-color:${colors[user.status]};`" :title="user.handler">{{
+                    user.handler }}</span>
                 </template>
               </div>
             </template>
@@ -290,8 +283,8 @@ export default defineComponent({
                   i.CHECKINFO == '起件'
                     ? i.BUSSNAME
                     : i.CHECKINFO == '归档'
-                    ? '审核结束'
-                    : i.NODEDISCRIPTION;
+                      ? '审核结束'
+                      : i.NODEDISCRIPTION;
               }
               if (!index) {
                 i.CHECKINFO = '';
@@ -501,6 +494,7 @@ export default defineComponent({
               .desc-handler {
                 position: absolute;
                 margin-top: 38px;
+
                 .handler-name {
                   display: flex;
                   float: left;

src/views/dataAdmin/dataAdmin/mapUpload/MapSourceModal.vue

@@ -16,7 +16,7 @@
     @ok="handleSubmit"
   >
     <div style="height: 60vh" class="res-form-container">
-      <a-tabs v-model:activeKey="activeKey" class="res-a-tabs">
+      <a-tabs :animated="false" v-model:activeKey="activeKey" class="res-a-tabs">
         <a-tab-pane key="1" tab="地图资源信息">
           <source-detail
             ref="refSourceDetail"

src/views/dataAdmin/dataAdmin/sceneResourceUpload/AddMethod.vue

@@ -40,7 +40,7 @@
         </template>
       </BasicForm> -->
 
-      <a-tabs v-model:activeKey="activeKey" class="res-a-tabs">
+      <a-tabs :animated="false" v-model:activeKey="activeKey" class="res-a-tabs">
         <a-tab-pane key="1" tab="场景资源信息">
           <BasicForm @register="registerForm">
             <template #basicinfo>

src/views/minWidgets/Keywords.js

@@ -7,7 +7,10 @@ export default function getKeywords(i, id) {
         if (i.length) {
             tagAjax().then(r => {
                 var name = r.filter(j => i.includes(j.code)).map(j => j.name).toString();
-                document.getElementById(`${id}`).innerHTML = name;
+                var dom = document.getElementById(`${id}`)
+                if (dom) {
+                    dom.innerHTML = name;
+                }
             })
         }
     }