From e39d2bda05763a4702783ab0c309a17ae6a650b3 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 11 Aug 2025 14:42:41 +0800
Subject: [PATCH] bug

---
 src/config/http.js                | 14 +++++++++-----
 src/pages/modules/building.vue    |  2 +-
 src/pages/modules/device.vue      |  2 +-
 src/pages/modules/save-chain.vue  |  2 +-
 src/pages/shells/config-modal.vue |  2 +-
 src/pages/shells/login-modal.vue  |  2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/config/http.js b/src/config/http.js
index 07d8d70..373abc9 100644
--- a/src/config/http.js
+++ b/src/config/http.js
@@ -2,16 +2,20 @@ import axios from 'axios'
 import i18n from '../i18n/i18n'
 import store from '../vuex/store'
 
-const urlHost = store.getters.serverUrl
-
 axios.defaults.timeout = 50000
 axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
-// 补充GET请求默认Content-Type（可选，GET请求通常无需此配置，但部分后端可能需要）
 axios.defaults.headers.get['Content-Type'] = 'application/json;charset=UTF-8'
 
 // 请求拦截器
 axios.interceptors.request.use(
   config => {
+    const urlHost = store.getters.serverUrl
+    if (urlHost && !config.url.startsWith('http')) {
+      // 移除urlHost和sevmethod中的多余斜杠，确保只保留一个
+      const base = urlHost.replace(/\/$/, '')
+      const path = config.url.replace(/^\//, '')
+      config.url = `${base}/${path}`
+    }
     config.headers['Accept-Language'] = i18n.locale === 'en-us' ? 'en' : 'zh'
     return config
   },
@@ -53,7 +57,7 @@ axios.interceptors.response.use(
 
 export const post = (sevmethod, params) => {
   return new Promise((resolve, reject) => {
-    axios.post(`${urlHost}/${sevmethod}`, params)
+    axios.post(sevmethod, params)
       .then(response => {
         resolve(response.data)
       })
@@ -65,7 +69,7 @@ export const post = (sevmethod, params) => {
 
 export const get = (sevmethod, params = {}) => {
   return new Promise((resolve, reject) => {
-    axios.get(`${urlHost}/${sevmethod}`, { params })
+    axios.get(sevmethod, { params })
       .then(response => {
         resolve(response.data)
       })
diff --git a/src/pages/modules/building.vue b/src/pages/modules/building.vue
index 3a61625..3557453 100644
--- a/src/pages/modules/building.vue
+++ b/src/pages/modules/building.vue
@@ -21,7 +21,7 @@
         <el-col :span="7"><button class="button_control button_control_disabled" @click="dialogVisible = false"><p>{{$t('Cancel')}}</p></button></el-col>
         <el-col :span="7"><button class="button_control" @click="_setStation"><p>{{$t('Save')}}</p></button></el-col>
       </el-row>
-      <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" />
+      <!-- <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" /> -->
     </el-dialog>
     <transition name="custom-message" >
       <div v-if="message" class="message" :style="{'top': isTop ? '.87rem' : '.57rem', 'color': error ? '#F56C6C' : '#67C23A'}">
diff --git a/src/pages/modules/device.vue b/src/pages/modules/device.vue
index 642d55c..db7697c 100644
--- a/src/pages/modules/device.vue
+++ b/src/pages/modules/device.vue
@@ -59,7 +59,7 @@
       </el-col>
     </el-row>
     <save-chain v-if="saveVisible" ref="saveChain" @dataFormSubmit="dataFormSubmit"/>
-    <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" />
+    <!-- <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" /> -->
   </div>
 </template>
 
diff --git a/src/pages/modules/save-chain.vue b/src/pages/modules/save-chain.vue
index ec78acb..40a84b4 100644
--- a/src/pages/modules/save-chain.vue
+++ b/src/pages/modules/save-chain.vue
@@ -13,7 +13,7 @@
       <el-col :span="7"><button class="button_control button_control_disabled" @click="exitUser"><p>{{$t('Cancel')}}</p></button></el-col>
       <el-col :span="7"><button class="button_control" @click="dataFormSubmit"><p>{{$t('Save')}}</p></button></el-col>
     </el-row>
-    <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" />
+    <!-- <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" /> -->
   </el-dialog>
 </template>
 
diff --git a/src/pages/shells/config-modal.vue b/src/pages/shells/config-modal.vue
index c4fdee3..cb598e7 100644
--- a/src/pages/shells/config-modal.vue
+++ b/src/pages/shells/config-modal.vue
@@ -31,7 +31,7 @@
       <el-col :span="7"><button class="button_control button_control_disabled" @click="exitUser"><p>{{$t('Cancel')}}</p></button></el-col>
       <el-col :span="7"><button class="button_control" @click="dataFormSubmit"><p>{{$t('Save')}}</p></button></el-col>
     </el-row>
-    <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" />
+    <!-- <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" /> -->
   </el-dialog>
 </template>
 
diff --git a/src/pages/shells/login-modal.vue b/src/pages/shells/login-modal.vue
index 1d6435d..8707ae7 100644
--- a/src/pages/shells/login-modal.vue
+++ b/src/pages/shells/login-modal.vue
@@ -17,7 +17,7 @@
       <el-col :span="7" v-if="userRole === 1"><button class="button_control button_control_disabled" @click="exitUser"><p>{{ $t('Logout') }}</p></button></el-col>
       <el-col :span="7" v-else><button class="button_control" @click="dataFormSubmit"><p>{{$t('Login')}}</p></button></el-col>
     </el-row>
-    <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" />
+    <!-- <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" /> -->
   </el-dialog>
 </template>