-
-
-
-
-
+
-
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
index 4feddb1e..e9bf1059 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@@ -1,8 +1,8 @@
@@ -54,7 +54,15 @@
申请使用
-
+
加入申购车
@@ -105,30 +113,37 @@
// 立即申请
function toView() {
// window.open(newpage.href, '_blank')
- console.log('一键申请===================>', props.dataList)
- localStorage.setItem(
- 'applyList',
- JSON.stringify([
- {
- arr: [
- {
- delFlag: props.dataList.delFlag,
- description: props.dataList.description,
- resourceId: props.dataList.id,
- resourceName: props.dataList.name,
- time: props.dataList.createDate,
- type: props.dataList.type,
- componentType: '图层服务',
- },
- ],
- deptId: props.dataList.deptId,
- deptName: props.dataList.deptName,
- },
- ])
- )
- router.push({
- path: '/apply',
- })
+ const webUrl = props.dataList.infoList.filter(
+ (val) => val.attrType == '外部服务地址'
+ )[0]?.attrValue
+ if (webUrl) {
+ window.open(webUrl)
+ } else {
+ console.log('一键申请===================>', props.dataList)
+ localStorage.setItem(
+ 'applyList',
+ JSON.stringify([
+ {
+ arr: [
+ {
+ delFlag: props.dataList.delFlag,
+ description: props.dataList.description,
+ resourceId: props.dataList.id,
+ resourceName: props.dataList.name,
+ time: props.dataList.createDate,
+ type: props.dataList.type,
+ componentType: '图层服务',
+ },
+ ],
+ deptId: props.dataList.deptId,
+ deptName: props.dataList.deptName,
+ },
+ ])
+ )
+ router.push({
+ path: '/apply',
+ })
+ }
}
// 收藏
const scFlag2 = ref(true)
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 0f2fad5a..a43b2eaf 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -225,6 +225,19 @@
{
+ if (showAbilitySquareNum.value === 0) {
+ showAbilitySquareNum.value = 1
+ visibleAbilitySquare.value = true
+ } else if (showAbilitySquareNum.value === 1) {
+ showAbilitySquareNum.value = 0
+ visibleAbilitySquare.value = false
+ }
+ }
+ let abilitySquareFunctionData = ref('智能算法')
+ const abilitySquareFunction = (e) => {
+ let snumSquare = ref({})
+ if (e === '应用广场') {
+ abilitySquareFunctionData.value = '应用资源'
+ } else if (e === '算法广场') {
+ abilitySquareFunctionData.value = '智能算法'
+ } else if (e === 'GIS广场') {
+ abilitySquareFunctionData.value = '图层服务'
+ }
+ snumSquare.value = {
+ abilityToType: abilitySquareFunctionData.value,
+ }
+ const applypage = router.resolve({
+ path: '/capacitySquare', // 跳转的页面路由
+ query: snumSquare.value,
+ })
+ window.open(applypage.href, '_blank')
+ visibleAbilitySquare.value = false
+ abilitySquareFunctionData.value = '智能算法'
+ }
return {
listKey,
ListContent,
@@ -1399,6 +1446,12 @@
getShoppingCartList,
whoShow1,
applyAll,
+ abilitySquare,
+ visibleAbilitySquare,
+ showAbilitySquare,
+ abilitySquareFunction,
+ abilitySquareFunctionData,
+ showAbilitySquareNum,
}
},
components: {
@@ -1427,6 +1480,10 @@
})
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 333b6258..117f7bbf 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -226,6 +226,7 @@
longitude: this.mapSearchParam.gpsX || '',
latitude: this.mapSearchParam.gpsY || '',
radius: this.mapSearchParam.radius || '',
+ status: 1,
}
let paramsFather = ''
let i = 1
diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index 7e9b860a..4f609744 100644
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@@ -113,7 +113,7 @@
-
+
@@ -579,7 +579,7 @@
}
.fixedmount {
- height: 2.3rem;
+ height: 1.5rem;
display: flex;
position: fixed;
bottom: 2.56rem;
@@ -633,8 +633,8 @@
.fixedmount div:nth-child(3) p:nth-child(1) {
height: 0.24rem;
width: 0.24rem;
- background: url('~@/assets/home/shangjia.png') no-repeat;
- background-size: contain;
+ background: url('~@/assets/home/abilitysquare.png') no-repeat;
+ background-size: 140% 126%;
background-position: center;
}