HC_YFZX
/
CaiYuanYiTiHua
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

dianlixunjian
徐景良 2024-08-08 18:27:29 +08:00
parent ba572e4a47 78342c3a8f
commit 13fdc6dbdf
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/FormViewer/index.vue
View File

@ -427,15 +427,17 @@
}
console.log(subTableDataStore.getGroupData);
let resultObj = {}
tabsFormRef.value.forEach((item,index) => {
console.log(item.getFieldsValue(),index)
let data = item.getFieldsValue()
Object.keys(data).forEach(key => {
if(!resultObj[key]){
resultObj[key] = data[key]
}
if(tabsFormRef.value){
tabsFormRef.value.forEach((item,index) => {
console.log(item.getFieldsValue(),index)
let data = item.getFieldsValue()
Object.keys(data).forEach(key => {
if(!resultObj[key]){
resultObj[key] = data[key]
}
})
})
})
}
//卡片组的值赋值给form，优化卡片组必填验证不通过
setFieldsValue({
...resultObj,

18
src/components/Upload/src/components/FileUpload.vue
View File

@ -188,15 +188,15 @@
// 防止弹出多个错误提示
setTimeout(() => (isActMsg.value = true), 1000);
}
// const isLt = file.size / 1024 / 1024 > maxSize;
// if (isLt) {
// createMessage.error(t('component.upload.maxSizeMultiple', [maxSize]));
// isLtMsg.value = false;
// // 防止弹出多个错误提示
// setTimeout(() => (isLtMsg.value = true), 1000);
// }
// return (isAct && !isLt) || Upload.LIST_IGNORE;
return isAct || Upload.LIST_IGNORE;
const isLt = file.size / 1024 / 1024 > 50;
if (isLt) {
createMessage.error(t('component.upload.maxSizeMultiple', [50]));
isLtMsg.value = false;
// 防止弹出多个错误提示
setTimeout(() => (isLtMsg.value = true), 1000);
}
return (isAct && !isLt) || Upload.LIST_IGNORE;
// return isAct || Upload.LIST_IGNORE;
};
async function customRequest(info: UploadRequestOption<any>) {

2
src/utils/http/axios/index.ts
View File

@ -233,7 +233,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
// authentication schemes，e.g: Bearer
// authenticationScheme: 'Bearer',
authenticationScheme: '',
timeout: 10 * 1000,
timeout: 30 * 1000,
// 基础接口地址
// baseURL: globSetting.apiUrl,

3
src/views/sys/exception/Exception.vue
View File

@ -12,7 +12,7 @@
<ChartsContianer v-show="!isFullScreen"></ChartsContianer>
<!-- full screen button -->
<div class="full-screen-button" :style="{right:isFullScreen?'20px':'590px'}" >
<div class="full-screen-button" :style="{right:isFullScreen?'20px':'590px', zIndex:isFullScreen? 100:1, }" >
<img v-if="!isFullScreen" @click="fullScreen" src="/public/statistical/full-scrren-button.png" alt="">
<img v-else @click="exitScreen" src="/public/statistical/full-scrren-button.png" alt="">
</div>
@ -328,7 +328,6 @@ function exitScreen() {
position:absolute;
bottom:46px;
right:590px;
z-index:1;
cursor:pointer;
img{
width:100%;