Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety
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
Commits
74a73389
Commit
74a73389
authored
Aug 19, 2021
by
王晓倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
设备信息获取经纬度、管道信息获取坐标
parent
ae570df8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
651 additions
and
543 deletions
+651
-543
DeviceInfoVo.java
...c/main/java/com/zehong/system/domain/vo/DeviceInfoVo.java
+4
-4
PipeVo.java
...tem/src/main/java/com/zehong/system/domain/vo/PipeVo.java
+4
-4
index.vue
gassafety-web/src/views/device/deviceInfo/index.vue
+401
-293
index.vue
gassafety-web/src/views/device/pipe/index.vue
+242
-242
No files found.
gassafety-system/src/main/java/com/zehong/system/domain/vo/DeviceInfoVo.java
View file @
74a73389
...
...
@@ -79,13 +79,13 @@ public class DeviceInfoVo extends BaseEntity
private
String
phone
;
/** 安装时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
@Excel
(
name
=
"安装时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd
HH:mm:ss
"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"安装时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
installationTime
;
/** 最后巡检时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
@Excel
(
name
=
"最后巡检时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd
HH:mm:ss
"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"最后巡检时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
inspectionTime
;
/** 是否删除 */
...
...
gassafety-system/src/main/java/com/zehong/system/domain/vo/PipeVo.java
View file @
74a73389
...
...
@@ -63,13 +63,13 @@ public class PipeVo extends BaseEntity
private
String
iconUrl
;
/** 安装时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
@Excel
(
name
=
"安装时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd
HH:mm:ss
"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"安装时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
installationTime
;
/** 最后巡检时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
@Excel
(
name
=
"最后巡检时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd
HH:mm:ss
"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"最后巡检时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
inspectionTime
;
/** 是否删除 */
...
...
gassafety-web/src/views/device/deviceInfo/index.vue
View file @
74a73389
This diff is collapsed.
Click to expand it.
gassafety-web/src/views/device/pipe/index.vue
View file @
74a73389
...
...
@@ -243,11 +243,11 @@
</template>
<
script
>
import
{
listPipe
,
getPipe
,
addPipe
,
updatePipe
,
exportPipe
}
from
"@/api/device/pipe"
;
import
MyFileUpload
from
'@/components/MyFileUpload'
;
//
import Mapdialog from "@/components/mapDialog/checkPipeLineLocation.vue";
import
{
listPipe
,
getPipe
,
addPipe
,
updatePipe
,
exportPipe
}
from
"@/api/device/pipe"
;
import
MyFileUpload
from
'@/components/MyFileUpload'
;
import
Mapdialog
from
"@/components/mapDialog/checkPipeLineLocation.vue"
;
export
default
{
export
default
{
name
:
"Pipe"
,
components
:
{
MyFileUpload
,
...
...
@@ -280,6 +280,7 @@ export default {
// 地图
loadmap
:
false
,
dialogTableVisible
:
false
,
str
:
""
,
// 管道压力数据字典
pressureOptions
:
[],
// 查询参数
...
...
@@ -365,9 +366,8 @@ export default {
this
.
fileList
=
[];
},
confirmFun
(
res
)
{
//确认选择经纬度
this
.
form
.
longitude
=
res
.
lng
;
this
.
form
.
latitude
=
res
.
lat
;
//确认选择坐标
this
.
form
.
coordinates
=
res
;
},
MapdialogFun
()
{
this
.
loadmap
=
true
;
...
...
@@ -503,7 +503,7 @@ export default {
})
},
}
};
};
</
script
>
<
style
>
...
...
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