diff --git a/front/src/assets/home/arrow.png b/front/src/assets/home/arrow.png new file mode 100644 index 00000000..92b33a39 Binary files /dev/null and b/front/src/assets/home/arrow.png differ diff --git a/front/src/assets/home/step.png b/front/src/assets/home/step.png new file mode 100644 index 00000000..ba6a00ec Binary files /dev/null and b/front/src/assets/home/step.png differ diff --git a/front/src/views/home/components/ApplicationTopDetails.vue b/front/src/views/home/components/ApplicationTopDetails.vue index 26495f16..7b2a1e9a 100644 --- a/front/src/views/home/components/ApplicationTopDetails.vue +++ b/front/src/views/home/components/ApplicationTopDetails.vue @@ -9,7 +9,7 @@
- + {{ props.dataList.name }} @@ -47,24 +47,21 @@
场景描述： {{ props.dataList.description.slice(0, 183) }}... - + {{ dowmOrUp }}
场景描述： {{ props.dataList.description }} - + {{ dowmOrUp }}
- 场景入口: + + 进入场景 + +
@@ -200,24 +197,24 @@ function toView() { // 融合服务--一键申请 const handleAKeyApplication = () => { let _applyList = [] - ;(props.dataList.fuseResourceList || []).map((v) => { - let resource = v.resource || {} - let obj = { - arr: [ - { - delFlag: resource.delFlag, - description: resource.description, - resourceId: resource.id, - resourceName: resource.name, - time: resource.createDate, - type: resource.type, - }, - ], - deptId: resource.deptId, - deptName: resource.deptName, - } - _applyList.push(obj) - }) + ; (props.dataList.fuseResourceList || []).map((v) => { + let resource = v.resource || {} + let obj = { + arr: [ + { + delFlag: resource.delFlag, + description: resource.description, + resourceId: resource.id, + resourceName: resource.name, + time: resource.createDate, + type: resource.type, + }, + ], + deptId: resource.deptId, + deptName: resource.deptName, + } + _applyList.push(obj) + }) localStorage.setItem('applyList', JSON.stringify(_applyList)) router.push({ @@ -339,6 +336,17 @@ watch( } .main { + + .rukou { + margin-top:24px; + background: #0058e1; + color: #ffffff; + width: 90px; + height: 32px; + border-radius: 2px; + border: 1px #0058e1 solid; + + } .bottomdesc { display: -webkit-box; /*设置为弹性盒子*/ @@ -353,12 +361,14 @@ watch( width: 800px; font-size: 16px; } + .bottomdesc1 { overflow: auto; width: 800px; font-size: 16px; height: 200px; } + margin-top: 0.2rem; font-size: 0.18rem; line-height: 0.34rem; diff --git a/front/src/views/home/components/CanAssignCase.vue b/front/src/views/home/components/CanAssignCase.vue index e98300f9..09111189 100644 --- a/front/src/views/home/components/CanAssignCase.vue +++ b/front/src/views/home/components/CanAssignCase.vue @@ -58,6 +58,7 @@ function toView(item) { path: '/integrationServicesDetails', query: { id: item.id, + districtType:item.district, type:'典型赋能场景' }, }) diff --git a/front/src/views/home/detailBack.vue b/front/src/views/home/detailBack.vue index 6caeb975..374130ab 100644 --- a/front/src/views/home/detailBack.vue +++ b/front/src/views/home/detailBack.vue @@ -26,16 +26,26 @@ const oldValue1 = ref('') const props = defineProps({ textColor: { type: String, default: '' }, returnType: { type: String, default: '' }, + districtType:{ type: Number, default: 0 }, }) const returnType = props.returnType +const districtType = props.districtType const previousPage = () => { - if (returnType =='典型赋能场景'|| returnType =='打包模式') { + if (returnType =='打包模式') { router.push({ path: '/integrationServices', query: { returnType: returnType, }, }) + }else if(returnType =='典型赋能场景'){ + router.push({ + path: '/integrationServices', + query: { + returnType: returnType, + districtType:districtType, + }, + }) } else { if (window.history.state.back) { window.history.go(-1) diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue index 1ad8a158..87a13232 100644 --- a/front/src/views/home/integrationServices.vue +++ b/front/src/views/home/integrationServices.vue @@ -124,6 +124,7 @@ export default defineComponent({ const router = useRouter() const select = router.currentRoute.value.query.select const returnType = router.currentRoute.value.query.returnType + const districtType = router.currentRoute.value.query.districtType const searchValue = ref('') const Cardsname = ref(select) const resourceList = reactive({ data: [] }) @@ -350,11 +351,17 @@ export default defineComponent({ } onMounted(() => { - searchAreas() + searchAreas() if (returnType == '典型赋能场景') { + + if(districtType==0){ + cityOrArea.value=0 + }else{ + cityOrArea.value=1 + } changeCards(0) - - } else if (returnType == '打包模式') { + } + else if (returnType == '打包模式') { changeCards(1) } else { if (storageSearchInfo) { @@ -390,6 +397,7 @@ export default defineComponent({ titleName, changeCards, returnType, + districtType, number, loadingData, cityOrArea, diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index 7c43fa36..ce801196 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -5,13 +5,15 @@ - - + + -
@@ -116,7 +118,37 @@
-
+
+ + + + + +
+
-
- +
+ + +
+
+
+
+ +
{{i+1}}
+
+
第{{i+1}}步:{{item.question}}
+
+ {{i+1}}>{{itemson.answer}} +
+
+ +
+ +
+
+
+
+ +
+
+
+ +
@@ -194,7 +279,9 @@ const componentCount = ref(0) const id = router.currentRoute.value.query.id const returnType = router.currentRoute.value.query.type + const districtType= router.currentRoute.value.query.districtType const hiddenBackFlag = router.currentRoute.value.query.hiddenBackFlag + const imgSrcYyzy = ref(require('@/assets/newHome/empty.png')) document.documentElement.style.transition = 'all 0.3s ease' document.documentElement.scrollTop = 0 document.body.style.transition = 'all 0.3s ease' @@ -311,8 +398,7 @@ componentCount.value = res.data.data.componentCount || 0 // 资源属性 let fuseAttrList = res.data.data.fuseAttrList || [] - // 融合关系 - let fuseResourceList = res.data.data.fuseResourceList || [] + let questionValue = fuseAttrList.find((v) => v.attrType === '常见问题') || {} let questionObj = { @@ -321,14 +407,43 @@ } painPoint.value = getAttrValue(fuseAttrList, '场景痛点') solution.value = getAttrValue(fuseAttrList, '解决方案') - step.value = getAttrValue(fuseAttrList, '使用步骤') + + step.value = getAttrValue(fuseAttrList, '构建步骤') + bgImg.value = fuseAttrList.find((v) => v.attrType === '服务图片').attrValue || '' let areaObj = { attrType: '应用领域', attrValue: '', } - combineList.value.forEach((item) => { + if(returnType==='典型赋能场景'){ + let fuseResourceList = res.data.data.fuseAttrList || [] + +combineList.value.forEach((item) => { + +let arr = [] +let resource = fuseResourceList.filter( + (v) => v.attrType == item.title +) + +// let a=resource[0].attrValue +let resourceArrList=JSON.parse(resource[0].attrValue) +if (resourceArrList.length > 0) { + + arr = resourceArrList.map((res) => ({ + name: res.name, + dept: res.dept, + type: res.type, + + })) + item.list = arr + } + +}) + }else{ + // 融合关系 + let fuseResourceList = res.data.data.fuseResourceList || [] + combineList.value.forEach((item) => { let arr = [] let resource = fuseResourceList.filter( (v) => v.resource && v.type == item.title @@ -367,6 +482,9 @@ item.list = arr }) + } + + detailInfoObj.value.infoList = [] detailInfoObj.value.infoList.push(questionObj) detailInfoObj.value.infoList.push(areaObj) @@ -400,6 +518,53 @@