Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety-progress
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
耿迪迪
gassafety-progress
Commits
ce3957ba
Commit
ce3957ba
authored
Mar 23, 2022
by
zhangjianqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
应急处置消息,应急处置预案、处置信息修改
parent
e9cdf457
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
424 additions
and
69 deletions
+424
-69
TEventHandle.java
.../src/main/java/com/zehong/system/domain/TEventHandle.java
+21
-0
TEventReceive.java
...src/main/java/com/zehong/system/domain/TEventReceive.java
+19
-0
TEventHandleMapper.xml
...m/src/main/resources/mapper/system/TEventHandleMapper.xml
+5
-1
TEventReceiveMapper.xml
.../src/main/resources/mapper/system/TEventReceiveMapper.xml
+12
-1
yj-cl.png
gassafetyprogress-web/src/assets/image/yj-cl.png
+0
-0
yj-jydw.png
gassafetyprogress-web/src/assets/image/yj-jydw.png
+0
-0
yj-wz.png
gassafetyprogress-web/src/assets/image/yj-wz.png
+0
-0
yj-xf.png
gassafetyprogress-web/src/assets/image/yj-xf.png
+0
-0
yj-xj.png
gassafetyprogress-web/src/assets/image/yj-xj.png
+0
-0
yj-yy.png
gassafetyprogress-web/src/assets/image/yj-yy.png
+0
-0
xiaoxi.png
gassafetyprogress-web/src/assets/xiaoxi.png
+0
-0
index.vue
gassafetyprogress-web/src/components/FileUpload/index.vue
+1
-0
Timeline.vue
gassafetyprogress-web/src/components/emergency/Timeline.vue
+140
-0
rightBar.vue
gassafetyprogress-web/src/components/emergency/rightBar.vue
+161
-57
Navbar.vue
gassafetyprogress-web/src/layout/components/Navbar.vue
+43
-2
config.js
gassafetyprogress-web/src/utils/mapClass/config.js
+6
-4
index.vue
gassafetyprogress-web/src/views/emergency/index.vue
+16
-4
No files found.
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEventHandle.java
View file @
ce3957ba
...
...
@@ -24,6 +24,9 @@ public class TEventHandle extends BaseEntity
@Excel
(
name
=
"事件id"
)
private
Long
eventId
;
@Excel
(
name
=
"类型"
)
private
Integer
eventType
;
/** 企业id */
@Excel
(
name
=
"企业id"
)
private
Long
enterpriseId
;
...
...
@@ -56,9 +59,27 @@ public class TEventHandle extends BaseEntity
@Excel
(
name
=
"指导时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
guidanceTime
;
private
Integer
readStatus
;
/** 0未删除 1已删除 */
private
Integer
isDel
;
public
Integer
getEventType
()
{
return
eventType
;
}
public
void
setEventType
(
Integer
eventType
)
{
this
.
eventType
=
eventType
;
}
public
Integer
getReadStatus
()
{
return
readStatus
;
}
public
void
setReadStatus
(
Integer
readStatus
)
{
this
.
readStatus
=
readStatus
;
}
public
String
getPlanTitle
()
{
return
planTitle
;
}
...
...
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEventReceive.java
View file @
ce3957ba
...
...
@@ -70,11 +70,30 @@ public class TEventReceive extends BaseEntity
/** 备注 */
private
String
remarks
;
private
Integer
companyRead
;
private
Integer
governmentRead
;
/** 0未删除 1已删除 */
private
Integer
isDel
;
@Excel
(
name
=
"状态"
)
private
Integer
status
;
public
Integer
getCompanyRead
()
{
return
companyRead
;
}
public
void
setCompanyRead
(
Integer
companyRead
)
{
this
.
companyRead
=
companyRead
;
}
public
Integer
getGovernmentRead
()
{
return
governmentRead
;
}
public
void
setGovernmentRead
(
Integer
governmentRead
)
{
this
.
governmentRead
=
governmentRead
;
}
public
void
setId
(
Integer
id
)
{
this
.
id
=
id
;
...
...
gassafetyprogress-system/src/main/resources/mapper/system/TEventHandleMapper.xml
View file @
ce3957ba
...
...
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap
type=
"TEventHandle"
id=
"TEventHandleResult"
>
<result
property=
"handleId"
column=
"handle_id"
/>
<result
property=
"eventId"
column=
"event_id"
/>
<result
property=
"eventType"
column=
"event_type"
/>
<result
property=
"enterpriseId"
column=
"enterprise_id"
/>
<result
property=
"enterpriseName"
column=
"enterprise_name"
/>
<result
property=
"management"
column=
"management"
/>
...
...
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql
id=
"selectTEventHandleVo"
>
select handle_id, event_id, enterprise_id, enterprise_name, management,management_event, plan_id,plan_title,plan_url, guidance_opinion, guidance_time, is_del, create_time from t_event_handle
select handle_id, event_id,
event_type,
enterprise_id, enterprise_name, management,management_event, plan_id,plan_title,plan_url, guidance_opinion, guidance_time, is_del, create_time from t_event_handle
</sql>
<select
id=
"selectTEventHandleList"
parameterType=
"TEventHandle"
resultMap=
"TEventHandleResult"
>
...
...
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into t_event_handle
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"eventId != null"
>
event_id,
</if>
<if
test=
"eventType != null"
>
event_type,
</if>
<if
test=
"enterpriseId != null"
>
enterprise_id,
</if>
<if
test=
"enterpriseName != null"
>
enterprise_name,
</if>
<if
test=
"management != null"
>
management,
</if>
...
...
@@ -54,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"eventId != null"
>
#{eventId},
</if>
<if
test=
"eventType != null"
>
#{eventType},
</if>
<if
test=
"enterpriseId != null"
>
#{enterpriseId},
</if>
<if
test=
"enterpriseName != null"
>
#{enterpriseName},
</if>
<if
test=
"management != null"
>
#{management},
</if>
...
...
@@ -72,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_event_handle
<trim
prefix=
"SET"
suffixOverrides=
","
>
<if
test=
"eventId != null"
>
event_id = #{eventId},
</if>
<if
test=
"eventType != null"
>
event_type = #{eventType},
</if>
<if
test=
"enterpriseId != null"
>
enterprise_id = #{enterpriseId},
</if>
<if
test=
"enterpriseName != null"
>
enterprise_name = #{enterpriseName},
</if>
<if
test=
"management != null"
>
management = #{management},
</if>
...
...
gassafetyprogress-system/src/main/resources/mapper/system/TEventReceiveMapper.xml
View file @
ce3957ba
...
...
@@ -20,12 +20,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result
property=
"enterpriseId"
column=
"enterprise_id"
/>
<result
property=
"enterpriseName"
column=
"enterprise_name"
/>
<result
property=
"remarks"
column=
"remarks"
/>
<result
property=
"companyRead"
column=
"company_read"
/>
<result
property=
"governmentRead"
column=
"government_read"
/>
<result
property=
"isDel"
column=
"is_del"
/>
<result
property=
"createTime"
column=
"create_time"
/>
</resultMap>
<sql
id=
"selectTEventReceiveVo"
>
select id, event_name, event_type, event_grade, address, longitude, latitude, informant, infor_time, informant_phone, `describe`, `status`,enterprise_id, enterprise_name, remarks, is_del, create_time from t_event_receive
select id, event_name, event_type, event_grade, address, longitude, latitude,
company_read,government_read,informant, infor_time, informant_phone, `describe`, `status`,enterprise_id, enterprise_name, remarks, is_del, create_time from t_event_receive
</sql>
<select
id=
"selectTEventReceiveList"
parameterType=
"TEventReceive"
resultMap=
"TEventReceiveResult"
>
...
...
@@ -36,6 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"eventGrade != null "
>
and event_grade = #{eventGrade}
</if>
<if
test=
"enterpriseId != null and enterpriseId != ''"
>
and enterprise_id = #{enterpriseId}
</if>
<if
test=
"status != null and status!=5"
>
and status = #{status}
</if>
<if
test=
"companyRead != null"
>
and company_read = #{companyRead}
</if>
<if
test=
"governmentRead != null"
>
and government_read = #{governmentRead}
</if>
<if
test=
"status ==5"
>
and status !=4
</if>
and is_del = 0
</where>
...
...
@@ -65,6 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"enterpriseId != null"
>
enterprise_id,
</if>
<if
test=
"enterpriseName != null"
>
enterprise_name,
</if>
<if
test=
"remarks != null"
>
remarks,
</if>
<if
test=
"companyRead != null"
>
company_read,
</if>
<if
test=
"governmentRead != null"
>
government_read,
</if>
<if
test=
"isDel != null"
>
is_del,
</if>
<if
test=
"createTime != null"
>
create_time,
</if>
</trim>
...
...
@@ -84,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"enterpriseId != null"
>
#{enterpriseId},
</if>
<if
test=
"enterpriseName != null"
>
#{enterpriseName},
</if>
<if
test=
"remarks != null"
>
#{remarks},
</if>
<if
test=
"companyRead != null"
>
#{companyRead},
</if>
<if
test=
"governmentRead != null"
>
#{governmentRead},
</if>
<if
test=
"isDel != null"
>
#{isDel},
</if>
<if
test=
"createTime != null"
>
#{createTime},
</if>
</trim>
...
...
@@ -106,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"enterpriseId != null"
>
enterprise_id = #{enterpriseId},
</if>
<if
test=
"enterpriseName != null"
>
enterprise_name = #{enterpriseName},
</if>
<if
test=
"remarks != null"
>
remarks = #{remarks},
</if>
<if
test=
"companyRead != null"
>
company_read = #{companyRead},
</if>
<if
test=
"governmentRead != null"
>
government_read = #{governmentRead},
</if>
<if
test=
"isDel != null"
>
is_del = #{isDel},
</if>
<if
test=
"createTime != null"
>
create_time = #{createTime},
</if>
</trim>
...
...
gassafetyprogress-web/src/assets/image/yj-cl.png
0 → 100644
View file @
ce3957ba
577 Bytes
gassafetyprogress-web/src/assets/image/yj-jydw.png
0 → 100644
View file @
ce3957ba
1.4 KB
gassafetyprogress-web/src/assets/image/yj-wz.png
0 → 100644
View file @
ce3957ba
1.02 KB
gassafetyprogress-web/src/assets/image/yj-xf.png
0 → 100644
View file @
ce3957ba
1.61 KB
gassafetyprogress-web/src/assets/image/yj-xj.png
0 → 100644
View file @
ce3957ba
1.1 KB
gassafetyprogress-web/src/assets/image/yj-yy.png
0 → 100644
View file @
ce3957ba
589 Bytes
gassafetyprogress-web/src/assets/xiaoxi.png
0 → 100644
View file @
ce3957ba
950 Bytes
gassafetyprogress-web/src/components/FileUpload/index.vue
View file @
ce3957ba
...
...
@@ -5,6 +5,7 @@
:before-upload=
"handleBeforeUpload"
:file-list=
"fileArr"
:limit=
"1"
:fileType=
"fileType"
:list-type=
"listType"
:on-error=
"handleUploadError"
:on-exceed=
"handleExceed"
...
...
gassafetyprogress-web/src/components/emergency/Timeline.vue
0 → 100644
View file @
ce3957ba
<
template
>
<ul
class=
"timeline-wrapper"
>
<li
class=
"timeline-item"
v-for=
"t in timelineList"
:key=
"t.id"
>
<div
class=
"timeline-box"
>
<div
class=
"out-circle"
>
<div
class=
"in-circle"
></div>
</div>
<div
class=
"long-line"
></div>
</div>
<div
class=
"timeline-content"
>
<div
class=
"timeline-date"
>
{{
t
.
createTime
}}
</div>
<div
class=
"timeline-title"
>
{{
t
.
management
}}
</div>
<div
class=
"timeline-desc"
>
<span
class=
"dbtn"
@
click=
"checkFile(t.managementEvent)"
v-if=
"t.managementEvent != null && t.managementEvent!=''"
>
<i
class=
"el-icon el-icon-view"
></i>
查看/下载
</span>
<span
v-else
>
-
</span>
</div>
</div>
</li>
</ul>
</
template
>
<
script
type=
"text/babel"
>
import
Vue
from
'vue'
export
default
Vue
.
component
(
'Timeline'
,{
name
:
"Timeline"
,
props
:
{
timelineList
:
{
type
:
Array
,
default
:
()
=>
{
return
[]
}
}
},
methods
:
{
checkFile
(
url
)
{
window
.
open
(
url
,
'_blank'
);
},
}
})
</
script
>
<
style
scoped
lang=
"scss"
>
ul
.timeline-wrapper
{
list-style
:
none
;
margin
:
0
;
padding
:
0
;
}
/* 时间线 */
.timeline-item
{
position
:
relative
;
.timeline-box
{
text-align
:
center
;
position
:
absolute
;
.out-circle
{
width
:
16px
;
height
:
16px
;
background
:
rgba
(
14
,
116
,
218
,
0
.1
);
box-shadow
:
0px
4px
12px
0px
rgba
(
0
,
0
,
0
,
0
.1
);
/*opacity: 0.1;*/
border-radius
:
50%
;
display
:
flex
;
align-items
:
center
;
.in-circle
{
width
:
12px
;
height
:
12px
;
margin
:
0
auto
;
background
:
rgba
(
14
,
116
,
218
,
1
);
border-radius
:
50%
;
box-shadow
:
0px
4px
12px
0px
rgba
(
0
,
0
,
0
,
0
.1
);
}
}
.long-line
{
width
:
2px
;
height
:
98px
;
background
:
#ffffff
;
box-shadow
:
0px
4px
12px
0px
rgba
(
0
,
0
,
0
,
0
.1
);
opacity
:
0
.5
;
margin-left
:
8px
;
}
}
.timeline-content
{
box-sizing
:
border-box
;
margin-left
:
20px
;
height
:
86px
;
padding
:
0
0
0
20px
;
text-align
:
left
;
margin-bottom
:
30px
;
.timeline-title
{
font-size
:
14px
;
word-break
:
break-all
;
margin-bottom
:
16px
;
color
:
#d9d9d9
;
font-weight
:
500
;
/*display: inline;*/
}
.timeline-date
{
font-size
:
16px
;
color
:
#dfe4ed
;
font-weight
:
500
;
margin-bottom
:
16px
;
}
.timeline-desc
{
font-size
:
14px
;
color
:
#30b46b
;
}
}
}
.dbtn
{
display
:
inline-block
;
line-height
:
normal
;
padding-left
:
2px
;
padding-right
:
2px
;
cursor
:
pointer
;
border-radius
:
3px
;
border-style
:
solid
;
border-width
:
0
;
color
:
rgb
(
48
,
180
,
107
);
}
.timeline-item
:last-of-type
.timeline-content
{
margin-bottom
:
0
;
}
</
style
>
gassafetyprogress-web/src/components/emergency/rightBar.vue
View file @
ce3957ba
...
...
@@ -14,8 +14,12 @@
<div
style=
"width: 100%"
v-for=
"item in receiveList"
>
<div
class=
"el-form-div title-div"
>
<div
v-if=
"item.status==1"
style=
"width: 80%;margin-left: 5px;"
>
未指派
</div>
<div
v-if=
"item.status==2"
style=
"width: 80%;margin-left: 5px;"
>
待处置
</div>
<div
v-if=
"item.status==3"
style=
"width: 80%;margin-left: 5px;"
>
已处置
</div>
<div
v-if=
"item.status==2"
style=
"width: 80%;margin-left: 5px;"
>
待处置
<span
v-if=
"(item.governmentRead==0&&userType==-2)||(item.companyRead==0&&userType!=-2)"
class=
"massage"
>
(您有新消息)
</span>
</div>
<div
v-if=
"item.status==3"
style=
"width: 80%;margin-left: 5px;"
>
已处置
<span
v-if=
"(item.governmentRead==0&&userType==-2)||(item.companyRead==0&&userType!=-2)"
class=
"massage"
>
(您有新消息)
</span>
</div>
<div
v-if=
"item.status==4"
style=
"width: 80%;margin-left: 5px;"
>
已完结
</div>
<div
style=
"height:30px;color: red;cursor:pointer;"
v-if=
"userType==-2"
@
click=
"handleDelete(item.id)"
>
取消事件
</div>
</div>
...
...
@@ -23,29 +27,42 @@
<div
class=
"content-div"
>
发生时间:
{{
item
.
inforTime
}}
</div>
<div
class=
"content-div"
>
事件地点:
{{
item
.
address
}}
</div>
<div
class=
"el-form-div"
>
<div
v-if=
"item.status==3 && userType==-2"
class=
"button-div"
@
click=
"endevent(item.id)"
>
事件结案
</div>
<div
v-if=
"item.status==3 && userType==-2"
class=
"button-div"
@
click=
"showList(item.id)"
>
预案指引
</div>
<div
v-if=
"item.status==1 && userType==-2"
class=
"button-div"
@
click=
"assignTask(item)"
>
任务指派
</div>
<div
v-if=
"userType==-2"
class=
"button-div"
@
click=
"showList(item.id)"
>
预案指引
</div>
<div
v-if=
"item.status==3 && userType==-2"
class=
"button-div"
@
click=
"endevent(item.id)"
>
事件结案
</div>
<div
v-if=
"userType!=-2"
class=
"button-div"
@
click=
"showList(item.id)"
>
信息处置
</div>
<div
class=
"button-div"
@
click=
"showDetail(item.id,$event)"
>
详情
</div>
</div>
<div
:id =
"item.id"
style=
"display: none;margin-top: 15px;margin-bottom: 20px;"
>
<timeline
:timeline-list=
"handleList"
></timeline>
</div>
</div>
</div>
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"900px"
append-to-body
>
<el-row
v-if=
"userType!=-2"
:gutter=
"10"
class=
"mb8"
>
<el-col
:span=
"1.5"
>
<el-row
:gutter=
"10"
class=
"mb8"
>
<el-col
:span=
"1.5"
v-if=
"userType!=-2"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleAdd"
>
新增
</el-button>
>
新增处置信息
</el-button>
</el-col>
<el-col
:span=
"1.5"
v-if=
"userType==-2"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleUpdate"
>
新增预案指引
</el-button>
</el-col>
</el-row>
<el-table
v-loading=
"loading"
:data=
"handleList"
>
<el-table-column
label=
"处置信息"
align=
"center"
prop=
"management"
/>
<el-table-column
label=
"处置附件"
align=
"center"
prop=
"managementEvent"
width=
"150px"
>
<el-table-column
label=
"类型"
align=
"center"
prop=
"eventType"
:formatter=
"getType"
width=
"120px"
/>
<el-table-column
label=
"处置信息/指导意见"
align=
"center"
prop=
"management"
/>
<el-table-column
label=
"处置附件/引导方案"
align=
"center"
prop=
"managementEvent"
width=
"150px"
>
<template
slot-scope=
"scope"
>
<span
class=
"dbtn"
...
...
@@ -57,49 +74,49 @@
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<
el-table-column
label=
"指导意见"
align=
"center"
prop=
"guidanceOpinion"
/
>
<
el-table-column
label=
"指导方案"
align=
"center"
prop=
"planUrl"
>
<
template
slot-scope=
"scope"
>
<
span
class=
"dbtn"
@
click=
"checkFile(scope.row.planUrl)"
v-if=
"scope.row.planUrl != null && scope.row.planUrl!=''"
>
<
i
class=
"el-icon el-icon-view"
></i>
查看/下载
<
/span
>
<
span
v-else
>
-
</span
>
<
/
template
>
<
/el-table-column
>
<el-table-column
label=
"
指导时间"
align=
"center"
prop=
"guidanc
eTime"
width=
"180"
>
<
!--<el-table-column label="指导意见" align="center" prop="guidanceOpinion" />--
>
<
!--<el-table-column label="指导方案" align="center" prop="planUrl" >--
>
<
!--<template slot-scope="scope">--
>
<
!--<span-->
<!--class="dbtn"-->
<!--@click="checkFile(scope.row.planUrl)"-->
<!--v-if="scope.row.planUrl != null && scope.row.planUrl!=''"-->
<!-->--
>
<
!--<i class="el-icon el-icon-view"></i>查看/下载-->
<
!--</span>--
>
<
!--<span v-else>-</span>--
>
<
!--</template>--
>
<
!--</el-table-column>--
>
<el-table-column
label=
"
创建时间"
align=
"center"
prop=
"creat
eTime"
width=
"180"
>
<!--<template slot-scope="scope">-->
<!--<span>{{ parseTime(scope.row.guidanceTime, '{y}-{m}-{d}') }}</span>-->
<!--</template>-->
</el-table-column>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
width=
"100"
>
<
template
slot-scope=
"scope"
>
<!--<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
<!--<template slot-scope="scope">-->
<!--<!–<el-button–>-->
<!--<!–size="mini"–>-->
<!--<!–type="text"–>-->
<!--<!–icon="el-icon-edit"–>-->
<!--<!–@click="handleUpdate(scope.row)"–>-->
<!--<!–v-hasPermi="['system:handle:edit']"–>-->
<!--<!–>修改</el-button>–>-->
<!--<el-button-->
<!--v-if="userType==-2"-->
<!--size="mini"-->
<!--type="text"-->
<!--icon="el-icon-edit"-->
<!--@click="handleUpdate(scope.row)"-->
<!--v-hasPermi="['system:handle:edit']"-->
<!-->修改
</el-button>
-->
<el-button
v-if=
"userType==-2"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
>
预案指引
</el-button>
<el-button
v-if=
"userType!=-2"
size=
"mini"
type=
"text"
icon=
"el-icon-delete"
@
click=
"handleDelete2(scope.row)"
>
删除
</el-button>
</
template
>
</el-table-column>
<!-->预案指引</el-button>-->
<!--<el-button-->
<!--v-if="userType!=-2"-->
<!--size="mini"-->
<!--type="text"-->
<!--icon="el-icon-delete"-->
<!--@click="handleDelete2(scope.row)"-->
<!-->删除</el-button>-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<pagination
v-show=
"total>0"
...
...
@@ -112,11 +129,11 @@
<!-- 添加或修改事件处置对话框 -->
<el-dialog
:title=
"title2"
:visible
.
sync=
"open2"
width=
"550px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form-item
label=
"处置信息"
prop=
"management"
>
<el-input
v-model=
"form.management"
type=
"textarea"
:disabled=
"readonly1"
placeholder=
"请输入处置信息"
/>
<el-form-item
label=
"处置信息"
prop=
"management"
:style=
"display"
>
<el-input
v-model=
"form.management"
type=
"textarea"
placeholder=
"请输入处置信息"
/>
</el-form-item>
<el-form-item
label=
"指导意见"
prop=
"
guidanceOpinion
"
:style=
"display2"
>
<el-input
v-model=
"form.
guidanceOpinion
"
type=
"textarea"
placeholder=
"请输入指导意见"
/>
<el-form-item
label=
"指导意见"
prop=
"
management
"
:style=
"display2"
>
<el-input
v-model=
"form.
management
"
type=
"textarea"
placeholder=
"请输入指导意见"
/>
</el-form-item>
<el-form-item
label=
"应急预案"
prop=
"planId"
:style=
"display2"
>
<el-select
v-model=
"form.planId"
placeholder=
"请选择预案等级"
@
change=
"fananchange"
>
...
...
@@ -131,6 +148,7 @@
<el-form-item
label=
"处置附件"
prop=
"managementEvent"
:style=
"display"
>
<FileUpload
listType=
"picture"
:fileType=
"fileType"
@
resFun=
"getFileInfo"
@
remove=
"listRemove"
:fileArr=
"fileList"
...
...
@@ -151,7 +169,7 @@
import
{
listReceive
,
getReceive
,
delReceive
,
addReceive
,
updateReceive
}
from
"@/api/system/receive"
;
import
{
listHandle
,
getHandle
,
delHandle
,
addHandle
,
updateHandle
,
exportHandle
}
from
"@/api/system/handle"
;
import
{
listPlanInfo
}
from
"@/api/system/planInfo"
;
import
Timeline
from
"./Timeline"
;
import
{
getUserProfile
}
from
"@/api/system/user"
;
import
FileUpload
from
'@/components/FileUpload'
;
let
uploadfile
=
require
(
"@/assets/uploadfile.png"
);
...
...
@@ -159,10 +177,12 @@
export
default
{
components
:
{
// RightPic,
FileUpload
FileUpload
,
Timeline
},
data
()
{
return
{
fileType
:[
'png'
,
'jpg'
,
'jpeg'
,
"doc"
,
"xls"
,
"ppt"
,
"txt"
,
"pdf"
],
// 是否显示弹出层
open
:
false
,
open2
:
false
,
...
...
@@ -196,6 +216,8 @@ export default {
pageSize
:
10
,
eventId
:
null
,
},
dongtai
:[
],
// 表单校验
rules
:
{
management
:
[
...
...
@@ -215,6 +237,30 @@ export default {
}
this
.
getList
();
});
//定时检测新消息
setInterval
(()
=>
{
var
params
=
this
.
queryParams
;
if
(
this
.
userType
==-
2
){
params
.
governmentRead
=
0
}
else
{
params
.
companyRead
=
0
}
listReceive
(
params
).
then
(
response
=>
{
var
newList
=
response
.
rows
;
newList
.
forEach
((
model
)
=>
{
this
.
receiveList
.
forEach
((
item
)
=>
{
if
(
item
.
id
==
model
.
id
){
console
.
log
(
"---------------"
+
item
.
id
)
if
(
this
.
userType
==-
2
){
item
.
governmentRead
=
0
;
}
else
{
item
.
companyRead
=
0
;
}
}
});
});
});
},
5000
);
},
methods
:
{
/** 查询事件接报列表 */
...
...
@@ -232,6 +278,7 @@ export default {
this
.
handleList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
return
response
.
total
;
});
},
showList
(
id
)
{
...
...
@@ -240,10 +287,15 @@ export default {
this
.
queryParams2
.
eventId
=
id
this
.
getHandleList
();
},
choice
(
val
)
{
console
.
log
(
val
)
choice
()
{
this
.
getList
();
},
getType
(
row
){
if
(
row
.
eventType
==
1
){
return
"处置信息"
}
return
"预案指引"
},
/** 新增按钮操作 */
handleAdd
()
{
this
.
reset
();
...
...
@@ -255,14 +307,16 @@ export default {
this
.
form
.
eventId
=
this
.
queryParams2
.
eventId
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
handleUpdate
()
{
this
.
reset
();
this
.
readonly1
=
true
;
this
.
display
=
"display:none"
;
this
.
display2
=
""
;
this
.
form
=
row
;
//
this.form = row;
this
.
open2
=
true
;
this
.
title2
=
"预案指引"
;
this
.
form
.
eventId
=
this
.
queryParams2
.
eventId
this
.
form
.
eventType
=
2
;
this
.
yuanList
();
},
yuanList
(){
...
...
@@ -278,7 +332,7 @@ export default {
return
item
.
planId
===
value
;
``
});
this
.
form
.
planTitle
=
obj
.
planTitle
;
this
.
form
.
planUrl
=
obj
.
iconUrl
;
this
.
form
.
managementEvent
=
obj
.
iconUrl
;
this
.
form
.
planId
=
value
;
},
// 表单重置
...
...
@@ -320,6 +374,11 @@ export default {
},
upReceive
(
id
){
var
receiveform
=
{
id
:
id
,
status
:
3
}
if
(
this
.
form
.
eventType
==
2
){
receiveform
.
companyRead
=
0
;
}
else
{
receiveform
.
governmentRead
=
0
;
}
updateReceive
(
receiveform
).
then
(
response
=>
{
});
},
...
...
@@ -376,6 +435,48 @@ export default {
assignTask
(
item
){
this
.
$parent
.
handleUpdate
(
item
);
},
async
showDetail
(
id
,
event
){
var
that
=
this
;
that
.
queryParams2
.
eventId
=
id
that
.
queryParams2
.
pageSize
=
100
;
if
(
event
.
target
.
innerText
==
"详情"
){
await
listHandle
(
that
.
queryParams2
).
then
(
response
=>
{
this
.
handleList
=
response
.
rows
;
if
(
response
.
total
==
0
){
this
.
msgSuccess
(
"暂无详情"
);
}
else
{
event
.
target
.
innerText
=
"关闭"
;
document
.
getElementById
(
id
).
style
.
display
=
""
;
that
.
updateRead
(
id
);
}
});
}
else
{
event
.
target
.
innerText
=
"详情"
;
document
.
getElementById
(
id
).
style
.
display
=
"none"
;
}
},
//更改读取状态
updateRead
(
id
){
var
receiveform
=
{
id
:
id
}
if
(
this
.
userType
==-
2
){
receiveform
.
governmentRead
=
1
;
}
else
{
receiveform
.
companyRead
=
1
;
}
updateReceive
(
receiveform
).
then
(
response
=>
{
});
this
.
receiveList
.
forEach
((
item
)
=>
{
if
(
item
.
id
==
id
){
if
(
this
.
userType
==-
2
){
item
.
governmentRead
=
1
;
}
else
{
item
.
companyRead
=
1
;
}
}
});
},
//上传
getFileInfo
(
res
){
//this.form.dealPlan = res.fileName;
...
...
@@ -462,7 +563,7 @@ export default {
line-height
:
25px
;
text-align
:
center
;
font-size
:
15
;
margin-left
:
1
5
%
;
margin-left
:
1
0
%
;
margin-top
:
10px
;
}
.title-div
{
...
...
@@ -506,6 +607,9 @@ export default {
border-width
:
0
;
color
:
rgb
(
48
,
180
,
107
);
}
.massage
{
color
:
#00ffff
;
}
.
test-5
:
:-
webkit-scrollbar-track
{
/*滚动条里面轨道*/
box-shadow
:
inset
0
0
5px
rgba
(
0
,
0
,
0
,
0
.2
);
...
...
gassafetyprogress-web/src/layout/components/Navbar.vue
View file @
ce3957ba
...
...
@@ -7,6 +7,9 @@
<div
class=
"right-menu"
>
<template
v-if=
"device!=='mobile'"
>
<div
class=
"right-menu-item"
v-if=
"total>0"
@
click=
"$router.push('/emergency/emergency')"
>
<img
src=
"@/assets/xiaoxi.png"
:hidden=
"xiaohidden"
style=
"height: 40px;width: 40px;margin-top: 5px;cursor: pointer;"
>
</div>
<search
id=
"header-search"
class=
"right-menu-item"
/>
<screenfull
id=
"screenfull"
class=
"right-menu-item hover-effect"
/>
...
...
@@ -46,7 +49,8 @@ import Hamburger from '@/components/Hamburger'
import
Screenfull
from
'@/components/Screenfull'
import
SizeSelect
from
'@/components/SizeSelect'
import
Search
from
'@/components/HeaderSearch'
import
{
getUserProfile
}
from
"@/api/system/user"
;
import
{
listReceive
}
from
"@/api/system/receive"
;
export
default
{
components
:
{
Breadcrumb
,
...
...
@@ -56,6 +60,13 @@ export default {
SizeSelect
,
Search
},
data
()
{
return
{
userType
:
-
2
,
total
:
0
,
xiaohidden
:
false
,
}
},
computed
:
{
...
mapGetters
([
'sidebar'
,
...
...
@@ -79,6 +90,37 @@ export default {
}
}
},
mounted
(){
getUserProfile
().
then
(
response
=>
{
this
.
userType
=
response
.
data
.
deptId
;
});
//定时检测新消息
setInterval
(()
=>
{
var
params
=
{
pageNum
:
1
,
pageSize
:
100
,
status
:
5
,
enterpriseId
:
this
.
userType
};
if
(
this
.
userType
==-
2
){
params
.
governmentRead
=
0
}
else
{
params
.
companyRead
=
0
}
listReceive
(
params
).
then
(
response
=>
{
//console.log("total==",response.total);
this
.
total
=
response
.
total
;
});
},
5000
);
setInterval
(()
=>
{
if
(
this
.
xiaohidden
){
this
.
xiaohidden
=
false
}
else
{
this
.
xiaohidden
=
true
}
},
500
);
},
methods
:
{
toggleSideBar
()
{
this
.
$store
.
dispatch
(
'app/toggleSideBar'
)
...
...
@@ -137,7 +179,6 @@ export default {
float
:
right
;
height
:
100%
;
line-height
:
50px
;
&
:focus
{
outline
:
none
;
}
...
...
gassafetyprogress-web/src/utils/mapClass/config.js
View file @
ce3957ba
...
...
@@ -32,10 +32,12 @@ export const svgUrl = {
7
:
require
(
"@/assets/image/zrxk.svg"
),
8
:
require
(
"@/assets/image/zcrq.svg"
),
9
:
require
(
"@/assets/image/car.png"
),
10
:
require
(
"@/assets/mapImages/mark02.png"
),
11
:
require
(
"@/assets/mapImages/mark03.png"
),
12
:
require
(
"@/assets/mapImages/mark04.png"
),
13
:
require
(
"@/assets/mapImages/mark01.png"
),
10
:
require
(
"@/assets/image/yj-jydw.png"
),
11
:
require
(
"@/assets/image/yj-wz.png"
),
12
:
require
(
"@/assets/image/yj-cl.png"
),
13
:
require
(
"@/assets/image/yj-yy.png"
),
14
:
require
(
"@/assets/image/yj-xf.png"
),
15
:
require
(
"@/assets/image/yj-xj.png"
),
};
export
const
svgAlarm
=
{
2
:
require
(
"@/assets/mapImages/tyxAlarm.svg"
),
...
...
gassafetyprogress-web/src/views/emergency/index.vue
View file @
ce3957ba
...
...
@@ -333,27 +333,39 @@ export default {
{
val
:
10
,
ischeck
:
false
,
imgurl
:
require
(
"@/assets/image/
tyxsub.sv
g"
),
imgurl
:
require
(
"@/assets/image/
yj-jydw.pn
g"
),
name
:
"救援队伍"
,
},
{
val
:
11
,
ischeck
:
false
,
imgurl
:
require
(
"@/assets/image/
fmjsub.sv
g"
),
imgurl
:
require
(
"@/assets/image/
yj-wz.pn
g"
),
name
:
"救援物资"
,
},
{
val
:
12
,
ischeck
:
false
,
imgurl
:
require
(
"@/assets/image/
czsub.sv
g"
),
imgurl
:
require
(
"@/assets/image/
yj-cl.pn
g"
),
name
:
"救援车辆"
,
},
{
val
:
13
,
ischeck
:
false
,
imgurl
:
require
(
"@/assets/image/
usersub.sv
g"
),
imgurl
:
require
(
"@/assets/image/
yj-yy.pn
g"
),
name
:
"医 院"
,
},
{
val
:
14
,
ischeck
:
false
,
imgurl
:
require
(
"@/assets/image/yj-xf.png"
),
name
:
"消防队伍"
,
},
{
val
:
15
,
ischeck
:
false
,
imgurl
:
require
(
"@/assets/image/yj-xj.png"
),
name
:
"巡检人员"
,
},
],
selarr1
:
[],
// 用户的center数据
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment