From 03f071cf30f1320010311824834f888438a057ba Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Sat, 12 Oct 2024 11:08:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=87=8D=E6=9E=84=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/distributionSignfor.js | 7 +- src/axios.js | 53 ++--- .../signdetail/distributionSigndetail.vue | 215 ++++++++---------- .../turndelivery/deliveryMarket.vue | 4 +- 4 files changed, 126 insertions(+), 153 deletions(-) diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js index ad461e4f..156381a6 100644 --- a/src/api/distribution/distributionSignfor.js +++ b/src/api/distribution/distributionSignfor.js @@ -325,14 +325,11 @@ export const $_updateSignAddValuePackage = data => { * 查询配送节点 * @returns {AxiosPromise} */ -export const searchNode = (searchType, searchCode) => { +export const searchNode = (params) => { return request({ url: '/api/logpm-distribution/signfor/searchNode', method: 'get', - params: { - searchType, - searchCode, - }, + params }); }; diff --git a/src/axios.js b/src/axios.js index 0304be4a..701cf312 100644 --- a/src/axios.js +++ b/src/axios.js @@ -10,16 +10,16 @@ import router from '@/router/'; // Vue路由 import { serialize } from 'utils/util'; // 序列化工具函数，通常用于处理请求参数 import { getToken } from 'utils/auth'; // 用于获取存储的Token import { isURL } from 'utils/validate'; // 验证字符串是否为URL的函数 -import { ElMessage,ElMessageBox } from 'element-plus'; // Element-Plus中的消息提示组件 +import { ElMessage, ElMessageBox } from 'element-plus'; // Element-Plus中的消息提示组件 import website from '@/config/website'; // 站点配置文件，可以配置一些通用信息如clientId、clientSecret import NProgress from 'nprogress'; // 页面顶部进度条 import 'nprogress/nprogress.css'; // 进度条样式 import { Base64 } from 'js-base64'; // Base64编码工具 import { baseUrl } from '@/config/env'; // API基础URL import crypto from '@/utils/crypto'; // 加密工具，可能用于加密Token等 -import {ref} from 'vue'; +import { ref } from 'vue'; let msg = ref(''); // 错误信息 -let isAlertShowing = false; // 新增的标志变量 +let isAlertShowing = false; // 新增的标志变量 // 存储待取消的HTTP请求的键值对，用于取消重复的请求 const pendingRequests = new Map(); @@ -40,11 +40,13 @@ function generateReqKey(config) { // 添加请求到pendingRequests对象，并创建取消令牌 function addPendingRequest(config) { const requestKey = generateReqKey(config); - config.cancelToken = config.cancelToken || new axios.CancelToken((cancel) => { - if (!pendingRequests.has(requestKey)) { - pendingRequests.set(requestKey, cancel); - } - }); + config.cancelToken = + config.cancelToken || + new axios.CancelToken(cancel => { + if (!pendingRequests.has(requestKey)) { + pendingRequests.set(requestKey, cancel); + } + }); } // 从pendingRequests对象中移除请求，并调用取消操作 @@ -60,7 +62,7 @@ function removePendingRequest(config) { //axios请求拦截器 axios.interceptors.request.use( config => { - // 检查 config.url 是否以 http 开头 + // 检查 config.url 是否以 http 开头 // console.log(config,'config'); // 在请求开始前，对之前的请求做检查取消操作 removePendingRequest(config); @@ -68,12 +70,12 @@ axios.interceptors.request.use( addPendingRequest(config); // 显示进度条 NProgress.start(); - + // // 检查URL是否完整，如果不完整或不是URL，则添加baseUrl前缀 if (!isURL(config.url) && !config.url.startsWith(baseUrl)) { config.url = baseUrl + config.url; } - // 检查URL是否完整，如果不完整或不是URL，并且不以 /imgapi 开头，则添加 baseUrl 前缀 + // 检查URL是否完整，如果不完整或不是URL，并且不以 /imgapi 开头，则添加 baseUrl 前缀 // if (!isURL(config.url) && !config.url.startsWith(baseUrl) && !config.url.startsWith('/imgapi')) { // config.url = baseUrl + config.url; // } @@ -84,7 +86,7 @@ axios.interceptors.request.use( `${website.clientId}:${website.clientSecret}` )}`; } - + // 如果请求需要token，则在请求头中添加token（除非明确声明不需token） const meta = config.meta || {}; const isToken = meta.isToken === false; @@ -101,12 +103,11 @@ axios.interceptors.request.use( if (config.text === true) { config.headers['Content-Type'] = 'text/plain'; } - + // 序列化POST请求的数据（如果请求配置了isSerialize） if (config.method === 'post' && meta.isSerialize === true) { config.data = serialize(config.data); } - return config; }, @@ -124,35 +125,35 @@ axios.interceptors.response.use( NProgress.done(); // 移除仍在pendingRequests中的请求 removePendingRequest(res.config); - + // 获取response中的状态码，优先获取自定义的code，若无则获取HTTP状态码 const status = res.data.code || res.status; // 获取状态码白名单内的状态，这些状态不会被默认处理，而是将控制权交给具体请求 const statusWhiteList = website.statusWhiteList || []; // 取错误消息 const message = res.data.msg || res.data.error_description || '未知错误'; - + // 如果状态码在白名单中，则直接返回Promise的reject状态 if (statusWhiteList.includes(status)) return Promise.reject(res); - + // 如果状态码为401，则表示用户未认证，需跳转到登录页 - if (status === 401 && !isAlertShowing){ + if (status === 401 && !isAlertShowing) { isAlertShowing = true; // 设置为 true 表示弹窗正在显示 ElMessageBox.alert('长时间未操作,登录已过期，请重新登录', '提示', { confirmButtonText: '确定', showClose: false, // 不显示关闭按钮 closeOnPressEscape: false, // 禁止通过 ESC 键关闭 closeOnClickModal: false, // 禁止点击遮罩关闭 - callback: (action) => { + callback: action => { isAlertShowing = false; // 恢复为 false 表示弹窗已经关闭 store.dispatch('FedLogOut').then(() => router.push({ path: '/login' })); }, }); - } - + } + // 如果response的状态码不是200，则显示消息提示，并返回Promise的reject状态 if (status !== 200 && status !== '0' && status !== '1') { - if(!msg.value){ + if (!msg.value) { ElMessage({ message: message, type: 'error', @@ -160,9 +161,9 @@ axios.interceptors.response.use( } setTimeout(() => { msg.value = ''; - }, 50); - msg.value=message - return Promise.reject(new Error(message)); + }, 1000); + msg.value = message; + return Promise.reject(new Error(message)); } // 正常状态返回responseData return res; @@ -188,4 +189,4 @@ axios.interceptors.response.use( ); // 导出axios实例 -export default axios; \ No newline at end of file +export default axios; diff --git a/src/views/distribution/signdetail/distributionSigndetail.vue b/src/views/distribution/signdetail/distributionSigndetail.vue index 3774382a..71f70c8e 100644 --- a/src/views/distribution/signdetail/distributionSigndetail.vue +++ b/src/views/distribution/signdetail/distributionSigndetail.vue @@ -1,66 +1,28 @@ - - diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue index d1a2be31..849c237c 100644 --- a/src/views/distribution/turndelivery/deliveryMarket.vue +++ b/src/views/distribution/turndelivery/deliveryMarket.vue @@ -106,10 +106,10 @@ - + From a3012e1e400c238311aea5ebdd417c86761944b8 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Sat, 12 Oct 2024 15:07:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=97=A0=E6=B3=95=E6=94=BE=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/storagecost/Traincostbreakdown.js | 20 +++++++++---------- .../Traincostbreakdown.vue | 4 ++-- .../distributionDeliveryListedt.vue | 5 +++++ .../signfor/distributionSignfortreat.vue | 5 +++++ 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/option/storagecost/Traincostbreakdown.js b/src/option/storagecost/Traincostbreakdown.js index f9857846..994712bb 100644 --- a/src/option/storagecost/Traincostbreakdown.js +++ b/src/option/storagecost/Traincostbreakdown.js @@ -365,15 +365,15 @@ export const columnList = [ head: false, }, - // { - // prop: 'createUserName', - // label: '操作', - // type: 6, - // values: '', - // width: '200', - // checkarr: [], - // fixed: 'right', - // sortable: false, - // }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + sortable: false, + }, ]; \ No newline at end of file diff --git a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue index 1f91e244..0f0927a6 100644 --- a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue +++ b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue @@ -49,7 +49,7 @@ @@ -137,7 +137,7 @@ const details = reactive({ columnList, /** 列表数据 */ - data: [{}], + data: [], /** 页面loading */ loadingObj: { /** 列表加载loading */ diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index e077e04b..2ae7eee2 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -660,6 +660,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageA(file)" /> @@ -690,6 +691,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageB(file)" /> @@ -720,6 +722,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageC(file)" /> @@ -750,6 +753,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageD(file)" /> @@ -780,6 +784,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageE(file)" /> diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index bdae0062..3380bfe8 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -305,6 +305,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageA(file)" /> @@ -337,6 +338,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageB(file)" /> @@ -368,6 +370,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageC(file)" /> @@ -399,6 +402,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageD(file)" /> @@ -430,6 +434,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageE(file)" /> From 69d63511adf722f5eadfc45c267a59f6a456b5bd Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Sat, 12 Oct 2024 16:47:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=8F=9C=E5=8D=95-=E4=B8=B4=E6=9C=9F=EF=BC=8C=E5=88=B0?= =?UTF-8?q?=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/basicdataWarehouse.vue | 164 +++++++++++------- .../reservation/reservationAddFrom.vue | 15 +- 2 files changed, 110 insertions(+), 69 deletions(-) diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue index a75d81a6..234574dc 100644 --- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue +++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue @@ -1,69 +1,83 @@