Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BCDH-APP
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
首开风险隐患双控平台
BCDH-APP
Commits
22fa4ff3
Commit
22fa4ff3
authored
Nov 05, 2021
by
罗新东
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉消息中心“查看消息”,添加了“我的上报”。
parent
81565b83
Pipeline
#7037
passed with stage
in 4 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
224 additions
and
26 deletions
+224
-26
src/router/index.js
src/router/index.js
+13
-4
src/service/danger.js
src/service/danger.js
+8
-1
src/views/danger/insertDanger/list.vue
src/views/danger/insertDanger/list.vue
+185
-0
src/views/danger/majorDanger/majorSurvey.vue
src/views/danger/majorDanger/majorSurvey.vue
+0
-2
src/views/danger/standBook/normalDetail.vue
src/views/danger/standBook/normalDetail.vue
+6
-7
src/views/messageCenter/messageNews/index.vue
src/views/messageCenter/messageNews/index.vue
+3
-5
src/views/risk/riskAccount/riskBigDetail.vue
src/views/risk/riskAccount/riskBigDetail.vue
+2
-7
src/views/saveWorkbench/index.vue
src/views/saveWorkbench/index.vue
+7
-0
No files found.
src/router/index.js
View file @
22fa4ff3
...
...
@@ -262,6 +262,7 @@ const routes = [{
},
{
path
:
'
/add-danger
'
,
name
:
'
add-danger
'
,
...
...
@@ -367,11 +368,12 @@ const routes = [{
},
component
:
()
=>
import
(
/* webpackChunkName: "SaveWorkbench" */
'
../views/danger/standBook
'
),
},
{
path
:
'
/normal-detail
'
,
name
:
'
normal-detail
'
,
meta
:
{
title
:
'
隐患
历史台账
详情
'
,
title
:
'
隐患详情
'
,
index
:
1
},
component
:
()
=>
import
(
/* webpackChunkName: "SaveWorkbench" */
'
../views/danger/standBook/normalDetail
'
),
...
...
@@ -532,9 +534,16 @@ const routes = [{
component
:
()
=>
import
(
/* webpackChunkName: "SaveWorkbench" */
'
../views/risk/riskAccount/riskBigDetail
'
),
},
{
path
:
'
/insert-danger
'
,
name
:
'
insert-danger
'
,
meta
:{
title
:
'
我的上报
'
,
index
:
1
},
component
:()
=>
import
(
'
@/views/danger/insertDanger/list
'
)
}
]
const
router
=
new
VueRouter
({
...
...
src/service/danger.js
View file @
22fa4ff3
...
...
@@ -283,7 +283,14 @@ export function list2(url="/rectification/list2", data) {
})
}
// 隐患整改已退回
// 我的上报接口
export
function
myHDList
(
url
=
"
/hdreport/myHDList
"
,
data
=
null
){
return
request
({
url
,
method
:
'
post
'
,
data
})
}
...
...
src/views/danger/insertDanger/list.vue
0 → 100644
View file @
22fa4ff3
<
template
>
<div>
<LHeader
:text=
"text"
></LHeader>
<!-- -->
<!-- 内容列表 -->
<div
class=
"con-list"
@
touchmove=
"showIndex = null"
>
<van-cell-group
inset
v-for=
"(item, index) in messageList"
:key=
"index"
@
click=
"touchstart(index, item)"
>
<van-row
gutter=
""
>
<van-col
span=
"5"
>
所属项目:
</van-col>
<van-col
span=
"19"
>
{{
item
.
proId
}}
</van-col>
</van-row>
<van-row
gutter=
""
>
<van-col
span=
"5"
>
隐患级别:
</van-col>
<van-col
span=
"19"
>
{{
item
.
hdLev
}}
</van-col>
</van-row>
<van-row
gutter=
""
>
<van-col
span=
"5"
>
适用范围:
</van-col>
<van-col
span=
"19"
>
{{
item
.
hdRange
}}
</van-col>
</van-row>
<van-row
gutter=
""
>
<van-col
span=
"5"
>
隐患类型:
</van-col>
<van-col
span=
"19"
>
{{
item
.
hdType
}}
</van-col>
</van-row>
<van-row
gutter=
""
>
<van-col
span=
"5"
>
发现时间:
</van-col>
<van-col
span=
"19"
>
{{
item
.
hdDiscoveryTime
}}
</van-col>
</van-row>
<!--
<van-row
gutter=
""
>
<van-col
span=
"5"
>
状态:
</van-col>
<van-col
span=
"19"
>
{{
item
.
taskName
}}
</van-col>
</van-row>
-->
<!-- 长按显示遮罩层 -->
<van-overlay
:show=
"showIndex == index"
>
<div
class=
"wrapper"
@
click.stop =
"showIndex = null"
>
<van-button
round
type=
"primary"
@
click=
"goDetail(item)"
>
详情
</van-button
>
</div>
</van-overlay>
</van-cell-group>
</div>
<!-- 暂无数据 -->
<div
style=
"width: 100%;text-align: center; font-size: .48rem;position: fixed; top: 30%;"
v-if=
"isHaveNews"
>
暂无数据
</div>
</div>
</
template
>
<
script
>
import
LHeader
from
"
@/components/header.vue
"
;
import
{
dangerReturnDel
,
myHDList
}
from
"
@/service/danger
"
;
export
default
{
components
:
{
LHeader
:
LHeader
},
data
()
{
return
{
text
:
"
我的上报
"
,
searchValue
:
""
,
isHaveNews
:
false
,
messageList
:
[],
Loop
:
""
,
// 定时器
showIndex
:
null
// 是否显示遮罩层
};
},
created
()
{
this
.
postList
();
},
methods
:
{
postList
()
{
this
.
$toast
.
loading
({
message
:
"
加载中...
"
,
forbidClick
:
true
,
loadingType
:
"
spinner
"
,
duration
:
0
});
myHDList
()
.
then
(
res
=>
{
this
.
$toast
.
clear
();
this
.
messageList
=
res
.
data
;
// 判断有无数据返回
if
(
this
.
messageList
.
length
==
0
)
{
this
.
isHaveNews
=
true
;
}
})
.
catch
(()
=>
{
this
.
$toast
.
clear
();
this
.
$toast
.
fail
(
"
加载失败,请稍后再试
"
);
});
},
onSearch
(
val
)
{
},
touchstart
(
index
,
item
)
{
if
(
this
.
showIndex
!=
null
)
{
this
.
showIndex
=
null
;
return
}
this
.
showIndex
=
index
;
},
goDetail
(
data
){
this
.
$router
.
push
({
// name: "insert-danger-detail",
name
:
"
normal-detail
"
,
params
:
{
id
:
data
.
id
,
detailTitle
:
'
上报详情
'
}
});
this
.
showIndex
=
null
;
},
// 提交
goSubmit
(
data
)
{
this
.
$router
.
push
({
name
:
"
add-danger
"
,
params
:
{
status
:
"
退回
"
,
taskId
:
data
.
taskId
}
});
this
.
showIndex
=
null
;
},
// 删除
goDelete
(
data
)
{
this
.
$toast
.
loading
({
message
:
"
删除中...
"
,
forbidClick
:
true
,
loadingType
:
"
spinner
"
,
duration
:
0
});
dangerReturnDel
(
`/hdreport/delete/
${
data
.
taskId
}
`
)
.
then
(
res
=>
{
this
.
$toast
.
clear
();
this
.
$toast
.
success
({
message
:
"
删除成功
"
,
duration
:
2000
});
this
.
postList
();
})
.
catch
(()
=>
{
this
.
$toast
.
clear
();
this
.
$toast
.
fail
(
"
删除失败,请稍后再试
"
);
});
this
.
showIndex
=
null
;
}
}
};
</
script
>
<
style
lang=
"less"
scoped
>
/* @import url(); 引入css类 */
.con-list {
padding: 10px 10px 0.533333rem;
background-color: #f0f1f5;
.van-cell-group--inset {
margin: 0;
margin-bottom: 10px;
padding: 10px;
font-size: 13px;
position: relative;
.van-row {
margin-bottom: 0.133333rem;
line-height: 0.64rem;
}
.van-overlay {
position: absolute;
.wrapper {
display: flex;
align-items: center;
justify-content: space-evenly;
height: 100%;
}
}
}
}
</
style
>
src/views/danger/majorDanger/majorSurvey.vue
View file @
22fa4ff3
...
...
@@ -28,8 +28,6 @@
<!-- 详情 -->
<div
class=
"detail"
>
详情
</div>
</van-cell-group>
<van-form
@
submit=
"onSubmit"
:show-error=
'false'
...
...
src/views/danger/standBook/normalDetail.vue
View file @
22fa4ff3
...
...
@@ -327,7 +327,7 @@
<div
class=
"step-wrap"
>
<van-row>
<van-col
span=
"24"
><div
class=
"info-title"
>
日志信息
</div></van-col
><div
class=
"info-title"
>
{{
item
.
createTime
}}
</div></van-col
>
</van-row>
<van-row>
...
...
@@ -354,12 +354,7 @@
>
<van-col
span=
"19"
>
{{
item
.
deptName
}}
</van-col>
</van-row>
<van-row>
<van-col
span=
"5"
><span
class=
"field-title"
>
时间:
</span></van-col
>
<van-col
span=
"19"
>
{{
item
.
createTime
}}
</van-col>
</van-row>
</div>
</van-step>
</van-steps>
...
...
@@ -468,10 +463,14 @@ export default {
};
},
created
()
{
if
(
this
.
$route
.
params
.
detailTitle
){
this
.
text
=
this
.
$route
.
params
.
detailTitle
}
this
.
id
=
this
.
$route
.
params
.
id
;
if
(
this
.
id
)
{
this
.
postDetail
();
}
},
methods
:
{
// 请求台账信息
...
...
src/views/messageCenter/messageNews/index.vue
View file @
22fa4ff3
...
...
@@ -17,7 +17,6 @@
<!--
<div
class=
"search-wrap"
>
<van-search
v-model=
"searchVal"
placeholder=
"搜索"
@
search=
"onSearch"
/>
</div>
-->
<!-- 内容列表 -->
<div
class=
"con-list"
@
touchmove=
"showIndex = null"
>
<!--
<van-pull-refresh
v-model=
"refreshing"
@
refresh=
"onRefresh"
>
...
...
@@ -43,12 +42,11 @@
<!-- 长按显示遮罩层 -->
<van-overlay
:show=
"showIndex == index"
>
<van-overlay
:show=
"showIndex == index"
v-if=
"item.status == '未读'"
>
<div
class=
"wrapper"
@
click.stop =
"showIndex = null"
>
<van-button
round
type=
"primary"
@
click=
"goDetail(item)"
<
!--
<
van-button
round
type=
"primary"
@
click=
"goDetail(item)"
>
查看
</van-button
>
>
-->
<van-button
round
type=
"info"
...
...
src/views/risk/riskAccount/riskBigDetail.vue
View file @
22fa4ff3
...
...
@@ -157,7 +157,7 @@
<div
class=
"step-wrap"
>
<van-row>
<van-col
span=
"24"
><div
class=
"info-title"
>
日志信息
</div></van-col
><div
class=
"info-title"
>
{{
item
.
createTime
}}
</div></van-col
>
</van-row>
<van-row>
...
...
@@ -184,12 +184,7 @@
>
<van-col
span=
"19"
>
{{
item
.
deptName
}}
</van-col>
</van-row>
<van-row>
<van-col
span=
"5"
><span
class=
"field-title"
>
时间:
</span></van-col
>
<van-col
span=
"19"
>
{{
item
.
createTime
}}
</van-col>
</van-row>
</div>
</van-step>
</van-steps>
...
...
src/views/saveWorkbench/index.vue
View file @
22fa4ff3
...
...
@@ -144,6 +144,13 @@ export default {
}
],
dangerList
:
[
{
key
:
"
11
"
,
// path: "/danger",
path
:
"
/insert-danger
"
,
imgUrl
:
require
(
"
@/assets/workbench/risk-confirm.png
"
),
text
:
"
我的上报
"
},
// 隐患排查治理
{
key
:
"
1
"
,
...
...
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