From d1c6fa3e2e7ef9a5009e798909ed80aecf2eb1db Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 29 十一月 2022 11:40:30 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/management/myIndex/index.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index ee0a296..03bbd75 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -55,9 +55,9 @@
<span>{{filterTime(scope.row.alarmTime)}}</span>
</template>
</el-table-column>
- <el-table-column :prop="myproblem === 1 ? 'continueTime' :'materials'" :label="myproblem===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'continueTime' :'materials'" :label="myproblem===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="15">
</el-table-column>
- <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
+ <el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
<div class="btn">
<!-- v-if="instatus===7 ? true : false" -->
@@ -83,9 +83,9 @@
</el-dialog>
<!-- 璇︽儏椤甸潰 -->
<el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
- :before-close="handleClose">
- <MyDetail :info=info v-if="myproblem==1 ? true:false"></MyDetail>
- <MyIllDetail :info=info v-else></MyIllDetail>
+ :before-close="handleNoClose">
+ <MyDetail :info=info v-if="myproblem==1 ? true:false" :mycode = 'code'></MyDetail>
+ <MyIllDetail :info=info v-else :mycode="code"></MyIllDetail>
</el-dialog>
<!-- tools -->
<div class="tools">
@@ -176,6 +176,7 @@
caseId: '',
myproblem: 1,
instatus: 7,
+ code:''
}
},
created() {
@@ -245,7 +246,6 @@
url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
@@ -299,7 +299,11 @@
})
.catch(_ => { });
},
+ handleNoClose(done) {
+ done();
+ },
async JumpView(data) {
+ this.code = data.code
await this.getEventInfo(data.code);
},
// 鑾峰彇妗堜欢淇℃伅
@@ -309,7 +313,6 @@
url: `sccg/base_case/baseCaseDetail/${code}`
})
.then(res => {
- console.log(res);
this.info = res.data;
this.dialogView = true;
})
@@ -321,7 +324,6 @@
url: `sccg/base_case/baseCaseDetail/${code}`
})
.then(res => {
- console.log(res);
this.info = res.data;
this.dialogExamine = true;
})
@@ -333,7 +335,6 @@
url: `sccg/base_case/baseCaseDetail/${code}`
})
.then(res => {
- console.log(res);
this.info = res.data;
this.dialogClosure = true;
})
--
Gitblit v1.8.0