diff --git a/src/styles/app.scss b/src/styles/app.scss index 3d1f574a..363910ce 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -381,7 +381,7 @@ body, height: 100%; width: 100%; background: #fff; - z-index: 2; + // z-index: 2; } .bjs-powered-by { display: none; diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue index 6617c8fe..8d9b99a3 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue @@ -145,7 +145,7 @@ const tableStore = new TableStore({ icon: 'el-icon-Open', render: 'basicButton', disabled: row => { - return row.createBy != adminInfo.$state.id || row.status == 1 || row.status == 2 + return !(row.createBy == adminInfo.$state.id || row.status == 3 || row.status == 4) }, click: row => { // deviceQuitPopup.value.open('重新发起退运', row) diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue index be97744a..1d9ae25d 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue @@ -162,7 +162,7 @@ const tableStore = new TableStore({ icon: 'el-icon-Open', render: 'basicButton', disabled: row => { - return row.createBy != adminInfo.$state.id || row.status == 6 || row.status == 1 || row.status == 2 + return !(row.createBy == adminInfo.$state.id|| row.status == 6 || row.status == 3 || row.status == 4) }, click: row => { planTestRef.value.open('重新发起计划测试', row.id, false) @@ -175,7 +175,7 @@ const tableStore = new TableStore({ icon: 'el-icon-Open', render: 'basicButton', disabled: row => { - return row.createBy != adminInfo.$state.id || row.status == 6 || row.status == 2 || row.status == 3 || row.status == 4 + return !(row.createBy == adminInfo.$state.id|| row.status == 1 ) }, click: row => { cancelLeave(row) diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/components/detailsItem.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/components/detailsItem.vue index 6d9c7e1f..763f9677 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/components/detailsItem.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/components/detailsItem.vue @@ -16,7 +16,7 @@ onMounted(() => { +