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
63f8afa0
Commit
63f8afa0
authored
Sep 18, 2021
by
耿迪迪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
组件循环引用 gengddi
parent
3474bf3d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
17 deletions
+13
-17
application-test.yml
gassafety-admin/src/main/resources/application-test.yml
+2
-2
index.vue
gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue
+1
-2
index.vue
...web/src/views/deviceInspection/inspectiondetail/index.vue
+3
-4
index.vue
...eb/src/views/riskManagement/hiddenTroubleDetail/index.vue
+3
-2
index.vue
gassafety-web/src/views/workOrder/detail/index.vue
+4
-7
No files found.
gassafety-admin/src/main/resources/application-test.yml
View file @
63f8afa0
...
...
@@ -58,13 +58,13 @@ spring:
# redis 配置
redis
:
# 地址
host
:
localhost
host
:
36.148.23.59
# 端口,默认为6379
port
:
6379
# 数据库索引
database
:
0
# 密码
password
:
password
:
1qaz2wsx3edc
# 连接超时时间
timeout
:
10s
lettuce
:
...
...
gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue
View file @
63f8afa0
...
...
@@ -258,13 +258,12 @@
import
{
map
,
DEVICE_TYPE
}
from
"utils/gaodeMap.js"
;
import
{
inspectorList
}
from
"@/api/system/user"
;
import
echarts
from
'echarts'
;
import
workOrder
from
"../../workOrder/detail/index.vue"
export
default
{
props
:[
"resourceId"
],
name
:
"DeviceAlarm"
,
components
:
{
workOrder
workOrder
:
()
=>
import
(
'../../workOrder/detail/index.vue'
)
},
data
()
{
return
{
...
...
gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue
View file @
63f8afa0
...
...
@@ -232,13 +232,12 @@
import
{
inspectorList
}
from
"@/api/system/user"
;
import
{
deviceTree
}
from
"@/api/device/deviceInfo"
;
import
{
deviceNodeTree
}
from
"@/api/device/deviceInfo"
;
import
workOrder
from
"../../workOrder/detail/index.vue"
export
default
{
props
:
[
"resourceId"
],
name
:
"InspectionPlanDetail"
,
components
:
{
workOrder
workOrder
:
()
=>
import
(
'../../workOrder/detail/index.vue'
)
},
data
()
{
return
{
...
...
@@ -693,5 +692,5 @@
width
:
100%
;
height
:
0px
;
}
</
style
>
\ No newline at end of file
</
style
>
gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue
View file @
63f8afa0
...
...
@@ -373,7 +373,7 @@ import { inspectorList, allListUser } from "@/api/system/user";
import
{
deviceNodeTree
}
from
"@/api/device/deviceInfo"
;
import
MyFileUpload
from
'@/components/MyFileUpload'
;
import
Mapdialog
from
"@/components/mapDialog/checkDeviceLoaction.vue"
;
import
workOrder
from
"../../workOrder/detail/index.vue"
//
import workOrder from "../../workOrder/detail/index.vue"
export
default
{
props
:[
"resourceId"
],
...
...
@@ -381,7 +381,8 @@ export default {
components
:
{
MyFileUpload
,
Mapdialog
,
workOrder
// workOrder
workOrder
:
()
=>
import
(
'../../workOrder/detail/index.vue'
)
},
data
()
{
return
{
...
...
gassafety-web/src/views/workOrder/detail/index.vue
View file @
63f8afa0
...
...
@@ -329,17 +329,14 @@
import
gaodeMap
from
"utils/gaodeMap.js"
;
import
{
map
,
DEVICE_TYPE
}
from
"utils/gaodeMap.js"
;
import
{
inspectorList
}
from
"@/api/system/user"
;
import
inspection
from
"../../deviceInspection/inspectiondetail/index.vue"
;
import
hiddenTrouble
from
"../../riskManagement/hiddenTroubleDetail/index.vue"
;
import
alarm
from
"../../dataMonitoring/alarmdetail/index.vue"
;
export
default
{
props
:
[
"linkOrderId"
],
name
:
"BasicsInfo"
,
components
:
{
inspection
,
hiddenTrouble
,
alarm
inspection
:
()
=>
import
(
'../../deviceInspection/inspectiondetail/index.vue'
)
,
alarm
:
()
=>
import
(
'../../dataMonitoring/alarmdetail/index.vue'
)
,
hiddenTrouble
:
()
=>
import
(
'../../riskManagement/hiddenTroubleDetail/index.vue'
)
},
data
()
{
return
{
...
...
@@ -812,4 +809,4 @@
font-size
:
15px
;
font-weight
:
900
;
}
</
style
>
\ No newline at end of file
</
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