From 1445c7e1f76c4628f4619cf67150a63d6f8f5e90 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期二, 01 十一月 2022 09:04:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/management/myIndex/index.vue | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index f39c4ae..075adec 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -31,7 +31,7 @@
<el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
- <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template slot-scope="scope">
<span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
</template>
@@ -55,15 +55,16 @@
<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" -->
<span @click="handleExamine(scope.row)" v-if="instatus===7">瀹℃牳</span>
- <!-- <span class="line" v-if="instatus===7 ? true : false">|</span> -->
<span @click="handleClosure(scope.row)" v-if="instatus===8">缁撴</span>
+ <span class="line" v-if="instatus !==9">|</span>
+ <span @click="JumpView(scope.row)">鏌ョ湅</span>
</div>
</template>
</el-table-column>
@@ -71,18 +72,20 @@
<!-- 瀹℃牳椤甸潰 -->
<el-dialog :visible.sync="dialogExamine" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogExamine"
:before-close="handleClose">
- <MyExamine :info="info" @closeDialog="closeDialog"></MyExamine>
+ <MyExamine :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyExamine>
+ <MyIllExamine :info="info" v-else @closeDialog="closeDialog"></MyIllExamine>
</el-dialog>
<!-- 缁撴椤甸潰 -->
<el-dialog :visible.sync="dialogClosure" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogClosure"
:before-close="handleClose">
- <MyClosure :info="info" @closeDialog="closeDialog"></MyClosure>
+ <MyClosure :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyClosure>
+ <MyIllClosure :info="info" v-else @closeDialog="closeDialog"></MyIllClosure>
</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">
@@ -115,12 +118,14 @@
<script>
import MyExamine from './components/examine'
import MyClosure from './components/closure'
+import MyIllExamine from './components/illExamine'
+import MyIllClosure from './components/illclosure'
import MyDetail from '@/components/detail'
import MyIllDetail from '@/components/illdetail'
import helper from '@/utils/mydate'
export default {
components: {
- MyExamine,MyClosure,MyDetail,MyIllDetail
+ MyExamine,MyClosure,MyDetail,MyIllDetail,MyIllExamine,MyIllClosure
},
data() {
return {
@@ -171,6 +176,7 @@
caseId: '',
myproblem: 1,
instatus: 7,
+ code:''
}
},
created() {
@@ -294,7 +300,11 @@
})
.catch(_ => { });
},
+ handleNoClose(done) {
+ done();
+ },
async JumpView(data) {
+ this.code = data.code
await this.getEventInfo(data.code);
},
// 鑾峰彇妗堜欢淇℃伅
--
Gitblit v1.8.0