diff --git a/.env.production b/.env.production index b029c67..6f90133 100644 --- a/.env.production +++ b/.env.production @@ -5,6 +5,6 @@ VITE_APP_ENV='production' # api接口请求地址 -VITE_APP_BASE_API='http://crm.hzzxq.com/ds' +VITE_APP_BASE_API='/rescue' diff --git a/.gitignore b/.gitignore index a547bf3..4fff125 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ dist-ssr *.njsproj *.sln *.sw? +*.zip diff --git a/dist (2).zip b/dist (2).zip deleted file mode 100644 index d38cc0c..0000000 Binary files a/dist (2).zip and /dev/null differ diff --git a/dist (3).zip b/dist (3).zip deleted file mode 100644 index a9e1e74..0000000 Binary files a/dist (3).zip and /dev/null differ diff --git a/dist (4).zip b/dist (4).zip deleted file mode 100644 index 06eb5c0..0000000 Binary files a/dist (4).zip and /dev/null differ diff --git a/dist.zip b/dist.zip deleted file mode 100644 index a99ed25..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/api/task.js b/src/api/task.js index 19ba313..67225c9 100644 --- a/src/api/task.js +++ b/src/api/task.js @@ -10,7 +10,6 @@ export const getParam = () => { // 获取航次列表 export const voyageReg = (data) => { - console.log(data) return request({ baseURL: data.baseURL, url: '/voyage/reg/list.htm', diff --git a/src/views/TaskInput.vue b/src/views/TaskInput.vue index eef6c65..65d6520 100644 --- a/src/views/TaskInput.vue +++ b/src/views/TaskInput.vue @@ -452,9 +452,14 @@ const VoyageSocketUrl = ref('') const getParamsList = () => { getParam().then(res => { const data = res.array.find(item => item.param_name === 'VoyageSocketUrl') - VoyageSocketUrl.value = data.param_value - getVoyageReg() + if (data.param_value) { + VoyageSocketUrl.value = data.param_value + } else { + VoyageSocketUrl.value = `${window.location.protocol}//${window.location.hostname}:${window.location.port}/ds/` + } + + getVoyageReg() }) } @@ -463,6 +468,7 @@ const voyageOptions = ref([]) const getVoyageReg = () => { voyageReg({ baseURL: VoyageSocketUrl.value }).then(res => { voyageOptions.value = res.array + console.log(res.array) }) }