Browse Source

小车修改

cjb 1 month ago
parent
commit
4537c17684

+ 0 - 1
entry/src/main/ets/common/util/mqtt.ets

@@ -101,7 +101,6 @@ class MqttManager {
 
 
   public async connect(options: MqttConnectOptions): Promise<boolean> {
   public async connect(options: MqttConnectOptions): Promise<boolean> {
     if (!this.client) return false;
     if (!this.client) return false;
-
     try {
     try {
       const res = await this.client.connect(options);
       const res = await this.client.connect(options);
       if (res.code === 0) {
       if (res.code === 0) {

+ 0 - 1
entry/src/main/ets/component/NavigationBar.ets

@@ -161,7 +161,6 @@ export struct NavigationBar {
 }
 }
 
 
 
 
-// 确认框
 @CustomDialog
 @CustomDialog
 export struct InAndOutBoundDialog {
 export struct InAndOutBoundDialog {
   @State materialNum: number=0
   @State materialNum: number=0

+ 3 - 2
entry/src/main/ets/pages/RgvControl.ets

@@ -25,7 +25,7 @@ struct RgvControl {
   @State currentStep: number = 1;
   @State currentStep: number = 1;
   @State selectWorkOrder: WorkOrderInfo = {}
   @State selectWorkOrder: WorkOrderInfo = {}
   @State workOrderArray: WorkOrderInfo[] = []
   @State workOrderArray: WorkOrderInfo[] = []
-
+  @State hangingText:string = '原位'
   @State cleanErrorClick: number = 1;
   @State cleanErrorClick: number = 1;
   @State cleanTaskClick: number = 1;
   @State cleanTaskClick: number = 1;
   @State selectRobotIndex : number = 0
   @State selectRobotIndex : number = 0
@@ -784,7 +784,7 @@ struct RgvControl {
               }.height('15%').justifyContent(FlexAlign.End)
               }.height('15%').justifyContent(FlexAlign.End)
               Select(this.hangingHeight)
               Select(this.hangingHeight)
                 .selected(0)
                 .selected(0)
-                .value(String(this.hangingHeight[0].value))
+                .value(this.hangingText)
                 .height('16%')
                 .height('16%')
                 .width('80%')
                 .width('80%')
                 .borderRadius($r('app.float.virtualSize_16'))
                 .borderRadius($r('app.float.virtualSize_16'))
@@ -795,6 +795,7 @@ struct RgvControl {
                   if(index == 7) this.hangingIndex=130
                   if(index == 7) this.hangingIndex=130
                   else if(index == 8) this.hangingIndex=129
                   else if(index == 8) this.hangingIndex=129
                   else this.hangingIndex = index
                   else this.hangingIndex = index
+                  this.hangingText = String(this.hangingHeight[index].value)
                 })
                 })
               RgvButton({
               RgvButton({
                 text:`升降`,
                 text:`升降`,