diff --git a/.env.production b/.env.production index 69cf472..c71f41b 100644 --- a/.env.production +++ b/.env.production @@ -4,7 +4,7 @@ VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 #// 测试环境 -# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://139.198.29.133:8080 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 @@ -12,7 +12,7 @@ # ------------------ 内网 -------------------------- # VITE_APP_API_BASEURL = http://192.168.2.96:8088 # ------------------ 外网 -------------------------- -VITE_APP_API_BASEURL = http://222.187.140.114:8896 +# VITE_APP_API_BASEURL = http://222.187.140.114:8896 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 69cf472..c71f41b 100644 --- a/.env.production +++ b/.env.production @@ -4,7 +4,7 @@ VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 #// 测试环境 -# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://139.198.29.133:8080 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 @@ -12,7 +12,7 @@ # ------------------ 内网 -------------------------- # VITE_APP_API_BASEURL = http://192.168.2.96:8088 # ------------------ 外网 -------------------------- -VITE_APP_API_BASEURL = http://222.187.140.114:8896 +# VITE_APP_API_BASEURL = http://222.187.140.114:8896 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts index bfa6faa..71f32fc 100644 --- a/src/store/modules/websocket.ts +++ b/src/store/modules/websocket.ts @@ -8,7 +8,8 @@ // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`, // wsUrl: 'ws://192.168.2.96:8085/websocket/', // wsUrl: 'ws://192.168.2.96:8088/websocket/', // 内网 - wsUrl: 'ws://222.187.140.114:8896/websocket/', // 外网 + // wsUrl: 'ws://222.187.140.114:8896/websocket/', // 外网 + wsUrl: 'ws://111.198.10.15:21609/websocket/', // 测试环境 websocket: null, // ws连接 wsStatus: false, // websocket连接状态 true为连接 diff --git a/.env.production b/.env.production index 69cf472..c71f41b 100644 --- a/.env.production +++ b/.env.production @@ -4,7 +4,7 @@ VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 #// 测试环境 -# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://139.198.29.133:8080 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 @@ -12,7 +12,7 @@ # ------------------ 内网 -------------------------- # VITE_APP_API_BASEURL = http://192.168.2.96:8088 # ------------------ 外网 -------------------------- -VITE_APP_API_BASEURL = http://222.187.140.114:8896 +# VITE_APP_API_BASEURL = http://222.187.140.114:8896 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts index bfa6faa..71f32fc 100644 --- a/src/store/modules/websocket.ts +++ b/src/store/modules/websocket.ts @@ -8,7 +8,8 @@ // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`, // wsUrl: 'ws://192.168.2.96:8085/websocket/', // wsUrl: 'ws://192.168.2.96:8088/websocket/', // 内网 - wsUrl: 'ws://222.187.140.114:8896/websocket/', // 外网 + // wsUrl: 'ws://222.187.140.114:8896/websocket/', // 外网 + wsUrl: 'ws://111.198.10.15:21609/websocket/', // 测试环境 websocket: null, // ws连接 wsStatus: false, // websocket连接状态 true为连接 diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue index 9f75ddc..aadc0f2 100644 --- a/src/views/business/schedule/order/orderEdit.vue +++ b/src/views/business/schedule/order/orderEdit.vue @@ -123,9 +123,9 @@ deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }], delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }], - phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }], - email: [{ required: true, message: '固定电话必填', trigger: 'blur' }], - invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }], + // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }], + // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }], + // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }], }) // 表单验证规则 // 从路由中获取页面类型参数 @@ -730,6 +730,18 @@ /> + + + + + + +