Parcourir la source

fix: swap carOwner confirm/cancel buttons, fix UHF tcp port string conversion

lq il y a 1 mois
Parent
commit
1dc27cf228
2 fichiers modifiés avec 4 ajouts et 3 suppressions
  1. 2 2
      frontend/src/view/parking/carOwner.vue
  2. 2 1
      internal/service/uhf/tcp_reader.go

+ 2 - 2
frontend/src/view/parking/carOwner.vue

@@ -167,12 +167,12 @@
         <el-button
           size="large"
           @click="carOwnerShow = false"
-        >{{$t.value.Confirm}}</el-button>
+        >{{$t.value.Cancel}}</el-button>
         <el-button
           type="primary"
           size="large"
           @click="carOwnerOperation"
-        >{{$t.value.Cancel}}</el-button>
+        >{{$t.value.Confirm}}</el-button>
       </template>
     </el-dialog>
   </div>

+ 2 - 1
internal/service/uhf/tcp_reader.go

@@ -2,6 +2,7 @@ package uhf
 
 import (
 	"errors"
+	"fmt"
 	"net"
 	"time"
 )
@@ -47,7 +48,7 @@ func NewTCPReader(ip string, port int) *TCPReader {
 }
 
 func (t *TCPReader) Connect() error {
-	addr := net.JoinHostPort(t.IP, string(rune(t.Port)))
+	addr := net.JoinHostPort(t.IP, fmt.Sprintf("%d", t.Port))
 	conn, err := net.DialTimeout("tcp", addr, 5*time.Second)
 	if err != nil {
 		t.isConnected = false