diff --git a/back/public/index.html b/back/public/index.html index eb19bbb6..17d1b9da 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -1,8 +1,8 @@ @@ -42,8 +42,9 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue index 1a3edea2..ceae9900 100644 --- a/back/src/views/modules/myAgent/CompetencyApplication.vue +++ b/back/src/views/modules/myAgent/CompetencyApplication.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-27 11:27:22 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-27 11:50:45 + * @LastEditTime: 2022-06-29 16:31:26 * @Description: 能力申请 --> @@ -143,7 +133,8 @@ export default { }, dataForm: { taskName: '', - taskId: '' + taskId: '', + processDefinitionKey: 'abilityprocess_v2' }, processInstanceId: '' } diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue new file mode 100644 index 00000000..74fc2a7c --- /dev/null +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -0,0 +1,459 @@ + + + + + + diff --git a/front/public/index.html b/front/public/index.html index afc695e8..6353bd6c 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-28 16:52:46 + * @LastEditTime: 2022-06-29 19:38:31 * @Description: 告诉大家这是什么 --> @@ -45,9 +45,9 @@ // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // 开发 window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; - window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796'; + window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; diff --git a/front/src/api/home.js b/front/src/api/home.js index 85da72ff..9f715249 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-04-01 19:19:40 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-22 18:59:03 + * @LastEditors: hisense.liangjunhua + * @LastEditTime: 2022-06-29 14:34:24 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -114,7 +114,7 @@ export function lastestPage(params) { // 提交申请 export function submitApply(data) { return request({ - url: '/ability/center/apply', + url: '/ability/center/v2/apply', method: 'post', data, }) @@ -305,3 +305,12 @@ export function queryPartAppByKeyId(params) { params, }) } +//组件详情列表 +export function queryPartAppByKeyId2(params) { + return request({ + url: 'dataResourceRel/queryApp4PartByKeyId', + method: 'get', + params, + }) +} + diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index 83566908..faed5074 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -150,6 +150,16 @@ export function nengliziyuanshangjiaapply(params) { params, }) } +export function getTaskVariables(params) { + return request({ + url: + '/act/task/getTaskVariables?taskId=' + + params.taskId + + '&variableName=tAbilityApplicationDTOList', + method: 'get', + params, + }) +} // 能力下架申请 export function undercarriage(data) { return request({ diff --git a/front/src/supermap/advance-init.js b/front/src/supermap/advance-init.js index 9671313f..0be17a7a 100644 --- a/front/src/supermap/advance-init.js +++ b/front/src/supermap/advance-init.js @@ -1726,6 +1726,9 @@ export function MapFun(mapObj) { } }) } + marker.on('click', e=>{ + console.log('点位数据', e) + }) layers.addLayer(marker) } }) diff --git a/front/src/views/detailsAll/AlgorithmDetails.vue b/front/src/views/detailsAll/AlgorithmDetails.vue index 1bac95d9..caa53ed5 100644 --- a/front/src/views/detailsAll/AlgorithmDetails.vue +++ b/front/src/views/detailsAll/AlgorithmDetails.vue @@ -88,7 +88,7 @@ import AlgorithmCommonProblem from '@/views/detailsAll/components/Algorithm/AlgorithmCommonProblem' //常见问题 import { ref, onMounted, onBeforeUnmount, reactive } from 'vue' import { useRouter } from 'vue-router' - import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home' + import { updateVisits, selectOne, queryPartAppByKeyId2 } from '@/api/home' import mybus from '@/myplugins/mybus' const router = useRouter() const scrollTop = ref(0) @@ -97,11 +97,7 @@ const dataList = reactive({ data: {} }) const id = router.currentRoute.value.query.id const obj = JSON.parse(window.sessionStorage.getItem('preview')) - const associatedComponents = ref([ - { type: '应用资源', dataList: [] }, - { type: '数据资源', dataList: [] }, - { type: '基础设施', dataList: [] }, - ]) + const associatedComponents = ref([{ type: '应用资源', dataList: [] }]) document.documentElement.style.transition = 'all 0.3s ease' document.documentElement.scrollTop = 0 document.body.style.transition = 'all 0.3s ease' @@ -163,9 +159,8 @@ associatedComponents.value.map((item, index) => { let queryPartAppByKeyIdParams = { keyId: id, - type: item.type, } - queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => { + queryPartAppByKeyId2(queryPartAppByKeyIdParams).then((res) => { associatedComponents.value[index].dataList = res.data.data }) }) diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue index 509ade79..32fc2079 100644 --- a/front/src/views/detailsAll/ApplicationDetails.vue +++ b/front/src/views/detailsAll/ApplicationDetails.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-08 11:32:22 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-20 18:59:18 + * @LastEditTime: 2022-06-30 10:22:31 * @Description: 应用详情页 -->