From 4a52c2cf78fcbb5c122a23a3c0711e4f0064ca4a Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Mon, 18 Jul 2022 10:47:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=92=8C=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E5=BA=94=E7=94=A8=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myAgent/demo/Application-resources.vue | 22 -- .../myAgent/demo/ResourcesAndServices.vue | 24 +- .../myAgent/demo/ability-resource-shelf.vue | 137 ++++---- .../views/detailsAll/ApplicationDetails.vue | 327 ++++++++++-------- .../Application/ApplicationAbilityTrial.vue | 184 ++++++++++ .../ApplicationDeploymentAndSecurity.vue | 38 +- .../Application/ApplicationNavigation.vue | 4 + 7 files changed, 474 insertions(+), 262 deletions(-) delete mode 100644 back/src/views/modules/myAgent/demo/Application-resources.vue create mode 100644 front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue diff --git a/back/src/views/modules/myAgent/demo/Application-resources.vue b/back/src/views/modules/myAgent/demo/Application-resources.vue deleted file mode 100644 index bf310a87..00000000 --- a/back/src/views/modules/myAgent/demo/Application-resources.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue index 2b46e2d3..5b37af66 100644 --- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue +++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue @@ -168,20 +168,6 @@ export default { this.dataView = val.filter( (item) => item.name === this.dataForm.type + '一' )[0] - console.log(this.dataView) - console.log(this.dataForm) - // 应用描述 - // this.dataView.children[0].children[0].children[4].note1 = - // this.dataForm.description - // 应用名称 - // this.dataView.children[0].children[0].children[0].note1 = - // this.dataForm.name - // 共享条件 - this.dataView.children[2].children[1].children[0].note1 = - this.dataForm.shareCondition - // 共享类型 - this.dataView.children[2].children[1].children[1].note1 = - this.dataForm.shareType this.dataForm.infoList.map((item, index) => { this.dataView.children.map((itemView, indexView) => { // console.log('itemView', itemView) @@ -236,12 +222,16 @@ export default { }) }) }) + if (item.attrType === '功能介绍') { this.dataForm.infoList[index].attrValue = JSON.parse( item.attrValue ) } }) + console.log(this.dataView) + console.log(this.dataForm) + debugger } else { const componentType = this.dataForm.infoList.filter( (item) => item.attrType === '组件类型' @@ -318,7 +308,11 @@ export default { }) }) }) - if (item.attrType === '算法优势' || item.attrType === '应用场景') { + if ( + item.attrType === '算法优势' || + item.attrType === '应用场景' || + item.attrType === '功能介绍' + ) { this.dataForm.infoList[index].attrValue = JSON.parse( item.attrValue ) diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue index a6e1e698..a1ee69a8 100644 --- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue +++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue @@ -7,9 +7,6 @@ @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'" > -
- -

审批

- + 同意 退回 - - - 提交 + + + 提交
@@ -53,7 +58,6 @@ diff --git a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue new file mode 100644 index 00000000..866bccd4 --- /dev/null +++ b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue index d6235ac1..51dee4f2 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue @@ -75,13 +75,14 @@ attrValue: '是', } dataFrom.value.content[1].childrenContent.push(isAndNo) - } else if (item.attrType === '访问地址') { - let obj = { - attrType: '访问地址', - attrValue: item.attrValue || '------', - } - dataFrom.value.content[0].childrenContent.push(obj) } + // } else if (item.attrType === '访问地址') { + // let obj = { + // attrType: '访问地址', + // attrValue: item.attrValue || '------', + // } + // dataFrom.value.content[0].childrenContent.push(obj) + // } }) if (dataFrom.value.content[1].childrenContent.length <= 0) { let data = [ @@ -99,12 +100,12 @@ }) } } - //访问地址跳转方法 - const addressFunction = (name, itemValue) => { - if (name == '访问地址') { - window.open(itemValue) - } - } + // //访问地址跳转方法 + // const addressFunction = (name, itemValue) => { + // if (name == '访问地址') { + // window.open(itemValue) + // } + // } watch( () => props.dataList, (val) => { @@ -125,13 +126,14 @@ attrValue: '是', } dataFrom.value.content[1].childrenContent.push(isAndNo) - } else if (item.attrType === '访问地址') { - let obj = { - attrType: '访问地址', - attrValue: item.attrValue || '------', - } - dataFrom.value.content[0].childrenContent.push(obj) } + // } else if (item.attrType === '访问地址') { + // let obj = { + // attrType: '访问地址', + // attrValue: item.attrValue || '------', + // } + // dataFrom.value.content[0].childrenContent.push(obj) + // } }) if (dataFrom.value.content[1].childrenContent.length <= 0) { debugger diff --git a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue index feff2a35..ba4241f8 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue @@ -41,6 +41,10 @@ name: '使用能力', key: 'ability-to-use', }, + { + name: '应用详情', + key: 'application-ability-trial', + }, { name: '部署与安全', key: 'deployment-and-security', From 5a9f4ee62035daddea5d9812b5bc67208e59b691 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Mon, 18 Jul 2022 11:24:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PutOnTheShelf.vue | 456 +++++++++--------- 1 file changed, 228 insertions(+), 228 deletions(-) diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index f8035e4a..99066335 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-17 14:11:08 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-16 15:05:16 + * @LastEditTime: 2022-07-18 11:23:39 * @Description: 上架 -->