luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
new-exam
dshclm 5 months ago
parent 2b02d0750f
commit 32e809101d
5 changed files with 387 additions and 407 deletions
Show Stats Download Patch File Download Diff File

112
ruoyi-admin/src/main/resources/templates/system/checkReport/add.html
Unescape View File

@ -269,9 +269,10 @@
}, },
computed: { computed: {
pickerOptionsEnd() { pickerOptionsEnd() {
var _this = this
return { return {
disabledDate: (time) => { disabledDate: function(time) {
return time.getTime() < new Date(this.postForm.checkStartTime).getTime(); return time.getTime() < new Date(_this.postForm.checkStartTime).getTime();
} }
}; };
} }
@ -293,11 +294,11 @@
// } // }
}, },
handleUploadSuccess(row) { handleUploadSuccess(row) {
return (response, file,fileList) => { return function(response, file, fileList) {
if (response.code == web_status.SUCCESS) { if (response.code == web_status.SUCCESS) {
row.fileName = response.originalFilename; row.fileName = response.originalFilename;
row.fileUrl = response.url; row.fileUrl = response.url;
row.fileList = fileList row.fileList = fileList;
$.modal.msgSuccess("文件上传成功"); $.modal.msgSuccess("文件上传成功");
} }
}; };
@ -308,11 +309,15 @@
handleExceed(){ handleExceed(){
$.modal.msgWarning('超出个数限制，最多只能上传一个文件！'); $.modal.msgWarning('超出个数限制，最多只能上传一个文件！');
}, },
handleChange(row, expandedRows){ handleChange(row, expandedRows) {
this.loading = true; this.loading = true;
if (expandedRows.length > 0) { if (expandedRows.length > 0) {
// 检查缓存中是否已经存在对应的数据 // 检查缓存中是否已经存在对应的数据
const cachedRow = this.cachedData.find((item) => item.checkType === row.checkType); var cachedRow = this.cachedData.find(function (item) {
return item.checkType === row.checkType;
});
if (cachedRow) { if (cachedRow) {
row.children = cachedRow.children; row.children = cachedRow.children;
this.loading = false; this.loading = false;
@ -320,17 +325,23 @@
$.ajax({ $.ajax({
url: '/system/checkReport/checkView/' + row.checkType + '/' + row.typeName, url: '/system/checkReport/checkView/' + row.checkType + '/' + row.typeName,
type: 'GET', type: 'GET',
success: ((res) => { success: (function (res) {
if (res.code === web_status.SUCCESS) { if (res.code === web_status.SUCCESS) {
res.data.forEach((item) => { res.data.forEach(function (item) {
Object.assign(item, { ifstarts: true }); Object.assign(item, { ifstarts: true });
}); });
// 将请求到的数据缓存起来 // 将请求到的数据缓存起来
this.updateCachedData(this.cachedData, {...row, children: res.data }); this.updateCachedData(this.cachedData, {
// 使用ES5的方式扩展对象
children: res.data,
checkType: row.checkType,
typeName: row.typeName
});
row.children = res.data; row.children = res.data;
this.loading = false; this.loading = false;
} }
}), }).bind(this)
}); });
} }
} }
@ -359,14 +370,14 @@
}, },
calculateTotalScore(value) { calculateTotalScore(value) {
if (value == 'totalScore'){ if (value === 'totalScore') {
this.postForm.totalScore = this.startsArry.reduce((sum, row) => { this.postForm.totalScore = this.startsArry.reduce(function (sum, row) {
return sum + parseFloat(row.score) return sum + parseFloat(row.score);
}, 0); }, 0);
} }
if (value == 'realScore'){ if (value === 'realScore') {
this.postForm.realScore = this.startsArry.reduce((sum, row) => { this.postForm.realScore = this.startsArry.reduce(function (sum, row) {
return sum + parseFloat(row.realScore) return sum + parseFloat(row.realScore);
}, 0); }, 0);
} }
}, },
@ -402,12 +413,13 @@
$.ajax({ $.ajax({
url: '/system/checkReport/checkViewParent/sys_check_type_report', url: '/system/checkReport/checkViewParent/sys_check_type_report',
type: 'GET', type: 'GET',
success: ((res) => { success: function (res) {
res.data.forEach(item => { res.data.forEach(function (item) {
Object.assign(item, { children: [] }); // 在ES5中使用Object.assign的替代方式来添加属性
item.children = [];
}); });
this.postForm.checkTypeDTOS = res.data; this.postForm.checkTypeDTOS = res.data;
}) }.bind(this)
}); });
}, },
formatDateToCustomString(date) { formatDateToCustomString(date) {
@ -420,62 +432,70 @@
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}, },
getCityList(){ getCityList() {
$.ajax({ $.ajax({
url: ctx + "system/area/getSysAreaList", url: ctx + "system/area/getSysAreaList",
type: 'GET', type: 'GET',
data:this.params , data: this.params,
success:((res)=>{ success: function (res) {
this.CityList = res.data.filter(obj => obj.id === '36625'); this.CityList = res.data.filter(function (obj) {
}) , return obj.id === '36625';
});
}.bind(this)
}); });
}, },
getAreaList(){ getAreaList() {
this.params.parentId = this.postForm.framework this.params.parentId = this.postForm.framework;
$.ajax({ $.ajax({
url: ctx + "system/area/getSysAreaList", url: ctx + "system/area/getSysAreaList",
type: 'GET', type: 'GET',
data:this.params, data: this.params,
success:((res)=>{ success: function (res) {
this.AreaList = res.data this.AreaList = res.data;
this.postForm.area = '' this.postForm.area = '';
}) , }.bind(this)
}); });
}, },
submitForm() { submitForm() {
this.$refs.postForm.validate((valid) => { this.$refs.postForm.validate(function (valid) {
const hasEmptyRealScore = this.cachedData.some(item => { var hasEmptyRealScore = this.cachedData.some(function (item) {
return item.children.some(child => { return item.children.some(function (child) {
return child.starts && !child.realScore; return child.starts &&!child.realScore;
}); });
}); });
if (hasEmptyRealScore){
if (hasEmptyRealScore) {
$.modal.alertWarning("所选自查项内有未评分项，请检查"); $.modal.alertWarning("所选自查项内有未评分项，请检查");
return false return false;
} }
// console.log(hasEmptyRealScore); // console.log(hasEmptyRealScore);
// console.log(this.cachedData) // console.log(this.cachedData)
if (!valid) { if (!valid) {
return return;
} }
// this.postForm.checkTypeDTOS = [] // this.postForm.checkTypeDTOS = []
this.postForm.checkTypeDTOS = this.cachedData.reduce((acc, item) => { this.postForm.checkTypeDTOS = this.cachedData.reduce(function (acc, item) {
return acc.concat(item.children); return acc.concat(item.children);
}, []); }, []);
this.postForm.checkStartTime = this.formatDateToCustomString(new Date(this.postForm.checkStartTime))
this.postForm.checkEndTime = this.formatDateToCustomString(new Date(this.postForm.checkEndTime)) this.postForm.checkStartTime = this.formatDateToCustomString(new Date(this.postForm.checkStartTime));
this.postForm.checkEndTime = this.formatDateToCustomString(new Date(this.postForm.checkEndTime));
axios.post(prefix + '/add', this.postForm) axios.post(prefix + '/add', this.postForm)
.then(function (response) { .then(function (response) {
if (response.data.code === 0) { if (response.data.code === 0) {
$.operate.successTabCallback(response.data); $.operate.successTabCallback(response.data);
}else{ } else {
$.modal.alertError(response.data.msg) $.modal.alertError(response.data.msg);
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
}) }.bind(this));
}, },
closeItem(){ closeItem(){
$.modal.closeTab() $.modal.closeTab()

175
ruoyi-admin/src/main/resources/templates/system/checkReport/detail.html
Unescape View File

@ -326,7 +326,7 @@
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}, },
handleUploadSuccess(row) { handleUploadSuccess(row) {
return (response, file) => { return function (response, file) {
if (response.code == web_status.SUCCESS) { if (response.code == web_status.SUCCESS) {
row.fileName = response.originalFilename; row.fileName = response.originalFilename;
row.fileUrl = response.url; row.fileUrl = response.url;
@ -335,7 +335,7 @@
}; };
}, },
handleRemove(row){ handleRemove(row){
return () => { return function () {
row.fileName = ''; row.fileName = '';
row.fileUrl = ''; row.fileUrl = '';
$.modal.msgSuccess("删除成功"); $.modal.msgSuccess("删除成功");
@ -348,7 +348,34 @@
$.modal.msgWarning('超出个数限制，最多只能上传一个文件！'); $.modal.msgWarning('超出个数限制，最多只能上传一个文件！');
}, },
handlePreview(file){ handlePreview(file){
window.location.href = ctx + "common/download/resource?resource=" + encodeURI(file.url) ; $.ajax({
url: '/common/download/resource?resource=' + file.url,
type: 'GET',
xhrFields: {
responseType: 'blob'
},
success: function (data, status, xhr) {
let contentType = xhr.getResponseHeader('Content-Type');
let filename = file.name;
if (navigator.msSaveBlob) {
// 兼容 IE
navigator.msSaveBlob(data, filename);
} else {
let blob = new Blob([data], { type: contentType });
let url = URL.createObjectURL(blob);
let a = document.createElement('a');
a.href = url;
a.download = filename;
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
URL.revokeObjectURL(url);
}
},
error: function (xhr, status, error) {
console.error('下载文件失败：', error);
}
});
}, },
validateEndTime(rule, value, callback) { validateEndTime(rule, value, callback) {
// if (value && this.postForm.checkStartTime && new Date(value).getTime() < new Date(this.postForm.checkStartTime).getTime()) { // if (value && this.postForm.checkStartTime && new Date(value).getTime() < new Date(this.postForm.checkStartTime).getTime()) {
@ -359,12 +386,20 @@
}, },
handleChange(row, expandedRows){ handleChange(row, expandedRows){
this.loading = true; this.loading = true;
var _this = this;
if (expandedRows.length > 0) { if (expandedRows.length > 0) {
// 检查缓存中是否已经存在对应的数据 // 检查缓存中是否已经存在对应的数据
const cachedRow = this.cachedData.find((item) => item.checkType === row.checkType); var cachedRow;
for (var i = 0; i < _this.cachedData.length; i++) {
var item = _this.cachedData[i];
if (item.checkType === row.checkType) {
cachedRow = item;
break;
}
}
if (cachedRow) { if (cachedRow) {
row.children = cachedRow.children; row.children = cachedRow.children;
this.loading = false; _this.loading = false;
} else { } else {
// $.ajax({ // $.ajax({
// url: '/system/checkReport/checkView/' + row.checkType + '/' + row.typeName, // url: '/system/checkReport/checkView/' + row.checkType + '/' + row.typeName,
@ -382,12 +417,22 @@
// }), // }),
// }); // });
row.children = [] row.children = []
this.editcheckTypeDTOS.forEach(item => { _this.editcheckTypeDTOS.forEach(function (item) {
if (item.checkType === row.checkType) { if (item.checkType === row.checkType) {
row.children.push(item); row.children.push(item);
} }
// 在ES5中没有Object.assign方法，这里通过遍历属性来模拟其功能
for (var key in { ifstarts: true }) {
item[key] = { ifstarts: true }[key];
}
});
_this.updateCachedData(_this.cachedData, {
// 在ES5中没有扩展运算符，这里手动合并对象属性
row: row,
children: row.children
}); });
this.updateCachedData(this.cachedData, {...row, children: row.children });
this.loading = false this.loading = false
} }
} }
@ -395,7 +440,14 @@
handleCheckChange(row, expandedRows){ handleCheckChange(row, expandedRows){
// console.log(this.editcheckTypeDTOS) // console.log(this.editcheckTypeDTOS)
// console.log(row) // console.log(row)
let existingData = this.editcheckTypeDTOS.find(item => row.itemsType === item.itemsType); var existingData;
for (var i = 0; i < this.editcheckTypeDTOS.length; i++) {
var item = this.editcheckTypeDTOS[i];
if (row.itemsType === item.itemsType) {
existingData = item;
break;
}
}
if (!this.startsArry){ if (!this.startsArry){
this.startsArry = [] this.startsArry = []
} }
@ -414,7 +466,7 @@
let score = parseFloat(row.score) let score = parseFloat(row.score)
let realScore = parseFloat(this.postForm.realScore) let realScore = parseFloat(this.postForm.realScore)
this.postForm.totalScore = totalScore - score this.postForm.totalScore = totalScore - score
this.postForm.realScore = realScore - parseFloat(row.realScore) this.postForm.realScore = realScore - parseFloat(row.realScore == null ? 0 : row.realScore)
// let index = this.startsArry.indexOf(row); // let index = this.startsArry.indexOf(row);
// if (index > -1) { // if (index > -1) {
// this.startsArry.splice(index, 1); // this.startsArry.splice(index, 1);
@ -435,7 +487,7 @@
} }
let realScore = parseFloat(this.postForm.realScore) let realScore = parseFloat(this.postForm.realScore)
this.postForm.realScore = realScore + parseFloat(row.realScore) this.postForm.realScore = realScore + parseFloat(row.realScore)
this.postForm.percentageScore = this.postForm.realScore / this.postForm.totalScore * 100; this.postForm.percentageScore = (this.postForm.realScore / this.postForm.totalScore * 100).toFixed(2);
}, },
handleInput(row, props) { handleInput(row, props) {
row.realScore = row.realScore.replace(/[^0-9.]/g, ''); row.realScore = row.realScore.replace(/[^0-9.]/g, '');
@ -451,48 +503,75 @@
}, },
//获取外层数据 //获取外层数据
getCheckView() { getCheckView() {
var _this = this;
$.ajax({ $.ajax({
url: '/system/checkReport/checkViewParent/sys_check_type_report', url: '/system/checkReport/checkViewParent/sys_check_type_report',
type: 'GET', type: 'GET',
success: ((res) => { success: function(res) {
res.data.forEach(item => { res.data.forEach(function(item) {
Object.assign(item, { children: [] }); // 在ES5中没有Object.assign方法，通过遍历属性来模拟其功能
var assignObj = { children: [] };
for (var key in assignObj) {
item[key] = assignObj[key];
}
}); });
this.postForm.checkTypeDTOS = res.data; _this.postForm.checkTypeDTOS = res.data;
}) }
}); });
}, },
getCityList(){ getCityList(){
var _this = this;
$.ajax({ $.ajax({
url: ctx + "system/area/getSysAreaList", url: ctx + "system/area/getSysAreaList",
type: 'GET', type: 'GET',
data:this.params , data: this.params,
success:((res)=>{ success: function(res) {
this.CityList = res.data _this.CityList = res.data.filter(function(obj) {
}) , return obj.id === '36625';
});
}
}); });
}, },
getAreaList(){ getAreaList(type){
this.params.parentId = this.postForm.framework if (type === 'mounted'){
// this.postForm.area = '' this.params.parentId = this.postForm.framework
$.ajax({ // this.postForm.area = ''
url: ctx + "system/area/getSysAreaList", var _this = this;
type: 'GET', $.ajax({
data:this.params, url: ctx + "system/area/getSysAreaList",
success:((res)=>{ type: 'GET',
this.AreaList = res.data data: this.params,
}) , success: function(res) {
}); _this.AreaList = res.data;
}
});
}else{
this.params.parentId = this.postForm.framework
this.postForm.area = ''
$.ajax({
url: ctx + "system/area/getSysAreaList",
type: 'GET',
data: this.params,
success: function(res) {
_this.AreaList = res.data;
}
});
}
}, },
submitForm() { submitForm() {
this.$refs.postForm.validate((valid) => { this.$refs.postForm.validate((valid) => {
const hasEmptyRealScore = this.cachedData.some(item => { var hasEmptyRealScore;
return item.children.some(child => { var _this = this;
return child.starts && !child.realScore;
hasEmptyRealScore = _this.cachedData.some(function (item) {
return item.children.some(function (child) {
return child.starts &&!child.realScore;
}); });
}); });
if (hasEmptyRealScore){ if (hasEmptyRealScore){
$.modal.alertWarning("所选自查项内有未评分项，请检查"); $.modal.alertWarning("所选自查项内有未评分项，请检查");
return false
} }
// console.log(hasEmptyRealScore); // console.log(hasEmptyRealScore);
// console.log(this.cachedData) // console.log(this.cachedData)
@ -502,13 +581,31 @@
// this.postForm.checkTypeDTOS = this.cachedData.reduce((acc, item) => { // this.postForm.checkTypeDTOS = this.cachedData.reduce((acc, item) => {
// return acc.concat(item.children); // return acc.concat(item.children);
// }, []); // }, []);
this.postForm.checkTypeDTOS = this.editcheckTypeDTOS.map(editItem => { _this.postForm.checkTypeDTOS = _this.editcheckTypeDTOS.map(function (editItem) {
let cachedItem = this.cachedData.find(cachedItem => cachedItem.itemsType === editItem.itemsType); var cachedItem;
for (var i = 0; i < _this.cachedData.length; i++) {
cachedItem = _this.cachedData[i];
if (cachedItem.itemsType === editItem.itemsType) {
break;
} else {
cachedItem = null;
}
}
if (cachedItem) { if (cachedItem) {
return {...editItem, ...cachedItem}; // 在ES5中没有扩展运算符，这里手动合并对象属性
var mergedItem = {};
for (var key in editItem) {
mergedItem[key] = editItem[key];
}
for (var key in cachedItem) {
mergedItem[key] = cachedItem[key];
}
return mergedItem;
} }
return editItem; return editItem;
}) });
this.postForm.checkStartTime = this.formatISO8601ToDateTime(this.postForm.checkStartTime) this.postForm.checkStartTime = this.formatISO8601ToDateTime(this.postForm.checkStartTime)
this.postForm.checkEndTime = this.formatISO8601ToDateTime(this.postForm.checkEndTime) this.postForm.checkEndTime = this.formatISO8601ToDateTime(this.postForm.checkEndTime)
this.postForm.createTime = this.formatISO8601ToDateTime(this.postForm.createTime) this.postForm.createTime = this.formatISO8601ToDateTime(this.postForm.createTime)
@ -516,8 +613,8 @@
.then(function (response) { .then(function (response) {
if (response.data.code === 0) { if (response.data.code === 0) {
$.operate.successTabCallback(response.data); $.operate.successTabCallback(response.data);
}else{ } else {
$.modal.alertError(response.data.msg) $.modal.alertError(response.data.msg);
} }
}) })
.catch(function (error) { .catch(function (error) {

127
ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html
Unescape View File

@ -285,9 +285,10 @@
}, },
computed: { computed: {
pickerOptionsEnd() { pickerOptionsEnd() {
var _this = this
return { return {
disabledDate: (time) => { disabledDate: function(time) {
return time.getTime() < new Date(this.postForm.checkStartTime).getTime(); return time.getTime() < new Date(_this.postForm.checkStartTime).getTime();
} }
}; };
} }
@ -337,7 +338,7 @@
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}, },
handleUploadSuccess(row) { handleUploadSuccess(row) {
return (response, file) => { return function (response, file) {
if (response.code == web_status.SUCCESS) { if (response.code == web_status.SUCCESS) {
row.fileName = response.originalFilename; row.fileName = response.originalFilename;
row.fileUrl = response.url; row.fileUrl = response.url;
@ -346,7 +347,7 @@
}; };
}, },
handleRemove(row){ handleRemove(row){
return () => { return function () {
row.fileName = ''; row.fileName = '';
row.fileUrl = ''; row.fileUrl = '';
$.modal.msgSuccess("删除成功"); $.modal.msgSuccess("删除成功");
@ -397,12 +398,20 @@
}, },
handleChange(row, expandedRows){ handleChange(row, expandedRows){
this.loading = true; this.loading = true;
var _this = this;
if (expandedRows.length > 0) { if (expandedRows.length > 0) {
// 检查缓存中是否已经存在对应的数据 // 检查缓存中是否已经存在对应的数据
const cachedRow = this.cachedData.find((item) => item.checkType === row.checkType); var cachedRow;
for (var i = 0; i < _this.cachedData.length; i++) {
var item = _this.cachedData[i];
if (item.checkType === row.checkType) {
cachedRow = item;
break;
}
}
if (cachedRow) { if (cachedRow) {
row.children = cachedRow.children; row.children = cachedRow.children;
this.loading = false; _this.loading = false;
} else { } else {
// $.ajax({ // $.ajax({
// url: '/system/checkReport/checkView/' + row.checkType + '/' + row.typeName, // url: '/system/checkReport/checkView/' + row.checkType + '/' + row.typeName,
@ -420,13 +429,22 @@
// }), // }),
// }); // });
row.children = [] row.children = []
this.editcheckTypeDTOS.forEach(item => { _this.editcheckTypeDTOS.forEach(function (item) {
if (item.checkType === row.checkType) { if (item.checkType === row.checkType) {
row.children.push(item); row.children.push(item);
} }
Object.assign(item, { ifstarts: true });
// 在ES5中没有Object.assign方法，这里通过遍历属性来模拟其功能
for (var key in { ifstarts: true }) {
item[key] = { ifstarts: true }[key];
}
});
_this.updateCachedData(_this.cachedData, {
// 在ES5中没有扩展运算符，这里手动合并对象属性
row: row,
children: row.children
}); });
this.updateCachedData(this.cachedData, {...row, children: row.children });
this.loading = false this.loading = false
} }
} }
@ -434,7 +452,14 @@
handleCheckChange(row, expandedRows){ handleCheckChange(row, expandedRows){
// console.log(this.editcheckTypeDTOS) // console.log(this.editcheckTypeDTOS)
// console.log(row) // console.log(row)
let existingData = this.editcheckTypeDTOS.find(item => row.itemsType === item.itemsType); var existingData;
for (var i = 0; i < this.editcheckTypeDTOS.length; i++) {
var item = this.editcheckTypeDTOS[i];
if (row.itemsType === item.itemsType) {
existingData = item;
break;
}
}
if (!this.startsArry){ if (!this.startsArry){
this.startsArry = [] this.startsArry = []
} }
@ -490,38 +515,47 @@
}, },
//获取外层数据 //获取外层数据
getCheckView() { getCheckView() {
var _this = this;
$.ajax({ $.ajax({
url: '/system/checkReport/checkViewParent/sys_check_type_report', url: '/system/checkReport/checkViewParent/sys_check_type_report',
type: 'GET', type: 'GET',
success: ((res) => { success: function(res) {
res.data.forEach(item => { res.data.forEach(function(item) {
Object.assign(item, { children: [] }); // 在ES5中没有Object.assign方法，通过遍历属性来模拟其功能
var assignObj = { children: [] };
for (var key in assignObj) {
item[key] = assignObj[key];
}
}); });
this.postForm.checkTypeDTOS = res.data; _this.postForm.checkTypeDTOS = res.data;
}) }
}); });
}, },
getCityList(){ getCityList(){
var _this = this;
$.ajax({ $.ajax({
url: ctx + "system/area/getSysAreaList", url: ctx + "system/area/getSysAreaList",
type: 'GET', type: 'GET',
data:this.params , data: this.params,
success:((res)=>{ success: function(res) {
this.CityList = res.data.filter(obj => obj.id === '36625'); _this.CityList = res.data.filter(function(obj) {
}) , return obj.id === '36625';
});
}
}); });
}, },
getAreaList(type){ getAreaList(type){
if (type === 'mounted'){ if (type === 'mounted'){
this.params.parentId = this.postForm.framework this.params.parentId = this.postForm.framework
// this.postForm.area = '' // this.postForm.area = ''
var _this = this;
$.ajax({ $.ajax({
url: ctx + "system/area/getSysAreaList", url: ctx + "system/area/getSysAreaList",
type: 'GET', type: 'GET',
data:this.params, data: this.params,
success:((res)=>{ success: function(res) {
this.AreaList = res.data _this.AreaList = res.data;
}) , }
}); });
}else{ }else{
this.params.parentId = this.postForm.framework this.params.parentId = this.postForm.framework
@ -529,19 +563,22 @@
$.ajax({ $.ajax({
url: ctx + "system/area/getSysAreaList", url: ctx + "system/area/getSysAreaList",
type: 'GET', type: 'GET',
data:this.params, data: this.params,
success:((res)=>{ success: function(res) {
this.AreaList = res.data _this.AreaList = res.data;
}) , }
}); });
} }
}, },
submitForm() { submitForm() {
this.$refs.postForm.validate((valid) => { this.$refs.postForm.validate((valid) => {
const hasEmptyRealScore = this.cachedData.some(item => { var hasEmptyRealScore;
return item.children.some(child => { var _this = this;
return child.starts && !child.realScore;
hasEmptyRealScore = _this.cachedData.some(function (item) {
return item.children.some(function (child) {
return child.starts &&!child.realScore;
}); });
}); });
if (hasEmptyRealScore){ if (hasEmptyRealScore){
@ -556,13 +593,31 @@
// this.postForm.checkTypeDTOS = this.cachedData.reduce((acc, item) => { // this.postForm.checkTypeDTOS = this.cachedData.reduce((acc, item) => {
// return acc.concat(item.children); // return acc.concat(item.children);
// }, []); // }, []);
this.postForm.checkTypeDTOS = this.editcheckTypeDTOS.map(editItem => { _this.postForm.checkTypeDTOS = _this.editcheckTypeDTOS.map(function (editItem) {
let cachedItem = this.cachedData.find(cachedItem => cachedItem.itemsType === editItem.itemsType); var cachedItem;
for (var i = 0; i < _this.cachedData.length; i++) {
cachedItem = _this.cachedData[i];
if (cachedItem.itemsType === editItem.itemsType) {
break;
} else {
cachedItem = null;
}
}
if (cachedItem) { if (cachedItem) {
return {...editItem, ...cachedItem}; // 在ES5中没有扩展运算符，这里手动合并对象属性
var mergedItem = {};
for (var key in editItem) {
mergedItem[key] = editItem[key];
}
for (var key in cachedItem) {
mergedItem[key] = cachedItem[key];
}
return mergedItem;
} }
return editItem; return editItem;
}) });
this.postForm.checkStartTime = this.formatISO8601ToDateTime(this.postForm.checkStartTime) this.postForm.checkStartTime = this.formatISO8601ToDateTime(this.postForm.checkStartTime)
this.postForm.checkEndTime = this.formatISO8601ToDateTime(this.postForm.checkEndTime) this.postForm.checkEndTime = this.formatISO8601ToDateTime(this.postForm.checkEndTime)
this.postForm.createTime = this.formatISO8601ToDateTime(this.postForm.createTime) this.postForm.createTime = this.formatISO8601ToDateTime(this.postForm.createTime)
@ -570,8 +625,8 @@
.then(function (response) { .then(function (response) {
if (response.data.code === 0) { if (response.data.code === 0) {
$.operate.successTabCallback(response.data); $.operate.successTabCallback(response.data);
}else{ } else {
$.modal.alertError(response.data.msg) $.modal.alertError(response.data.msg);
} }
}) })
.catch(function (error) { .catch(function (error) {

280
ruoyi-admin/src/main/resources/templates/system/checkReport/selfcheck.html
Unescape View File

@ -1,280 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('自行检查')" />
<th:block th:include="include :: datetimepicker-css" />
<th:block th:include="include :: element-css" />
<th:block th:include="include :: select2-css" />
</head>
<style>
.layui-layer-btn{
display: none !important;
}
</style>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
<div class="app-container">
<el-form ref="postForm" :model="postForm" :rules="rules" label-position="right" label-width="150px">
<el-card>
<el-row>
<el-col :span="12">
<el-form-item label="报告人员:" prop="adduser">
<el-input disabled v-model="postForm.adduser" type="text"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报告人单位:" prop="depart">
<el-input disabled v-model="postForm.depart" :precision="1" :max="999999" type="text"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="检查开始日期:" prop="checkStartTime">
<el-date-picker
type="date"
placeholder="选择日期"
v-model="postForm.checkStartTime"
style="width: 100%;"
disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查类型:" prop="chackType">
<el-select disabled v-model="postForm.checkType">
<el-option
v-for="item in checkTypeList"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-card>
<div class="filter-container" style="margin-top: 25px;height: 300px">
<!-- <el-button class="filter-item" type="primary" icon="el-icon-plus" size="small" plain @click="handleAdd">-->
<!-- 添加-->
<!-- </el-button>-->
<el-table
:data="postForm.checkTypeDTOS"
:border="true"
style="width: 100%;margin-top: 25px;height: 100%;overflow: auto"
>
<el-table-column
label="检查项"
width="300"
align="center"
>
<template v-slot="scope">
<el-select disabled v-model="scope.row.checkType" class="filter-item">
<el-option
v-for="item in reportCheckList"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
label="检查内容"
>
<template v-slot="scope">
<el-input disabled v-model="scope.row.typeContent" type="textarea" />
</template>
</el-table-column>
<el-table-column
label="状态"
align="center"
width="200px"
>
<template v-slot="scope">
<el-radio-group v-model="scope.row.starts">
<el-radio
v-for="item in startsList"
:key="item.dictValue"
:label="item.dictValue"
>
{{item.dictLabel}}
</el-radio>
</el-radio-group>
</template>
</el-table-column>
</el-table>
</div>
<div style="position: fixed;bottom: -58px;right: 21px;">
<el-button type="primary" icon="el-icon-check" @click="submitForm">保存</el-button>
<el-button type="info" icon="el-icon-back" @click="closeItem()">返回</el-button>
</div>
</el-form>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: element-js" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript">
var prefix = ctx + "system/checkReport"
$("#form-check-add").validate({
focusCleanup: true
});
var app = new Vue({
el: '#app',
data: {
quTypeDisabled: false,
itemImage: true,
postForm: {
checkTypeDTOS: [],
adduser: [[${tdCheckReportDTO.adduser}]],
depart: [[${tdCheckReportDTO.depart}]],
checkStartTime: '',
checkType: '',
},
reportCheckList: [],
startsList:[],
checkTypeList:[],
rules: {
adduser: [
{ required: true, message: '报告人员不能为空！' }
],
depart: [
{ required: true, message: '报告人单位不能为空！' }
],
checkStartTime: [
{ required: true, message: '检查开始时间不能为空！' }
],
framework: [
{ required: true, message: '所属地市不能为空！' }
],
area: [
{ required: true, message: '所属区县不能为空！' }
]
},
},
mounted(){
this.postForm = [[${tdCheckReportDTO}]]
this.postForm.checkType = '0'
$.ajax({
url:'/system/dict/data/list',
type:'POST',
data:{dictType: 'sys_self_check'},
success:((res)=>{
this.startsList = res.rows
})
})
$.ajax({
url:'/system/dict/data/list',
type:'POST',
data:{dictType: 'sys_check_type_report'},
success:((res)=>{
this.reportCheckList = res.rows
})
})
$.ajax({
url:'/system/dict/data/list',
type:'POST',
data:{dictType: 'sys_check_type'},
success:((res)=>{
this.checkTypeList = res.rows
})
})
var date = new Date();
this.postForm.checkStartTime = this.formatDateToCustomString(date);
this.postForm.createTime = this.formatISO8601ToDateTime([[${tdCheckReportDTO}]].createTime);
if ([[${tdCheckReportDTO}]].checkEndTime){
this.postForm.checkEndTime = this.formatISO8601ToDateTime([[${tdCheckReportDTO}]].checkEndTime);
}
},
methods:{
formatISO8601ToDateTime(isoString) {
var date = new Date(isoString);
var year = date.getFullYear();
var month = (date.getMonth() + 1).toString().padStart(2, '0'); // 月份是从0开始的，所以需要+1
var day = date.getDate().toString().padStart(2, '0');
var hours = date.getHours().toString().padStart(2, '0');
var minutes = date.getMinutes().toString().padStart(2, '0');
var seconds = date.getSeconds().toString().padStart(2, '0');
// 拼接成标准的日期时间格式
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
formatDateToCustomString(date) {
var year = date.getFullYear();
var month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以加1
var day = String(date.getDate()).padStart(2, '0');
var hours = String(date.getHours()).padStart(2, '0');
var minutes = String(date.getMinutes()).padStart(2, '0');
var seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
// 添加子项
handleAdd() {
console.log(
this.postForm
)
this.postForm.checkTypeDTOS.push({checkType:'', typeContent: '',})
},
removeItem(index) {
this.postForm.checkTypeDTOS.splice(index, 1)
},
successTabCallback(result) {
if (result.data.code == web_status.SUCCESS) {
var parent = activeWindow();
if ($.common.isEmpty(parent.table)) {
$.modal.msgSuccessReload(result.data.msg);
} else if (parent.table.options.type == table_type.bootstrapTable) {
$.modal.close();
parent.$.modal.msgSuccess(result.data.msg);
parent.$.table.refresh();
} else if (parent.table.options.type == table_type.bootstrapTreeTable) {
$.modal.close();
parent.$.modal.msgSuccess(result.data.msg);
parent.$.treeTable.refresh();
}
} else if (result.data.code == web_status.WARNING) {
$.modal.alertWarning(result.data.msg)
} else {
$.modal.alertError(result.data.msg);
}
$.modal.closeLoading();
$.modal.enable();
},
submitForm() {
this.$refs.postForm.validate((valid) => {
console.log(this.postForm)
if (!valid) {
return
}
let that = this
axios.post(prefix + '/selfCheckSave', this.postForm)
.then(function (response) {
if (response.data.code === 0) {
$.operate.successCallback(response.data);
}else{
$.modal.alertError(response.data.msg)
}
})
.catch(function (error) {
console.log(error);
});
})
},
closeItem(){
$.modal.close()
}
}
})
</script>
</body>
</html>

100
ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html
Unescape View File

@ -6,7 +6,38 @@
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app"> <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
<div> <!-- <form class="form-horizontal m" id="form-train-add">-->
<!-- <input name="deptId" type="hidden" id="treeId"/>-->
<!-- <div class="row">-->
<!-- <div class="col-sm-6">-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-4 control-label is-required">所属市州：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select id="City" name="AREAID" required @change="getAreaList()" v-model="City" class="form-control m-b">-->
<!-- <option value="">-&#45;&#45;请选择-&#45;&#45;</option>-->
<!-- <option v-for="option in CityList" :value="option.id" :key="option.id">-->
<!-- {{ option.name }}-->
<!-- </option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-sm-6">-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-4 control-label is-required">所属区县：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select id="Area" name="FRAMEWORK" required v-model="Area" class="form-control m-b">-->
<!-- <option value="">-&#45;&#45;请选择-&#45;&#45;</option>-->
<!-- <option v-for="option in AreaList" :value="option.id" :key="option.id">-->
<!-- {{ option.name }}-->
<!-- </option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </form>-->
<!-- <div>-->
<el-card v-for="item in paperList" style="margin-bottom: 10px; line-height: 30px;"> <el-card v-for="item in paperList" style="margin-bottom: 10px; line-height: 30px;">
<el-row :gutter="20"> <el-row :gutter="20">
@ -27,7 +58,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
考试状态：{{ item.stateName}} 考试状态：{{ item.userTime}}
</el-col> </el-col>
</el-row> </el-row>
@ -43,17 +74,26 @@
el: '#app', el: '#app',
data: { data: {
paperList: [[${list}]], paperList: [[${list}]],
examStateList:examStateDatas examStateList:examStateDatas,
CityList: [],
}, },
mounted(){ mounted(){
this.paperList = this.updatedPaperList this.paperList = this.updatedPaperList
this.getCityList()
}, },
computed: { computed: {
updatedPaperList() { updatedPaperList() {
return this.paperList.map(paper => { return this.paperList.map(paper => {
const match = this.examStateList.find(item => item.dictValue == paper.state); const match = this.examStateList.find(function (item){
item.dictValue == paper.state
});
if (match) { if (match) {
return { ...paper, stateName: match.dictLabel }; var newPaper = {};
for (var key in paper) {
newPaper[key] = paper[key];
}
newPaper.stateName = match.dictLabel;
return newPaper;
} else { } else {
return paper; return paper;
} }
@ -70,9 +110,57 @@
const minutes = ('0' + date.getMinutes()).slice(-2); const minutes = ('0' + date.getMinutes()).slice(-2);
const seconds = ('0' + date.getSeconds()).slice(-2); const seconds = ('0' + date.getSeconds()).slice(-2);
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
} },
getCityList(){
$.ajax({
url: ctx + "system/area/getSysAreaList",
type: 'GET',
data:this.params ,
success:((res)=>{
this.CityList = res.data.filter(obj => obj.id === '36625');
}) ,
});
},
} }
}) })
// var app = new Vue({
// el: '#app',
// data: {
// CityList: [],
// AreaList:[],
// params:{
// parentId:'000',
// },
// },
// mounted(){
// // 初始化地市列表
// this.getCityList();
// },
// methods:{
// getCityList(){
// $.ajax({
// url: ctx + "system/area/getSysAreaList",
// type: 'GET',
// data:this.params ,
// success:((res)=>{
// this.CityList = res.data.filter(obj => obj.id === '36625');
// }) ,
// });
// },
// getAreaList(){
// debugger
// this.params.parentId = this.City
// $.ajax({
// url: ctx + "system/area/getSysAreaList",
// type: 'GET',
// data:this.params,
// success:((res)=>{
// this.AreaList = res.data
// }) ,
// });
// }
// }
// })
</script> </script>
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save