huanglingchen
/
device-pad
0
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

修改接收后台数据不生效，给数据添加单位

master
huanglingchen 4 months ago
parent
5fbbfc7789
commit
9184741a28
6 changed files with 300 additions and 211 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +220
    -85
      components/carPage/index.vue
  2. +10
    -14
      components/controlPage/index.vue
  3. +67
    -106
      pages/index/index.vue
  4. BIN
      static/image/errorToast.png
  5. BIN
      static/image/successToast.png
  6. +3
    -6
      utils/requset.js

+ 220
- 85
components/carPage/index.vue View File

@ -9,7 +9,7 @@
<view v-for="item,index in carDetail1" :key="index" :class="item.width==0?'optionWidth':''">
<span>{{item.name}}</span>
<span style="padding-right:4px ;">{{item.val}}</span>
<span>{{index==7||index==11?'mm':index==9?'°':''}}</span>
<span>{{index>=9?'mm':index==8?'°':''}}</span>
</view>
</view>
</view>
@ -21,7 +21,7 @@
<view v-for="item,index in carDetail2" :key="index" :class="item.width==0?'optionWidth':''">
<span>{{item.name}}</span>
<span style="padding-right:4px ;">{{item.val}}</span>
<span>{{index==7||index==11?'mm':index==9?'°':''}}</span>
<span>{{index>=9?'mm':index==8?'°':''}}</span>
</view>
</view>
</view>
@ -33,7 +33,7 @@
<view v-for="item,index in carDetail3" :key="index" :class="item.width==0?'optionWidth':''">
<span>{{item.name}}</span>
<span style="padding-right:4px ;">{{item.val}}</span>
<span>{{index==7||index==11?'mm':index==9?'°':''}}</span>
<span>{{index>=9?'mm':index==8?'°':''}}</span>
</view>
</view>
</view>
@ -44,103 +44,238 @@
<script>
export default{
props:{
carData1:{
type:Array
},
carData2:{
type:Array
},
carData3:{
type:Array
},
carData:{
type:Object
}
},
data(){
let dataInter1=[
{
name:'支架车在线状态：',
width:0,
val:''
},{
name:'左横移限位：',
width:1,
val:''
},{
name:'右横移限位：',
width:1,
val:''
},{
name:'上限位：',
width:1,
val:''
},{
name:'下限位：',
width:1,
val:''
},{
name:'左滚转限位：',
width:1,
val:''
},{
name:'右滚转限位：',
width:1,
val:''
},{
name:'超重限位：',
width:1,
val:''
},{
name:'滚转位置：',
width:1,
val:''
},{
name:'行进位置：',
width:0,
val:''
},{
name:'横移位置：',
width:0,
val:''
},{
name:'升降位置：',
width:0,
val:''
}
]
let dataInter2=[
{
name:'支架车在线状态：',
width:0,
val:''
},{
name:'左横移限位：',
width:1,
val:''
},{
name:'右横移限位：',
width:1,
val:''
},{
name:'上限位：',
width:1,
val:''
},{
name:'下限位：',
width:1,
val:''
},{
name:'左滚转限位：',
width:1,
val:''
},{
name:'右滚转限位：',
width:1,
val:''
},{
name:'超重限位：',
width:1,
val:''
},{
name:'滚转位置：',
width:1,
val:''
},{
name:'行进位置：',
width:0,
val:''
},{
name:'横移位置：',
width:0,
val:''
},{
name:'升降位置：',
width:0,
val:''
}
]
let dataInter3=[
{
name:'支架车在线状态：',
width:0,
val:''
},{
name:'左横移限位：',
width:1,
val:''
},{
name:'右横移限位：',
width:1,
val:''
},{
name:'上限位：',
width:1,
val:''
},{
name:'下限位：',
width:1,
val:''
},{
name:'左滚转限位：',
width:1,
val:''
},{
name:'右滚转限位：',
width:1,
val:''
},{
name:'超重限位：',
width:1,
val:''
},{
name:'滚转位置：',
width:1,
val:''
},{
name:'行进位置：',
width:0,
val:''
},{
name:'横移位置：',
width:0,
val:''
},{
name:'升降位置：',
width:0,
val:''
}
]
return{
dataInter:[
{
name:'支架车在线状态：',
width:0,
val:'离线'
},{
name:'左横移限位：',
width:1,
val:'2'
},{
name:'右横移限位：',
width:1,
val:'3'
},{
name:'上限位：',
width:1,
val:'3'
},{
name:'下限位：',
width:1,
val:'3'
},{
name:'左滚转限位：',
width:1,
val:'3'
},{
name:'右滚转限位：',
width:1,
val:'3'
},{
name:'行进位置：',
width:1,
val:'3'
},{
name:'横移位置：',
width:1,
val:'3'
},{
name:'滚转位置：',
width:1,
val:'3'
},{
name:'超重限位：',
width:1,
val:'3'
},{
name:'升降位置：',
width:0,
val:'3'
}
],
carDetail1:[],
carDetail2:[],
carDetail3:[],
carDetail1:dataInter1,
carDetail2:dataInter2,
carDetail3:dataInter3,
}
},
methods:{
// 处理支架车数据数据
carEntsorgen(value){
this.carDetail1[0].val=value.online==1?'在线':'离线';
this.carDetail1[1].val=value.leftHorizontalLimit;
this.carDetail1[2].val=value.rightHorizontalLimit;
this.carDetail1[3].val=value.downLimit;
this.carDetail1[4].val=value.upLimit;
this.carDetail1[5].val=value.leftTurnLimit;
this.carDetail1[6].val=value.rightTurnLimit;
this.carDetail1[7].val=value.overWeightLimit;
this.carDetail1[8].val=value.turnPosition;
this.carDetail1[9].val=value.walkAxisPosition;
this.carDetail1[10].val=value.horizontalAxisPosition;
this.carDetail1[11].val=value.liftPosition;
this.carDetail2[0].val=value.onlineTwo==1?'在线':'离线';
this.carDetail2[1].val=value.leftHorizontalLimitTwo;
this.carDetail2[2].val=value.rightHorizontalLimitTwo;
this.carDetail2[3].val=value.downLimitTwo;
this.carDetail2[4].val=value.upLimitTwo;
this.carDetail2[5].val=value.leftTurnLimitTwo;
this.carDetail2[6].val=value.rightTurnLimitTwo;
this.carDetail2[7].val=value.overWeightLimitTwo;
this.carDetail2[8].val=value.turnPositionTwo;
this.carDetail2[9].val=value.walkAxisPositionTwo;
this.carDetail2[10].val=value.horizontalAxisPositionTwo;
this.carDetail2[11].val=value.liftPositionTwo;
this.carDetail3[0].val=value.onlineThree==1?'在线':'离线';
this.carDetail3[1].val=value.leftHorizontalLimitThree;
this.carDetail3[2].val=value.rightHorizontalLimitThree;
this.carDetail3[3].val=value.downLimitThree;
this.carDetail3[4].val=value.upLimitThree;
this.carDetail3[5].val=value.leftTurnLimitThree;
this.carDetail3[6].val=value.rightTurnLimitThree;
this.carDetail3[7].val=value.overWeightLimitThree;
this.carDetail3[8].val=value.turnPositionThree;
this.carDetail3[9].val=value.walkAxisPositionThree;
this.carDetail3[10].val=value.horizontalAxisPositionThree;
this.carDetail3[11].val=value.liftPositionThree;
}
},
watch:{
carData1:{
handler(newVal,oldVal){
if(newVal){
this.carDetail1=newVal
}
}
},
carData2:{
handler(newVal,oldVal){
if(newVal){
this.carDetail2=newVal
}
}
},
carData3:{
carData:{
immediate:true,
handler(newVal,oldVal){
if(newVal){
this.carDetail3=newVal
this.carEntsorgen(newVal);
// console.log(this.carDetail1)
// console.log(this.carDetail2)
// console.log(this.carDetail3)
}
}
}
},
mounted() {
this.carDetail1=this.dataInter; //初始化1号车数据
this.carDetail2=this.dataInter; //初始化2号车数据
this.carDetail3=this.dataInter; //初始化3号车数据
}
}
</script>


+ 10
- 14
components/controlPage/index.vue View File

@ -234,8 +234,8 @@
ctrlFlag: 0,//控制模式：0-手动、1-自动
lightFlag: 1,//设备状态：0-正常、1-异常
},
errorIcon:'/static/image/error.png',
normalIcon:'/static/image/normal.png'
errorIcon:'../../static/image/error.png',
normalIcon:'../../static/image/normal.png'
}
},
methods:{
@ -245,18 +245,13 @@
url:`/zhxx/dt/horizonLoadIControl/${value}`,
data:{}
}).then((res)=>{
if(res.code==200){
uni.showToast({
title: res.msg,
icon: "success",
duration: 1000
})
}else{
uni.showToast({
title: res.msg?res.msg:'请求失败',
icon: "error",
duration: 1000
})
console.log(res)
if(res.data.code==200){
this.$eventBus.emit('showToast',{title:res.data.msg,duration:1000,icon:'success'})
}else {
console.log(22222)
this.$eventBus.emit('showToast',{title:res.data.msg?res.data.msg:'请求失败',duration:1000,icon:'error'})
}
}).catch((Error)=>{
// console.log(Error)
@ -296,6 +291,7 @@
},
watch:{
Data:{
immediate:true,
handler(newVal,oldVal){
if(newVal){
this.deviceData=newVal


+ 67
- 106
pages/index/index.vue View File

@ -12,7 +12,12 @@
<span :class="optionIndex==2?'pitch':''" @click="outLogin()">退出</span>
</view> -->
<controlPage v-if="optionIndex==0" :Data='deviceData'></controlPage>
<carPage v-if="optionIndex==1" :carData1='carData1' :carData2='carData2' :carData3='carData3'></carPage>
<carPage v-if="optionIndex==1" :carData='deviceData'></carPage>
<view class="showToast" v-if="showToastState==1">
<image :src="showToastIcon=='success'?successIcon:errorIcon"></image>
<span>{{showToastTitle}}</span>
</view>
</view>
</template>
@ -20,6 +25,8 @@
import controlPage from '/components/controlPage/index.vue';
import carPage from '/components/carPage/index.vue';
import {httpPost} from '../../utils/requset.js';
import error from '../../static/image/errorToast.png';
import successImage from '@/static/image/successToast.png';
export default {
components: {
controlPage,
@ -28,66 +35,17 @@
data() {
return {
optionIndex:0,
dataInter:[
{
name:'支架车在线状态：',
width:0,
val:''
},{
name:'左横移限位：',
width:1,
val:''
},{
name:'右横移限位：',
width:1,
val:''
},{
name:'上限位：',
width:1,
val:''
},{
name:'下限位：',
width:1,
val:''
},{
name:'左滚转限位：',
width:1,
val:''
},{
name:'右滚转限位：',
width:1,
val:''
},{
name:'行进位置：',
width:1,
val:''
},{
name:'横移位置：',
width:1,
val:''
},{
name:'滚转位置：',
width:1,
val:''
},{
name:'超重限位：',
width:1,
val:''
},{
name:'升降位置：',
width:0,
val:''
}
],
carData1:[],
carData2:[],
carData3:[],
deviceData:{},
showToastTitle:'',
showToastIcon:'',
showToastState:0,
errorIcon:error,
successIcon:successImage
}
},
methods: {
cutOption(value){
this.optionIndex=value
this.optionIndex=value;
},
outLogin(){
uni.showModal({
@ -117,59 +75,29 @@
url:'/zhxx/dt/horizonLoadInfo',
data:{}
}).then((res)=>{
if(res.code==200){
this.deviceData=res.data;
this.carData1=this.carEntsorgen(res.data,1);
this.carData2=this.carEntsorgen(res.data,2);
this.carData3=this.carEntsorgen(res.data,3);
if(res.data.code==200){
this.deviceData=res.data.data[0];
}
}).catch((err)=>{
console.log(err)
if(err.errMsg.includes('Failed to connect')){
this.showToat({
title:'请确保成功连接网络',
icon:'error',
duration:1800
})
}
})
},
carEntsorgen(value,type){
let data=value;
let arrData=this.dataInter;
if(type==1){
arrData[0].val=value.online==1?'在线':'离线';
arrData[1].val=value.leftHorizontalLimit;
arrData[2].val=value.rightHorizontalLimit;
arrData[3].val=value.downLimit;
arrData[4].val=value.upLimit;
arrData[5].val=value.leftTurnLimit;
arrData[6].val=value.rightTurnLimit;
arrData[7].val=value.walkAxisPosition;
arrData[8].val=value.horizontalAxisPosition;
arrData[9].val=value.turnPosition;
arrData[10].val=value.overWeightLimit;
arrData[11].val=value.liftPosition;
}else if(type==2){
arrData[0].val=value.onlineTwo==1?'在线':'离线';
arrData[1].val=value.leftHorizontalLimitTwo;
arrData[2].val=value.rightHorizontalLimitTwo;
arrData[3].val=value.downLimitTwo;
arrData[4].val=value.upLimitTwo;
arrData[5].val=value.leftTurnLimitTwo;
arrData[6].val=value.rightTurnLimitTwo;
arrData[7].val=value.walkAxisPositionTwo;
arrData[8].val=value.horizontalAxisPositionTwo;
arrData[9].val=value.turnPositionTwo;
arrData[10].val=value.overWeightLimitTwo;
arrData[11].val=value.liftPositionTwo;
}else{
arrData[0].val=value.onlineThree==1?'在线':'离线';
arrData[1].val=value.leftHorizontalLimitThree;
arrData[2].val=value.rightHorizontalLimitThree;
arrData[3].val=value.downLimitThree;
arrData[4].val=value.upLimitThree;
arrData[5].val=value.leftTurnLimitThree;
arrData[6].val=value.rightTurnLimitThree;
arrData[7].val=value.walkAxisPositionThree;
arrData[8].val=value.horizontalAxisPositionThree;
arrData[9].val=value.turnPositionThree;
arrData[10].val=value.overWeightLimitThree;
arrData[11].val=value.liftPositionThree;
}
return arrData;
showToat(value){
this.showToastState=1;
this.showToastTitle=value.title;
this.showToastIcon=value.icon;
setTimeout(()=>{
this.showToastState=0;
},value.duration)
}
},
@ -191,6 +119,13 @@
setInterval(()=>{
this.deviceAjax();
},1000)
// ,{title:res.data.msg?res.data.msg:'请求失败',duration:1000,icon:'error'}
this.$eventBus.on('showToast',(data)=>{
console.log(3333333);
this.showToat(data);
})
}
}
</script>
@ -235,4 +170,30 @@
right: 2%;
}
.showToast{
position: absolute;
left: 50%;
transform: translateX(-50%);
padding: 16px 12px;
background-color: rgb(0,0,0,0.7);
z-index: 2000;
top: 40%;
border-radius: 10px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
}
.showToast>image{
width: 40px;
height: 40px;
margin-bottom: 20px;
}
.showToast>span{
color: #ffffff;
font-size: 18px;
}
</style>

BIN
static/image/errorToast.png View File

Before After
Width: 48  |  Height: 48  |  Size: 1000 B

BIN
static/image/successToast.png View File

Before After
Width: 48  |  Height: 48  |  Size: 967 B

+ 3
- 6
utils/requset.js View File

@ -27,12 +27,9 @@ export function httpPost(option) {
reject(err, 22222)
},
complete(res) {
if (res.data.code == 401) {
// uni.reLaunch({
// url: "/pages/login/LoginPage"
// })
fetchUserName()
}
// console.log(res)
reject(res)
}
})
})


Write Preview
Loading…
Cancel
Save