@@ -135,7 +156,7 @@
},
{
name: '使用能力',
- key: 'integration-combination-ability',
+ key: 'integration-ability',
},
{
name: '构建步骤',
@@ -234,14 +255,25 @@
attrType: '应用领域',
attrValue: fuseAttrList.find((v) => v.attrType === '应用领域').attrValue,
}
- combineList.value.map((item) => {
- let arr = (
- fuseResourceList.filter(
- (v) => v.resource && v.resource.type == item.title
- ) || []
- ).map((d) => d.resource.name)
+ combineList.value.forEach((item) => {
+ let arr = []
+ let resource=fuseResourceList.filter((v)=>v.resource && v.type == item.title)
+ if(resource.length>0){
+ if(item.title==='基础设施'){
+ arr=resource.map(res=>({
+ id: res.resource.idtCameraChannel, name: res.resource.channelName, dept: res.resource.nodeName, platform: 'UCS'
+ }))
+ }else if(item.title==='组件服务'){
+ arr=resource.map(res=>({
+ id: res.resource.id, name: res.resource.name, dept: res.resource.deptName, platform: 'UCS'
+ }))
+ }else if(item.title==='数据资源'){
+ arr=resource.map(res=>({
+ id: res.resource.zycode, name: res.resource.zyname, dept: res.resource.TGBM, platform: 'UCS'
+ }))
+ }
+ }
item.list = arr
- return item
})
detailInfoObj.value.infoList = []
detailInfoObj.value.infoList.push(questionObj)
@@ -254,6 +286,10 @@
}
getIntegrationServicesDeatil(id)
+ function openResourceDetail(row, column, event){
+ console.log(row)
+ }
+
function handleOpenUrl(type) {
let obj =
(detailInfoObj.value.fuseAttrList || []).find(
@@ -459,10 +495,12 @@
.step {
padding: 0.8rem 0;
background: rgb(247, 248, 250);
-
+ .step-content {
+ margin-top: 0.3rem;
+ }
}
- .combination-ability {
+ .ability {
padding: 0.8rem 0;
background: rgb(247, 248, 250);
@@ -471,34 +509,14 @@
}
.combine-content {
- width: 13rem;
- margin: 0 auto;
- }
-
- .combine-item {
- margin: 0 0.1rem;
- width: 4.28rem;
- display: flex;
- flex-direction: column;
- align-items: center;
- border: 1px solid #e4e6f5;
- border-radius: 0.1rem;
- padding: 0.1rem 0;
- cursor: pointer;
- height: 2.5rem;
-
- &:hover {
- border-radius: 0.02rem;
- border: 0.01rem solid #0058e1;
- box-shadow: 0rem 0.08rem 0.2rem rgb(0 88 225 / 30%);
- }
-
+ margin-top: 0.3rem;
+ align-items: flex-start;
.title {
- color: #212121;
- text-align: center;
- padding: 0.2rem 0;
- font-size: 0.22rem;
- text-align: center;
+ height: 2rem;
+ width: 2rem;
+ margin-right: 0.5rem;
+ background: url('~@/assets/home/rhfw_square.png') no-repeat;
+ background-size: 100%;
}
}
From 3609c2ba20dca480145437696074e38d7ba0dc0c Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 29 Jul 2022 14:49:44 +0800
Subject: [PATCH 11/13] bug751
---
.../components/PurchaseVehicle.vue | 25 ++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 2e2814df..99b76346 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -21,6 +21,7 @@
/>
批量删除
+
+ 批量删除
+
Date: Fri, 29 Jul 2022 14:54:31 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E6=9D=A5=E6=BA=90=E9=83=A8=E9=97=A8?=
=?UTF-8?q?=E5=85=B1=E4=BA=AB=E9=97=A8=E6=88=B7=E9=A2=9C=E8=89=B2=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/abilityStatistics/components/ResourceAggregation.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 837b6885..230b5b5e 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -237,7 +237,7 @@
type: 'pie',
selectedMode: 'single',
radius: ['50%', '30%'],
- color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#fe8455'],
+ color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
top: '0',
label: {
normal: {
From c8a8a58705731ea56eb0c59abec1e2e9bda805c5 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Fri, 29 Jul 2022 15:27:24 +0800
Subject: [PATCH 13/13] 747\739\748 Bug
---
.../myAgent/demo/ResourcesAndServices.vue | 71 ++++++++++++++++---
.../Application/ApplicationTopDetails.vue | 8 ++-
.../Business/BusinessTopDetails.vue | 2 +-
.../Developer/DeveloperTopDetails.vue | 2 +-
.../LayerService/LayerServiceTopDetails.vue | 2 +-
5 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
index 75305f2e..c12c04d2 100644
--- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@@ -40,29 +40,48 @@
v-for="multipleAdditionsItem in itemsonson.note1"
:key="multipleAdditionsItem"
>
-
+
+ {{
+ multipleAdditionsItem.question ||
+ multipleAdditionsItem.type ||
+ multipleAdditionsItem.name
+ }}
+
{{
multipleAdditionsItem.question ||
multipleAdditionsItem.type ||
multipleAdditionsItem.name
}}
-
+
+
+ {{
+ multipleAdditionsItem.answer ||
+ multipleAdditionsItem.price ||
+ multipleAdditionsItem.img
+ }}
+
{{
multipleAdditionsItem.answer ||
multipleAdditionsItem.price ||
multipleAdditionsItem.img
}}
- {{ multipleAdditionsItem.desc }}
+
+
+ {{ multipleAdditionsItem.desc }}
+ {{ multipleAdditionsItem.desc }}
+
{{ itemsonson.note1 }}
+
{{ itemDataFormValue.name }}
- {{ itemDataFormValue.desc }}
+
+ {{ itemDataFormValue.desc }}
+ {{ itemDataFormValue.desc }}
+
