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
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 @@
<el-row>
<el-col
:span=
"11"
>
<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
v-for=
"item in pipeList"
:key=
"item.pipeCode"
...
...
@@ -75,7 +79,12 @@
<el-col
:span=
"11"
>
<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-col>
...
...
@@ -171,7 +180,10 @@ export default {
{
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"
}],
installationTime
:
[
{
...
...
@@ -232,19 +244,19 @@ export default {
this
.
form
.
url
=
""
;
this
.
fileArr
=
[];
},
getPipeInfos
(){
getPipeInfos
()
{
pipeAllInfoList
({}).
then
((
response
)
=>
{
this
.
pipeList
=
response
.
data
;
});
}
},
watch
:{
dialogVisible
(
val
){
if
(
val
){
},
watch
:
{
dialogVisible
(
val
)
{
if
(
val
)
{
this
.
getPipeInfos
();
}
}
}
}
,
}
,
};
</
script
>
...
...
gassafety-web/src/components/PopWindow/pressureGage.vue
View file @
b0b31198
...
...
@@ -2,13 +2,18 @@
<el-dialog
:title=
"title"
:visible
.
sync=
"dialogVisible"
:before-close=
"handleClose"
>
:before-close=
"handleClose"
>
<el-row>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"135px"
>
<el-row>
<el-col
:span=
"11"
>
<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
v-for=
"item in pipeList"
:key=
"item.pipeCode"
...
...
@@ -24,13 +29,19 @@
<el-row>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备名称"
prop=
"deviceName"
>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
</el-form-item>
</el-col>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备型号"
prop=
"deviceModel"
>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -69,7 +80,12 @@
<el-col
:span=
"11"
>
<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-col>
...
...
@@ -157,7 +173,10 @@ export default {
{
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"
}],
installationTime
:
[
{
...
...
gassafety-web/src/components/PopWindow/regulatorBox.vue
View file @
b0b31198
...
...
@@ -2,13 +2,18 @@
<el-dialog
:title=
"title"
:visible
.
sync=
"dialogVisible"
:before-close=
"handleClose"
>
:before-close=
"handleClose"
>
<el-row>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"135px"
>
<el-row>
<el-col
:span=
"11"
>
<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
v-for=
"item in pipeList"
:key=
"item.pipeCode"
...
...
@@ -24,13 +29,19 @@
<el-row>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备名称"
prop=
"deviceName"
>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
</el-form-item>
</el-col>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备型号"
prop=
"deviceModel"
>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -69,7 +80,12 @@
<el-col
:span=
"11"
>
<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-col>
...
...
@@ -118,26 +134,29 @@
</
template
>
<
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"
;
import
{
pipeAllInfoList
}
from
"@/api/device/pipe"
;
import
MyFileUpload
from
"@/components/MyFileUpload"
;
import
{
DEVICE_TYPE
}
from
"utils/gaodeMap.js"
;
export
default
{
export
default
{
props
:
{
title
:
{
type
:
String
}
title
:
{
type
:
String
},
},
data
()
{
data
()
{
return
{
form
:
{
deviceType
:
"1"
form
:
{
deviceType
:
"1"
,
},
dialogVisible
:
false
,
dialogVisible
:
false
,
fileList
:
[],
map
:
null
,
obj
:
null
,
gaoMap
:
null
,
map
:
null
,
obj
:
null
,
gaoMap
:
null
,
fileArr
:
[],
pipeList
:
[],
rules
:
{
...
...
@@ -157,11 +176,10 @@
iotNo
:
[
{
required
:
true
,
message
:
"请输入物联网编号"
,
trigger
:
"blur"
},
],
linkman
:
[
{
required
:
true
,
message
:
"请输入联系人"
,
trigger
:
"blur"
},
],
linkman
:
[{
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"
}],
installationTime
:
[
...
...
@@ -173,43 +191,43 @@
},
],
},
}
};
},
components
:
{
MyFileUpload
MyFileUpload
,
},
methods
:
{
show
()
{
show
()
{
this
.
dialogVisible
=
true
;
//this.getPipeInfo();
},
hide
()
{
this
.
remove
()
hide
()
{
this
.
remove
();
},
getFileInfo
(
res
)
{
getFileInfo
(
res
)
{
this
.
form
.
iconUrl
=
res
.
url
;
},
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
this
.
$refs
[
"form"
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
this
.
form
.
deviceId
!=
null
)
{
updateDeviceInfo
(
this
.
form
).
then
(
response
=>
{
updateDeviceInfo
(
this
.
form
).
then
((
response
)
=>
{
this
.
dialogVisible
=
false
;
this
.
map
.
remove
(
this
.
obj
);
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
this
.
msgSuccess
(
"修改成功"
);
});
}
else
{
addDeviceInfo
(
this
.
form
).
then
(
response
=>
{
if
(
response
.
code
==
200
)
{
addDeviceInfo
(
this
.
form
).
then
((
response
)
=>
{
if
(
response
.
code
==
200
)
{
this
.
remove
();
this
.
map
.
remove
(
this
.
obj
);
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
.
closeAddMarker
();
this
.
msgSuccess
(
"新增成功"
);
}
else
{
}
else
{
this
.
msgSuccess
(
"新增失败"
);
}
});
...
...
@@ -224,20 +242,20 @@
handleClose
(
done
)
{
done
();
},
getPipeInfos
()
{
getPipeInfos
()
{
pipeAllInfoList
({}).
then
((
response
)
=>
{
this
.
pipeList
=
response
.
data
;
});
}
},
watch
:{
dialogVisible
(
val
){
if
(
val
){
},
watch
:
{
dialogVisible
(
val
)
{
if
(
val
)
{
this
.
getPipeInfos
();
}
}
}
}
},
},
};
</
script
>
gassafety-web/src/components/PopWindow/valveWell.vue
View file @
b0b31198
...
...
@@ -2,13 +2,18 @@
<el-dialog
:title=
"title"
:visible
.
sync=
"dialogVisible"
:before-close=
"handleClose"
>
:before-close=
"handleClose"
>
<el-row>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"135px"
>
<el-row>
<el-col
:span=
"11"
>
<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
v-for=
"item in pipeList"
:key=
"item.pipeCode"
...
...
@@ -24,13 +29,19 @@
<el-row>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备名称"
prop=
"deviceName"
>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
<el-input
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
</el-form-item>
</el-col>
<el-col
:span=
"11"
>
<el-form-item
label=
"设备型号"
prop=
"deviceModel"
>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
<el-input
v-model=
"form.deviceModel"
placeholder=
"请输入设备型号"
/>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -68,7 +79,12 @@
<el-col
:span=
"11"
>
<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-col>
...
...
@@ -117,26 +133,29 @@
</
template
>
<
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"
;
import
{
pipeAllInfoList
}
from
"@/api/device/pipe"
;
import
MyFileUpload
from
"@/components/MyFileUpload"
;
import
{
DEVICE_TYPE
}
from
"utils/gaodeMap.js"
;
export
default
{
export
default
{
props
:
{
title
:
{
type
:
String
}
title
:
{
type
:
String
},
},
data
()
{
data
()
{
return
{
form
:
{
deviceType
:
"2"
form
:
{
deviceType
:
"2"
,
},
dialogVisible
:
false
,
dialogVisible
:
false
,
fileList
:
[],
map
:
null
,
obj
:
null
,
gaoMap
:
null
,
map
:
null
,
obj
:
null
,
gaoMap
:
null
,
fileArr
:
[],
pipeList
:
[],
rules
:
{
...
...
@@ -156,11 +175,10 @@
iotNo
:
[
{
required
:
true
,
message
:
"请输入物联网编号"
,
trigger
:
"blur"
},
],
linkman
:
[
{
required
:
true
,
message
:
"请输入联系人"
,
trigger
:
"blur"
},
],
linkman
:
[{
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"
}],
installationTime
:
[
...
...
@@ -172,42 +190,42 @@
},
],
},
}
};
},
components
:
{
MyFileUpload
,
},
methods
:
{
show
()
{
show
()
{
this
.
dialogVisible
=
true
;
},
hide
()
{
this
.
remove
()
hide
()
{
this
.
remove
();
},
getFileInfo
(
res
)
{
getFileInfo
(
res
)
{
this
.
form
.
iconUrl
=
res
.
url
;
},
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
this
.
$refs
[
"form"
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
this
.
form
.
deviceId
!=
null
)
{
updateDeviceInfo
(
this
.
form
).
then
(
response
=>
{
updateDeviceInfo
(
this
.
form
).
then
((
response
)
=>
{
this
.
dialogVisible
=
false
;
this
.
map
.
remove
(
this
.
obj
);
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
this
.
gaoMap
.
addMarker
(
this
.
gaoMap
.
deviceType
,
this
.
form
);
this
.
msgSuccess
(
"修改成功"
);
});
}
else
{
addDeviceInfo
(
this
.
form
).
then
(
response
=>
{
if
(
response
.
code
==
200
)
{
addDeviceInfo
(
this
.
form
).
then
((
response
)
=>
{
if
(
response
.
code
==
200
)
{
this
.
remove
();
this
.
map
.
remove
(
this
.
obj
);
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
.
closeAddMarker
();
this
.
msgSuccess
(
"新增成功"
);
}
else
{
}
else
{
this
.
msgSuccess
(
"新增失败"
);
}
});
...
...
@@ -222,20 +240,20 @@
this
.
form
.
url
=
""
;
this
.
fileArr
=
[];
},
getPipeInfos
()
{
getPipeInfos
()
{
pipeAllInfoList
({}).
then
((
response
)
=>
{
this
.
pipeList
=
response
.
data
;
});
}
},
watch
:{
dialogVisible
(
val
){
if
(
val
){
},
watch
:
{
dialogVisible
(
val
)
{
if
(
val
)
{
this
.
getPipeInfos
();
}
}
}
}
},
},
};
</
script
>
gassafety-web/src/components/PopWindowGis/workerManView.vue
View file @
b0b31198
...
...
@@ -131,6 +131,18 @@ export default {
ok
()
{
this
.
$refs
.
formData
.
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
moment
(
this
.
formData
.
beginTime
).
valueOf
()
>
moment
(
this
.
formData
.
endTime
).
valueOf
()
)
{
this
.
msgError
(
"开始时间不能大于结束时间"
);
this
.
formData
.
endTime
=
""
;
return
;
}
this
.
okLoading
=
true
;
this
.
formData
.
beginTime
=
moment
(
this
.
formData
.
beginTime
).
format
(
"YYYY-MM-DD HH:mm:ss"
...
...
@@ -138,6 +150,7 @@ export default {
this
.
formData
.
endTime
=
moment
(
this
.
formData
.
endTime
).
format
(
"YYYY-MM-DD HH:mm:ss"
);
console
.
log
(
this
.
formData
);
// 找到哪个值班人员
...
...
@@ -176,7 +189,7 @@ export default {
message
:
res
.
msg
,
});
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
<
template
>
<div
class=
"app-container"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
:inline=
"true"
v-show=
"showSearch"
label-width=
"100px"
>
<div
v-if=
"fromGisMap"
>
<div
style=
"width: 5%; height: 45px; margin-left: 20px"
@
click=
"$router.go(-1)"
>
<el-button
size=
"medium"
type=
"text"
style=
"font-size: 18px; color: rgb(7, 63, 112); float: left"
>
返回
</el-button
>
<div
style=
"float: left; margin-top: 8px; margin-left: 5px"
>
<img
src=
"../../../assets/logo/fanhui.png"
style=
"width: 25px"
alt=
""
/>
</div>
</div>
</div>
<el-form
:model=
"queryParams"
ref=
"queryForm"
:inline=
"true"
v-show=
"showSearch"
label-width=
"100"
>
<el-form-item
label=
"设备编号"
prop=
"deviceCode"
>
<el-input
v-model=
"queryParams.deviceCode"
...
...
@@ -11,7 +38,12 @@
/>
</el-form-item>
<el-form-item
label=
"报警类型"
prop=
"alarmType"
>
<el-select
v-model=
"queryParams.alarmType"
placeholder=
"请选择报警类型"
clearable
size=
"small"
>
<el-select
v-model=
"queryParams.alarmType"
placeholder=
"请选择报警类型"
clearable
size=
"small"
>
<el-option
v-for=
"dict in typeOptions"
:key=
"dict.dictValue"
...
...
@@ -22,32 +54,48 @@
</el-form-item>
<el-form-item
label=
"报警开始时间"
prop=
"startTime1"
>
<el-date-picker
clearable
size=
"small"
clearable
size=
"small"
v-model=
"queryParams.startTime1"
value-format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetime"
placeholder=
"请选择起始时间"
align=
"right"
>
align=
"right"
>
</el-date-picker>
<font
color=
"#C0C4CC"
>
至
</font>
</el-form-item>
<el-form-item
label=
""
prop=
"endTime1"
>
<el-date-picker
clearable
size=
"small"
clearable
size=
"small"
v-model=
"queryParams.endTime1"
value-format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetime"
placeholder=
"请选择截止时间"
align=
"right"
>
align=
"right"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
搜索
</el-button
>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button
>
</el-form-item>
</el-form>
<el-table
v-loading=
"loading"
:data=
"deviceAlarmList"
@
selection-change=
"handleSelectionChange"
>
<el-table
v-loading=
"loading"
:data=
"deviceAlarmList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"设备名称"
align=
"center"
>
<template
slot-scope=
"scope"
>
...
...
@@ -65,27 +113,49 @@
</
template
>
</el-table-column>
<el-table-column
label=
"报警值"
align=
"center"
prop=
"alarmValue"
/>
<el-table-column
label=
"报警开始时间"
align=
"center"
prop=
"startTime"
width=
"180"
>
<el-table-column
label=
"报警开始时间"
align=
"center"
prop=
"startTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
startTime
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"报警结束时间"
align=
"center"
prop=
"endTime"
width=
"180"
>
<el-table-column
label=
"报警结束时间"
align=
"center"
prop=
"endTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
endTime
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"处理状态"
align=
"center"
prop=
"dealStatus"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.orderId == null || scope.row.orderId == ''"
>
未生成工单
</span>
<span
v-if=
"(scope.row.dealStatus == null || scope.row.dealStatus == '')
&& scope.row.orderId != null && scope.row.orderId != ''"
>
未处理
</span>
<span
v-if=
"scope.row.orderId == null || scope.row.orderId == ''"
>
未生成工单
</span
>
<span
v-if=
"
(scope.row.dealStatus == null || scope.row.dealStatus == '') &&
scope.row.orderId != null &&
scope.row.orderId != ''
"
>
未处理
</span
>
<span
v-if=
"scope.row.dealStatus == 1"
>
不需处理
</span>
<span
v-if=
"scope.row.dealStatus == 2"
>
已处理完成
</span>
<span
v-if=
"scope.row.dealStatus == 3"
>
未处理完成
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"normal"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleIssue(scope.row)"
v-hasPermi=
"['workOrder:basicsInfo:add']"
v-if=
"scope.row.orderId == '' || scope.row.orderId == null"
>
生成工单
...
...
@@ -102,13 +172,13 @@
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"800px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"130px"
>
<el-form-item
label=
"报警设备"
prop=
"deviceName"
>
<font>
{{
form.deviceName
}}
</font>
<font>
{{
form.deviceName
}}
</font>
</el-form-item>
<el-form-item
label=
"报警类型"
prop=
"alarmType"
>
<font>
{{
form.alarmType
}}
</font>
<font>
{{
form.alarmType
}}
</font>
</el-form-item>
<el-form-item
label=
"报警值"
prop=
"alarmValue"
>
<font>
{{
form.alarmValue
}}
</font>
<font>
{{
form.alarmValue
}}
</font>
</el-form-item>
<el-form-item
label=
"工单名称"
prop=
"orderName"
>
<el-input
v-model=
"form.orderName"
placeholder=
"请输入工单名称"
/>
...
...
@@ -120,7 +190,11 @@
</el-select>
</el-form-item>
<el-form-item
label=
"工单描述"
prop=
"remarks"
>
<el-input
type=
"textarea"
v-model=
"form.remarks"
placeholder=
"请输入工单描述"
/>
<el-input
type=
"textarea"
v-model=
"form.remarks"
placeholder=
"请输入工单描述"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
...
@@ -138,10 +212,11 @@
export
default
{
name
:
"DeviceAlarm"
,
components
:
{
},
components
:
{},
data
()
{
return
{
// 判断是从哪里来的,如果是地图里来的,则可以返回
fromGisMap
:
false
,
// 遮罩层
loading
:
true
,
// 导出遮罩层
...
...
@@ -186,45 +261,57 @@ export default {
alarmType
:
null
,
startTime1
:
null
,
endTime1
:
null
,
dealStatus
:
null
dealStatus
:
null
,
},
// 表单参数
form
:
{
},
form
:
{},
// 表单校验
rules
:
{
orderName
:
[
{
required
:
true
,
message
:
"工单名称不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"工单名称不能为空"
,
trigger
:
"blur"
}
,
],
appointInspector
:
[
{
required
:
true
,
message
:
"请选择巡检人员"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"请选择巡检人员"
,
trigger
:
"blur"
}
,
],
}
}
,
};
},
created
()
{
this
.
getList
();
this
.
getDicts
(
"t_alarm_type"
).
then
(
response
=>
{
this
.
getDicts
(
"t_alarm_type"
).
then
(
(
response
)
=>
{
this
.
typeOptions
=
response
.
data
;
});
},
beforeRouteEnter
:
(
to
,
from
,
next
)
=>
{
next
((
vm
)
=>
{
// 如果是从地图里来的
if
(
from
.
path
==
"/enterprise/mapView"
){
// console.log(123)
vm
.
fromGisMap
=
true
;
}
else
{
vm
.
fromGisMap
=
false
;
}
});
},
methods
:
{
/** 查询报警信息列表 */
getList
()
{
this
.
loading
=
true
;
listDeviceAlarm
(
this
.
queryParams
).
then
(
response
=>
{
listDeviceAlarm
(
this
.
queryParams
).
then
(
(
response
)
=>
{
this
.
deviceAlarmList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
getInspectorList
(){
getInspectorList
()
{
this
.
loading
=
true
;
inspectorList
().
then
(
response
=>
{
inspectorList
().
then
(
(
response
)
=>
{
this
.
inspector
=
response
.
data
;
this
.
loading
=
false
;
});
},
setUserId
(
val
){
setUserId
(
val
)
{
this
.
form
.
appointInspector
=
val
;
},
// 取消按钮
...
...
@@ -244,7 +331,7 @@ export default {
allotTime
:
null
,
actualInspector
:
null
,
actualTime
:
null
,
remarks
:
null
remarks
:
null
,
};
this
.
resetForm
(
"form"
);
},
...
...
@@ -268,8 +355,8 @@ export default {
handleIssue
(
row
)
{
this
.
reset
();
this
.
getInspectorList
();
const
alarmId
=
row
.
alarmId
||
this
.
ids
getDeviceAlarm
(
alarmId
).
then
(
response
=>
{
const
alarmId
=
row
.
alarmId
||
this
.
ids
;
getDeviceAlarm
(
alarmId
).
then
(
(
response
)
=>
{
this
.
form
=
response
.
data
;
this
.
open
=
true
;
this
.
title
=
"填写工单信息"
;
...
...
@@ -278,11 +365,11 @@ export default {
/** 提交按钮 */
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
this
.
$refs
[
"form"
].
validate
(
(
valid
)
=>
{
if
(
valid
)
{
this
.
form
.
resourceId
=
this
.
form
.
alarmId
;
this
.
form
.
orderType
=
"3"
;
addBasicsInfo
(
this
.
form
).
then
(
response
=>
{
addBasicsInfo
(
this
.
form
).
then
(
(
response
)
=>
{
this
.
msgSuccess
(
"生成工单成功"
);
this
.
open
=
false
;
this
.
getList
();
...
...
@@ -300,6 +387,6 @@ export default {
}
})
//带参跳转
},
}
}
,
};
</
script
>
gassafety-web/src/views/enterprise/mapView/index.vue
View file @
b0b31198
...
...
@@ -758,7 +758,7 @@ export default {
// 左边的bar
.leftBar-wrapper
{
position
:
fixed
;
left
:
10
0
px
;
left
:
10px
;
top
:
150px
;
.box
{
width
:
180px
;
...
...
@@ -976,13 +976,13 @@ input[type="radio"] {
.search-input
{
position
:
fixed
;
top
:
100px
;
left
:
7%
;
left
:
10px
;
width
:
240px
;
}
.search-but
{
position
:
fixed
;
top
:
100px
;
left
:
2
3%
;
left
:
2
60px
;
width
:
85px
;
color
:
white
;
background-color
:
#053b6a
;
...
...
@@ -991,7 +991,7 @@ input[type="radio"] {
.refresh-but
{
position
:
fixed
;
top
:
100px
;
left
:
28%
;
left
:
345px
;
width
:
85px
;
color
:
white
;
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