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
b0b31198
Commit
b0b31198
authored
Aug 11, 2021
by
纪泽龙
Browse files
Options
Browse Files
Download
Plain Diff
优化一些页面逻辑
parents
624e1196
9a38e9f1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
458 additions
and
291 deletions
+458
-291
flowMeter.vue
gassafety-web/src/components/PopWindow/flowMeter.vue
+22
-10
pressureGage.vue
gassafety-web/src/components/PopWindow/pressureGage.vue
+25
-6
regulatorBox.vue
gassafety-web/src/components/PopWindow/regulatorBox.vue
+135
-117
valveWell.vue
gassafety-web/src/components/PopWindow/valveWell.vue
+134
-116
workerManView.vue
gassafety-web/src/components/PopWindowGis/workerManView.vue
+14
-1
index.vue
gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue
+124
-37
index.vue
gassafety-web/src/views/enterprise/mapView/index.vue
+4
-4
No files found.
gassafety-web/src/components/PopWindow/flowMeter.vue
View file @
b0b31198
...
@@ -9,7 +9,11 @@
...
@@ -9,7 +9,11 @@
<el-row>
<el-row>
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"所属管道"
prop=
"pipeCode"
>
<el-form-item
label=
"所属管道"
prop=
"pipeCode"
>
<el-select
v-model=
"form.pipeCode"
placeholder=
"请选择所属管道"
style=
"width: 100%"
>
<el-select
v-model=
"form.pipeCode"
placeholder=
"请选择所属管道"
style=
"width: 100%"
>
<el-option
<el-option
v-for=
"item in pipeList"
v-for=
"item in pipeList"
:key=
"item.pipeCode"
:key=
"item.pipeCode"
...
@@ -75,7 +79,12 @@
...
@@ -75,7 +79,12 @@
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"联系电话"
prop=
"phone"
>
<el-form-item
label=
"联系电话"
prop=
"phone"
>
<el-input
v-model=
"form.phone"
placeholder=
"请输入联系电话"
/>
<el-input
type=
"number"
maxlength=
"11"
v-model=
"form.phone"
placeholder=
"请输入联系电话"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -171,7 +180,10 @@ export default {
...
@@ -171,7 +180,10 @@ export default {
{
required
:
true
,
message
:
"请输入物联网编号"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"请输入物联网编号"
,
trigger
:
"blur"
},
],
],
linkman
:
[{
required
:
true
,
message
:
"请输入联系人"
,
trigger
:
"blur"
}],
linkman
:
[{
required
:
true
,
message
:
"请输入联系人"
,
trigger
:
"blur"
}],
phone
:
[{
required
:
true
,
message
:
"请输入联系电话"
,
trigger
:
"blur"
}],
phone
:
[
{
required
:
true
,
message
:
"请输入联系电话"
,
trigger
:
"blur"
},
{
min
:
11
,
max
:
11
,
message
:
"长度11个数字"
,
trigger
:
"blur"
},
],
iconUrl
:
[{
required
:
true
,
message
:
"请上传图片"
,
trigger
:
"change"
}],
iconUrl
:
[{
required
:
true
,
message
:
"请上传图片"
,
trigger
:
"change"
}],
installationTime
:
[
installationTime
:
[
{
{
...
@@ -232,19 +244,19 @@ export default {
...
@@ -232,19 +244,19 @@ export default {
this
.
form
.
url
=
""
;
this
.
form
.
url
=
""
;
this
.
fileArr
=
[];
this
.
fileArr
=
[];
},
},
getPipeInfos
(){
getPipeInfos
()
{
pipeAllInfoList
({}).
then
((
response
)
=>
{
pipeAllInfoList
({}).
then
((
response
)
=>
{
this
.
pipeList
=
response
.
data
;
this
.
pipeList
=
response
.
data
;
});
});
}
},
},
watch
:{
},
dialogVisible
(
val
){
watch
:
{
if
(
val
){
dialogVisible
(
val
)
{
if
(
val
)
{
this
.
getPipeInfos
();
this
.
getPipeInfos
();
}
}
}
}
,
}
}
,
};
};
</
script
>
</
script
>
...
...
gassafety-web/src/components/PopWindow/pressureGage.vue
View file @
b0b31198
...
@@ -2,13 +2,18 @@
...
@@ -2,13 +2,18 @@
<el-dialog
<el-dialog
:title=
"title"
:title=
"title"
:visible
.
sync=
"dialogVisible"
:visible
.
sync=
"dialogVisible"
:before-close=
"handleClose"
>
:before-close=
"handleClose"
>
<el-row>
<el-row>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"135px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"135px"
>
<el-row>
<el-row>
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"所属管道"
prop=
"pipeCode"
>
<el-form-item
label=
"所属管道"
prop=
"pipeCode"
>
<el-select
v-model=
"form.pipeCode"
placeholder=
"请选择所属管道"
style=
"width: 100%"
>
<el-select
v-model=
"form.pipeCode"
placeholder=
"请选择所属管道"
style=
"width: 100%"
>
<el-option
<el-option
v-for=
"item in pipeList"
v-for=
"item in pipeList"
:key=
"item.pipeCode"
:key=
"item.pipeCode"
...
@@ -24,13 +29,19 @@
...
@@ -24,13 +29,19 @@
<el-row>
<el-row>
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备名称"
prop=
"deviceName"
>
<el-form-item
label=
"设备名称"
prop=
"deviceName"
>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备型号"
prop=
"deviceModel"
>
<el-form-item
label=
"设备型号"
prop=
"deviceModel"
>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -69,7 +80,12 @@
...
@@ -69,7 +80,12 @@
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"联系电话"
prop=
"phone"
>
<el-form-item
label=
"联系电话"
prop=
"phone"
>
<el-input
v-model=
"form.phone"
placeholder=
"请输入联系电话"
/>
<el-input
type=
"number"
maxlength=
"11"
v-model=
"form.phone"
placeholder=
"请输入联系电话"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -157,7 +173,10 @@ export default {
...
@@ -157,7 +173,10 @@ export default {
{
required
:
true
,
message
:
"请输入物联网编号"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"请输入物联网编号"
,
trigger
:
"blur"
},
],
],
linkman
:
[{
required
:
true
,
message
:
"请输入联系人"
,
trigger
:
"blur"
}],
linkman
:
[{
required
:
true
,
message
:
"请输入联系人"
,
trigger
:
"blur"
}],
phone
:
[{
required
:
true
,
message
:
"请输入联系电话"
,
trigger
:
"blur"
}],
phone
:
[
{
required
:
true
,
message
:
"请输入联系电话"
,
trigger
:
"blur"
},
{
min
:
11
,
max
:
11
,
message
:
"长度11个数字"
,
trigger
:
"blur"
},
],
iconUrl
:
[{
required
:
true
,
message
:
"请上传图片"
,
trigger
:
"change"
}],
iconUrl
:
[{
required
:
true
,
message
:
"请上传图片"
,
trigger
:
"change"
}],
installationTime
:
[
installationTime
:
[
{
{
...
...
gassafety-web/src/components/PopWindow/regulatorBox.vue
View file @
b0b31198
...
@@ -2,13 +2,18 @@
...
@@ -2,13 +2,18 @@
<el-dialog
<el-dialog
:title=
"title"
:title=
"title"
:visible
.
sync=
"dialogVisible"
:visible
.
sync=
"dialogVisible"
:before-close=
"handleClose"
>
:before-close=
"handleClose"
>
<el-row>
<el-row>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"135px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"135px"
>
<el-row>
<el-row>
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"所属管道"
prop=
"pipeCode"
>
<el-form-item
label=
"所属管道"
prop=
"pipeCode"
>
<el-select
v-model=
"form.pipeCode"
placeholder=
"请选择所属管道"
style=
"width: 100%"
>
<el-select
v-model=
"form.pipeCode"
placeholder=
"请选择所属管道"
style=
"width: 100%"
>
<el-option
<el-option
v-for=
"item in pipeList"
v-for=
"item in pipeList"
:key=
"item.pipeCode"
:key=
"item.pipeCode"
...
@@ -24,13 +29,19 @@
...
@@ -24,13 +29,19 @@
<el-row>
<el-row>
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备名称"
prop=
"deviceName"
>
<el-form-item
label=
"设备名称"
prop=
"deviceName"
>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备型号"
prop=
"deviceModel"
>
<el-form-item
label=
"设备型号"
prop=
"deviceModel"
>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -69,7 +80,12 @@
...
@@ -69,7 +80,12 @@
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"联系电话"
prop=
"phone"
>
<el-form-item
label=
"联系电话"
prop=
"phone"
>
<el-input
v-model=
"form.phone"
placeholder=
"请输入联系电话"
/>
<el-input
type=
"number"
maxlength=
"11"
v-model=
"form.phone"
placeholder=
"请输入联系电话"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -118,26 +134,29 @@
...
@@ -118,26 +134,29 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
{
getAllDeviceInfo
,
addDeviceInfo
,
updateDeviceInfo
,
}
from
"@/api/device/deviceInfo"
;
import
{
pipeAllInfoList
}
from
"@/api/device/pipe"
;
import
MyFileUpload
from
"@/components/MyFileUpload"
;
import
{
DEVICE_TYPE
}
from
"utils/gaodeMap.js"
;
import
{
getAllDeviceInfo
,
addDeviceInfo
,
updateDeviceInfo
}
from
"@/api/device/deviceInfo"
;
export
default
{
import
{
pipeAllInfoList
}
from
"@/api/device/pipe"
;
import
MyFileUpload
from
"@/components/MyFileUpload"
;
import
{
DEVICE_TYPE
}
from
"utils/gaodeMap.js"
;
export
default
{
props
:
{
props
:
{
title
:
{
type
:
String
}
title
:
{
type
:
String
},
},
},
data
()
{
data
()
{
return
{
return
{
form
:
{
form
:
{
deviceType
:
"1"
deviceType
:
"1"
,
},
},
dialogVisible
:
false
,
dialogVisible
:
false
,
fileList
:
[],
fileList
:
[],
map
:
null
,
map
:
null
,
obj
:
null
,
obj
:
null
,
gaoMap
:
null
,
gaoMap
:
null
,
fileArr
:
[],
fileArr
:
[],
pipeList
:
[],
pipeList
:
[],
rules
:
{
rules
:
{
...
@@ -157,11 +176,10 @@
...
@@ -157,11 +176,10 @@
iotNo
:
[
iotNo
:
[
{
required
:
true
,
message
:
"请输入物联网编号"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"请输入物联网编号"
,
trigger
:
"blur"
},
],
],
linkman
:
[
linkman
:
[{
required
:
true
,
message
:
"请输入联系人"
,
trigger
:
"blur"
}],
{
required
:
true
,
message
:
"请输入联系人"
,
trigger
:
"blur"
},
],
phone
:
[
phone
:
[
{
required
:
true
,
message
:
"请输入联系电话"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"请输入联系电话"
,
trigger
:
"blur"
},
{
min
:
11
,
max
:
11
,
message
:
"长度11个数字"
,
trigger
:
"blur"
},
],
],
iconUrl
:
[{
required
:
true
,
message
:
"请上传图片"
,
trigger
:
"change"
}],
iconUrl
:
[{
required
:
true
,
message
:
"请上传图片"
,
trigger
:
"change"
}],
installationTime
:
[
installationTime
:
[
...
@@ -173,43 +191,43 @@
...
@@ -173,43 +191,43 @@
},
},
],
],
},
},
}
};
},
},
components
:
{
components
:
{
MyFileUpload
MyFileUpload
,
},
},
methods
:
{
methods
:
{
show
()
{
show
()
{
this
.
dialogVisible
=
true
;
this
.
dialogVisible
=
true
;
//this.getPipeInfo();
//this.getPipeInfo();
},
},
hide
()
{
hide
()
{
this
.
remove
()
this
.
remove
();
},
},
getFileInfo
(
res
)
{
getFileInfo
(
res
)
{
this
.
form
.
iconUrl
=
res
.
url
;
this
.
form
.
iconUrl
=
res
.
url
;
},
},
submitForm
()
{
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
this
.
$refs
[
"form"
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
if
(
this
.
form
.
deviceId
!=
null
)
{
if
(
this
.
form
.
deviceId
!=
null
)
{
updateDeviceInfo
(
this
.
form
).
then
(
response
=>
{
updateDeviceInfo
(
this
.
form
).
then
((
response
)
=>
{
this
.
dialogVisible
=
false
;
this
.
dialogVisible
=
false
;
this
.
map
.
remove
(
this
.
obj
);
this
.
map
.
remove
(
this
.
obj
);
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
this
.
msgSuccess
(
"修改成功"
);
this
.
msgSuccess
(
"修改成功"
);
});
});
}
else
{
}
else
{
addDeviceInfo
(
this
.
form
).
then
(
response
=>
{
addDeviceInfo
(
this
.
form
).
then
((
response
)
=>
{
if
(
response
.
code
==
200
)
{
if
(
response
.
code
==
200
)
{
this
.
remove
();
this
.
remove
();
this
.
map
.
remove
(
this
.
obj
);
this
.
map
.
remove
(
this
.
obj
);
this
.
form
.
deviceId
=
response
.
data
;
this
.
form
.
deviceId
=
response
.
data
;
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
//this.gaoMap.placeSearch.clear();
//this.gaoMap.placeSearch.clear();
this
.
gaoMap
.
closeAddMarker
();
this
.
gaoMap
.
closeAddMarker
();
this
.
msgSuccess
(
"新增成功"
);
this
.
msgSuccess
(
"新增成功"
);
}
else
{
}
else
{
this
.
msgSuccess
(
"新增失败"
);
this
.
msgSuccess
(
"新增失败"
);
}
}
});
});
...
@@ -224,20 +242,20 @@
...
@@ -224,20 +242,20 @@
handleClose
(
done
)
{
handleClose
(
done
)
{
done
();
done
();
},
},
getPipeInfos
()
{
getPipeInfos
()
{
pipeAllInfoList
({}).
then
((
response
)
=>
{
pipeAllInfoList
({}).
then
((
response
)
=>
{
this
.
pipeList
=
response
.
data
;
this
.
pipeList
=
response
.
data
;
});
});
}
},
},
watch
:{
},
dialogVisible
(
val
){
watch
:
{
if
(
val
){
dialogVisible
(
val
)
{
if
(
val
)
{
this
.
getPipeInfos
();
this
.
getPipeInfos
();
}
}
}
},
}
},
}
};
</
script
>
</
script
>
gassafety-web/src/components/PopWindow/valveWell.vue
View file @
b0b31198
...
@@ -2,13 +2,18 @@
...
@@ -2,13 +2,18 @@
<el-dialog
<el-dialog
:title=
"title"
:title=
"title"
:visible
.
sync=
"dialogVisible"
:visible
.
sync=
"dialogVisible"
:before-close=
"handleClose"
>
:before-close=
"handleClose"
>
<el-row>
<el-row>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"135px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"135px"
>
<el-row>
<el-row>
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"所属管道"
prop=
"pipeCode"
>
<el-form-item
label=
"所属管道"
prop=
"pipeCode"
>
<el-select
v-model=
"form.pipeCode"
placeholder=
"请选择所属管道"
style=
"width: 100%"
>
<el-select
v-model=
"form.pipeCode"
placeholder=
"请选择所属管道"
style=
"width: 100%"
>
<el-option
<el-option
v-for=
"item in pipeList"
v-for=
"item in pipeList"
:key=
"item.pipeCode"
:key=
"item.pipeCode"
...
@@ -24,13 +29,19 @@
...
@@ -24,13 +29,19 @@
<el-row>
<el-row>
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备名称"
prop=
"deviceName"
>
<el-form-item
label=
"设备名称"
prop=
"deviceName"
>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备型号"
prop=
"deviceModel"
>
<el-form-item
label=
"设备型号"
prop=
"deviceModel"
>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -68,7 +79,12 @@
...
@@ -68,7 +79,12 @@
<el-col
:span=
"11"
>
<el-col
:span=
"11"
>
<el-form-item
label=
"联系电话"
prop=
"phone"
>
<el-form-item
label=
"联系电话"
prop=
"phone"
>
<el-input
v-model=
"form.phone"
placeholder=
"请输入联系电话"
/>
<el-input
type=
"number"
maxlength=
"11"
v-model=
"form.phone"
placeholder=
"请输入联系电话"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -117,26 +133,29 @@
...
@@ -117,26 +133,29 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
{
getAllDeviceInfo
,
addDeviceInfo
,
updateDeviceInfo
,
}
from
"@/api/device/deviceInfo"
;
import
{
pipeAllInfoList
}
from
"@/api/device/pipe"
;
import
MyFileUpload
from
"@/components/MyFileUpload"
;
import
{
DEVICE_TYPE
}
from
"utils/gaodeMap.js"
;
import
{
getAllDeviceInfo
,
addDeviceInfo
,
updateDeviceInfo
}
from
"@/api/device/deviceInfo"
;
export
default
{
import
{
pipeAllInfoList
}
from
"@/api/device/pipe"
;
import
MyFileUpload
from
"@/components/MyFileUpload"
;
import
{
DEVICE_TYPE
}
from
"utils/gaodeMap.js"
;
export
default
{
props
:
{
props
:
{
title
:
{
type
:
String
}
title
:
{
type
:
String
},
},
},
data
()
{
data
()
{
return
{
return
{
form
:
{
form
:
{
deviceType
:
"2"
deviceType
:
"2"
,
},
},
dialogVisible
:
false
,
dialogVisible
:
false
,
fileList
:
[],
fileList
:
[],
map
:
null
,
map
:
null
,
obj
:
null
,
obj
:
null
,
gaoMap
:
null
,
gaoMap
:
null
,
fileArr
:
[],
fileArr
:
[],
pipeList
:
[],
pipeList
:
[],
rules
:
{
rules
:
{
...
@@ -156,11 +175,10 @@
...
@@ -156,11 +175,10 @@
iotNo
:
[
iotNo
:
[
{
required
:
true
,
message
:
"请输入物联网编号"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"请输入物联网编号"
,
trigger
:
"blur"
},
],
],
linkman
:
[
linkman
:
[{
required
:
true
,
message
:
"请输入联系人"
,
trigger
:
"blur"
}],
{
required
:
true
,
message
:
"请输入联系人"
,
trigger
:
"blur"
},
],
phone
:
[
phone
:
[
{
required
:
true
,
message
:
"请输入联系电话"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"请输入联系电话"
,
trigger
:
"blur"
},
{
min
:
11
,
max
:
11
,
message
:
"长度11个数字"
,
trigger
:
"blur"
},
],
],
iconUrl
:
[{
required
:
true
,
message
:
"请上传图片"
,
trigger
:
"change"
}],
iconUrl
:
[{
required
:
true
,
message
:
"请上传图片"
,
trigger
:
"change"
}],
installationTime
:
[
installationTime
:
[
...
@@ -172,42 +190,42 @@
...
@@ -172,42 +190,42 @@
},
},
],
],
},
},
}
};
},
},
components
:
{
components
:
{
MyFileUpload
,
MyFileUpload
,
},
},
methods
:
{
methods
:
{
show
()
{
show
()
{
this
.
dialogVisible
=
true
;
this
.
dialogVisible
=
true
;
},
},
hide
()
{
hide
()
{
this
.
remove
()
this
.
remove
();
},
},
getFileInfo
(
res
)
{
getFileInfo
(
res
)
{
this
.
form
.
iconUrl
=
res
.
url
;
this
.
form
.
iconUrl
=
res
.
url
;
},
},
submitForm
()
{
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
this
.
$refs
[
"form"
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
if
(
this
.
form
.
deviceId
!=
null
)
{
if
(
this
.
form
.
deviceId
!=
null
)
{
updateDeviceInfo
(
this
.
form
).
then
(
response
=>
{
updateDeviceInfo
(
this
.
form
).
then
((
response
)
=>
{
this
.
dialogVisible
=
false
;
this
.
dialogVisible
=
false
;
this
.
map
.
remove
(
this
.
obj
);
this
.
map
.
remove
(
this
.
obj
);
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
this
.
msgSuccess
(
"修改成功"
);
this
.
msgSuccess
(
"修改成功"
);
});
});
}
else
{
}
else
{
addDeviceInfo
(
this
.
form
).
then
(
response
=>
{
addDeviceInfo
(
this
.
form
).
then
((
response
)
=>
{
if
(
response
.
code
==
200
)
{
if
(
response
.
code
==
200
)
{
this
.
remove
();
this
.
remove
();
this
.
map
.
remove
(
this
.
obj
);
this
.
map
.
remove
(
this
.
obj
);
this
.
form
.
deviceId
=
response
.
data
;
this
.
form
.
deviceId
=
response
.
data
;
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
//this.gaoMap.placeSearch.clear();
//this.gaoMap.placeSearch.clear();
this
.
gaoMap
.
closeAddMarker
();
this
.
gaoMap
.
closeAddMarker
();
this
.
msgSuccess
(
"新增成功"
);
this
.
msgSuccess
(
"新增成功"
);
}
else
{
}
else
{
this
.
msgSuccess
(
"新增失败"
);
this
.
msgSuccess
(
"新增失败"
);
}
}
});
});
...
@@ -222,20 +240,20 @@
...
@@ -222,20 +240,20 @@
this
.
form
.
url
=
""
;
this
.
form
.
url
=
""
;
this
.
fileArr
=
[];
this
.
fileArr
=
[];
},
},
getPipeInfos
()
{
getPipeInfos
()
{
pipeAllInfoList
({}).
then
((
response
)
=>
{
pipeAllInfoList
({}).
then
((
response
)
=>
{
this
.
pipeList
=
response
.
data
;
this
.
pipeList
=
response
.
data
;
});
});
}
},
},
watch
:{
},
dialogVisible
(
val
){
watch
:
{
if
(
val
){
dialogVisible
(
val
)
{
if
(
val
)
{
this
.
getPipeInfos
();
this
.
getPipeInfos
();
}
}
}
},
}
},
}
};
</
script
>
</
script
>
gassafety-web/src/components/PopWindowGis/workerManView.vue
View file @
b0b31198
...
@@ -131,6 +131,18 @@ export default {
...
@@ -131,6 +131,18 @@ export default {
ok
()
{
ok
()
{
this
.
$refs
.
formData
.
validate
((
valid
)
=>
{
this
.
$refs
.
formData
.
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
if
(
moment
(
this
.
formData
.
beginTime
).
valueOf
()
>
moment
(
this
.
formData
.
endTime
).
valueOf
()
)
{
this
.
msgError
(
"开始时间不能大于结束时间"
);
this
.
formData
.
endTime
=
""
;
return
;
}
this
.
okLoading
=
true
;
this
.
okLoading
=
true
;
this
.
formData
.
beginTime
=
moment
(
this
.
formData
.
beginTime
).
format
(
this
.
formData
.
beginTime
=
moment
(
this
.
formData
.
beginTime
).
format
(
"YYYY-MM-DD HH:mm:ss"
"YYYY-MM-DD HH:mm:ss"
...
@@ -138,6 +150,7 @@ export default {
...
@@ -138,6 +150,7 @@ export default {
this
.
formData
.
endTime
=
moment
(
this
.
formData
.
endTime
).
format
(
this
.
formData
.
endTime
=
moment
(
this
.
formData
.
endTime
).
format
(
"YYYY-MM-DD HH:mm:ss"
"YYYY-MM-DD HH:mm:ss"
);
);
console
.
log
(
this
.
formData
);
console
.
log
(
this
.
formData
);
// 找到哪个值班人员
// 找到哪个值班人员
...
@@ -176,7 +189,7 @@ export default {
...
@@ -176,7 +189,7 @@ export default {
message
:
res
.
msg
,
message
:
res
.
msg
,
});
});
this
.
dialogVisible
=
false
;
this
.
dialogVisible
=
false
;
this
.
gaodeMap
.
trackBack
(
target
,
arr
,
data
)
this
.
gaodeMap
.
trackBack
(
target
,
arr
,
data
);
}
}
});
});
}
}
...
...
gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue
View file @
b0b31198
This diff is collapsed.
Click to expand it.
gassafety-web/src/views/enterprise/mapView/index.vue
View file @
b0b31198
...
@@ -758,7 +758,7 @@ export default {
...
@@ -758,7 +758,7 @@ export default {
// 左边的bar
// 左边的bar
.leftBar-wrapper
{
.leftBar-wrapper
{
position
:
fixed
;
position
:
fixed
;
left
:
10
0
px
;
left
:
10px
;
top
:
150px
;
top
:
150px
;
.box
{
.box
{
width
:
180px
;
width
:
180px
;
...
@@ -976,13 +976,13 @@ input[type="radio"] {
...
@@ -976,13 +976,13 @@ input[type="radio"] {
.search-input
{
.search-input
{
position
:
fixed
;
position
:
fixed
;
top
:
100px
;
top
:
100px
;
left
:
7%
;
left
:
10px
;
width
:
240px
;
width
:
240px
;
}
}
.search-but
{
.search-but
{
position
:
fixed
;
position
:
fixed
;
top
:
100px
;
top
:
100px
;
left
:
2
3%
;
left
:
2
60px
;
width
:
85px
;
width
:
85px
;
color
:
white
;
color
:
white
;
background-color
:
#053b6a
;
background-color
:
#053b6a
;
...
@@ -991,7 +991,7 @@ input[type="radio"] {
...
@@ -991,7 +991,7 @@ input[type="radio"] {
.refresh-but
{
.refresh-but
{
position
:
fixed
;
position
:
fixed
;
top
:
100px
;
top
:
100px
;
left
:
28%
;
left
:
345px
;
width
:
85px
;
width
:
85px
;
color
:
white
;
color
:
white
;
background-color
:
#053b6a
;
background-color
:
#053b6a
;
...
...
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