@@ -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%;
}
}
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 54b2653d..32097d52 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -224,7 +224,7 @@
pageSize: this.mapSearchParam.pageSize,
name: this.mapSearchParam.cameraName || '',
longitude: this.mapSearchParam.gpsX || '',
- atitude: this.mapSearchParam.gpsY || '',
+ latitude: this.mapSearchParam.gpsY || '',
radius: this.mapSearchParam.radius || '',
}
let paramsFather = ''
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 @@
/>
批量删除
+
+ 批量删除
+