|
|
@@ -1018,6 +1018,7 @@ export default {
|
|
|
checkAlljoblog: true,
|
|
|
JoblogdialogVisible: false,
|
|
|
dialogLog: '',
|
|
|
+ isJoblogVisible: false,
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -1649,6 +1650,8 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
+
|
|
|
// 作业日志连接socket获取数据
|
|
|
initWebSocket(){
|
|
|
const code= this.ticketId;
|
|
|
@@ -1699,6 +1702,10 @@ export default {
|
|
|
|
|
|
// 作业日志tab点击事件
|
|
|
async handleTabClick(tab) {
|
|
|
+ // 当选中作业日志时传递isJoblogVisible给onNewSocketLog判断日志弹框的显示
|
|
|
+ this.isJoblogVisible = (this.activeName === 'jobLogs');
|
|
|
+ // console.log(this.isJoblogVisible,'复制是否正确')
|
|
|
+
|
|
|
if (tab.name === 'jobLogs') {
|
|
|
await this.getJoblogs()
|
|
|
}
|
|
|
@@ -1712,11 +1719,12 @@ export default {
|
|
|
this.jobLogtypes = dicts;
|
|
|
this.joblogsOptions = dicts.map(item => item.value);
|
|
|
this.checkedJoblogs = [...this.joblogsOptions]; // 初始化全选
|
|
|
- console.log(this.checkAlljoblog,'选中状态');
|
|
|
+ // console.log(this.checkAlljoblog,'选中状态');
|
|
|
this.checkAlljoblog = true;
|
|
|
- console.log(this.checkAlljoblog,'是否选中');
|
|
|
+ // console.log(this.checkAlljoblog,'是否选中');
|
|
|
this.isIndeterminate = false;
|
|
|
this.filterJoblogs();
|
|
|
+
|
|
|
},
|
|
|
|
|
|
// 作业日志页面数据展示样式分割
|
|
|
@@ -1788,8 +1796,12 @@ export default {
|
|
|
// 3. 判断是否未被选中 → 弹窗
|
|
|
if (!selectedTypes.includes(newLogType)) {
|
|
|
this.dialogLog = newLog;
|
|
|
- this.JoblogdialogVisible = true;
|
|
|
- // console.log('弹框内容:', newLog);
|
|
|
+ console.log(this.isJoblogVisible,'this.isJoblogVisible');
|
|
|
+ if (this.isJoblogVisible){
|
|
|
+ this.JoblogdialogVisible = true;
|
|
|
+ console.log('弹框内容:', newLog);
|
|
|
+ }
|
|
|
+
|
|
|
} else {
|
|
|
this.JoblogdialogVisible = false;
|
|
|
// console.log('该类型已勾选,不弹框');
|