项目书-意见&主要参加人员 功能添加 10.21

master
zhc077 1 month ago
parent 578ee02850
commit 0216e1394c
  1. 16
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java
  2. 4
      jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/HeZuoDanWeiDemo.vue
  3. 18
      jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/JUploadDemo.vue
  4. 4
      jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/XiangMuJiXiaoMuBiaoDemo.vue

@ -9,6 +9,10 @@ import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.util.CommonUtils;
import org.jeecg.common.util.filter.SsrfFileTypeFilter;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.common.util.oss.OssBootUtil;
import org.jeecg.modules.oss.entity.OssFile;
import org.jeecg.modules.oss.service.IOssFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.util.AntPathMatcher;
@ -45,6 +49,9 @@ public class CommonController {
@Value(value="${jeecg.uploadType}")
private String uploadType;
@Autowired
private IOssFileService ossFileService;
/**
* @Author 政辉
* @return
@ -111,6 +118,15 @@ public class CommonController {
//update-end-author:taoyan date:20200814 for:文件上传改造
}
if(oConvertUtils.isNotEmpty(savePath)){
String fileName = file.getOriginalFilename();
fileName = CommonUtils.getFileName(fileName);
//保存附件地地
OssFile ossFile = new OssFile();
ossFile.setFileName(fileName);
ossFile.setUrl(savePath);
ossFileService.save(ossFile);
result.setMessage(savePath);
result.setSuccess(true);
}else {

@ -37,8 +37,8 @@
<CooperationDepartModal @register="registerModal"
@success="handleSuccess"></CooperationDepartModal>
</div>
<div type="primary" class="button-container">
<a-button @click="goBack">返回 </a-button>
<div class="button-container">
<a-button type="primary" @click="goBack">返回 </a-button>
</div>
</template>

@ -18,20 +18,20 @@
const uploadModalValue = ref('');
const schemas: FormSchema[] = [
{
/*{
field: 'uploadFile',
component: 'JUpload',
helpMessage: '无限制上传',
label: '上传文件',
},
},*/
{
field: 'uploadFileMax',
component: 'JUpload',
helpMessage: '最多上传3个文件',
label: '上传文件(3)',
componentProps: { maxCount: 3 },
helpMessage: '最多上传10个文件',
label: '上传文件(10)',
componentProps: { maxCount: 10 },
},
{
/*{
field: 'uploadImage',
component: 'JUpload',
label: '上传图片',
@ -39,8 +39,8 @@
componentProps: {
fileType: UploadTypeEnum.image,
},
},
{
},*/
/*{
field: 'uploadImageMax',
component: 'JUpload',
label: '上传图片(1)',
@ -49,7 +49,7 @@
fileType: UploadTypeEnum.image,
maxCount: 1,
},
},
},*/
];
const [registerModel, { openModal }] = useModal();

@ -35,8 +35,8 @@
<!-- 表单区域 -->
<ProjectObjectiveModal @register="registerModal" @success="handleSuccess"></ProjectObjectiveModal>
</div>
<div type="primary" class="button-container">
<a-button @click="goBack">返回 </a-button>
<div class="button-container">
<a-button type="primary" @click="goBack">返回 </a-button>
</div>
</template>

Loading…
Cancel
Save