Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety-progress
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-progress
Commits
19291222
Commit
19291222
authored
Apr 13, 2022
by
纪泽龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
快完成了
parent
05557e3e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
548 additions
and
33 deletions
+548
-33
all.scss
gassafetyprogress-web/src/assets/styles/all.scss
+22
-0
xjxcmap.js
gassafetyprogress-web/src/utils/mapClass/xjxcmap.js
+17
-0
Left.vue
.../views/operationMonitor/xunjianxuncha/components/Left.vue
+0
-0
MapBottom.vue
...s/operationMonitor/xunjianxuncha/components/MapBottom.vue
+417
-0
Middle.vue
...iews/operationMonitor/xunjianxuncha/components/Middle.vue
+0
-0
Right.vue
...views/operationMonitor/xunjianxuncha/components/Right.vue
+46
-10
ScroItem.vue
...ws/operationMonitor/xunjianxuncha/components/ScroItem.vue
+19
-8
Scroll.vue
...iews/operationMonitor/xunjianxuncha/components/Scroll.vue
+4
-3
index.vue
...ss-web/src/views/operationMonitor/xunjianxuncha/index.vue
+23
-12
No files found.
gassafetyprogress-web/src/assets/styles/all.scss
View file @
19291222
...
@@ -574,6 +574,7 @@
...
@@ -574,6 +574,7 @@
}
}
}
}
}
}
.zzz
{
.zzz
{
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
...
@@ -582,6 +583,10 @@
...
@@ -582,6 +583,10 @@
// 滚动条公共样式
// 滚动条公共样式
.scrollStyle
{
.scrollStyle
{
.
el-table
:
:
before
{
height
:
0px
!
important
;
}
&
:
:-
webkit-scrollbar
{
&
:
:-
webkit-scrollbar
{
width
:
10px
;
width
:
10px
;
background
:
rgba
(
6
,
29
,
51
,
0
.8
);
background
:
rgba
(
6
,
29
,
51
,
0
.8
);
...
@@ -614,6 +619,23 @@
...
@@ -614,6 +619,23 @@
// overflow-y: none !important;
// overflow-y: none !important;
}
}
}
}
// 巡检巡查table样式修改
.map-bottom-wrapper
{
.el-table__header
{
tr
th
{
background-color
:
rgba
(
24
,
144
,
255
,
0
.1
);
&
.gutter
{
display
:
none
;
}
}
}
.el-table__row
{
td
{
padding
:
0
!
important
;
}
}
}
// map里的label
// map里的label
.amap-info
{
.amap-info
{
position
:
fixed
!
important
;
position
:
fixed
!
important
;
...
...
gassafetyprogress-web/src/utils/mapClass/xjxcmap.js
0 → 100644
View file @
19291222
/*
* @Author: your name
* @Date: 2022-04-13 09:42:29
* @LastEditTime: 2022-04-13 10:03:22
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/utils/mapClass/xjxjmap.js
*/
import
{
EditorMap
}
from
"./map"
export
class
XjxcMap
extends
EditorMap
{
constructor
(
contaienr
,
config
=
{},
vue
){
super
(
contaienr
,
config
=
{},
vue
)
}
}
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/
topChar
s/Left.vue
→
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/
component
s/Left.vue
View file @
19291222
File moved
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/components/MapBottom.vue
0 → 100644
View file @
19291222
This diff is collapsed.
Click to expand it.
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/
topChar
s/Middle.vue
→
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/
component
s/Middle.vue
View file @
19291222
File moved
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/
topChar
s/Right.vue
→
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/
component
s/Right.vue
View file @
19291222
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2022-04-11 15:07:47
* @Date: 2022-04-11 15:07:47
* @LastEditTime: 2022-04-1
2 18:14:09
* @LastEditTime: 2022-04-1
3 09:25:51
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/topChars/left.vue
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/topChars/left.vue
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<div
class=
"scroll-wrapper"
>
<div
class=
"scroll-wrapper"
>
<Scroll
:dataList=
"arr"
>
<Scroll
:dataList=
"arr"
>
<template
v-slot=
"
{ dataList }">
<template
v-slot=
"
{ dataList }">
<
!--
<ScroItem
v-for=
"(item,index) in dataList"
:key=
"item.companyName+index"
:data=
"item"
/>
--
>
<
ScroItem
v-for=
"(item,index) in dataList"
:key=
"item.companyName+index"
:data=
"item"
:index=
"index"
/
>
</
template
>
</
template
>
</Scroll>
</Scroll>
</div>
</div>
...
@@ -49,40 +49,76 @@ export default {
...
@@ -49,40 +49,76 @@ export default {
return
{
return
{
arr
:
[
arr
:
[
{
{
companyName
:
123
,
companyName
:
"河北泽宏公司啊啊啊啊啊"
,
time
:
"2022-04-09 07:29"
,
time
:
"2022-04-09 07:29"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
},
},
{
{
companyName
:
123
,
companyName
:
"河北泽宏公司啊啊啊啊啊"
,
time
:
"2022-04-09 07:29"
,
time
:
"2022-04-09 07:29"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
},
},
{
{
companyName
:
123
,
companyName
:
"河北泽宏公司啊啊啊啊啊"
,
time
:
"2022-04-09 07:29"
,
time
:
"2022-04-09 07:29"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
},
},
{
{
companyName
:
123
,
companyName
:
"河北泽宏公司啊啊啊啊啊"
,
time
:
"2022-04-09 07:29"
,
time
:
"2022-04-09 07:29"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
},
},
{
{
companyName
:
123
,
companyName
:
"河北泽宏公司啊啊啊啊啊"
,
time
:
"2022-04-09 07:29"
,
time
:
"2022-04-09 07:29"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
},
},
{
{
companyName
:
123
,
companyName
:
"河北泽宏公司啊啊啊啊啊"
,
time
:
"2022-04-09 07:29"
,
time
:
"2022-04-09 07:29"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
},
},
{
{
companyName
:
123
,
companyName
:
"河北泽宏公司啊啊啊啊啊"
,
time
:
"2022-04-09 07:29"
,
time
:
"2022-04-09 07:29"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
},
},
{
companyName
:
"河北泽宏公司啊啊啊啊啊"
,
time
:
"2022-04-09 07:29"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
},
{
companyName
:
"河北泽宏公司啊啊啊啊啊"
,
time
:
"2022-04-09 07:29"
,
text
:
"大师傅阿斯蒂芬阿斯蒂芬Î"
,
},
// {
// companyName: 123,
// time: "2022-04-09 07:29",
// text: "大师傅阿斯蒂芬阿斯蒂芬Î",
// },
// {
// companyName: 123,
// time: "2022-04-09 07:29",
// text: "大师傅阿斯蒂芬阿斯蒂芬Î",
// },
// {
// companyName: 123,
// time: "2022-04-09 07:29",
// text: "大师傅阿斯蒂芬阿斯蒂芬Î",
// },
// {
// companyName: 123,
// time: "2022-04-09 07:29",
// text: "大师傅阿斯蒂芬阿斯蒂芬Î",
// },
// {
// companyName: 123,
// time: "2022-04-09 07:29",
// text: "大师傅阿斯蒂芬阿斯蒂芬Î",
// },
],
],
};
};
},
},
...
@@ -135,7 +171,7 @@ export default {
...
@@ -135,7 +171,7 @@ export default {
font-size
:
14px
;
font-size
:
14px
;
// 这个解决子元素overhidden失效问题
// 这个解决子元素overhidden失效问题
min-height
:
0
;
min-height
:
0
;
.top
{
>
.top
{
background
:
rgba
(
24
,
144
,
255
,
0
.1
);
background
:
rgba
(
24
,
144
,
255
,
0
.1
);
height
:
29px
;
height
:
29px
;
line-height
:
29px
;
line-height
:
29px
;
...
...
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/
topChar
s/ScroItem.vue
→
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/
component
s/ScroItem.vue
View file @
19291222
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2022-04-12 18:02:16
* @Date: 2022-04-12 18:02:16
* @LastEditTime: 2022-04-1
2 18:12:50
* @LastEditTime: 2022-04-1
3 09:24:43
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/topChars/ScrollItem.vue
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/topChars/ScrollItem.vue
-->
-->
<
template
>
<
template
>
<div
class=
"top flex"
>
<div
class=
"top flex"
:class=
"[
{ n: index % 2 == 0, n2: index % 2 == 1 }]"
>
<div
class=
"
zzz
"
>
{{
data
.
companyName
}}
</div>
<div
class=
"
left zzz"
:title=
"data.companyName
"
>
{{
data
.
companyName
}}
</div>
<div
class=
"zzz"
>
{{
data
.
time
}}
</div>
<div
class=
"zzz"
:title=
"data.time"
>
{{
data
.
time
}}
</div>
<div
class=
"zzz"
>
{{
data
.
text
}}
</div>
<div
class=
"zzz"
:title=
"data.text"
>
{{
data
.
text
}}
</div>
</div>
</div>
</
template
>
</
template
>
...
@@ -29,14 +29,25 @@ export default {
...
@@ -29,14 +29,25 @@ export default {
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.top
{
.top
{
background
:
rgba
(
24
,
144
,
255
,
0
.1
)
;
width
:
100%
;
height
:
29px
;
height
:
29px
;
line-height
:
29px
;
line-height
:
29px
;
&
.n
{
color
:
#333333
;
}
&
.n2
{
color
:
#1f8df3
;
background
:
rgba
(
0
,
0
,
0
,
0
.1
);
}
>
div
{
>
div
{
flex
:
1
;
flex
:
1
;
text-align
:
center
;
text-align
:
center
;
// box-sizing: border-box;
font-size
:
12px
;
// padding: 0 5px;
box-sizing
:
border-box
;
padding
:
0
2px
;
&
.left
{
padding
:
0
5px
;
}
}
}
}
}
</
style
>
</
style
>
\ No newline at end of file
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/
topChar
s/Scroll.vue
→
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/
component
s/Scroll.vue
View file @
19291222
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2022-04-12 16:09:32
* @Date: 2022-04-12 16:09:32
* @LastEditTime: 2022-04-1
2 17:53:32
* @LastEditTime: 2022-04-1
3 15:41:17
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/components/scrollCom/scroll.vue
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/components/scrollCom/scroll.vue
...
@@ -71,7 +71,7 @@ export default {
...
@@ -71,7 +71,7 @@ export default {
if
(
this
.
top
<=
maxTop
)
{
if
(
this
.
top
<=
maxTop
)
{
this
.
top
=
0
;
this
.
top
=
0
;
}
}
},
30
);
},
24
);
},
},
stopScroll
()
{
stopScroll
()
{
clearInterval
(
this
.
timer
);
clearInterval
(
this
.
timer
);
...
@@ -90,11 +90,12 @@ export default {
...
@@ -90,11 +90,12 @@ export default {
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.scroll
{
.scroll
{
height
:
100%
;
height
:
100%
;
background
:
red
;
//
background: red;
overflow
:
hidden
;
overflow
:
hidden
;
position
:
relative
;
position
:
relative
;
}
}
.contain
{
.contain
{
width
:
100%
;
position
:
absolute
;
position
:
absolute
;
}
}
</
style
>
</
style
>
\ No newline at end of file
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/index.vue
View file @
19291222
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2022-04-11 14:11:04
* @Date: 2022-04-11 14:11:04
* @LastEditTime: 2022-04-1
2 14:53:40
* @LastEditTime: 2022-04-1
3 10:34:15
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/index.vue
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/index.vue
...
@@ -14,33 +14,40 @@
...
@@ -14,33 +14,40 @@
<Left
/>
<Left
/>
</div>
</div>
<div
class=
"middle"
>
<div
class=
"middle"
>
<Middle/>
<Middle
/>
</div>
</div>
<div
class=
"right"
>
<div
class=
"right"
>
<Right/>
<Right
/>
</div>
</div>
</div>
</div>
<div
class=
"middle"
></div>
<div
class=
"bottom"
>
<div
class=
"bottom"
>
<MapBottom/>
</div>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
Left
from
"./topChars/Left"
;
import
Left
from
"./components/Left"
;
import
Middle
from
"./topChars/Middle"
;
import
Middle
from
"./components/Middle"
;
import
Right
from
"./topChars/Right"
;
import
Right
from
"./components/Right"
;
import
MapBottom
from
"./components/MapBottom"
;
export
default
{
export
default
{
components
:
{
components
:
{
Left
,
Left
,
Middle
,
Middle
,
Right
Right
,
MapBottom
},
},
data
()
{
data
()
{
return
{};
return
{
};
},
},
mounted
(){
}
};
};
</
script
>
</
script
>
...
@@ -69,12 +76,10 @@ export default {
...
@@ -69,12 +76,10 @@ export default {
.middle
{
.middle
{
width
:
35
.3%
;
width
:
35
.3%
;
padding
:
15px
80px
19px
71px
;
padding
:
15px
80px
19px
71px
;
}
}
.right
{
.right
{
width
:
25
.2%
;
width
:
25
.2%
;
padding
:
15px
29px
;
padding
:
15px
29px
;
}
}
>
div
{
>
div
{
// box-shadow: 2px 0px 13px 1px rgba(0, 0, 0, 0.1);
// box-shadow: 2px 0px 13px 1px rgba(0, 0, 0, 0.1);
...
@@ -82,8 +87,14 @@ export default {
...
@@ -82,8 +87,14 @@ export default {
border-radius
:
3px
;
border-radius
:
3px
;
}
}
}
}
>
.middle
{
margin
:
5px
0
;
background
:
repeating-linear-gradient
(
135deg
,
transparent
,
transparent
3px
,
#D6D6D6
3px
,
#D6D6D6
8px
);
height
:
2px
;
}
.bottom
{
.bottom
{
flex
:
1
;
flex
:
1
;
background-color
:
red
;
}
}
>
div
{
>
div
{
...
...
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