From 998b75f0d4aaed03001ec4246cd4f3b4b0743b7e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 23 Nov 2022 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/taskinfo/taskinfoDetail.vue | 87 ++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 59 deletions(-)
diff --git a/src/views/taskinfo/taskinfoDetail.vue b/src/views/taskinfo/taskinfoDetail.vue
index 22eb01e..f2e928f 100644
--- a/src/views/taskinfo/taskinfoDetail.vue
+++ b/src/views/taskinfo/taskinfoDetail.vue
@@ -1,8 +1,8 @@
<template>
<div>
- <el-button class="backBtn" size="small" type="success" icon="el-icon-back" @click="handleBack">返 回
- </el-button>
- <el-row>
+ <el-row v-if="!eventgmDetailVisible">
+ <el-button class="backBtn" size="small" type="success" icon="el-icon-back" @click="handleBack">返 回
+ </el-button>
<el-col :span="12">
<div>
<el-card class="trackClass" style="overflow-y: auto">
@@ -133,67 +133,23 @@
class="el-collapse-item__header focusing is-active"
>
<div class="avue-group__header avue-group">
- <i class="el-icon-s-custom avue-group__icon"></i>
+ <i class="el-icon-warning avue-group__icon"></i>
<h1 class="avue-group__title">相关事件信息</h1>
</div>
</div>
</div>
<el-card>
- <el-form v-for="eventgm in eventgmList"
- :model="form"
- label-position="right"
- size="mini"
- class="taskinfoForm"
- label-width="70px"
- style="
- margin-top: 20px;
- margin-left: 10px;
- margin-right: 10px;
- height: calc(100% - 40px);
- width: calc(100% - 20px);
- "
+ <el-table
+ ref="multipleTable"
+ :data="eventgmList"
+ tooltip-effect="dark"
+ style="width: 100%"
+ max-height="240"
+ @row-dblclick="rowDblclick"
>
- <el-row>
- <el-col span="24">
- <el-form-item label="地点">
- <el-input disabled="true" v-model="eventgm.address" autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="24">
- <el-form-item label="事件类型">
- <el-input disabled="true" v-model="eventgm.typeName" autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="事件状态">
- <el-input disabled="true" v-model="eventgm.stateName" autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="事件来源">
- <el-input disabled="true" v-model="eventgm.source" autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row>
- <el-col span="24">
- <el-form-item label="内容">
- <el-input disabled="true" v-model="eventgm.remark" autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12" v-if="eventgm.no">
- <el-form-item label="工单编号">
- <el-input disabled="true" v-model="eventgm.no" autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-divider></el-divider>
- </el-form>
+ <el-table-column prop="title" label="标题" align="center"></el-table-column>
+ <el-table-column prop="stateName" label="状态" align="center"></el-table-column>
+ </el-table>
</el-card>
</div>
@@ -205,6 +161,9 @@
<open-layers-map ref="OpenLayersMap" @toData="toData" :isDetail="true" :routeRange="form.routeRange"></open-layers-map>
</el-col>
</el-row>
+
+ <!--显示详情-->
+ <eventgm-detail v-if="eventgmDetailVisible" ref="detailVisible" :detailInfo="eventgmDetailInfo" :taskToEventgm="true" @isDetail="isDetail"></eventgm-detail>
</div>
</template>
@@ -213,10 +172,11 @@
import {getUser} from "@/api/system/user"
import {getDetail} from "@/api/taskinfo/taskinfo";
import {getDictionary} from "@/api/system/dictbiz";
+import EventgmDetail from "@/views/eventgm/eventgmDetail";
export default {
name: "taskinfoDetail",
- components: {OpenLayersMap},
+ components: {EventgmDetail, OpenLayersMap},
props:["detailInfo"],
data(){
return{
@@ -224,6 +184,8 @@
form:{},
accepterInfo:[],
eventgmList:[],
+ eventgmDetailVisible:false,
+ eventgmDetailInfo:{},
}
},
created() {
@@ -279,6 +241,13 @@
},
handleBack(){
this.$emit('isDetail');
+ },
+ rowDblclick(row){
+ this.eventgmDetailInfo = row
+ this.eventgmDetailVisible = true
+ },
+ isDetail(){
+ this.eventgmDetailVisible = !this.eventgmDetailVisible
}
},
}
--
Gitblit v1.9.3