From 0c3bd21467ee05c9706c2718c14900cf3095b795 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Wed, 26 Jun 2024 11:37:06 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request.js | 4 ++-- components/form/DateTime.vue | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api/request.js b/api/request.js index a31742a..4033891 100644 --- a/api/request.js +++ b/api/request.js @@ -8,14 +8,14 @@ // export const BASE_URL = "http://jxj.zhgdyun.com:61212" // 洁远程 // export const BASE_URL = "http://182.90.224.237:35557" // export const BASE_URL = "http://192.168.34.155:19111" -export const BASE_URL = "http://192.168.34.221:9111" +// export const BASE_URL = "http://192.168.34.221:9111" // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 //export const BASE_URL = "http://192.168.8.100:10000" //export const BASE_URL = "http://106.13.16.28:10000" // 生产环境 // export const BASE_URL = "http://42.180.188.17:9809" // 鞍钢正式环境 -// export const BASE_URL = "http://42.180.188.17:19098" // 鞍钢线上测试环境 +export const BASE_URL = "http://42.180.188.17:19098" // 鞍钢线上测试环境 //是否已显示未登录弹窗 let showNoLoginTip = false diff --git a/components/form/DateTime.vue b/components/form/DateTime.vue index 6caa190..f0658fa 100644 --- a/components/form/DateTime.vue +++ b/components/form/DateTime.vue @@ -50,9 +50,11 @@ return props.modelValue }, set(val) { - if (props.formProps.format === 'yyyy-mm-dd hh:mm') { - val = val.substring(0, 16) + ':00' + console.log(11111111, props.formProps.format == 'yyyy-MM-dd HH:mm', val) + if (props.formProps.format == 'yyyy-MM-dd HH:mm') { + val = val.substring(0, 16) } + console.log(val) emits('update:modelValue', val) } })