This commit is contained in:
parent
00a170929e
commit
e996528fa0
|
|
@ -207,7 +207,7 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
closeSelectedTag(view) {
|
closeSelectedTag(view) {
|
||||||
this.refreshSelectedTag(view)
|
this.$tab.refreshPage(view)
|
||||||
this.$tab.closePage(view).then(({ visitedViews }) => {
|
this.$tab.closePage(view).then(({ visitedViews }) => {
|
||||||
if (this.isActive(view)) {
|
if (this.isActive(view)) {
|
||||||
this.toLastView(visitedViews, view)
|
this.toLastView(visitedViews, view)
|
||||||
|
|
|
||||||
|
|
@ -1,71 +1,94 @@
|
||||||
import store from '@/store'
|
import store from '@/store'
|
||||||
import router from '@/router';
|
import router from '@/router'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
// 刷新当前tab页签
|
// 刷新当前tab页签
|
||||||
refreshPage(obj) {
|
refreshPage(obj) {
|
||||||
const { path, query, matched } = router.currentRoute;
|
const { path, query, matched } = router.currentRoute
|
||||||
if (obj === undefined) {
|
if (obj === undefined) {
|
||||||
matched.forEach((m) => {
|
matched.forEach((m) => {
|
||||||
if (m.components && m.components.default && m.components.default.name) {
|
if (
|
||||||
if (!['Layout', 'ParentView'].includes(m.components.default.name)) {
|
m.components &&
|
||||||
obj = { name: m.components.default.name, path: path, query: query };
|
m.components.default &&
|
||||||
|
m.components.default.name
|
||||||
|
) {
|
||||||
|
if (
|
||||||
|
!['Layout', 'ParentView'].includes(
|
||||||
|
m.components.default.name,
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
obj = {
|
||||||
|
name: m.components.default.name,
|
||||||
|
path: path,
|
||||||
|
query: query,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
return store.dispatch('tagsView/delCachedView', obj).then(() => {
|
return store.dispatch('tagsView/delCachedView', obj).then(() => {
|
||||||
const { path, query } = obj
|
const { path, query } = obj
|
||||||
router.replace({
|
router.replace({
|
||||||
path: '/redirect' + path,
|
path: '/redirect' + path,
|
||||||
query: query
|
query: query,
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 关闭当前tab页签,打开新页签
|
// 关闭当前tab页签,打开新页签
|
||||||
closeOpenPage(obj) {
|
closeOpenPage(obj) {
|
||||||
store.dispatch("tagsView/delView", router.currentRoute);
|
store.dispatch('tagsView/delView', router.currentRoute)
|
||||||
if (obj !== undefined) {
|
if (obj !== undefined) {
|
||||||
return router.push(obj);
|
return router.push(obj)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 关闭指定tab页签
|
// 关闭指定tab页签
|
||||||
closePage(obj) {
|
closePage(obj) {
|
||||||
if (obj === undefined) {
|
if (obj === undefined) {
|
||||||
return store.dispatch('tagsView/delView', router.currentRoute).then(({ visitedViews }) => {
|
return store
|
||||||
|
.dispatch('tagsView/delView', router.currentRoute)
|
||||||
|
.then(({ visitedViews }) => {
|
||||||
const latestView = visitedViews.slice(-1)[0]
|
const latestView = visitedViews.slice(-1)[0]
|
||||||
if (latestView) {
|
if (latestView) {
|
||||||
return router.push(latestView.fullPath)
|
return router.push(latestView.fullPath)
|
||||||
}
|
}
|
||||||
return router.push('/');
|
return router.push('/')
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
return store.dispatch('tagsView/delView', obj);
|
return store.dispatch('tagsView/delView', obj)
|
||||||
},
|
},
|
||||||
// 关闭所有tab页签
|
// 关闭所有tab页签
|
||||||
closeAllPage() {
|
closeAllPage() {
|
||||||
return store.dispatch('tagsView/delAllViews');
|
return store.dispatch('tagsView/delAllViews')
|
||||||
},
|
},
|
||||||
// 关闭左侧tab页签
|
// 关闭左侧tab页签
|
||||||
closeLeftPage(obj) {
|
closeLeftPage(obj) {
|
||||||
return store.dispatch('tagsView/delLeftTags', obj || router.currentRoute);
|
return store.dispatch(
|
||||||
|
'tagsView/delLeftTags',
|
||||||
|
obj || router.currentRoute,
|
||||||
|
)
|
||||||
},
|
},
|
||||||
// 关闭右侧tab页签
|
// 关闭右侧tab页签
|
||||||
closeRightPage(obj) {
|
closeRightPage(obj) {
|
||||||
return store.dispatch('tagsView/delRightTags', obj || router.currentRoute);
|
return store.dispatch(
|
||||||
|
'tagsView/delRightTags',
|
||||||
|
obj || router.currentRoute,
|
||||||
|
)
|
||||||
},
|
},
|
||||||
// 关闭其他tab页签
|
// 关闭其他tab页签
|
||||||
closeOtherPage(obj) {
|
closeOtherPage(obj) {
|
||||||
return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute);
|
return store.dispatch(
|
||||||
|
'tagsView/delOthersViews',
|
||||||
|
obj || router.currentRoute,
|
||||||
|
)
|
||||||
},
|
},
|
||||||
// 添加tab页签
|
// 添加tab页签
|
||||||
openPage(title, url, params) {
|
openPage(title, url, params) {
|
||||||
const obj = { path: url, meta: { title: title } }
|
const obj = { path: url, meta: { title: title } }
|
||||||
store.dispatch('tagsView/addView', obj);
|
store.dispatch('tagsView/addView', obj)
|
||||||
return router.push({ path: url, query: params });
|
return router.push({ path: url, query: params })
|
||||||
},
|
},
|
||||||
// 修改tab页签
|
// 修改tab页签
|
||||||
updatePage(obj) {
|
updatePage(obj) {
|
||||||
return store.dispatch('tagsView/updateVisitedView', obj);
|
return store.dispatch('tagsView/updateVisitedView', obj)
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -219,6 +219,7 @@ import {
|
||||||
getShanghaiProByIdNumberAPI,
|
getShanghaiProByIdNumberAPI,
|
||||||
getShanghaiProListByWorkerIdAPI,
|
getShanghaiProListByWorkerIdAPI,
|
||||||
addShanghaiProEinAPI,
|
addShanghaiProEinAPI,
|
||||||
|
updatePersonLightStatusAPI,
|
||||||
} from '@/api/construction-person/entry-and-exit-manage/person-entry'
|
} from '@/api/construction-person/entry-and-exit-manage/person-entry'
|
||||||
import { getPostTypeSelectListCommonFun } from '@/utils/getCommonData'
|
import { getPostTypeSelectListCommonFun } from '@/utils/getCommonData'
|
||||||
import {
|
import {
|
||||||
|
|
@ -462,6 +463,7 @@ export default {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.$modal.msgSuccess('新增成功')
|
this.$modal.msgSuccess('新增成功')
|
||||||
resolve(true)
|
resolve(true)
|
||||||
|
await updatePersonLightStatusAPI(this.workerId)
|
||||||
} else {
|
} else {
|
||||||
reject(false)
|
reject(false)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue