Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
DC-TOM
Project
Project
Details
Activity
Releases
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
刘照晖
DC-TOM
Commits
d48ee858
Commit
d48ee858
authored
May 23, 2025
by
liuzhaoh
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://app.bmetech.com/liuzhaohui/dctomproject
into dev
parents
dfdc6e4f
7159f508
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
125 additions
and
156 deletions
+125
-156
dialog.vue
src/views/closeManage/components/dialog.vue
+2
-2
myAgency.vue
src/views/closeManage/myAgency.vue
+97
-97
myDone.vue
src/views/closeManage/myDone.vue
+26
-57
No files found.
src/views/closeManage/components/dialog.vue
View file @
d48ee858
...
...
@@ -91,14 +91,14 @@ const handleSave = ()=> {
width
:
100%
;
.real-btn
{
width
:
auto
;
height
:
28
px
;
height
:
32
px
;
background
:
rgb
(
64
,
158
,
255
);
border
:
1px
solid
rgb
(
64
,
158
,
255
);
border-radius
:
4px
;
box-shadow
:
0
1px
9px
0
rgba
(
12
,
123
,
255
,
0
.3
)
inset
;
text-align
:
center
;
padding
:
0
16px
;
line-height
:
28
px
;
line-height
:
32
px
;
color
:
rgba
(
255
,
255
,
255
,
0
.85
);
margin-right
:
16px
;
cursor
:
pointer
;
...
...
src/views/closeManage/myAgency.vue
View file @
d48ee858
This diff is collapsed.
Click to expand it.
src/views/closeManage/myDone.vue
View file @
d48ee858
...
...
@@ -4,6 +4,7 @@
<el-form-item
label=
"事件名称:"
>
<el-select
v-model=
"formInline.eventNameId"
placeholder=
"请选择"
style=
"width: 280px"
>
<el-option
v-for=
"(item, index) in basicConfiguration.ticketEventName"
...
...
@@ -20,17 +21,20 @@
<el-form-item
label=
"所属区域:"
>
<el-select
v-model=
"formInline.branchFactoryIds"
placeholder=
"请选择"
style=
"width: 180px"
>
<el-option
label=
"全部"
value=
""
/>
<el-option
v-for=
"(item, index) in basicConfiguration.branchFactoryList"
:key=
"item.
i
d"
:label=
"item.
name
"
:value=
"item.
i
d"
:key=
"item.
branchFactoryI
d"
:label=
"item.
branchFactory
"
:value=
"item.
branchFactoryI
d"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"设备类型"
>
<el-select
v-model=
"formInline.deviceType"
>
<el-select
v-model=
"formInline.deviceType"
style=
"width: 180px"
placeholder=
"请选择"
>
<el-option
label=
"全部"
value=
""
/>
<el-option
v-for=
"(item, index) in basicConfiguration.deviceList"
...
...
@@ -42,14 +46,13 @@
</el-select>
</el-form-item>
<el-form-item
label=
"发生时间"
>
<el-date-picker
type=
"daterange"
<el-date-picker
type=
"date
time
range"
v-model=
"formInline.createTime"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
format=
"YYYY-MM-DD HH:mm:ss"
date-format=
"YYYY/MM/DD ddd"
time-format=
"A hh:mm:ss"
value-format=
"YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-form-item>
...
...
@@ -935,42 +938,7 @@ const changeBag = (data)=>{
}
const
tableData
=
[
{
id
:
1
,
name
:
'张三'
,
phone
:
'13888888888'
,
email
:
'<EMAIL>'
,
branchFactory
:
'上海分公司'
,
deviceType
:
'烟感'
,
eventTime
:
'2021-09-09 12:00:00'
,
eventStatus
:
'已处理'
,
eventDetail
:
'设备报警'
,
level
:
1
},
{
id
:
2
,
name
:
'张三'
,
phone
:
'13888888888'
,
email
:
'<EMAIL>'
,
branchFactory
:
'上海分公司'
,
deviceType
:
'烟感'
,
eventTime
:
'2021-09-09 12:00:00'
,
eventStatus
:
'已处理'
,
eventDetail
:
'设备报警'
,
level
:
2
},
{
id
:
3
,
name
:
'张三'
,
phone
:
'13888888888'
,
email
:
'<EMAIL>'
,
branchFactory
:
'上海分公司'
,
deviceType
:
'烟感'
,
eventTime
:
'20'
,
level
:
3
}
];
const
tableData
=
ref
([]);
const
tableColumns
=
ref
([
{
...
...
@@ -1051,8 +1019,9 @@ const getWarnAndTicketConfigMap = ()=> {
}
getDataFun
(
url
,
params
).
then
(
res
=>
{
if
(
res
&&
res
.
code
===
1
)
{
const
{
ticketEventName
,
event
Type
}
=
res
.
data
;
const
{
ticketEventName
,
device
Type
}
=
res
.
data
;
basicConfiguration
.
ticketEventName
=
basicConfiguration
.
ticketEventName
.
concat
(
ticketEventName
);
basicConfiguration
.
deviceList
=
deviceType
;
}
});
};
...
...
@@ -1143,9 +1112,9 @@ const disposeType = (list)=> {
}
onMounted
(()
=>
{
//
getBranchTypeList();
//
getWarnAndTicketConfigMap();
//
searchData();
getBranchTypeList
();
getWarnAndTicketConfigMap
();
searchData
();
});
const
currentPage
=
ref
(
1
);
...
...
@@ -1176,6 +1145,9 @@ const handlePaginationChange = (pagination) => {
color
:
#fff
;
text-align
:
center
;
}
.table-box
{
height
:
calc
(
100vh
-
200px
);
}
.yellow
{
// color: #faa508;
position
:
relative
;
...
...
@@ -1186,9 +1158,8 @@ const handlePaginationChange = (pagination) => {
border-radius
:
50%
;
background
:
#ffb224
;
position
:
absolute
;
left
:
50%
;
top
:
50%
;
transform
:
translate
(
-50%
);
left
:
0
;
top
:
6px
;
}
}
.red
{
...
...
@@ -1200,9 +1171,8 @@ const handlePaginationChange = (pagination) => {
border-radius
:
50%
;
background
:
#db001d
;
position
:
absolute
;
left
:
50%
;
top
:
50%
;
transform
:
translate
(
-50%
);
left
:
0
;
top
:
6px
;
}
}
...
...
@@ -1215,9 +1185,8 @@ const handlePaginationChange = (pagination) => {
border-radius
:
50%
;
background
:
#aa05fa
;
position
:
absolute
;
left
:
50%
;
top
:
50%
;
transform
:
translate
(
-50%
);
left
:
0
;
top
:
6px
;
}
}
.view-btn
{
...
...
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