|
@@ -168,6 +168,7 @@
|
|
line-height: 0.2rem;
|
|
line-height: 0.2rem;
|
|
background: #2175F2;
|
|
background: #2175F2;
|
|
text-align: center;
|
|
text-align: center;
|
|
|
|
+ margin-bottom: 2px;
|
|
}
|
|
}
|
|
.h5-go-task i{
|
|
.h5-go-task i{
|
|
color: #1890FF;
|
|
color: #1890FF;
|
|
@@ -754,16 +755,16 @@
|
|
},
|
|
},
|
|
showMap:function(){
|
|
showMap:function(){
|
|
var that = this;
|
|
var that = this;
|
|
- if(this.mapData.drawnImg == null){
|
|
|
|
|
|
+ if(this.mapData.mapImg == null){
|
|
this.normalmapimg = "";
|
|
this.normalmapimg = "";
|
|
$("#areaimg").attr("src","");
|
|
$("#areaimg").attr("src","");
|
|
}else {
|
|
}else {
|
|
- this.normalmapimg = "data:image/png;base64," + this.mapData.drawnImg;
|
|
|
|
- $("#areaimg").attr("src","data:image/png;base64," + this.mapData.drawnImg);
|
|
|
|
|
|
+ this.normalmapimg = "data:image/png;base64," + this.mapData.mapImg;
|
|
|
|
+ $("#areaimg").attr("src","data:image/png;base64," + this.mapData.mapImg);
|
|
}
|
|
}
|
|
this.$nextTick(function() {
|
|
this.$nextTick(function() {
|
|
that.imgscale = parseInt($("#areaimg").css("height"))/that.mapData.height;
|
|
that.imgscale = parseInt($("#areaimg").css("height"))/that.mapData.height;
|
|
- if(that.robotData.mapX==null||that.robotData.mapY==null||that.mapData.drawnImg == null){
|
|
|
|
|
|
+ if(that.robotData.mapX==null||that.robotData.mapY==null||that.mapData.mapImg == null){
|
|
that.pgrobotl = []; //机器人实时位置
|
|
that.pgrobotl = []; //机器人实时位置
|
|
}else{
|
|
}else{
|
|
that.pgrobotl = [that.robotData.mapX,that.robotData.mapY]; //机器人实时位置
|
|
that.pgrobotl = [that.robotData.mapX,that.robotData.mapY]; //机器人实时位置
|