From 768645a94a288e813834fa78cc92f8878b49a302 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Tue, 19 Jul 2022 15:54:23 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=BD=92=E5=B1=9E=E9=83=A8=E9=97=A8bug619?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/capacityOnTheShelf/Algorithm.vue | 23 +++++++++++++++++-- .../components/PutOnTheShelf.vue | 11 ++++++++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue index b0340a92..8cd5eb58 100644 --- a/front/src/views/capacityOnTheShelf/Algorithm.vue +++ b/front/src/views/capacityOnTheShelf/Algorithm.vue @@ -27,7 +27,15 @@ :refData="refData" :dataFrom="dataFrom" :videoList="videoList" - :externalField="['算法名称', '算法描述', '共享条件', '共享类型']" + :externalField="[ + '算法名称', + '算法描述', + '共享条件', + '共享类型', + '归属部门', + '部门联系人', + '部门联系人电话', + ]" > { getUserInfo(res6.data.data.id).then((res2) => { - const deptId = res2.data.data.deptId + const deptId = dataFrom.value.deptId const userId = res2.data.data.id const userName = res2.data.data.realName const params = { @@ -283,6 +291,7 @@ resourceDTO: [dataFrom.value], } shangjiaapply(params).then((res3) => { + debugger console.log('res3', res3) if (res3.data.code == 0) { message.success('上架申请提交成功，请注意查看消息通知！') @@ -386,6 +395,16 @@ case '接口请求方式': dataFrom.value.apiMethodType = obj.attrValue break + case '归属部门': + dataFrom.value.deptId = obj.attrValue + dataFrom.value.deptName = obj.attrValueTwo.label + break + case '部门联系人': + dataFrom.value.deptContacts = obj.attrValue + break + case '部门联系人电话': + dataFrom.value.deptPhone = obj.attrValue + break } // console.log('dataFrom.value', dataFrom.value) }) diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index d6830f7a..409ec691 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -514,6 +514,9 @@ getUserInfo().then(({ data: res1 }) => { console.log(res1.data) item.note1 = res1.data.deptId + item.note2 = item.options.filter( + (val) => val.value == item.note1 + )[0] console.log('默认部门=========>', item, res1.data) data.value.list.push(item) }) @@ -525,6 +528,7 @@ console.log(res1.data) item.note1 = res1.data.realName || '' }) + data.value.list.push(item) } } else if (item.name === '部门联系人电话') { if (!item.note1) { @@ -532,6 +536,7 @@ console.log(res1.data) item.note1 = res1.data.mobile || '' }) + data.value.list.push(item) } } else { data.value.list.push(item) @@ -568,7 +573,6 @@ } mybus.on('showTextFunctionEmit', (show) => { console.log('ssdcsd') - debugger showText.value = show }) mybus.off('func') @@ -816,10 +820,15 @@ props.externalField && props.externalField.indexOf(val.name) > -1 ) { + let note2 = {} //储存归属部门的名字 + if (val.options) { + note2 = val.options.filter((item) => item.value == val.note1)[0] + } mybus.emit('chageDataFromDwon', { attrType: val.name, attrValue: val.note1, delFlag: 0, + attrValueTwo: note2, }) } else { if (val.name !== '应用领域' && val.name !== '发布端') { From 9d72fe666dcbdefd4d6ef072ebda9dabffd0bf73 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Tue, 19 Jul 2022 16:02:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 95d963eb..ea7fa33a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ back/dist-市局-后台管理-v0.8.2.1.zip front/public/index.html back/dist-西海岸-后台管理-v0.8.2.1.zip back/dist-市局-后台管理-v0.8.2.3.zip +back/dist-西海岸-后台管理-v0.8.2.4.d.zip +*.zip \ No newline at end of file From 5afe117bc6096305b37614982d4af882751779fb Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Tue, 19 Jul 2022 16:20:45 +0800 Subject: [PATCH 3/7] bug619 --- front/src/views/capacityOnTheShelf/Algorithm.vue | 1 - front/src/views/capacityOnTheShelf/Application.vue | 14 ++++++++++++-- .../views/capacityOnTheShelf/BusinessComponent.vue | 7 ++++++- .../capacityOnTheShelf/DevelopmentComponents.vue | 7 ++++++- .../src/views/capacityOnTheShelf/LayerServices.vue | 7 ++++++- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue index 8cd5eb58..85cebc5b 100644 --- a/front/src/views/capacityOnTheShelf/Algorithm.vue +++ b/front/src/views/capacityOnTheShelf/Algorithm.vue @@ -291,7 +291,6 @@ resourceDTO: [dataFrom.value], } shangjiaapply(params).then((res3) => { - debugger console.log('res3', res3) if (res3.data.code == 0) { message.success('上架申请提交成功，请注意查看消息通知！') diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue index 9e66206a..dae497f0 100644 --- a/front/src/views/capacityOnTheShelf/Application.vue +++ b/front/src/views/capacityOnTheShelf/Application.vue @@ -28,7 +28,13 @@ :dataFrom="dataFrom" :videoList="videoList" :imgList="imgList" - :externalField="['应用名称', '应用描述']" + :externalField="[ + '应用名称', + '应用描述', + '归属部门', + '部门联系人', + '部门联系人电话', + ]" > { getUserInfo(res6.data.data.id).then((res2) => { - const deptId = res2.data.data.deptId + const deptId = dataFrom.value.deptId const userId = res2.data.data.id const userName = res2.data.data.realName const params = { @@ -339,6 +345,10 @@ case '访问地址': dataFrom.value.link = obj.attrValue break + case '归属部门': + dataFrom.value.deptId = obj.attrValue + dataFrom.value.deptName = obj.attrValueTwo.label + break case '部门联系人': dataFrom.value.deptContacts = obj.attrValue break diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue index 9d8a9617..dd1d89e2 100644 --- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue +++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue @@ -32,6 +32,7 @@ '组件描述', '共享条件', '共享类型', + '归属部门', '部门联系人', '部门联系人电话', ]" @@ -253,7 +254,7 @@ dataFrom.value.id = res.data.data getUser().then((res6) => { getUserInfo(res6.data.data.id).then((res2) => { - const deptId = res2.data.data.deptId + const deptId = dataFrom.value.deptId const userId = res2.data.data.id const userName = res2.data.data.realName const params = { @@ -349,6 +350,10 @@ case '共享类型': dataFrom.value.shareType = obj.attrValue break + case '归属部门': + dataFrom.value.deptId = obj.attrValue + dataFrom.value.deptName = obj.attrValueTwo.label + break case '部门联系人': dataFrom.value.deptContacts = obj.attrValue break diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue index 9203d616..ead4358f 100644 --- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue +++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue @@ -33,6 +33,7 @@ '组件描述', '共享条件', '共享类型', + '归属部门', '部门联系人', '部门联系人电话', ]" @@ -253,7 +254,7 @@ dataFrom.value.id = res.data.data getUser().then((res6) => { getUserInfo(res6.data.data.id).then((res2) => { - const deptId = res2.data.data.deptId + const deptId = dataFrom.value.deptId const userId = res2.data.data.id const userName = res2.data.data.realName const params = { @@ -349,6 +350,10 @@ case '共享类型': dataFrom.value.shareType = obj.attrValue break + case '归属部门': + dataFrom.value.deptId = obj.attrValue + dataFrom.value.deptName = obj.attrValueTwo.label + break case '部门联系人': dataFrom.value.deptContacts = obj.attrValue break diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue index 0c58e0e2..4d898100 100644 --- a/front/src/views/capacityOnTheShelf/LayerServices.vue +++ b/front/src/views/capacityOnTheShelf/LayerServices.vue @@ -32,6 +32,7 @@ '图层描述', '共享条件', '共享类型', + '归属部门', '部门联系人', '部门联系人电话', ]" @@ -201,7 +202,7 @@ dataFrom.value.id = res.data.data getUser().then((res6) => { getUserInfo(res6.data.data.id).then((res2) => { - const deptId = res2.data.data.deptId + const deptId = dataFrom.value.deptId const userId = res2.data.data.id const userName = res2.data.data.realName const params = { @@ -297,6 +298,10 @@ case '共享类型': dataFrom.value.shareType = obj.attrValue break + case '归属部门': + dataFrom.value.deptId = obj.attrValue + dataFrom.value.deptName = obj.attrValueTwo.label + break case '部门联系人': dataFrom.value.deptContacts = obj.attrValue break From 0ca63565e3323b9c218ef1a7fe6d26a9925c533a Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Tue, 19 Jul 2022 16:43:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Developer/DeveloperOwningDepartmentAndServiceProvider.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue index 1d5f2198..32acb728 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue @@ -237,6 +237,7 @@ max-width: 2.8rem; div { max-width: 2.8rem; + display: flex; // overflow: hidden; // text-overflow: ellipsis; // display: -webkit-box; From e4d79e03b8a7a888aceee5585e4b4908003fc591 Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Tue, 19 Jul 2022 17:14:42 +0800 Subject: [PATCH 5/7] bug==select --- .../components/PutOnTheShelf.vue | 48 +++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index 4b5912b2..6defc5bc 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -318,12 +318,24 @@ :list="props.videoList" tip="支持视频类型，大小不超过100M" > - 请选择来源应用 - + --> + { + const dataList = [] + res.data.data.notLinked.forEach((element) => { + dataList.push({ + value: element.id, + label: element.name, + }) + }) + item.options = dataList + }) } else { data.value.list.push(item) } @@ -744,7 +769,7 @@ const targetKeysOther = ref([]) // 上一步关联数据 // const targetKeysBack = ref([]) - + // 来源应用-back const sourceClick = () => { mockData.value = [] visibleAssociatedApplication.value = true @@ -915,18 +940,35 @@ const handleChange2 = (value) => { console.log(`selected ${value}`) } + const applicationsChange = (value) => { + data.value.list.map((item) => { + if (item.name === '来源应用') { + item.note1 = value + data.value.list.push(item } + }) + console.log(`selected ${value}`) + } const handleBlur = () => { console.log('blur') } + const applicationsBlur = () => { + console.log('blur') + } const handleFocus = () => { console.log('focus') } + const applicationsFocus = () => { + console.log('focus') + } const filterOption = (input, option) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 } + const applicationsOption = (input, option) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }