diff --git a/front/src/views/home/detailsPageInfrastructureTree.vue b/front/src/views/home/detailsPageInfrastructureTree.vue
index 22dea505..fb30c728 100644
--- a/front/src/views/home/detailsPageInfrastructureTree.vue
+++ b/front/src/views/home/detailsPageInfrastructureTree.vue
@@ -140,7 +140,7 @@
mybus.on('getDeptList', () => {
init()
})
-
+ init()
const onSelect = async (item, val, child) => {
console.log('item--------onSelect---->', item)
console.log('val------onSelect------>', val)
diff --git a/front/src/views/home/infrastructureApplication.vue b/front/src/views/home/infrastructureApplication.vue
index b8a699dc..6e6171c2 100644
--- a/front/src/views/home/infrastructureApplication.vue
+++ b/front/src/views/home/infrastructureApplication.vue
@@ -2,7 +2,7 @@
* @Author: Light
* @Date: 2022-11-18 11:53:43
* @LastEditors: Light
- * @LastEditTime: 2022-11-29 17:28:02
+ * @LastEditTime: 2022-11-30 11:55:51
* @Description: 告诉大家这是什么
-->
@@ -340,11 +340,14 @@
if (item.approveStatus == '通过') {
dataList.selectItem = item
getVideoUrl(item.cameraInfo)
+ return
+ } else if (item.backToFirst == 'true') {
+ message.info('请到个人中心查看详情')
} else {
- dataList.selectItem = {}
message.info('请耐心等待审核通过')
- showVisible.value = false
}
+ dataList.selectItem = {}
+ showVisible.value = false
}
const handleOk = () => {
console.log('id', instanceId.value)
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 66817d91..cb9a0779 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -1577,6 +1577,7 @@
JSON.stringify(router.currentRoute.value.query)
)
newQuery.selectType = name
+ newQuery.select = '基础设施'
router
.replace({
query: newQuery,
@@ -1595,6 +1596,7 @@
JSON.stringify(router.currentRoute.value.query)
)
newQuery.selectType = name
+ newQuery.select = '基础设施'
router
.replace({
query: newQuery,
@@ -1623,6 +1625,7 @@
JSON.stringify(router.currentRoute.value.query)
)
newQuery.selectType = name
+ newQuery.select = '基础设施'
router
.replace({
query: newQuery,
@@ -1633,6 +1636,7 @@
JSON.stringify(router.currentRoute.value.query)
)
newQuery.selectType = name
+ newQuery.select = '基础设施'
router
.replace({
query: newQuery,
@@ -1661,6 +1665,7 @@
JSON.stringify(router.currentRoute.value.query)
)
newQuery.selectType = name
+ newQuery.select = '基础设施'
router
.replace({
query: newQuery,
@@ -1710,6 +1715,7 @@
JSON.stringify(router.currentRoute.value.query)
)
newQuery.selectType = name
+ newQuery.select = '基础设施'
router
.replace({
query: newQuery,
@@ -1751,6 +1757,7 @@
JSON.stringify(router.currentRoute.value.query)
)
newQuery.selectType = name
+ newQuery.select = '基础设施'
router
.replace({
query: newQuery,
@@ -1802,6 +1809,7 @@
JSON.stringify(router.currentRoute.value.query)
)
newQuery.selectType = name
+ newQuery.select = '基础设施'
router
.replace({
query: newQuery,
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 2e4c5ea6..ab269bc2 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -59,6 +59,7 @@
v-for="item in contentList.data"
:key="item.index"
>
+
申请单号:{{
@@ -152,6 +153,7 @@
height="80"
v-if="
item.processDefinitionName != '能力资源下架' &&
+ item.approveStatus !== '不通过' &&
(item.resourceStatus == 4 || item.resourceStatus == 5)
"
style="position: absolute; top: 20px; left: -850px"
@@ -1081,6 +1083,16 @@
height: 150px;
border-bottom: #cccccc 1px solid;
position: relative;
+ .withdraw {
+ width: 0.675rem;
+ height: 0.3rem;
+ background: url('~@/assets/home/withdraw.png') no-repeat;
+ background-size: 100%;
+ position: absolute;
+ top: 0.3rem;
+ left: 0.87rem;
+ transform: rotate(-30deg);
+ }
.content-body-title {
min-width: 100px;