diff --git a/src/api/pro/outsourcingPro.js b/src/api/pro/outsourcingPro.js index c2fa1af..bc00ccc 100644 --- a/src/api/pro/outsourcingPro.js +++ b/src/api/pro/outsourcingPro.js @@ -171,3 +171,15 @@ export function addAnnotations(data) { data: data }) } +/** + * 删除监理人员 + * @param data + * @returns {AxiosPromise} + */ +export function delPersonByIdCardAndPhone(data) { + return request({ + url: '/project/SupervisionUnit/delSupervisoryPersonApply', + method: 'post', + data: data + }) +} diff --git a/src/api/video/camera.js b/src/api/video/camera.js index 5244fbf..07a8d84 100644 --- a/src/api/video/camera.js +++ b/src/api/video/camera.js @@ -12,21 +12,21 @@ export function reqStationAndCamera(query) { return request({ url: '/project/camera/list', method: 'get', - params: query + params: query, }) } export function reqGetRealtimeVideo(query) { return request({ url: '/project/camera/list', method: 'get', - params: query + params: query, }) } export function reqCloseVideo1(query) { return request({ url: '/project/camera/list', method: 'get', - params: query + params: query, }) } diff --git a/src/components/JessibucaH265/index.vue b/src/components/JessibucaH265/index.vue index 833263c..aa523c8 100644 --- a/src/components/JessibucaH265/index.vue +++ b/src/components/JessibucaH265/index.vue @@ -105,6 +105,8 @@ export default { async getQxToken() { const res = await getQxToken() + + console.log('res播放视频的token', res) this.qxToken = res.msg }, async selectVideoLoginInfo() { diff --git a/src/components/pro-tabs/bns-person-approval-tabs.vue b/src/components/pro-tabs/bns-person-approval-tabs.vue index 59201d9..1ce7e97 100644 --- a/src/components/pro-tabs/bns-person-approval-tabs.vue +++ b/src/components/pro-tabs/bns-person-approval-tabs.vue @@ -137,7 +137,13 @@ - + - + 审批部门：{{ item.section }} 审批人：{{ item.name }}

审批时间： {{ item.time }}

-

审批状态： {{ item.status }}

+

审批状态： {{ auditingType(item) }}

审批意见：

{{ item.checkPerson }} ( @@ -112,6 +112,13 @@
+ +
@@ -328,6 +335,20 @@ export default { addReason() { this.dialogVisible = true }, + + // 审批状态 + auditingType(item) { + if (item.status === '未审核' || item.status == '') return '未审核' + if (item.status === '已审核' && (item.agree == 1 || item.agree == 3)) return '审核通过' + if (item.status === '已审核' && item.agree == 2) return '审核驳回' + if (item.status === '已审核' && (item.agree == 4 || item.agree == null)) return '撤回' + }, + + // 根据审核状态以及审核结果添加样式 + styleByType(item) { + console.log('item修改样式', item) + if (item.status === '未审核') return 'currentLight' + }, }, } diff --git a/src/views/educTrainLearn/libertyLearn/exercise.vue b/src/views/educTrainLearn/libertyLearn/exercise.vue index 94a8f00..54c3c9d 100644 --- a/src/views/educTrainLearn/libertyLearn/exercise.vue +++ b/src/views/educTrainLearn/libertyLearn/exercise.vue @@ -263,7 +263,9 @@ - 确定退出本次练习吗? + + 确定退出本次练习吗? + 取 消 确 定 @@ -552,9 +554,10 @@ export default { handleClose() { this.dialogVisible2 = false // 关闭页面 - this.$tab.closePage().then(() => { - this.$router.push({ path: '/educTrainLearn/libertyLearn/index' }) - }) + this.$tab.closePage() + // this.$tab.closePage().then(() => { + // this.$router.push({ path: '/educTrainLearn/libertyLearn/index' }) + // }) }, }, } diff --git a/src/views/pro/apply/supervisorEnterApply.vue b/src/views/pro/apply/supervisorEnterApply.vue index d8878fa..fee18dc 100644 --- a/src/views/pro/apply/supervisorEnterApply.vue +++ b/src/views/pro/apply/supervisorEnterApply.vue @@ -1,7 +1,13 @@