This commit is contained in:
2023-05-25 18:36:27 +08:00
parent 351a1e2c65
commit 8a6f9f8b59
6 changed files with 90 additions and 96 deletions

View File

@@ -314,7 +314,7 @@ export default {
// width 10.4rem // width 10.4rem
margin-left 2.8rem margin-left 2.8rem
position fixed position fixed
bottom 0 bottom 0.5rem
img img
width 1.1rem width 1.1rem
height 1.1rem height 1.1rem
@@ -424,6 +424,6 @@ export default {
box-shadow 0px -3px 10px rgba(black, 0.3) box-shadow 0px -3px 10px rgba(black, 0.3)
border-radius 10px border-radius 10px
.setup_no .setup_no
_font(.32rem, 1rem,#FD6A35,,) _font(.3rem, 1rem,#FD6A35,,)
margin-left .4rem margin-left .4rem
</style> </style>

View File

@@ -21,11 +21,13 @@ export default {
label: '故障信息', label: '故障信息',
index: '1', index: '1',
router: '/ErrorInfo' router: '/ErrorInfo'
}, { },
{
label: '故障处理', label: '故障处理',
index: '2', index: '2',
router: '/ErrorDeal' router: '/ErrorDeal'
}] }
]
} }
} }
} }

View File

@@ -1,89 +1,77 @@
<template> <template>
<section> <div class="movepoint">
<div class="clear site_container"> <div class="con">
<!-- <div class="fl left_side"> <div class="box1">
<site-nav default_active="1" active="1-1"></site-nav> <div class="point fl" v-for="e in dataList" :key="e.point_code" @click="toRadio(e)">{{e.code_name}}</div>
</div> --> </div>
<div class="con"> <div class="box2">
<div class="box1"> <span class="span1">目标站点</span>
<!-- <div class="point fl" v-for="e in dataList" :key="e.id">{{e.code}}</div> --> <span class="span2">{{selectObj.code_name}}</span>
<div class="point fl" v-for="e in dataList" :key="e.point_code" @click="toRadio(e)">{{e.code_name}}</div> <button class="btn btn1" @click="toSure">确定</button>
</div> <button class="btn btn2" @click="toClear">清除</button>
<div class="box2">
<span class="span1">目标站点</span>
<span class="span2">{{selectObj.code_name}}</span>
<button class="btn btn1">确定</button>
<button class="btn btn2">清除</button>
</div>
</div> </div>
</div> </div>
</section> </div>
</template> </template>
<script> <script>
import NavBar from '@components/NavBar.vue'
import SiteNav from '@components/SiteNav.vue'
import {queryPoint, confirmPoint} from '@/config/getData.js' import {queryPoint, confirmPoint} from '@/config/getData.js'
export default { export default {
name: 'MovePoint', name: 'MovePoint',
components: {
NavBar,
SiteNav
},
data () { data () {
return { return {
selectObj: {}, selectObj: {},
// dataList: [] // dataList: [],
dataList: [ dataList: [
{ {
id: '1', id: '1',
code: 'A-ZD101' code_name: 'A-ZD101'
}, },
{ {
id: '2', id: '2',
code: 'A-ZD102' code_name: 'A-ZD102'
}, },
{ {
id: '3', id: '3',
code: 'A-ZD103' code_name: 'A-ZD103'
}, },
{ {
id: '4', id: '4',
code: 'A-ZD101' code_name: 'A-ZD101'
}, },
{ {
id: '5', id: '5',
code: 'A-ZD101' code_name: 'A-ZD101'
}, },
{ {
id: '6', id: '6',
code: 'A-ZD101' code_name: 'A-ZD101'
}, },
{ {
id: '7', id: '7',
code: 'A-ZD101' code_name: 'A-ZD101'
}, },
{ {
id: '8', id: '8',
code: 'A-ZD101' code_name: 'A-ZD101'
}, },
{ {
id: '9', id: '9',
code: 'A-ZD101' code_name: 'A-ZD101'
}, },
{ {
id: '10', id: '10',
code: 'A-ZD101' code_name: 'A-ZD101'
}, },
{ {
id: '11', id: '11',
code: 'A-ZD101' code_name: 'A-ZD101'
} }
] ]
} }
}, },
created () { created () {
this.initData() // this.initData()
}, },
methods: { methods: {
async initData () { async initData () {
@@ -117,54 +105,59 @@ export default {
} }
} }
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.con .con
float left float left
margin-left .4rem margin-left .4rem
margin-top .1rem margin-top .39rem
.box1 .box1
width 10.4rem width 10.4rem
height 4.2rem // height 6.1rem
margin-top .5rem
.point .point
width 2rem width 2rem
height 1.22rem
line-height .9rem line-height .9rem
color #FA6400 color #FA6400
font-size .36rem font-size .36rem
text-align center text-align center
border .16rem solid #DFE1E6 border .16rem solid #DFE1E6
border-radius .08rem border-radius .2rem
background #ffffff background #ffffff
margin-right .4rem margin-right .4rem
margin-bottom .2rem margin-bottom .35rem
.box2 .box2
position relative position fixed
bottom .5rem
width 9.81rem width 9.81rem
height 1.2rem height 1.5rem
border .16rem solid #DFE1E6 border .16rem solid #DFE1E6
border-radius .08rem border-radius .2rem
background #ffffff background #ffffff
margin-top .8rem .span1
span
position absolute position absolute
left .3rem left .3rem
top .3rem top .34rem
display inline-block display inline-block
line-height .5rem
font-size .28rem font-size .28rem
border-right 2px solid #FA6400 border-right 3px solid #FA6400
width 1.8rem width 1.6rem
color #464646 color #464646
.span2
position absolute
left 2.5rem
top .4rem
display inline-block
font-size .34rem
color #fa6400
.btn .btn
width 1.8rem width 1.8rem
line-height .65rem line-height .88rem
font-size .32rem font-size .32rem
border-radius .28rem border-radius .28rem
color #ffffff color #ffffff
.btn1 .btn1
position absolute position absolute
left 5.3rem left 5.5rem
top .15rem top .15rem
background #FD6A35 background #FD6A35
.btn2 .btn2

View File

@@ -1,6 +1,6 @@
<template> <template>
<section> <section>
<div class="clear site_container"> <div class="clear">
<!-- <div class="fl left_side"> <!-- <div class="fl left_side">
<site-nav default_active="1" active="1-2"></site-nav> <site-nav default_active="1" active="1-2"></site-nav>
</div> --> </div> -->
@@ -16,11 +16,11 @@
</tr> </tr>
<tr v-for="(e, index) in dataList" :key="e.task_id"> <tr v-for="(e, index) in dataList" :key="e.task_id">
<td>{{index+1}}</td> <td>{{index+1}}</td>
<td>{{e.task_no}}</td> <td>{{e.task_num}}</td>
<td>{{e.next_point}}</td> <td>{{e.next_point}}</td>
<td>{{e.next_point}}</td> <td>{{e.target_point}}</td>
<td>{{e.status}}</td> <td>{{e.task_status_name}}</td>
<td class="last-td">{{e.time}}</td> <td class="last-td">{{e.create_time}}</td>
</tr> </tr>
</table> </table>
</div> </div>
@@ -29,48 +29,47 @@
</template> </template>
<script> <script>
import NavBar from '@components/NavBar.vue'
import SiteNav from '@components/SiteNav.vue' import SiteNav from '@components/SiteNav.vue'
import {queryTaskList} from '@/config/getData.js' import {queryTaskList} from '@/config/getData.js'
export default { export default {
name: 'TaskList', name: 'TaskList',
components: { components: {
NavBar,
SiteNav SiteNav
}, },
data () { data () {
return { return {
pkId: '', pkId: '',
dataList: [ dataList: []
{ // dataList: [
task_id: '1', // {
task_no: '1001', // task_id: '1',
next_point: '1001', // task_no: '1001',
status: '正在执行', // next_point: '1001',
time: '2021-07-14 12:00:00' // status: '正在执行',
}, // time: '2021-07-14 12:00:00'
{ // },
task_id: '2', // {
task_no: '1002', // task_id: '2',
next_point: '1001', // task_no: '1002',
status: '未执行', // next_point: '1001',
time: '2021-07-15 12:00:00' // status: '未执行',
}, // time: '2021-07-15 12:00:00'
{ // },
task_id: '3', // {
task_no: '1003', // task_id: '3',
next_point: '1001', // task_no: '1003',
status: '未执行', // next_point: '1001',
time: '2021-07-18 12:00:00' // status: '未执行',
}, // time: '2021-07-18 12:00:00'
{ // },
task_id: '4', // {
task_no: '1004', // task_id: '4',
next_point: '1001', // task_no: '1004',
status: '未执行', // next_point: '1001',
time: '2021-09-10 12:00:00' // status: '未执行',
} // time: '2021-09-10 12:00:00'
] // }
// ]
} }
}, },
created () { created () {

View File

@@ -1,6 +1,6 @@
<template> <template>
<section> <section>
<div class="clear site_container"> <div class="clear">
<!-- <div class="fl left_side"> <!-- <div class="fl left_side">
<test-nav :array="testData" @change="handleChange"></test-nav> <test-nav :array="testData" @change="handleChange"></test-nav>
</div> --> </div> -->

View File

@@ -100,7 +100,7 @@ export default {
}, { }, {
label: '故障管理', label: '故障管理',
index: '3', index: '3',
router: '/ErrorDeal' router: '/ErrorInfo'
}, { }, {
label: '车辆信息', label: '车辆信息',
index: '4', index: '4',