From c6177c2463d9ff59b886d7c7952e99cd2c6d353b Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 12 一月 2024 15:09:03 +0800
Subject: [PATCH] 修复弹窗bug
---
src/views/Admin/components/userMod.vue | 2 +-
src/util/request.js | 22 +++++++++++-----------
src/views/Admin/components/msgDetailMod.vue | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/util/request.js b/src/util/request.js
index 965afa7..d8e08f5 100644
--- a/src/util/request.js
+++ b/src/util/request.js
@@ -10,7 +10,7 @@
const { baseUrl } = require('../../config/env.' + process.env.NODE_ENV)
const http= axios.create({
baseURL: baseUrl,
- timeout: 5000,//响应时间
+ timeout: 50000,//响应时间
// headers:{"Content-Type":"application/json;charset=utf-8"},
})
@@ -59,17 +59,17 @@
(error) => {
// 对响应错误做点什么
if (error.message.indexOf('timeout') != -1) {
- message.error('网络超时');
- setTimeout(() => {
- Session.clear()
- window.location.href = '/';
- }, 1000);
+ message.error('网络超时')
+ // setTimeout(() => {
+ // Session.clear()
+ // window.location.href = '/'
+ // }, 1000)
} else if (error.message == 'Network Error') {
- message.error('网络连接错误');
- setTimeout(() => {
- Session.clear();
- window.location.href = '/';
- }, 1000);
+ message.error('网络连接错误')
+ // setTimeout(() => {
+ // Session.clear()
+ // window.location.href = '/'
+ // }, 1000)
} else {
if (error.response.data) message.error(error.response.data.error);
else message.error('接口路径找不到');
diff --git a/src/views/Admin/components/msgDetailMod.vue b/src/views/Admin/components/msgDetailMod.vue
index ca3c942..64002df 100644
--- a/src/views/Admin/components/msgDetailMod.vue
+++ b/src/views/Admin/components/msgDetailMod.vue
@@ -41,8 +41,8 @@
<a-row :gutter="24" v-if="details.acceptingUnitIds && details.acceptingUnitIds.length>0">
<a-col :span="4">接收人</a-col>
<a-col :span="20">
- <b>本次共发送信息给 {{details.acceptingUnitIds.length}}人：</b><br/><br/>
- {{details.acceptingUnitIds.map(i=>i.recipienterName + '(' + i.recipienterPhone.replace(/(\d{3})\d{4}(\d+)/, "$1****$2") + ')').join(',')}}
+ <b>本次共发送信息给 {{details.acceptingUnitIds.length + details.peerRecipientIds.length}}人：</b><br/><br/>
+ {{details.acceptingUnitIds.map(i=>i.recipienterName + '(' + i.recipienterPhone.replace(/(\d{3})\d{4}(\d+)/, "$1****$2") + ')').join(',').concat(details.peerRecipientIds.map(i=>i.recipienterName + '(' + i.recipienterPhone.replace(/(\d{3})\d{4}(\d+)/, "$1****$2") + ')').join(','))}}
</a-col>
</a-row>
<a-row :gutter="24" v-if="details.attachments && details.attachments.length > 0"><a-col :span="4">附件内容</a-col>
diff --git a/src/views/Admin/components/userMod.vue b/src/views/Admin/components/userMod.vue
index 2352c64..554fdda 100644
--- a/src/views/Admin/components/userMod.vue
+++ b/src/views/Admin/components/userMod.vue
@@ -63,7 +63,7 @@
</a-tree-select>
</a-form-model-item>
<a-form-model-item label="所属单位">
- <a-input v-model="form.company" readOnly/>
+ <a-input v-model="form.company"/>
</a-form-model-item>
<a-form-model-item label="角色" prop="roleId">
<a-select v-model="form.roleId" placeholder="角色">
--
Gitblit v1.9.2