Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
GaoQuYingJiH5-ASD
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
xinzhedeai
GaoQuYingJiH5-ASD
Commits
096faad1
Commit
096faad1
authored
Jul 13, 2024
by
xinzhedeai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
应急演练上传
parent
ebf76af9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
183 additions
and
175 deletions
+183
-175
http.js
sdk/http.js
+1
-1
dw-list-detail.html
src/dw-list-detail.html
+8
-11
dw-list-detail.js
src/dw-list-detail.js
+87
-89
emergency-detail.html
src/emergency-detail.html
+22
-10
emergency-detail.js
src/emergency-detail.js
+65
-64
No files found.
sdk/http.js
View file @
096faad1
...
...
@@ -48,7 +48,7 @@ var http2 = {
if
(
!
value
){
vant
.
Dialog
.
alert
({
title
:
'
信息提示
'
,
message
:
'
网络异常, 请重
新刷新页面
'
,
message
:
'
网络异常, 请重
试
'
,
// message: '请求异常'
})
fn
&&
fn
(
null
)
...
...
src/dw-list-detail.html
View file @
096faad1
...
...
@@ -6,10 +6,6 @@
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0, viewprot-fit:cover"
>
<title>
危险作业备案-详情
</title>
<!-- <script src="https://cdn.bootcdn.net/ajax/libs/pdf.js/2.0.193/pdf.min.js"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/pdf.js/2.0.193/pdf.worker.min.js"></script> -->
<!-- <script src="../js/pdfjs-4.2.67-dist/build/pdf.mjs"></script>
<script src="../js/pdfjs-4.2.67-dist/build/pdf.worker.mjs"></script> -->
<script
src=
"https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.11.338/pdf.min.js"
></script>
<script
type=
"text/javascript"
src=
"../sdk/includeHead.js"
></script>
<style>
...
...
@@ -46,15 +42,15 @@
<div
class=
"content"
v-cloak
>
<input
type=
"submit"
id=
"submitBtn"
style=
"display:none;"
>
<van-cell-group>
<van-field
v-model=
"form.name"
:disabled=
"disabled"
label=
"危险作业"
placeholder=
""
/>
<van-field
v-model=
"form.name"
:disabled=
"disabled"
label=
"危险作业
*
"
placeholder=
""
/>
</van-cell-group>
<van-cell-group
:class=
"{'disable-van-cell': disabled}"
>
<van-cell
is-link
@
click=
"showPopup('showPopup4hdInspectDate1')"
>
作业起始时间
<span
class=
"formValue"
>
{{form.startTime}}
</span></van-cell>
<van-cell
is-link
@
click=
"showPopup('showPopup4hdInspectDate1')"
>
作业起始时间
*
<span
class=
"formValue"
>
{{form.startTime}}
</span></van-cell>
<van-popup
v-model=
"showPopup4hdInspectDate1"
position=
"bottom"
:style=
"{ height: '30%' }"
>
<van-datetime-picker
v-model=
"hdInspectDateModel1"
type=
"date"
title=
"选择年月日"
@
confirm=
"confirm4hdInspectDate1"
@
cancel=
"showPopup4hdInspectDate1=false"
/>
</van-cell-group>
<van-cell-group
:class=
"{'disable-van-cell': disabled}"
>
<van-cell
is-link
@
click=
"showPopup('showPopup4hdInspectDate2')"
>
作业结束时间
<span
class=
"formValue"
>
{{form.endTime}}
</span></van-cell>
<van-cell
is-link
@
click=
"showPopup('showPopup4hdInspectDate2')"
>
作业结束时间
*
<span
class=
"formValue"
>
{{form.endTime}}
</span></van-cell>
<van-popup
v-model=
"showPopup4hdInspectDate2"
position=
"bottom"
:style=
"{ height: '30%' }"
>
<van-datetime-picker
v-model=
"hdInspectDateModel2"
type=
"date"
title=
"选择年月日"
@
confirm=
"confirm4hdInspectDate2"
@
cancel=
"showPopup4hdInspectDate2=false"
/>
</van-cell-group>
...
...
@@ -94,18 +90,19 @@
<span
v-show=
"!disabled"
style=
"font-weight: bold; cursor: pointer;"
@
click=
"filePathList=[];fileList=[]"
>
删除
</span>
</van-cell>
</van-cell-group>
<!-- :before-read="beforeRead" :max-size="1*1024*1024"-->
<van-cell-group
:class=
"{'disable-van-cell': disabled}"
v-show=
"pageType !== 'detail' && !filePathList.length"
>
<van-cell>
文件:
<span
style=
"color: red;"
>
(限制大小2.5M以内,格式png/jpg/jpeg/pdf)
</span>
<div
style=
"width: 2.5rem;"
>
<van-uploader
v-model=
"fileList"
accept=
".jpg,.jpeg,.png,.pdf"
:preview-image=
"false"
:before-upload=
"beforeUpload"
:after-read=
"afterRead"
:before-read=
"beforeRead"
:after-read=
"afterRead"
:preview-full-image=
"false"
>
<!-- <van-button size="mini" icon="plus" type="primary">上传文件</van-button> -->
<!--
:after-read="afterRead"
:before-read="beforeRead"
<van-button size="mini" icon="plus" type="primary">上传文件</van-button> -->
<div
style=
"width: 1.6rem;height: 0.6rem;line-height: 0.6rem; background-color: #1989fa;color:#fff;text-align: center;border-radius: 2px;"
>
上传文件
</div>
</van-uploader>
</div></van-cell>
...
...
src/dw-list-detail.js
View file @
096faad1
...
...
@@ -58,38 +58,34 @@ window.addEventListener("load", function() {
this
.
disabled
=
false
this
.
pageType
=
'
edit
'
this
.
detail
()
}
else
{
// 新增
}
else
if
(
gemhoUtil
.
getParameter
(
'
type
'
)
===
'
add
'
)
{
// 新增
this
.
disabled
=
true
this
.
pageType
=
'
add
'
this
.
resetData
()
}
},
computed
:{
showImage
(){
return
this
.
filePathList
[
0
]
&&
(
this
.
filePathList
[
0
].
indexOf
(
'
.png
'
)
>-
1
||
this
.
filePathList
[
0
].
indexOf
(
'
.jpg
'
)
>-
1
||
this
.
filePathList
[
0
].
indexOf
(
'
.jpeg
'
)
>-
1
)
computed
:
{
showImage
()
{
return
this
.
filePathList
[
0
]
&&
(
this
.
filePathList
[
0
].
indexOf
(
'
.png
'
)
>
-
1
||
this
.
filePathList
[
0
].
indexOf
(
'
.jpg
'
)
>
-
1
||
this
.
filePathList
[
0
].
indexOf
(
'
.jpeg
'
)
>-
1
)
},
showPdf
(){
return
this
.
filePathList
[
0
]
&&
(
this
.
filePathList
[
0
].
indexOf
(
'
.pdf
'
)
>
-
1
)
showPdf
()
{
return
this
.
filePathList
[
0
]
&&
(
this
.
filePathList
[
0
].
indexOf
(
'
.pdf
'
)
>
-
1
)
},
showWrapper
(){
showWrapper
()
{
return
this
.
filePathList
[
0
]
}
},
methods
:
{
previewFile
(){
previewFile
()
{
// var src = 'dangerjob/e40eda16-7a86-4a2a-976b-892e17eeed49.pdf'
// location.href = './pdfViewer.html?pdfSrc='+ src
console
.
log
(
this
.
previewUrl
+
'
/
'
+
this
.
filePathList
[
0
])
location
.
href
=
this
.
previewUrl
+
'
/
'
+
this
.
filePathList
[
0
]
},
beforeUpload
(
file
)
{
console
.
log
(
'
beforeUpload
'
,
file
)
// 在文件上传之前的处理逻辑,例如校验文件大小、文件类型等
return
true
;
// 返回 true 继续上传,返回 false 中止上传
},
beforeRead
(
file
)
{
if
(
file
.
size
>
(
2.5
*
1024
*
1024
))
{
if
(
file
.
size
>
(
2.5
*
1024
*
1024
))
{
vant
.
Dialog
.
alert
({
title
:
'
信息提示
'
,
message
:
'
文件大小不可超过2.5M
'
...
...
@@ -98,65 +94,67 @@ window.addEventListener("load", function() {
}
return
true
;
},
afterRead
(
file
)
{
console
.
log
(
'
afterRead
'
,
file
)
// 文件读取完成后的处理逻辑
const
formData
=
new
FormData
();
formData
.
append
(
'
file
'
,
file
.
file
);
// 通过FormData构建要上传的文件数据
formData
.
append
(
'
modelName
'
,
'
dangerjob
'
);
// console.log('afterRead', file)
// // 文件读取完成后的处理逻辑
// const formData = new FormData();
// formData.append('file', file.file); // 通过FormData构建要上传的文件数据
// formData.append('modelName', 'dangerjob');
// 发送HTTP POST请求
fetch
(
this
.
previewUrl
+
'
/api/common/upload
'
,
{
method
:
'
POST
'
,
body
:
formData
})
.
then
(
response
=>
{
if
(
response
.
ok
)
{
return
response
.
json
();
}
throw
new
Error
(
'
Network response was not ok.
'
);
})
.
then
(
data
=>
{
console
.
log
(
data
);
// 处理后端返回的数据
// 可根据后端返回的数据做进一步处理,如显示上传成功信息等
this
.
filePathList
=
data
.
body
?
[
data
.
body
]
:
[]
})
.
catch
(
error
=>
{
console
.
error
(
'
There has been a problem with your fetch operation:
'
,
error
);
});
},
// afterRead(file) { // 调用爱山东中台系统,将数据流传递过去
// // gemhoUtil.setCookie('uploading', 'Y')
// vant.Toast.loading({
// message: '正在处理...',
// forbidClick: true,
// loadingType: 'spinner',
// });
// http2.post({
// serviceId: API_KEY_MAP["upload"]['id'],
// interfacePublicKey: API_KEY_MAP["upload"]["publicKey"],
// interfacePrivateKey: API_KEY_MAP["upload"]["privateKey"],
// reqParams: {
// modelName: 'dangerjob',
// },
// fileList: [{
// fileName: 'file',
// file: file.file
// }]
// }, (res) => {
// // gemhoUtil.setCookie('uploading', 'N')
// if(res){
// console.log('接口回调数据', JSON.parse(res))
// var result = JSON.parse(res)
// if(result.body && result.body.indexOf('dangerjob') > -1){
// this.filePathList = [result.body]
// }else{
// this.filePathList = []
// }
// vant.Toast.clear()
// // 发送HTTP POST请求
// fetch(this.previewUrl + '/api/common/upload', {
// method: 'POST',
// body: formData
// })
// .then(response => {
// if (response.ok) {
// return response.json();
// }
// throw new Error('Network response was not ok.');
// })
// .then(data => {
// console.log(data); // 处理后端返回的数据
// // 可根据后端返回的数据做进一步处理,如显示上传成功信息等
// this.filePathList = data.body ? [data.body] : []
// })
// .catch(error => {
// console.error('There has been a problem with your fetch operation:', error);
// });
// },
// afterRead
// beforeRead
afterRead
(
file
)
{
// 调用爱山东中台系统,将数据流传递过去
// gemhoUtil.setCookie('uploading', 'Y')
vant
.
Toast
.
loading
({
message
:
'
正在处理...
'
,
forbidClick
:
true
,
loadingType
:
'
spinner
'
,
});
http2
.
post
({
serviceId
:
API_KEY_MAP
[
"
upload
"
][
'
id
'
],
interfacePublicKey
:
API_KEY_MAP
[
"
upload
"
][
"
publicKey
"
],
interfacePrivateKey
:
API_KEY_MAP
[
"
upload
"
][
"
privateKey
"
],
reqParams
:
{
modelName
:
'
dangerjob
'
,
},
fileList
:
[{
fileName
:
'
file
'
,
file
:
file
.
file
}]
},
(
res
)
=>
{
// gemhoUtil.setCookie('uploading', 'N')
if
(
res
)
{
console
.
log
(
'
接口回调数据
'
,
JSON
.
parse
(
res
))
var
result
=
JSON
.
parse
(
res
)
if
(
result
.
body
&&
result
.
body
.
indexOf
(
'
dangerjob
'
)
>
-
1
)
{
this
.
filePathList
=
[
result
.
body
]
}
else
{
this
.
filePathList
=
[]
}
vant
.
Toast
.
clear
()
}
})
},
resetData
()
{
// 使用 Object.assign 来重写 this.$data,以达到重置 data 的目的
Object
.
assign
(
this
.
$data
,
this
.
$options
.
data
.
call
(
this
));
...
...
@@ -181,14 +179,14 @@ window.addEventListener("load", function() {
}
},
(
res
)
=>
{
if
(
res
)
{
if
(
res
)
{
console
.
log
(
'
接口回调数据
'
,
JSON
.
parse
(
res
))
vant
.
Toast
.
clear
()
var
result
=
JSON
.
parse
(
res
)
// this.noticeContent = result.noticeContent
this
.
form
=
result
.
content
[
0
]
this
.
filePathList
=
result
.
content
[
0
].
filePathList
||
[]
if
(
this
.
form
.
workTime
&&
this
.
form
.
workTime
.
length
)
{
if
(
this
.
form
.
workTime
&&
this
.
form
.
workTime
.
length
)
{
this
.
form
.
startTime
=
this
.
form
.
workTime
[
0
]
this
.
form
.
endTime
=
this
.
form
.
workTime
[
1
]
}
...
...
@@ -208,7 +206,7 @@ window.addEventListener("load", function() {
})
return
;
}
if
(
+
new
Date
(
this
.
form
.
startTime
)
>
+
new
Date
(
this
.
form
.
endTime
))
{
if
(
+
new
Date
(
this
.
form
.
startTime
)
>
+
new
Date
(
this
.
form
.
endTime
))
{
vant
.
Dialog
.
alert
({
message
:
'
起始时间不能大于结束时间
'
,
})
...
...
@@ -229,7 +227,7 @@ window.addEventListener("load", function() {
reqParams
:
this
.
form
},
(
res
)
=>
{
if
(
res
)
{
if
(
res
)
{
console
.
log
(
'
添加结果
'
,
res
)
vant
.
Toast
({
message
:
'
操作成功
'
,
...
...
src/emergency-detail.html
View file @
096faad1
...
...
@@ -27,11 +27,21 @@
.van-cell
:after
{
border-bottom
:
none
;
}
.formSubmitBtnWrapper
{
display
:
flex
;
justify-content
:
center
;
margin-top
:
0.2rem
;
margin-bottom
:
0.2rem
;
}
.formSubmitBtnWrapper
.van-button
{
width
:
4rem
;
}
</style>
</head>
<body>
<div
id=
"app"
>
<div
class=
"content"
v-cloak
:class=
"{'disable-van-cell':
!disabled}
"
>
<div
class=
"content"
v-cloak
:class=
"{'disable-van-cell':
disabled}"
v-show=
"form.planName
"
>
<span
style=
"font-size: 16px; color #000; font-weight: bold;margin-left:0.25rem;"
>
演练任务
</span>
<van-cell-group>
<van-field
v-model=
"form.planName"
:disabled=
"true"
label=
"计划名称"
placeholder=
""
/>
...
...
@@ -46,14 +56,7 @@
<van-field
v-model=
"form.publishDesc"
:disabled=
"true"
label=
"演练描述"
placeholder=
""
/>
</van-cell-group>
<span
style=
"font-size: 16px; color #000; font-weight: bold; margin-left:0.25rem"
>
演练情况
</span>
<van-button
v-if=
"!disabled"
type=
"info"
size=
"small"
@
click=
"submit"
style=
"margin-left: 4.2rem;width: 1.2rem; height:0.6rem;}"
>
提交
</van-button>
<div>
<van-cell-group>
<van-field
v-model=
"form.issueDescription"
:disabled=
"disabled"
label=
"发现问题"
placeholder=
""
/>
</van-cell-group>
<van-cell-group>
<van-field
v-model=
"form.processDescription"
:disabled=
"disabled"
label=
"过程描述"
placeholder=
""
/>
</van-cell-group>
<van-cell-group
:class=
"{'disable-van-cell': true}"
v-show=
"showWrapper"
>
<van-cell>
文件预览:
<div
style=
"width: 6.5rem;"
>
...
...
@@ -72,7 +75,6 @@
<van-uploader
v-model=
"fileList"
accept=
".jpg,.jpeg,.png"
:preview-image=
"false"
:before-upload=
"beforeUpload"
:after-read=
"afterRead"
:before-read=
"beforeRead"
:preview-full-image=
"false"
>
...
...
@@ -83,14 +85,24 @@
</van-uploader>
</div></van-cell>
</van-cell-group>
<van-cell-group>
<van-field
v-model=
"form.issueDescription"
:disabled=
"disabled"
label=
"发现问题*"
placeholder=
""
/>
</van-cell-group>
<van-cell-group>
<van-field
v-model=
"form.processDescription"
:disabled=
"disabled"
label=
"过程描述*"
placeholder=
""
/>
</van-cell-group>
<van-cell-group
:class=
"{'disable-van-cell': disabled}"
>
<van-cell
is-link
@
click=
"showPopup('showPopup4completionDate')"
>
完成时间
<span
class=
"formValue"
>
{{form.completionDate}}
</span></van-cell>
<van-cell
@
click=
"showPopup('showPopup4completionDate')"
>
完成时间*
<span
class=
"formValue"
>
{{form.completionDate}}
</span></van-cell>
<van-popup
v-model=
"showPopup4completionDate"
position=
"bottom"
:style=
"{ height: '30%' }"
>
<van-datetime-picker
v-model=
"completionDate"
type=
"date"
title=
"选择年月日"
@
confirm=
"confirm4completionDate"
@
cancel=
"showPopup4completionDate=false"
/>
</van-popup>
</van-cell-group>
</div>
<div
class=
"formSubmitBtnWrapper"
v-if=
"!disabled"
>
<van-button
type=
"info"
size=
"small"
@
click=
"submit"
>
提交
</van-button>
</div>
</div>
</div>
</body>
...
...
src/emergency-detail.js
View file @
096faad1
...
...
@@ -89,17 +89,18 @@ window.addEventListener("load", function() {
vant
.
Toast
({
message
:
'
操作成功
'
,
})
if
(
!
this
.
form
.
id
)
{
// 添加时则
location
.
reload
()
}
// if (!this.form.id) { // 添加时则
// location.reload()
// }
history
.
back
()
}
})
},
beforeUpload
(
file
)
{
console
.
log
(
'
beforeUpload
'
,
file
)
// 在文件上传之前的处理逻辑,例如校验文件大小、文件类型等
return
true
;
// 返回 true 继续上传,返回 false 中止上传
},
//
beforeUpload(file) {
//
console.log('beforeUpload',file)
//
// 在文件上传之前的处理逻辑,例如校验文件大小、文件类型等
//
return true; // 返回 true 继续上传,返回 false 中止上传
//
},
beforeRead
(
file
)
{
if
(
file
.
size
>
(
2.5
*
1024
*
1024
))
{
vant
.
Dialog
.
alert
({
...
...
@@ -110,67 +111,67 @@ window.addEventListener("load", function() {
}
return
true
;
},
// afterRead(file) {
// // 获取文件流,调用网关中台接口,获取文件全路径url
// console.log('afterRead',file)
// vant.Toast.loading({
// message: '正在处理...',
// forbidClick: true,
// loadingType: 'spinner',
// });
// http2.post({
// serviceId: API_KEY_MAP["upload"]['id'],
// interfacePublicKey: API_KEY_MAP["upload"]["publicKey"],
// interfacePrivateKey: API_KEY_MAP["upload"]["privateKey"],
// reqParams: {
// modelName: 'emergencydrill',
// },
// fileList: [{
// fileName: 'file',
// file: file.file
// }]
// }, (res) => {
// // gemhoUtil.setCookie('uploading', 'N')
// if(res){
// console.log('接口回调数据', JSON.parse(res))
// var result = JSON.parse(res)
// if(result.body && result.body.indexOf('emergencydrill') > -1){
// this.filePathList = [result.body]
// }else{
// this.filePathList = []
// }
// vant.Toast.clear()
// }
// })
// },
afterRead
(
file
)
{
// 获取文件流,调用网关中台接口,获取文件全路径url
console
.
log
(
'
afterRead
'
,
file
)
// 文件读取完成后的处理逻辑
const
formData
=
new
FormData
();
formData
.
append
(
'
file
'
,
file
.
file
);
// 通过FormData构建要上传的文件数据
formData
.
append
(
'
modelName
'
,
'
emergencydrill
'
);
// 发送HTTP POST请求
fetch
(
this
.
previewUrl
+
'
/api/common/upload
'
,
{
method
:
'
POST
'
,
body
:
formData
})
.
then
(
response
=>
{
if
(
response
.
ok
)
{
return
response
.
json
();
vant
.
Toast
.
loading
({
message
:
'
正在处理...
'
,
forbidClick
:
true
,
loadingType
:
'
spinner
'
,
});
http2
.
post
({
serviceId
:
API_KEY_MAP
[
"
upload
"
][
'
id
'
],
interfacePublicKey
:
API_KEY_MAP
[
"
upload
"
][
"
publicKey
"
],
interfacePrivateKey
:
API_KEY_MAP
[
"
upload
"
][
"
privateKey
"
],
reqParams
:
{
modelName
:
'
emergencydrill
'
,
},
fileList
:
[{
fileName
:
'
file
'
,
file
:
file
.
file
}]
},
(
res
)
=>
{
// gemhoUtil.setCookie('uploading', 'N')
if
(
res
){
console
.
log
(
'
接口回调数据
'
,
JSON
.
parse
(
res
))
var
result
=
JSON
.
parse
(
res
)
if
(
result
.
body
&&
result
.
body
.
indexOf
(
'
emergencydrill
'
)
>
-
1
){
this
.
filePathList
=
[
result
.
body
]
}
else
{
this
.
filePathList
=
[]
}
vant
.
Toast
.
clear
()
}
throw
new
Error
(
'
Network response was not ok.
'
);
})
.
then
(
data
=>
{
console
.
log
(
data
);
// 处理后端返回的数据
// 可根据后端返回的数据做进一步处理,如显示上传成功信息等
this
.
filePathList
=
data
.
body
?
[
data
.
body
]
:
[]
})
.
catch
(
error
=>
{
console
.
error
(
'
There has been a problem with your fetch operation:
'
,
error
);
});
},
// afterRead(file) {
// console.log('afterRead',file)
// // 文件读取完成后的处理逻辑
// const formData = new FormData();
// formData.append('file', file.file); // 通过FormData构建要上传的文件数据
// formData.append('modelName', 'emergencydrill');
// // 发送HTTP POST请求
// fetch(this.previewUrl + '/api/common/upload', {
// method: 'POST',
// body: formData
// })
// .then(response => {
// if (response.ok) {
// return response.json();
// }
// throw new Error('Network response was not ok.');
// })
// .then(data => {
// console.log(data); // 处理后端返回的数据
// // 可根据后端返回的数据做进一步处理,如显示上传成功信息等
// this.filePathList = data.body ? [data.body] : []
// })
// .catch(error => {
// console.error('There has been a problem with your fetch operation:', error);
// });
// },
showPopup
(
popupType
)
{
if
(
!
this
.
disabled
)
{
this
[
popupType
]
=
true
...
...
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