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 diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue index bb9de2a6..96ecab54 100644 --- a/front/src/views/capacityOnTheShelf/Algorithm.vue +++ b/front/src/views/capacityOnTheShelf/Algorithm.vue @@ -28,7 +28,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 = { @@ -457,6 +465,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/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 diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index 2c637f08..63898e7d 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.liangjunhua - * @LastEditTime: 2022-07-19 18:49:40 + * @LastEditTime: 2022-07-19 18:51:52 * @Description: 上架 -->