修改样式
This commit is contained in:
parent
facdcd90c1
commit
0cf8c573a1
|
@ -102,7 +102,7 @@ public class CommonUtils {
|
|||
}
|
||||
//替换上传文件名字的特殊字符
|
||||
fileName = fileName.replace("=","").replace(",","").replace("&","")
|
||||
.replace("#", "").replace("“", "").replace("”", "").replace("(", "(").replace(")", ")");
|
||||
.replace("#", "").replace("“", "").replace("”", "");
|
||||
//替换上传文件名字中的空格
|
||||
fileName=fileName.replaceAll("\\s","");
|
||||
//update-beign-author:taoyan date:20220302 for: /issues/3381 online 在线表单 使用文件组件时,上传文件名中含%,下载异常
|
||||
|
|
|
@ -114,8 +114,9 @@ public class XxhbjwxtscwjxxController extends JeecgController<Xxhbjwxtscwjxx, IX
|
|||
String sorts[] = ("历次过程性考核-评分标准,历次过程性考核-内容及要求(或试题),课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题(或内容及要求),课程考核质量评价单,课程目标达成情况评价报告").split(",");
|
||||
for (String par : sorts){
|
||||
list2.add(list.stream().filter(item->item.getFjtype().equals(par)).findFirst().orElse(null));
|
||||
|
||||
}
|
||||
pageList.setRecords(list2);
|
||||
pageList.setRecords(list2.stream().filter(list3 -> list3!=null).collect(Collectors.toList()));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -33,9 +33,9 @@ public class ZjSqxxServiceImpl extends ServiceImpl<ZjSqxxMapper, ZjSqxx> impleme
|
|||
SysUser user = sysUserService.getById(userId);
|
||||
|
||||
//先删除该用户的授权记录
|
||||
QueryWrapper<ZjSqxx> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("user_id",userId);
|
||||
baseMapper.delete(queryWrapper);
|
||||
// QueryWrapper<ZjSqxx> queryWrapper = new QueryWrapper<>();
|
||||
// queryWrapper.eq("user_id",userId);
|
||||
// baseMapper.delete(queryWrapper);
|
||||
|
||||
for(ZjSqxx sq:zjSqxxList){
|
||||
sq.setId(null);
|
||||
|
|
|
@ -486,9 +486,11 @@ public class CommonController {
|
|||
|
||||
|
||||
@RequestMapping(value = "/ycxz", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public void ycxz(@RequestBody JSONObject jsonObject, HttpServletResponse response) {
|
||||
public Result<?> ycxz(@RequestBody JSONObject jsonObject, HttpServletResponse response) {
|
||||
String downpath = jsonObject.getString("filename");
|
||||
System.out.println("downPath---->"+downpath);
|
||||
for(String imgPath: downpath.split(",")){
|
||||
System.out.println("imgPath---->"+imgPath);
|
||||
// 其余处理略
|
||||
InputStream inputStream = null;
|
||||
OutputStream outputStream = null;
|
||||
|
@ -511,6 +513,7 @@ public class CommonController {
|
|||
}
|
||||
//TODO 不确定是否有问题,
|
||||
Map<String,String> map = SFTPUtil.download(sftpConfig,imgPath,getDownloadPath(path));
|
||||
System.out.println("msg-->"+map.get("msg"));
|
||||
if(!map.get("code").equals("0")){
|
||||
response.setStatus(404);
|
||||
throw new RuntimeException(map.get("msg"));
|
||||
|
@ -582,7 +585,7 @@ public class CommonController {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
return Result.OK(null);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -321,8 +321,8 @@ justauth:
|
|||
sftp:
|
||||
hostname: 210.47.29.99
|
||||
port: 22
|
||||
username: sftp
|
||||
password: Nenujwc@99
|
||||
username: root
|
||||
password: hmZ2a*G7fwwj
|
||||
timeout: 1000
|
||||
uploadpath: kczx
|
||||
fullpath: /data
|
|
@ -411,7 +411,7 @@ async function batchHandleDown(record) {
|
|||
}
|
||||
//下载
|
||||
function handleDownload(record) {
|
||||
record = record.replaceAll(" ","").replaceAll("(","(").replaceAll(")",")");
|
||||
record = record.replaceAll(" ","");
|
||||
downloadFile(record);
|
||||
}
|
||||
//预览
|
||||
|
@ -448,7 +448,7 @@ async function handleChakan(record) {
|
|||
}
|
||||
|
||||
if (record.ktbg) {
|
||||
var file1 = getFileAccessHttpUrl(record.ktbg.replaceAll(" ","").replaceAll("(","(").replaceAll(")",")"));
|
||||
var file1 = getFileAccessHttpUrl(record.ktbg.replaceAll(" ",""));
|
||||
console.log("file1---->",file1);
|
||||
console.log("file11111---->",encodeURIComponent(encryptByBase64(file1)));
|
||||
ktbgUrl.value = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1));
|
||||
|
@ -457,7 +457,7 @@ async function handleChakan(record) {
|
|||
}
|
||||
|
||||
if (record.ktbgshyj) {
|
||||
var file1 = getFileAccessHttpUrl(record.ktbgshyj.replaceAll(" ","").replaceAll("(","(").replaceAll(")",")"));
|
||||
var file1 = getFileAccessHttpUrl(record.ktbgshyj.replaceAll(" ",""));
|
||||
ktbgshyjUrl.value = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1));
|
||||
} else {
|
||||
ktbgshyjUrl.value = '';
|
||||
|
@ -471,14 +471,14 @@ async function handleChakan(record) {
|
|||
// }
|
||||
|
||||
if (record.lwzg) {
|
||||
var file1 = getFileAccessHttpUrl(record.lwzg.replaceAll(" ","").replaceAll("(","(").replaceAll(")",")"));
|
||||
var file1 = getFileAccessHttpUrl(record.lwzg.replaceAll(" ",""));
|
||||
lwzgUrl.value = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1));
|
||||
} else {
|
||||
lwzgUrl.value = '';
|
||||
}
|
||||
|
||||
if (record.zdjld) {
|
||||
var file1 = getFileAccessHttpUrl(record.zdjld.replaceAll(" ","").replaceAll("(","(").replaceAll(")",")"));
|
||||
var file1 = getFileAccessHttpUrl(record.zdjld.replaceAll(" ",""));
|
||||
zdjldUrl.value = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1));
|
||||
} else {
|
||||
zdjldUrl.value = '';
|
||||
|
|
|
@ -152,22 +152,22 @@ function handleSuccess() {
|
|||
/**
|
||||
* 预览
|
||||
*/
|
||||
function handleYulan(record) {
|
||||
var file1 = getFileAccessHttpUrl(record.path.replaceAll(" ","").replaceAll("(","(").replaceAll(")",")"));
|
||||
async function handleYulan(record) {
|
||||
var file1 = getFileAccessHttpUrl(record.path.replaceAll(" ",""));
|
||||
|
||||
if(file1){
|
||||
console.log("filename--->",file1)
|
||||
defHttp.post({ url: '/sys/common/ycxz',params:{fileName:file1+","} }).then((res) => {});
|
||||
if(record.path){
|
||||
await defHttp.post({ url: '/sys/common/ycxz',params:{filename:record.path+","} }).then((res) => {
|
||||
});
|
||||
window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1)),"_blank");
|
||||
}
|
||||
|
||||
console.log("ktbgUrl1--->",file1)
|
||||
window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1)),"_blank");
|
||||
}
|
||||
/**
|
||||
* 下载
|
||||
*/
|
||||
function handleDown(record) {
|
||||
downloadFile(record.path.replaceAll(" ","").replaceAll("(","(").replaceAll(")",")"));
|
||||
downloadFile(record.path.replaceAll(" ",""));
|
||||
}
|
||||
/**
|
||||
* 操作栏
|
||||
|
|
|
@ -103,12 +103,18 @@ function handleEdit(record: Recordable) {
|
|||
/**
|
||||
* 预览
|
||||
*/
|
||||
function handleYulan(record) {
|
||||
async function handleYulan(record) {
|
||||
var file = getFileAccessHttpUrl(record.studentPath);
|
||||
|
||||
if(record.studentPath){
|
||||
console.log("filename--->",record.studentPath)
|
||||
await defHttp.post({ url: '/sys/common/ycxz',params:{filename:record.studentPath+","} }).then((res) => {
|
||||
});
|
||||
window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
|
||||
}
|
||||
console.log('🤬', file);
|
||||
// window.open('https://view.xdocin.com/view?src=' + encodeURIComponent(encryptByBase64(file)));
|
||||
// window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file)));
|
||||
window.open(file, '_blank');
|
||||
// window.open(file, '_blank');
|
||||
}
|
||||
/**
|
||||
* 下载
|
||||
|
|
|
@ -14,41 +14,41 @@ export const columns: BasicColumn[] = [
|
|||
dataIndex: 'realname',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '头像',
|
||||
dataIndex: 'avatar',
|
||||
width: 120,
|
||||
customRender: render.renderAvatar,
|
||||
},
|
||||
{
|
||||
title: '性别',
|
||||
dataIndex: 'sex',
|
||||
width: 80,
|
||||
sorter: true,
|
||||
customRender: ({ text }) => {
|
||||
return render.renderDict(text, 'sex');
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '生日',
|
||||
dataIndex: 'birthday',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '手机号',
|
||||
dataIndex: 'phone',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '部门',
|
||||
width: 150,
|
||||
dataIndex: 'orgCodeTxt',
|
||||
},
|
||||
{
|
||||
title: '负责部门',
|
||||
width: 150,
|
||||
dataIndex: 'departIds_dictText',
|
||||
},
|
||||
// {
|
||||
// title: '头像',
|
||||
// dataIndex: 'avatar',
|
||||
// width: 120,
|
||||
// customRender: render.renderAvatar,
|
||||
// },
|
||||
// {
|
||||
// title: '性别',
|
||||
// dataIndex: 'sex',
|
||||
// width: 80,
|
||||
// sorter: true,
|
||||
// customRender: ({ text }) => {
|
||||
// return render.renderDict(text, 'sex');
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// title: '生日',
|
||||
// dataIndex: 'birthday',
|
||||
// width: 100,
|
||||
// },
|
||||
// {
|
||||
// title: '手机号',
|
||||
// dataIndex: 'phone',
|
||||
// width: 100,
|
||||
// },
|
||||
// {
|
||||
// title: '部门',
|
||||
// width: 150,
|
||||
// dataIndex: 'orgCodeTxt',
|
||||
// },
|
||||
// {
|
||||
// title: '负责部门',
|
||||
// width: 150,
|
||||
// dataIndex: 'departIds_dictText',
|
||||
// },
|
||||
{
|
||||
title: '状态',
|
||||
dataIndex: 'status_dictText',
|
||||
|
@ -135,7 +135,7 @@ export const formSchema: FormSchema[] = [
|
|||
show: false,
|
||||
},
|
||||
{
|
||||
label: '用户账号',
|
||||
label: '登录账号',
|
||||
field: 'username',
|
||||
component: 'Input',
|
||||
dynamicDisabled: ({ values }) => {
|
||||
|
@ -173,13 +173,13 @@ export const formSchema: FormSchema[] = [
|
|||
required: true,
|
||||
component: 'Input',
|
||||
},
|
||||
{
|
||||
label: '工号',
|
||||
field: 'workNo',
|
||||
required: true,
|
||||
component: 'Input',
|
||||
dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true),
|
||||
},
|
||||
// {
|
||||
// label: '工号',
|
||||
// field: 'workNo',
|
||||
// required: true,
|
||||
// component: 'Input',
|
||||
// dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true),
|
||||
// },
|
||||
{
|
||||
label: '职务',
|
||||
field: 'post',
|
||||
|
@ -188,6 +188,7 @@ export const formSchema: FormSchema[] = [
|
|||
componentProps: {
|
||||
labelKey: 'name',
|
||||
},
|
||||
ifShow: false,
|
||||
},
|
||||
{
|
||||
label: '角色',
|
||||
|
@ -200,6 +201,12 @@ export const formSchema: FormSchema[] = [
|
|||
valueField: 'id',
|
||||
immediate: false,
|
||||
},
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入登录密码',
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
label: '所属部门',
|
||||
|
@ -231,6 +238,7 @@ export const formSchema: FormSchema[] = [
|
|||
},
|
||||
};
|
||||
},
|
||||
ifShow: false,
|
||||
},
|
||||
{
|
||||
label: '租户',
|
||||
|
@ -244,6 +252,7 @@ export const formSchema: FormSchema[] = [
|
|||
valueField: 'id',
|
||||
immediate: false,
|
||||
},
|
||||
ifShow: false,
|
||||
},
|
||||
{
|
||||
label: '身份',
|
||||
|
@ -261,6 +270,7 @@ export const formSchema: FormSchema[] = [
|
|||
},
|
||||
};
|
||||
},
|
||||
ifShow: false,
|
||||
},
|
||||
{
|
||||
label: '负责部门',
|
||||
|
@ -271,59 +281,59 @@ export const formSchema: FormSchema[] = [
|
|||
},
|
||||
ifShow: ({ values }) => values.userIdentity == 2,
|
||||
},
|
||||
{
|
||||
label: '头像',
|
||||
field: 'avatar',
|
||||
component: 'JImageUpload',
|
||||
componentProps: {
|
||||
fileMax: 1,
|
||||
},
|
||||
},
|
||||
{
|
||||
label: '生日',
|
||||
field: 'birthday',
|
||||
component: 'DatePicker',
|
||||
},
|
||||
{
|
||||
label: '性别',
|
||||
field: 'sex',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: {
|
||||
dictCode: 'sex',
|
||||
placeholder: '请选择性别',
|
||||
stringToNumber: true,
|
||||
},
|
||||
},
|
||||
{
|
||||
label: '邮箱',
|
||||
field: 'email',
|
||||
component: 'Input',
|
||||
required: true,
|
||||
dynamicRules: ({ model, schema }) => {
|
||||
return [
|
||||
{ ...rules.duplicateCheckRule('sys_user', 'email', model, schema, true)[0], trigger: 'blur' },
|
||||
{ ...rules.rule('email', false)[0], trigger: 'blur' },
|
||||
];
|
||||
},
|
||||
},
|
||||
{
|
||||
label: '手机号码',
|
||||
field: 'phone',
|
||||
component: 'Input',
|
||||
required: true,
|
||||
dynamicRules: ({ model, schema }) => {
|
||||
return [
|
||||
{ ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0], trigger: 'blur' },
|
||||
{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' },
|
||||
];
|
||||
},
|
||||
},
|
||||
{
|
||||
label: '座机',
|
||||
field: 'telephone',
|
||||
component: 'Input',
|
||||
rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }],
|
||||
},
|
||||
// {
|
||||
// label: '头像',
|
||||
// field: 'avatar',
|
||||
// component: 'JImageUpload',
|
||||
// componentProps: {
|
||||
// fileMax: 1,
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// label: '生日',
|
||||
// field: 'birthday',
|
||||
// component: 'DatePicker',
|
||||
// },
|
||||
// {
|
||||
// label: '性别',
|
||||
// field: 'sex',
|
||||
// component: 'JDictSelectTag',
|
||||
// componentProps: {
|
||||
// dictCode: 'sex',
|
||||
// placeholder: '请选择性别',
|
||||
// stringToNumber: true,
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// label: '邮箱',
|
||||
// field: 'email',
|
||||
// component: 'Input',
|
||||
// required: true,
|
||||
// dynamicRules: ({ model, schema }) => {
|
||||
// return [
|
||||
// { ...rules.duplicateCheckRule('sys_user', 'email', model, schema, true)[0], trigger: 'blur' },
|
||||
// { ...rules.rule('email', false)[0], trigger: 'blur' },
|
||||
// ];
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// label: '手机号码',
|
||||
// field: 'phone',
|
||||
// component: 'Input',
|
||||
// required: true,
|
||||
// dynamicRules: ({ model, schema }) => {
|
||||
// return [
|
||||
// { ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0], trigger: 'blur' },
|
||||
// { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' },
|
||||
// ];
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// label: '座机',
|
||||
// field: 'telephone',
|
||||
// component: 'Input',
|
||||
// rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }],
|
||||
// },
|
||||
{
|
||||
label: '工作流引擎',
|
||||
field: 'activitiSync',
|
||||
|
@ -334,6 +344,7 @@ export const formSchema: FormSchema[] = [
|
|||
type: 'radio',
|
||||
stringToNumber: true,
|
||||
},
|
||||
ifShow: false,
|
||||
},
|
||||
];
|
||||
|
||||
|
|
Loading…
Reference in New Issue