修改

src/api/dataMapping.js

-
 import { post } from '@/utils/http'
 import {
   EADC_ARRCHITECTURE,
@@ -33,21 +32,38 @@ export function removeEleRelation(params) {
 }
 // 资产关系新增
 export function createAssetRelation(params) {
-  return post(EADC_ARRCHITECTURE + '/archi-asset-relation/cAssetRelation', params)
+  return post(
+    EADC_ARRCHITECTURE + '/archi-asset-relation/cAssetRelation',
+    params,
+    true,
+  )
 }
 // 资产关系修改
 export function updAssetRelation(params) {
-  return post(EADC_ARRCHITECTURE + '/archi-asset-relation/uAssetRelation', params)
+  return post(
+    EADC_ARRCHITECTURE + '/archi-asset-relation/uAssetRelation',
+    params,
+    true,
+  )
 }
 // 根据元素查资产
 export function queryAssetByEle(params) {
-  return post(EADC_ARRCHITECTURE + '/archi-asset-relation/queryAssetByEle', params)
+  return post(
+    EADC_ARRCHITECTURE + '/archi-asset-relation/queryAssetByEle',
+    params,
+  )
 }
 // 资产关系删除
 export function removeAssetRelation(params) {
-  return post(EADC_ARRCHITECTURE + '/archi-asset-relation/rAssetRelation', params)
+  return post(
+    EADC_ARRCHITECTURE + '/archi-asset-relation/rAssetRelation',
+    params,
+  )
 }
 // 资产关系发布/停用
 export function pAssetRelation(params) {
-  return post(EADC_ARRCHITECTURE + '/archi-asset-relation/pAssetRelation', params)
-}
\ No newline at end of file
+  return post(
+    EADC_ARRCHITECTURE + '/archi-asset-relation/pAssetRelation',
+    params,
+  )
+}

src/views/bigScreen/architectureBlueprintAnalysis/index.vue

@@ -4,7 +4,7 @@
  * @Autor: pan
  * @Date: 2024-05-28 18:59:07
  * @LastEditors: pan
- * @LastEditTime: 2024-06-03 08:28:59
+ * @LastEditTime: 2024-06-19 18:25:31
 -->
 <template>
   <div class="w-100 h-100 p-10 architectureBlueprintAnalysis">
@@ -111,18 +111,24 @@ export default {
           countItems: [
             {
               title: '业务域',
-              count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum-sys'],
-              count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum'],
+              count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum'],
+              count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum-sys'],
             },
             {
               title: '业务职能',
-              count1: 595,
-              count2: 624,
+              count1: ARCHI_BUSINESS
+                ? (ARCHI_BUSINESS['oneLevelBusFuncNum'] || 0) +
+                  (ARCHI_BUSINESS['twoLevelBusFuncNum'] || 0)
+                : 0,
+              count2: ARCHI_BUSINESS
+                ? (ARCHI_BUSINESS['oneLevelBusFuncNum-sys'] || 0) +
+                  (ARCHI_BUSINESS['twoLevelBusFuncNum-sys'] || 0)
+                : 0,
             },
             {
               title: '业务流程',
-              count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum-sys'],
-              count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum'],
+              count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum'],
+              count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum-sys'],
             },
           ],
         },
@@ -132,22 +138,23 @@ export default {
           countItems: [
             {
               title: '应用',
-              count1: 12,
-              count2: 14,
+              count1: ARCHI_APPLICATION && ARCHI_APPLICATION['appDomainNum'],
+              count2:
+                ARCHI_APPLICATION && ARCHI_APPLICATION['appDomainNum-sys'],
             },
             {
               title: '一级功能',
               count1:
-                ARCHI_APPLICATION && ARCHI_APPLICATION['oneLevelAppCount-sys'],
-              count2:
                 ARCHI_APPLICATION && ARCHI_APPLICATION['oneLevelAppCount'],
+              count2:
+                ARCHI_APPLICATION && ARCHI_APPLICATION['oneLevelAppCount-sys'],
             },
             {
               title: '二级功能',
               count1:
-                ARCHI_APPLICATION && ARCHI_APPLICATION['twoLevelAppCount-sys'],
-              count2:
                 ARCHI_APPLICATION && ARCHI_APPLICATION['twoLevelAppCount'],
+              count2:
+                ARCHI_APPLICATION && ARCHI_APPLICATION['twoLevelAppCount-sys'],
             },
           ],
         },
@@ -157,13 +164,13 @@ export default {
           countItems: [
             {
               title: '一级主题域',
-              count1: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount-sys'],
-              count2: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount'],
+              count1: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount'],
+              count2: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount-sys'],
             },
             {
               title: '二级主题域',
-              count1: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount-sys'],
-              count2: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount'],
+              count1: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount'],
+              count2: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount-sys'],
             },
             {
               title: '概念实体',
@@ -178,18 +185,18 @@ export default {
           countItems: [
             {
               title: '技术域',
-              count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum-sys'],
-              count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum'],
+              count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum'],
+              count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum-sys'],
             },
             {
               title: '技术能力',
-              count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum-sys'],
-              count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum'],
+              count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum'],
+              count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum-sys'],
             },
             {
               title: '技术组件',
-              count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum-sys'],
-              count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum'],
+              count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum'],
+              count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum-sys'],
             },
           ],
         },
@@ -198,19 +205,19 @@ export default {
           bgColor: '#a4ebaf',
           countItems: [
             {
-              title: '防护对象',
-              count1: 12,
-              count2: 14,
+              title: '安全管理体系',
+              count1: ARCHI_SAFE && ARCHI_SAFE['safeManageNum'],
+              count2: ARCHI_SAFE && ARCHI_SAFE['safeManageNum-sys'],
             },
             {
-              title: '防护要求',
-              count1: 595,
-              count2: 624,
+              title: '安全主题域',
+              count1: ARCHI_SAFE && ARCHI_SAFE['safeThemeNum'],
+              count2: ARCHI_SAFE && ARCHI_SAFE['safeThemeNum-sys'],
             },
             {
-              title: '防护措施',
-              count1: 2869,
-              count2: 2967,
+              title: '安全策略',
+              count1: ARCHI_SAFE && ARCHI_SAFE['safePlicyNum'],
+              count2: ARCHI_SAFE && ARCHI_SAFE['safePlicyNum-sys'],
             },
           ],
         },

src/views/busi-assets-list/RelationChildAdd.vue

@@ -4,7 +4,7 @@
  * @Autor: pan
  * @Date: 2024-05-10 18:41:29
  * @LastEditors: pan
- * @LastEditTime: 2024-06-19 17:40:54
+ * @LastEditTime: 2024-06-19 18:33:03
 -->
 <template>
   <el-dialog
@@ -239,26 +239,22 @@ export default {
     },
     handleSubmit() {
       this.$refs['addForm'].onValidate(() => {
-        const loading = this.$loading({
-          lock: true,
-          text: '保存中',
-          spinner: 'el-icon-loading',
-        })
         const formInfo = this.$refs['addForm'].getData()
         const typeApi = this.isEdit ? updAssetRelation : createAssetRelation
         const params = {
           ...this.rowData,
           ...formInfo,
           state: 2,
-          assetRelaId: this.relationData.assetRelaId
+          assetRelaId: this.relationData.assetRelaId,
         }
         typeApi(params).then((res) => {
           if (res.code === 200) {
-            loading.close()
             this.$message.success('保存成功')
             this.showDialog = false
             this.handleClose()
             this.$emit('querySearch')
+          } else {
+            this.$messsage.warning(res.msg)
           }
         })
       })