From c0bb1422b108900859e4a18082f778790e31ad11 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Thu, 5 Jan 2023 16:20:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/assets/home/arrow.png | Bin 0 -> 552 bytes front/src/assets/home/step.png | Bin 0 -> 475 bytes .../home/components/ApplicationTopDetails.vue | 68 +++-- .../views/home/components/CanAssignCase.vue | 1 + front/src/views/home/detailBack.vue | 12 +- front/src/views/home/integrationServices.vue | 14 +- .../views/home/integrationServicesDetails.vue | 272 ++++++++++++++++-- 7 files changed, 313 insertions(+), 54 deletions(-) create mode 100644 front/src/assets/home/arrow.png create mode 100644 front/src/assets/home/step.png diff --git a/front/src/assets/home/arrow.png b/front/src/assets/home/arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..92b33a394922607e121a5e8af0519b228ca84f19 GIT binary patch literal 552 zcmeAS@N?(olHy`uVBq!ia0vp@K+Mm<3?w=JZgmAxEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBC~+XbC&V>v-dDfA4{v{B{I7u%KBmt7(zo*uL}kdNkL_E31Jwg{wQl}h zwdN;KW7fj25WPTMy*vK^O#sRQQTO&gK%;;Rpi$IC6L`sfb4F$XCN+^*=hHx;I!_nJ5RU7vCqu=W z9Ryr1zN>KcRCp&){(atGeQkp?GWWvo28ZYfF1MI_@|nf?kaZ#1oiY=v4sR{870le$ zvqLvq~zLoZ7BzCY!X qy*p)>{XB!Jz4q}pG=3<) literal 0 HcmV?d00001 diff --git a/front/src/assets/home/step.png b/front/src/assets/home/step.png new file mode 100644 index 0000000000000000000000000000000000000000..ba6a00ec205b9de8994a0be6e4f91b999e9508cc GIT binary patch literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^xVqjQw zmGcPDaH*0YzhDLyUI9LKHc2TSMloR~2@ZZ%PH_=tK~XNDV-@c^fT|diyxm=-O4FYh z0Xgg?p1!W^&l#Bon8b`)iqnBYhdo^!Lo7~Dy?RsZkOB`&0M}NZ@VD#!|6g2HwPvc5 zqVf6fj7*+WtR`hXR^PuefvY>=l)$=I25o1Vb{z?olHY!J>9M<)`?Gs?Sv{27I7k1M zOX+p13J05GEAP#?@Z$d#zeFGQdAUK!KVGW#8omqFVUf5Hzqf14T=PF7i3vAXUFS6I z>OZ$sV)dG;>b4WxzkOCREf;z>EroUGb;bC3e?sr{tL|=mZL+C*C+ET|BJ1Z_*Pb}J s%!j2qc=DVRcebdTb8cU%BK?6kb*|3z7Z&M7K<_Yky85}Sb4q9e07-bPX#fBK literal 0 HcmV?d00001 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 @@ From f0b737396b0cc338fe093cd7a4035bea976cf242 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Fri, 6 Jan 2023 10:54:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=8B=E8=83=BD?= =?UTF-8?q?=E5=9C=BA=E6=99=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ability/assignedScene/area-add.vue | 6 +- .../ability/assignedScene/city-add.vue | 6 +- .../assignedScene/components/ability-add.vue | 21 +++-- .../components/scene-use-step.vue | 77 ++++++++----------- 4 files changed, 52 insertions(+), 58 deletions(-) diff --git a/back/src/views/modules/ability/assignedScene/area-add.vue b/back/src/views/modules/ability/assignedScene/area-add.vue index edac755d..bec30639 100644 --- a/back/src/views/modules/ability/assignedScene/area-add.vue +++ b/back/src/views/modules/ability/assignedScene/area-add.vue @@ -41,7 +41,7 @@ -
只能上传图片文件
+
只能上传图片文件，格式为jpg/png
点击上传
@@ -299,7 +299,7 @@ export default { file.type === 'image/jpg' || file.type === 'image/png' if (!isImage) { - this.$message.error('上传头像图片只能是 jpg/png 格式!') + this.$message.error('上传图片只能是 jpg/png 格式!') } return isImage }, @@ -314,7 +314,7 @@ export default { file.type === 'image/png' if (!isImage) { - this.$message.error('上传头像图片只能是 jpg/png 格式!') + this.$message.error('上传图片只能是 jpg/png 格式!') } return isImage }, diff --git a/back/src/views/modules/ability/assignedScene/city-add.vue b/back/src/views/modules/ability/assignedScene/city-add.vue index 4560fcfb..e77d109a 100644 --- a/back/src/views/modules/ability/assignedScene/city-add.vue +++ b/back/src/views/modules/ability/assignedScene/city-add.vue @@ -56,7 +56,7 @@ -
只能上传图片文件
+
只能上传图片文件，格式为jpg/png
点击上传
@@ -458,7 +458,7 @@ export default { file.type === 'image/jpg' || file.type === 'image/png' if (!isImage) { - this.$message.error('上传头像图片只能是 jpg/png 格式!') + this.$message.error('上传图片只能是 jpg/png 格式!') } return isImage }, @@ -473,7 +473,7 @@ export default { file.type === 'image/png' if (!isImage) { - this.$message.error('上传头像图片只能是 jpg/png 格式!') + this.$message.error('上传图片只能是 jpg/png 格式!') } return isImage }, diff --git a/back/src/views/modules/ability/assignedScene/components/ability-add.vue b/back/src/views/modules/ability/assignedScene/components/ability-add.vue index cb8a5fc5..199dd0a9 100644 --- a/back/src/views/modules/ability/assignedScene/components/ability-add.vue +++ b/back/src/views/modules/ability/assignedScene/components/ability-add.vue @@ -61,12 +61,21 @@ + + + +
diff --git a/back/src/views/modules/ability/assignedScene/components/scene-use-step.vue b/back/src/views/modules/ability/assignedScene/components/scene-use-step.vue index 75894914..71a0796d 100644 --- a/back/src/views/modules/ability/assignedScene/components/scene-use-step.vue +++ b/back/src/views/modules/ability/assignedScene/components/scene-use-step.vue @@ -31,18 +31,28 @@ v-if="index != item.answer.length - 1" v-model="itemson.answer" placeholder="请输入步骤小节" - style="width: 200px" + style="width: 160px" :disabled="disabledType" > +
+
- - +
@@ -89,33 +84,7 @@
- - - +
@@ -262,7 +247,7 @@ export default { } .question-box { float: left; - width: 42%; + width: 295px; } .question-box1 { float: left; From 04ce2dbd88448ff1923ff1e7d68b67fea18f3773 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Fri, 6 Jan 2023 11:07:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/assets/img/del.png | Bin 0 -> 229 bytes .../assignedScene/components/scene-one-input.vue | 2 +- .../assignedScene/components/scene-use-step.vue | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 back/src/assets/img/del.png diff --git a/back/src/assets/img/del.png b/back/src/assets/img/del.png new file mode 100644 index 0000000000000000000000000000000000000000..fd546467c15ceddc8abc28936e2d117adce0af73 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa#^NA%Cx&(BWL^R}^F3W0LoEE? zPTI?R$bqMIKl|+os+R(SH?n!DJuq@Sr1nK*0}IbV0g1a$lUP44)-b(3_w9NAZS!aR zG%2_iRK>rMan&FDBpI9SPu9t9XNmH5c%$Aa-J9jaUzQ`N-812#cEBD}qgfKg2CJua z6l=u=d{8*F!s%L~=De#xe^QU}^mYGFsQ14A>dn(5Tl;wmnXXMf_wlOZ{C6+Zemu0k d8q@Ygcz-}X|IOA3E + + + diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue index d3e6b140..13214218 100644 --- a/back/src/views/modules/workBench/workBench.vue +++ b/back/src/views/modules/workBench/workBench.vue @@ -1,5 +1,9 @@