Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
K
kd_control
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
zhanglw
kd_control
Commits
1e085c45
Commit
1e085c45
authored
Mar 30, 2023
by
zhanglw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报警后台+卡调大屏测试反馈
parent
c64f5fca
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
450 additions
and
35 deletions
+450
-35
index.vue
src/views/DeviceManage/callPolice/index.vue
+4
-12
index.vue
src/views/DeviceManage/callPoliceLog/index.vue
+422
-0
index.vue
src/views/MLargeScreen/index.vue
+3
-2
index.vue
src/views/regionalManagement/regionalCaiDian/index.vue
+21
-21
No files found.
src/views/DeviceManage/callPolice/index.vue
View file @
1e085c45
...
@@ -51,20 +51,12 @@
...
@@ -51,20 +51,12 @@
<el-table-column
prop=
"driver"
label=
"司机"
align=
"center"
></el-table-column>
<el-table-column
prop=
"driver"
label=
"司机"
align=
"center"
></el-table-column>
<el-table-column
prop=
"type"
label=
"报警类型"
align=
"center"
:formatter=
"baojingleixingChange"
></el-table-column>
<el-table-column
prop=
"type"
label=
"报警类型"
align=
"center"
:formatter=
"baojingleixingChange"
></el-table-column>
<el-table-column
prop=
"areaName"
label=
"报警区域"
align=
"center"
></el-table-column>
<el-table-column
prop=
"areaName"
label=
"报警区域"
align=
"center"
></el-table-column>
<el-table-column
prop=
"operator"
label=
"处理人"
align=
"center"
></el-table-column>
<el-table-column
label=
"操作"
align=
"center"
>
<el-table-column
prop=
"handleTime"
label=
"处理时间"
align=
"center"
></el-table-column>
<el-table-column
label=
"解除报警"
align=
"center"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"primary"
@
click=
"toRelieveAlarm(scope.row)"
v-if=
"scope.row.status == 1"
>
解除报警
</el-button>
<el-button
size=
"mini"
type=
"primary"
@
click=
"toRelieveAlarm(scope.row)"
v-if=
"scope.row.status == 1"
>
解除报警
</el-button>
<span
v-if=
"scope.row.status == 0"
>
已解除报警
</span>
<span
v-if=
"scope.row.status == 0"
>
已解除报警
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<!-- <el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="toDelete(scope.row)"></el-button>
</template>
</el-table-column> -->
</el-table>
</el-table>
<!--分页组件-->
<!--分页组件-->
<el-pagination
:total=
"total"
:current-page=
"page"
style=
"margin-top: 8px;"
layout=
"total, prev, pager, next, sizes"
@
size-change=
"sizeChange"
@
current-change=
"pageChange"
/>
<el-pagination
:total=
"total"
:current-page=
"page"
style=
"margin-top: 8px;"
layout=
"total, prev, pager, next, sizes"
@
size-change=
"sizeChange"
@
current-change=
"pageChange"
/>
...
...
src/views/DeviceManage/callPoliceLog/index.vue
0 → 100644
View file @
1e085c45
This diff is collapsed.
Click to expand it.
src/views/MLargeScreen/index.vue
View file @
1e085c45
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
<!-- 头部标题 -->
<!-- 头部标题 -->
<div
class=
"top_title"
>
<div
class=
"top_title"
>
<div
class=
"top_titl_left"
>
<div
class=
"top_titl_left"
>
<div></div>
<div
v-for=
"(item,index) in topSmallTitleLeftData"
:key=
"index"
style=
"cursor: pointer;"
@
click=
"changeOver(item)"
>
<div
v-for=
"(item,index) in topSmallTitleLeftData"
:key=
"index"
style=
"cursor: pointer;"
@
click=
"changeOver(item)"
>
<div
:class=
"selectModule == item.componentName ? 'top_titl_left_textStyle2' : 'top_titl_left_textStyle1' "
>
{{
item
.
title
}}
</div>
<div
:class=
"selectModule == item.componentName ? 'top_titl_left_textStyle2' : 'top_titl_left_textStyle1' "
>
{{
item
.
title
}}
</div>
<img
src=
"../../assets/images/cutGraph/light7.png"
width=
"85"
style=
"margin-top:-1vh;"
v-if=
"selectModule == item.componentName"
>
<img
src=
"../../assets/images/cutGraph/light7.png"
width=
"85"
style=
"margin-top:-1vh;"
v-if=
"selectModule == item.componentName"
>
...
@@ -182,10 +183,10 @@ export default {
...
@@ -182,10 +183,10 @@ export default {
let
array1
=
res
.
data
.
content
.
sort
(
function
(
a
,
b
){
let
array1
=
res
.
data
.
content
.
sort
(
function
(
a
,
b
){
return
parseInt
(
a
.
dsort
)
-
parseInt
(
b
.
dsort
);
return
parseInt
(
a
.
dsort
)
-
parseInt
(
b
.
dsort
);
});
});
for
(
let
i
=
0
;
i
<
3
;
i
++
){
for
(
let
i
=
0
;
i
<
2
;
i
++
){
leftTemporaryData
.
push
(
array1
[
i
]);
leftTemporaryData
.
push
(
array1
[
i
]);
}
}
for
(
let
j
=
3
;
j
<
res
.
data
.
totalElements
;
j
++
){
for
(
let
j
=
2
;
j
<
res
.
data
.
totalElements
;
j
++
){
rightTemporaryData
.
push
(
array1
[
j
]);
rightTemporaryData
.
push
(
array1
[
j
]);
}
}
this
.
topSmallTitleLeftData
=
leftTemporaryData
;
this
.
topSmallTitleLeftData
=
leftTemporaryData
;
...
...
src/views/regionalManagement/regionalCaiDian/index.vue
View file @
1e085c45
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"name"
label=
"采点名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"name"
label=
"采点名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"areaName"
label=
"所属采区"
align=
"center"
></el-table-column>
<el-table-column
prop=
"areaName"
label=
"所属采区"
align=
"center"
></el-table-column>
<el-table-column
prop=
"areashovel"
label=
"铲车名称"
align=
"center"
></el-table-column
>
<!--
<el-table-column
prop=
"areashovel"
label=
"铲车名称"
align=
"center"
></el-table-column>
--
>
<el-table-column
prop=
"arearesources"
label=
"矿种"
align=
"center"
></el-table-column>
<el-table-column
prop=
"arearesources"
label=
"矿种"
align=
"center"
></el-table-column>
<el-table-column
prop=
"areaore"
label=
"是否配矿"
align=
"center"
></el-table-column>
<el-table-column
prop=
"areaore"
label=
"是否配矿"
align=
"center"
></el-table-column>
<el-table-column
prop=
"areapriority"
label=
"优先级"
align=
"center"
></el-table-column>
<el-table-column
prop=
"areapriority"
label=
"优先级"
align=
"center"
></el-table-column>
...
@@ -45,11 +45,11 @@
...
@@ -45,11 +45,11 @@
<el-option
v-for=
"(obj,index) in caidianAreaInformationData"
:label=
"obj.name"
:value=
"obj.name"
:key=
"index"
></el-option>
<el-option
v-for=
"(obj,index) in caidianAreaInformationData"
:label=
"obj.name"
:value=
"obj.name"
:key=
"index"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"铲车"
prop=
"areashovel"
>
<!-- <el-form-item label="铲车" prop="areashovel">--
>
<el-select
v-model=
"form.item.areashovel"
multiple
placeholder=
"请选择铲车"
style=
"width:280px;"
>
<!-- <el-select v-model="form.item.areashovel" multiple placeholder="请选择铲车" style="width:280px;">--
>
<el-option
v-for=
"(obj,index) in dianchanCarInformationData"
:label=
"obj.number"
:value=
"obj.number"
:key=
"index"
>
{{obj.number}}
</el-option
>
<!-- <el-option v-for="(obj,index) in dianchanCarInformationData" :label="obj.number" :value="obj.number" :key="index">{{obj.number}}</el-option>--
>
</el-select
>
<!-- </el-select>--
>
</el-form-item
>
<!-- </el-form-item>--
>
<el-form-item
label=
"矿种"
prop=
"arearesources"
>
<el-form-item
label=
"矿种"
prop=
"arearesources"
>
<el-select
v-model=
"form.item.arearesources"
placeholder=
"请选择矿种"
style=
"width:280px;"
>
<el-select
v-model=
"form.item.arearesources"
placeholder=
"请选择矿种"
style=
"width:280px;"
>
<el-option
label=
"废石"
value=
"废石"
></el-option>
<el-option
label=
"废石"
value=
"废石"
></el-option>
...
@@ -141,9 +141,9 @@ export default {
...
@@ -141,9 +141,9 @@ export default {
name
:
[
name
:
[
{
required
:
true
,
message
:
'
请输入采点名称
'
,
trigger
:
'
blur
'
}
{
required
:
true
,
message
:
'
请输入采点名称
'
,
trigger
:
'
blur
'
}
],
],
areashovel
:
[
//
areashovel: [
{
required
:
true
,
message
:
'
请选择铲车
'
,
trigger
:
'
change
'
}
//
{required: true, message: '请选择铲车', trigger: 'change' }
],
//
],
areaName
:
[
areaName
:
[
{
required
:
true
,
message
:
'
请选择所属采区
'
,
trigger
:
'
change
'
}
{
required
:
true
,
message
:
'
请选择所属采区
'
,
trigger
:
'
change
'
}
],
],
...
@@ -225,9 +225,9 @@ export default {
...
@@ -225,9 +225,9 @@ export default {
},
},
toEdit
(
item
)
{
toEdit
(
item
)
{
// 请除表单验证
// 请除表单验证
this
.
form
.
item
.
areashovel
=
this
.
dianchanCarInformationData
.
map
(
function
(
v
)
{
//
this.form.item.areashovel = this.dianchanCarInformationData.map(function(v) {
return
v
.
number
;
//
return v.number;
});
//
});
this
.
$refs
[
'
form1
'
]
&&
this
.
$refs
[
'
form1
'
].
clearValidate
();
this
.
$refs
[
'
form1
'
]
&&
this
.
$refs
[
'
form1
'
].
clearValidate
();
this
.
form
.
title
=
'
修改采点
'
;
this
.
form
.
title
=
'
修改采点
'
;
this
.
form
.
status
.
cu
=
0
;
this
.
form
.
status
.
cu
=
0
;
...
@@ -257,7 +257,7 @@ export default {
...
@@ -257,7 +257,7 @@ export default {
submitForm
(
validateName
,
item
){
submitForm
(
validateName
,
item
){
if
(
!
this
.
form
.
status
.
cu
){
if
(
!
this
.
form
.
status
.
cu
){
this
.
form
.
status
.
cu
=
2
;
this
.
form
.
status
.
cu
=
2
;
item
.
areashovel
=
item
.
areashovel
.
toLocaleString
();
//
item.areashovel = item.areashovel.toLocaleString();
this
.
$refs
[
validateName
].
validate
(
valid
=>
{
this
.
$refs
[
validateName
].
validate
(
valid
=>
{
if
(
valid
){
if
(
valid
){
if
(
this
.
form
.
reqType
===
'
add
'
){
if
(
this
.
form
.
reqType
===
'
add
'
){
...
...
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