From be4df4632339539a75b6dc67e125b1034d31f075 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Wed, 17 Apr 2024 00:27:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=20=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- .env.production | 12 +++++++--- env.d.ts | 8 +++---- src/request/customer_management.js | 1 - .../waybill_registration/edit.vue | 1 - .../information/edit.vue | 1 - .../user_practitioner/index.vue | 2 +- src/views/index/components/info.vue | 2 +- src/views/login/index.vue | 2 +- src/views/mechanical_files/beidou/add.vue | 4 ++-- .../mechanical_files/inspect_annually/add.vue | 19 ++++++++------- .../inspect_annually/edit.vue | 6 ++--- src/views/mechanical_files/insure/add.vue | 24 +++++++++++-------- src/views/mechanical_files/insure/index.vue | 2 +- .../mechanical_files/maintenance/add.vue | 8 +++---- src/views/mechanical_files/operations/add.vue | 24 +++++++++++-------- .../mechanical_files/taxation_manage/add.vue | 4 ++-- 17 files changed, 69 insertions(+), 55 deletions(-) diff --git a/.env.development b/.env.development index 1252cf2..045cc8b 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ VITE_BASE_URL=http://192.168.0.69:7082/ -VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/zxwebsocket/ -VITE_LEARNING_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/websocket/ +VITE_ON_LINE_WEB_SOCKET_URL=ws://192.168.0.31:8869 +VITE_LEARNING_WEB_SOCKET_URL=ws://192.168.0.31:8899 diff --git a/.env.production b/.env.production index e120c4c..07df8ad 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,10 @@ -VITE_BASE_URL=http://192.168.0.31:7082/integrated_traffic/ -VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/zxwebsocket/ -VITE_LEARNING_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/websocket/ +VITE_BASE_URL=http://39.101.166.211:8073/integrated_traffic/ + +#websocket t掉线 +VITE_ON_LINE_WEB_SOCKET_URL=ws://39.101.166.211:8869 +# VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaqjt.qhdsafety.com/disconnected/ + +#websocket 在线学习 +VITE_LEARNING_WEB_SOCKET_URL=ws://39.101.166.211:8899 +# VITE_LEARNING_WEB_SOCKET_URL=wss://qaaqjt.qhdsafety.com/onlinelearning/ diff --git a/env.d.ts b/env.d.ts index a6b6bbe..433693a 100644 --- a/env.d.ts +++ b/env.d.ts @@ -1,9 +1,5 @@ interface ImportMetaEnv { // Auto generate by env-parse - /** - * undefined - */ - readonly VITE_BASE_URL: string /** * undefined */ @@ -16,6 +12,10 @@ interface ImportMetaEnv { * undefined */ readonly VITE_TEMPLATE_URL: string + /** + * undefined + */ + readonly VITE_BASE_URL: string /** * undefined */ diff --git a/src/request/customer_management.js b/src/request/customer_management.js index 5dd4a8f..f1c4e0c 100644 --- a/src/request/customer_management.js +++ b/src/request/customer_management.js @@ -20,4 +20,3 @@ export const editSafetyCustomerInfo = (params) => export const deleteContactInfo = (params) => upload("/securitycustomer/deleteContactInfo", params); // 删除 - diff --git a/src/views/electronic_waybill_management/waybill_registration/edit.vue b/src/views/electronic_waybill_management/waybill_registration/edit.vue index 9f49d65..186eb7e 100644 --- a/src/views/electronic_waybill_management/waybill_registration/edit.vue +++ b/src/views/electronic_waybill_management/waybill_registration/edit.vue @@ -553,7 +553,6 @@ fnCustomerType(); const fnLocation = async () => { const res = await getTrafficLocationSelectList(); const varList = res.varList || []; - console.log(res); const StartOptionstMap = new Map(); varList.forEach((item) => { if (item.LOCATIONTYPE === "1") { diff --git a/src/views/enterprise_management/information/edit.vue b/src/views/enterprise_management/information/edit.vue index 772727f..e4a18b5 100644 --- a/src/views/enterprise_management/information/edit.vue +++ b/src/views/enterprise_management/information/edit.vue @@ -614,7 +614,6 @@ const data = reactive({ const fnGetData = async () => { const resData = await getEnterpriseInfo(); data.form = resData.pd; - console.log(data.form); data.form.bus_images = addingPrefixToFile(resData.busImgs); data.form.official_seal_file = [ { diff --git a/src/views/enterprise_management/user_practitioner/index.vue b/src/views/enterprise_management/user_practitioner/index.vue index e90fe13..ecf5810 100644 --- a/src/views/enterprise_management/user_practitioner/index.vue +++ b/src/views/enterprise_management/user_practitioner/index.vue @@ -234,7 +234,7 @@ const reviewItem = async (row) => { /* const fnWindow = async () => { window.open( - "http://192.168.0.69:8081/#/middlePage?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJwYXNzd2QiOiJMZmtmcUAxMjM0NTYiLCJleHAiOjE3MTI3MTUxNDYsInVzZXIiOiJsZnlqemhkcCIsInRhcmdldCI6Imh0dHA6Ly8xOTIuMTY4LjAuNjk6ODA4Mi8jL21pZGRsZVBhZ2UifQ.xb0HD3sqJOCi4y3Ogtg27rTkKPrmdKd-DK660LpM_X8" + "http://60.10.47.50:9001/#/middlePage?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJwYXNzd2QiOiJMZmtmcUAxMjM0NTYiLCJleHAiOjE3MTI4OTc1NjcsInVzZXIiOiJsZnlqemhkcCIsInRhcmdldCI6Imh0dHA6Ly8xOTIuMTY4LjAuNjk6ODA4Mi8jL21pZGRsZVBhZ2UifQ.TUl_q6hcWaXMAVlVqOVQup77MjQWcxc-g8SNrhQRbzc" ); }; */ // 页面下拉选项字典获取 diff --git a/src/views/index/components/info.vue b/src/views/index/components/info.vue index 93ec883..52eac25 100644 --- a/src/views/index/components/info.vue +++ b/src/views/index/components/info.vue @@ -8,7 +8,7 @@
公司名称：
- 秦皇岛卓云科技有限公司 + XXX公司
组织机构代码证： diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 036da6f..c7baa3c 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -62,7 +62,7 @@ >
{ const resData = await getTrailerListCompass({ ID: event }); data.busInfo = resData.list[0]; - if(form.value.TELEPHONE === '') { + if (form.value.TELEPHONE === "") { form.value.TELEPHONE = data.busInfo.CAR_OWNERS_TEL; } - if(form.value.CAR_OWNERS === '') { + if (form.value.CAR_OWNERS === "") { form.value.CAR_OWNERS = data.busInfo.CAR_OWNERS; } data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile( diff --git a/src/views/mechanical_files/inspect_annually/add.vue b/src/views/mechanical_files/inspect_annually/add.vue index 6f3aeb7..2278667 100644 --- a/src/views/mechanical_files/inspect_annually/add.vue +++ b/src/views/mechanical_files/inspect_annually/add.vue @@ -10,7 +10,8 @@ + @change="getVehicle" + > - + { const fnBusChange = async (event) => { const resData = await getTrailerList({ ID: event }); data.busInfo = resData.list[0]; - if(form.value.CAR_OWNERS === '') { - form.value.CAR_OWNERS = data.busInfo.CAR_OWNERS + if (form.value.CAR_OWNERS === "") { + form.value.CAR_OWNERS = data.busInfo.CAR_OWNERS; } - if(form.value.TELEPHONE === '') { - form.value.TELEPHONE = data.busInfo.CAR_OWNERS_TEL + if (form.value.TELEPHONE === "") { + form.value.TELEPHONE = data.busInfo.CAR_OWNERS_TEL; } data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile( resData.drivingLicenseImgs diff --git a/src/views/mechanical_files/inspect_annually/edit.vue b/src/views/mechanical_files/inspect_annually/edit.vue index 3e9be21..66193a0 100644 --- a/src/views/mechanical_files/inspect_annually/edit.vue +++ b/src/views/mechanical_files/inspect_annually/edit.vue @@ -9,9 +9,9 @@ @@ -20,11 +20,11 @@ - + diff --git a/src/views/mechanical_files/insure/add.vue b/src/views/mechanical_files/insure/add.vue index 92dd5fd..11186ab 100644 --- a/src/views/mechanical_files/insure/add.vue +++ b/src/views/mechanical_files/insure/add.vue @@ -7,9 +7,11 @@ - + - + { const fnBusChange = async (event) => { const resData = await getTrailerList2({ ID: event }); data.busInfo = resData.list[0]; - if(form.value.CAR_OWNERS === '') { - form.value.CAR_OWNERS = data.busInfo.CAR_OWNERS + if (form.value.CAR_OWNERS === "") { + form.value.CAR_OWNERS = data.busInfo.CAR_OWNERS; } - if(form.value.TELEPHONE === '') { - form.value.TELEPHONE = data.busInfo.CAR_OWNERS_TEL + if (form.value.TELEPHONE === "") { + form.value.TELEPHONE = data.busInfo.CAR_OWNERS_TEL; } data.busInfo.DRIVING_LICENSE_IMG = addingPrefixToFile( resData.drivingLicenseImgs diff --git a/src/views/mechanical_files/insure/index.vue b/src/views/mechanical_files/insure/index.vue index 41063b9..ea84250 100644 --- a/src/views/mechanical_files/insure/index.vue +++ b/src/views/mechanical_files/insure/index.vue @@ -169,7 +169,7 @@ > -