修改数据统计

src/views/dashboard/workbench/component/TopCardStatistic.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-23 17:10:32
+ * @LastEditTime: 2024-03-04 14:11:26
  * @FilePath: \xld-gis-admin\src\views\dashboard\workbench\component\TopCardStatistic.vue
  * @Description: 统计卡片
 -->
@@ -36,9 +36,14 @@
 </template>
   <script lang="ts">
 import { defineComponent, onMounted, toRefs, onUnmounted, nextTick, reactive } from 'vue';
-import { queryApiUseCountMouths,querySupportApp,querySourceAccess } from '/@/api/interface/interface';
-import {list} from '/@/api/authorize/authorize';
-import {GetIServerRequestCount} from '/@/api/dashboard/index';
+import {
+  queryApiUseCountMouths,
+  querySupportApp,
+  querySourceAccess,
+  QueryDRResourceFileSize,
+} from '/@/api/interface/interface';
+import { list } from '/@/api/authorize/authorize';
+import { GetIServerRequestCount } from '/@/api/dashboard/index';
 
 export default defineComponent({
   name: 'TopCardStatistic',
@@ -52,7 +57,7 @@ export default defineComponent({
 
   setup(props) {
     const data = reactive({
-      interval:null,
+      interval: null,
       statisticData: props.statisticData,
       dataSize: 10000,
       dataType: 5,
@@ -76,11 +81,20 @@ export default defineComponent({
         // });
         // console.log(supportNumRes)
       }
-      if(sysRes){
+      if (sysRes) {
         analysisProject = sysRes.length;
       }
       data.analysisProject = analysisProject;
       data.supportNum = supportNum;
+      //(1)数据容量统计 文件个数字段sumcount（SUMCOUNT）,文件大小字段SUMSIZE
+      const sizeRes = await QueryDRResourceFileSize({}) as any;
+      if(sizeRes && sizeRes.length >0){
+        let sumSize = 0
+        sizeRes.map(item=>{
+          sumSize += item.SUMSIZE
+        })
+        data.dataSize = sumSize
+      }
 
       // //（2）查询支撑应用
       // const res2 = await querySupportApp() as any
@@ -91,7 +105,6 @@ export default defineComponent({
       // //（3）查询资源访问
       // const res3 = await querySourceAccess({}) as any
       // if(res3 && res3.resp_cod === 0){}
-      
     };
 
     onMounted(() => {

src/views/dataAdmin/assembly/MapSourceModal.vue

@@ -2,7 +2,7 @@
 <template>
   <BasicModal width="1200px" v-bind="$attrs" @register="registerModal" @cancel="handleCancel" :title="getTitle"
     @ok="handleSubmit">
-    <div style="height: 60vh" class="res-form-container">
+    <div style="height: 50vh;overflow: auto;" class="res-form-container">
       <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"
@@ -12,8 +12,8 @@
           <FlowStep :flowTitle="'组件资源上传'" :flowCode="flowCode" :formData="formData"></FlowStep>
         </a-tab-pane>
       </a-tabs>
-      <check v-if="isCheck" ref="checkDom" />
     </div>
+    <check v-if="isCheck" ref="checkDom" />
   </BasicModal>
 </template>
 <script lang="ts">
@@ -77,7 +77,7 @@ export default defineComponent({
       const { createMessage } = useMessage();
       if (!isCheck.value) refSourceDetail.value.submitForm();
       else {
-        let flag = await checkDom.value.handleSubmit(formData.value?.BUSSID)
+        let flag = await checkDom.value.handleSubmit(formData.value?.bussid)
         if (flag) {
           refSourceDetail.value.resetForm();
           closeModal();

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

@@ -10,7 +10,7 @@
     :minHeight="500"
     :maxHeight="600"
   >
-    <div style="height: 50vh">
+    <div style="height: 50vh;overflow: auto;">
       <!-- <div class="text-center text-black text-2xl">
         <a-typography-title style="font-size: 16px;">流域基础信息</a-typography-title>
         <a-menu v-model:selectedKeys="current" mode="horizontal" @click="menuClick">
@@ -71,8 +71,8 @@
           ></FlowStep>
         </a-tab-pane>
       </a-tabs>
-      <check v-if="isCheck" ref="checkDom" />
     </div>
+    <check v-if="isCheck" ref="checkDom" />
   </BasicModal>
 </template>
 <script lang="ts">
@@ -288,7 +288,7 @@ export default defineComponent({
           }, 300);
         }
       } else {
-        let flag = await checkDom.value.handleSubmit(formData.value?.BUSSID);
+        let flag = await checkDom.value.handleSubmit(formData.value?.bussid);
         if (flag) {
           handleCancel();
           closeModal();

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

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-15 16:19:10
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2024-03-04 10:37:21
+ * @LastEditTime: 2024-03-04 14:01:47
  * @FilePath: \xld-gis-admin\src\views\resource\map\MapSourceModal.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -15,7 +15,7 @@
     :title="getTitle"
     @ok="handleSubmit"
   >
-    <div style="height: 60vh" class="res-form-container">
+    <div style="height: 50vh;overflow: auto;" class="res-form-container">
       <a-tabs :animated="false" v-model:activeKey="activeKey" class="res-a-tabs">
         <a-tab-pane key="1" tab="地图资源信息">
           <source-detail
@@ -32,8 +32,8 @@
           <FlowStep :flowTitle="flowName" :flowCode="'20220523001'" :formData="formData"></FlowStep>
         </a-tab-pane>
       </a-tabs>
-      <check v-if="isCheck" ref="checkDom" />
     </div>
+    <check v-if="isCheck" ref="checkDom" />
   </BasicModal>
 </template>
 <script lang="ts">
@@ -93,7 +93,7 @@ export default defineComponent({
       const { createMessage } = useMessage();
       if (!isCheck.value) refSourceDetail.value.submitForm();
       else {
-        let flag = await checkDom.value.handleSubmit(formData.value?.BUSSID)
+        let flag = await checkDom.value.handleSubmit(formData.value?.bussid)
         if (flag) {
           refSourceDetail.value.resetForm();
           closeModal();

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

@@ -9,37 +9,7 @@
     :useWrapper="true"
     :minHeight="500"
   >
-    <div style="height: 50vh">
-      <!-- <BasicForm @register="registerForm">
-        <template #title>
-          <div class="text-center text-black text-2xl">
-            <a-menu v-model:selectedKeys="current" mode="horizontal">
-              <a-menu-item key="mail1"> 场景资源信息 </a-menu-item>
-              <a-menu-item key="mail2"> 流程信息 </a-menu-item>
-            </a-menu>
-          </div>
-        </template>
-        <template #basicinfo>
-          <div class="basic-info-title">基础信息</div>
-        </template>
-
-        <template #descinfo>
-          <div class="basic-info-title">描述信息</div>
-        </template>
-
-        <template #upload>
-          <a-upload name="file" :multiple="true">
-            <a-button type="primary">
-              <upload-outlined></upload-outlined>
-              文件上传
-            </a-button>
-            <span style="font-size: 14px; margin-left: 10px"
-              >支持上传png、jpeg、gif、tif等格式文件</span
-            >
-          </a-upload>
-        </template>
-      </BasicForm> -->
-
+    <div style="height: 50vh;overflow: auto;">
       <a-tabs :animated="false" v-model:activeKey="activeKey" class="res-a-tabs">
         <a-tab-pane key="1" tab="场景资源信息">
           <BasicForm @register="registerForm">
@@ -89,8 +59,8 @@
           ></FlowStep>
         </a-tab-pane>
       </a-tabs>
-      <check v-if="isCheck" ref="checkDom" />
     </div>
+    <check v-if="isCheck" ref="checkDom" />
   </BasicModal>
 </template>
 <script lang="ts">
@@ -288,7 +258,7 @@ export default defineComponent({
           }, 300);
         }
       } else {
-        let flag = await checkDom.value.handleSubmit(formData.value?.BUSSID);
+        let flag = await checkDom.value.handleSubmit(formData.value?.bussid);
         if (flag) {
           handleCancel();
           closeModal();

src/views/resource/examine/check.vue

@@ -1,6 +1,6 @@
 <template>
-  <div style="height: 80px;">
-      <BasicForm @register="registerForm">
+  <div style="height: 160px;">
+      <BasicForm @register="registerForm" :minHeight="160">
         <template #descinfo>
           <div class="basic-info-title">审核信息</div>
         </template>
@@ -63,7 +63,7 @@ export default defineComponent({
       setModalProps({ confirmLoading: false });
       isUpdate.value = !!data?.isUpdate;
       if (unref(isUpdate)) {
-        bussid.value = data.record.BUSSID;
+        bussid.value = data.record.bussid;
         setFieldsValue(data.record);
       }
     });

src/views/resource/examine/index.vue

@@ -255,8 +255,9 @@ export default defineComponent({
         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;
+        const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {},{bussid:record?.BUSSID});
+        //if (record.bussid) res.bussid = record?.BUSSID;
+        debugger
         openModal(true, {
           record: result,
           isUpdate: true,
@@ -272,21 +273,13 @@ export default defineComponent({
     async function handleEdit(record: Recordable) {
       ischect.value = true;
       if(!record?.BUSSID) return;
-      // setTimeout(() => {
-      //   openModal(true, {
-      //     record,
-      //     isUpdate: true,
-      //     isCheck: true,
-      //   });
-      //   appStore.setRouterPushAuditFlag(false)
-      // }, 100);
       const res = (await queryResourceById(record?.SERVICEID)) as any;
       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 || {},{BUSSID:record?.BUSSID});
-        if (record.bussid) res.bussid = record.BUSSID;
+        const result = Object.assign(res.metadata, res.servicebase, res.dataVersionConf || {},{bussid:record?.BUSSID});
+        //if (record.bussid) res.bussid = record.BUSSID;
         openModal(true, {
           record: result,
           isUpdate: true,