diff --git a/back/public/index.html b/back/public/index.html index 788f8554..3e830a61 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -27,7 +27,7 @@ 'isTab': true, // 是否通过tab展示内容? 'iframeURL': '' // 是否通过iframe嵌套展示内容? (以http[s]://开头, 自动匹配) }; - window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo'; + window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.243:9796/#/vueTemplateDemo'; // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/#/vueTemplateDemo'; // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; @@ -72,9 +72,9 @@ diff --git a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue index 1a1154ed..91a1826c 100644 --- a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue +++ b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-27 11:27:22 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-29 16:31:26 + * @LastEditTime: 2022-07-25 09:48:46 * @Description: "能力资源下架" --> diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue index ceae9900..cde3984b 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-29 16:31:26 + * @LastEditTime: 2022-07-25 09:39:01 * @Description: 能力申请 --> 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 13153689..b7ce4506 100644 --- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue +++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue @@ -83,6 +83,7 @@ diff --git a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue index 2bfed3a9..55894f62 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue @@ -106,7 +106,7 @@ if ( props.dataList.link && whoShow1.value.itShowQingDao && - props.dataList.applyState === '通过' + props.dataList.approveStatus === '通过' ) { list.value.push('应用详情') } @@ -154,7 +154,7 @@ if ( props.dataList.link && whoShow1.value.itShowQingDao && - props.dataList.applyState === '通过' + props.dataList.approveStatus === '通过' ) { list.value.push('应用详情') } diff --git a/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue b/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue index d5a97180..ccee9b56 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue @@ -1,8 +1,8 @@