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
e57ca340
Commit
e57ca340
authored
Nov 12, 2021
by
罗新东
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了上传显示图标,修改了隐患详情不显示图片,已经修改不成功
parent
01410880
Pipeline
#7106
passed with stage
in 11 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
18 deletions
+64
-18
src/assets/upload/file.png
src/assets/upload/file.png
+0
-0
src/assets/upload/pic.png
src/assets/upload/pic.png
+0
-0
src/assets/upload/video.png
src/assets/upload/video.png
+0
-0
src/views/danger/addDanger/addDanger.vue
src/views/danger/addDanger/addDanger.vue
+61
-15
src/views/danger/majorDanger/majorSurvey.vue
src/views/danger/majorDanger/majorSurvey.vue
+2
-2
src/views/danger/standBook/normalDetail.vue
src/views/danger/standBook/normalDetail.vue
+1
-1
No files found.
src/assets/upload/file.png
View replaced file @
01410880
View file @
e57ca340
3.05 KB
|
W:
|
H:
426 Bytes
|
W:
|
H:
2-up
Swipe
Onion skin
src/assets/upload/pic.png
0 → 100644
View file @
e57ca340
443 Bytes
src/assets/upload/video.png
View replaced file @
01410880
View file @
e57ca340
3.33 KB
|
W:
|
H:
449 Bytes
|
W:
|
H:
2-up
Swipe
Onion skin
src/views/danger/addDanger/addDanger.vue
View file @
e57ca340
...
...
@@ -27,7 +27,11 @@
@
click=
"showProjectName = true"
:rules=
"[
{ required: true, message: '所属项目不能为空' }]"
/>
<van-popup
v-model=
"showProjectName"
position=
"bottom"
v-if=
"!isShowreturnCause"
>
<van-popup
v-model=
"showProjectName"
position=
"bottom"
v-if=
"!isShowreturnCause"
>
<van-picker
show-toolbar
value-key=
"projectName"
...
...
@@ -47,7 +51,11 @@
@
click=
"showRange = true"
:rules=
"[
{ required: true, message: '适用范围不能为空' }]"
/>
<van-popup
v-model=
"showRange"
position=
"bottom"
v-if=
"!isShowreturnCause"
>
<van-popup
v-model=
"showRange"
position=
"bottom"
v-if=
"!isShowreturnCause"
>
<van-picker
show-toolbar
value-key=
"hdRange"
...
...
@@ -66,6 +74,7 @@
placeholder=
"请选择"
@
click=
"showType = true"
:rules=
"[
{ required: true, message: '隐患类型不能为空' }]"
:class="{'gray':isShowreturnCause}"
/>
<van-popup
v-model=
"showType"
position=
"bottom"
v-if=
"!isShowreturnCause"
>
<van-picker
...
...
@@ -87,7 +96,11 @@
@
click=
"showDangerName = true"
:rules=
"[
{ required: true, message: '隐患项目名称不能为空' }]"
/>
<van-popup
v-model=
"showDangerName"
position=
"bottom"
v-if=
"!isShowreturnCause"
>
<van-popup
v-model=
"showDangerName"
position=
"bottom"
v-if=
"!isShowreturnCause"
>
<van-picker
show-toolbar
value-key=
"hdName"
...
...
@@ -216,7 +229,29 @@
:max-count=
"5"
upload-text=
"最多上传五个"
v-model=
"uploaderImg"
/>
>
<template
slot=
"default"
>
<!-- 11111111111 -->
<div
style=
"
width: 2.13333rem;
height: 2.13333rem;
background: #f7f8fa;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
"
>
<img
src=
"@/assets/upload/pic.png"
alt=
""
style=
"width: 0.64rem; height: 0.64rem"
/>
<span
class=
"van-uploader__upload-text"
>
最多上传五个
</span>
</div>
</
template
>
</van-uploader>
</template>
</van-field>
...
...
@@ -229,7 +264,7 @@
v-model=
"uploaderVideo"
accept=
"video/*"
>
<template
slot=
"default"
>
<template
slot=
"default"
>
<!-- 11111111111 -->
<div
style=
"
...
...
@@ -392,6 +427,7 @@ export default {
data
()
{
return
{
id
:
0
,
text
:
"
新增隐患
"
,
taskId
:
""
,
projectId
:
""
,
// 所属工程
...
...
@@ -465,6 +501,7 @@ export default {
onSubmit
(
values
)
{
let
formdata
=
new
FormData
();
formdata
.
append
(
"
id
"
,
this
.
id
);
formdata
.
append
(
"
proId
"
,
this
.
projectId
);
// formdata.append("projectName", this.projectName);
formdata
.
append
(
"
hdRange
"
,
values
.
hdRange
);
...
...
@@ -548,8 +585,9 @@ export default {
// 对数据进行赋值
this
.
returnCause
=
res
.
data
.
reason
;
let
msg
=
res
.
data
.
hdReport
;
msg
.
hdPictureList
=
msg
.
hdPictureList
||
[];
msg
.
hdVideoList
=
msg
.
hdVideoList
||
[];
// msg.hdPictureList=msg.hdPictureList||[];
// msg.hdVideoList=msg.hdVideoList||[];
this
.
id
=
msg
.
id
;
this
.
projectId
=
msg
.
proId
;
this
.
projectName
=
res
.
data
.
projectInformations
.
filter
(
(
item
)
=>
item
.
id
==
msg
.
proId
...
...
@@ -566,20 +604,28 @@ export default {
this
.
describe
=
msg
.
hdDescribe
;
this
.
expireTime
=
msg
.
hdExpirationTime
;
this
.
recPeople
=
msg
.
rectificationUser
;
this
.
uploaderImg
=
msg
.
hdPictureList
.
map
(
item
=>
{
this
.
uploaderImg
=
(
res
.
data
.
imgsysFiles
||
[]).
map
((
item
)
=>
{
return
{
...
item
,
url
:
item
.
filePath
}
})
this
.
uploaderVideo
=
msg
.
hdVideoList
.
map
(
item
=>
{
url
:
item
.
filePath
,
};
});
console
.
log
(
this
.
uploaderImg
);
this
.
uploaderVideo
=
(
res
.
data
.
videosysFiles
||
[]).
map
((
item
)
=>
{
return
{
...
item
,
url
:
item
.
filePath
url
:
item
.
filePath
,
};
});
postHdShowPeople
(
`/hdreport/showPeople/
${
msg
.
proId
}
`
).
then
(
(
res
)
=>
{
this
.
columnsRecPeople
=
res
.
data
;
}
})
);
})
.
catch
(()
=>
{
.
catch
((
err
)
=>
{
console
.
log
(
err
);
this
.
$toast
.
clear
();
this
.
$toast
.
fail
(
"
加载失败,请稍后再试
"
);
});
...
...
src/views/danger/majorDanger/majorSurvey.vue
View file @
e57ca340
...
...
@@ -34,7 +34,7 @@
:scroll-to-error=
"true"
validate-trigger=
"onSubmit"
>
<van-field
name=
"isResult"
label=
"
隐患复查
结果"
>
<van-field
name=
"isResult"
label=
"
审批
结果"
>
<template
#input
>
<van-radio-group
v-model=
"radio"
...
...
@@ -42,7 +42,7 @@
@
change=
"selectResult"
>
<van-radio
name=
"1"
>
同意
</van-radio>
<van-radio
name=
"0"
>
重新认定隐患级别
</van-radio>
<van-radio
name=
"0"
>
退回
</van-radio>
</van-radio-group>
</
template
>
</van-field>
...
...
src/views/danger/standBook/normalDetail.vue
View file @
e57ca340
...
...
@@ -210,7 +210,7 @@
>
<van-col
span=
"18"
>
{{
item
.
createTime
}}
</van-col>
</van-row>
<van-row>
<van-row
v-if=
"item.thinkHdLev"
>
<van-col
span=
"9"
><span
class=
"field-title"
>
认定隐患级别:
</span></van-col
>
...
...
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