|
|
@@ -108,6 +108,7 @@
|
|
|
label="观察内容"
|
|
|
align="center"
|
|
|
width="170"
|
|
|
+ show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -133,7 +134,7 @@
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="操作" align="center" width="175px">
|
|
|
+ <el-table-column label="操作" align="center" width="185px">
|
|
|
<template slot-scope="scope">
|
|
|
<div class="evaluate">
|
|
|
<div
|
|
|
@@ -196,6 +197,7 @@
|
|
|
:studentList="studentList"
|
|
|
@closePop="closePop"
|
|
|
@getData="getData"
|
|
|
+ @updatePanelB="updatePanelB"
|
|
|
></popbox>
|
|
|
</el-dialog>
|
|
|
|
|
|
@@ -244,6 +246,8 @@ export default {
|
|
|
isLoading: true,
|
|
|
classid: "",
|
|
|
|
|
|
+ // 当前时间
|
|
|
+ visitTime:'',
|
|
|
// 学生详情信息
|
|
|
info:{},
|
|
|
// 默认选择项
|
|
|
@@ -283,11 +287,11 @@ export default {
|
|
|
stypeId: "",
|
|
|
};
|
|
|
},
|
|
|
- watch: {
|
|
|
- total(newVal, oldVal) {
|
|
|
- this.$emit("updatePanelA", newVal);
|
|
|
- }
|
|
|
- },
|
|
|
+ // watch: {
|
|
|
+ // total(newVal, oldVal) {
|
|
|
+ // this.$emit("updatePanelA", newVal);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
methods: {
|
|
|
// 大分类点击
|
|
|
clickFtypeId(e) {
|
|
|
@@ -405,7 +409,7 @@ export default {
|
|
|
this.isLoading = false;
|
|
|
this.tableData = res.data[0];
|
|
|
this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
|
|
|
- console.log(" 获取筛选数据", res.data[0]);
|
|
|
+ // console.log(" 获取筛选数据", res.data[0]);
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
this.isLoading = false;
|
|
|
@@ -435,6 +439,7 @@ export default {
|
|
|
// },
|
|
|
// 添加新纪录
|
|
|
addRecord(){
|
|
|
+ this.getPresentDate()
|
|
|
this.judgeNum=2
|
|
|
this.recordData={
|
|
|
classId:this.info.classid,
|
|
|
@@ -442,12 +447,12 @@ export default {
|
|
|
contact:[],
|
|
|
place:'',
|
|
|
recordContent:'',
|
|
|
- recordDate:'',
|
|
|
+ recordDate:this.visitTime,
|
|
|
recordImg:[],
|
|
|
recordTit:'',
|
|
|
semName:'',
|
|
|
studentName:this.info.username,
|
|
|
- term:'',
|
|
|
+ term:this.termValue,
|
|
|
tname:'',
|
|
|
type:''
|
|
|
}
|
|
|
@@ -455,6 +460,25 @@ export default {
|
|
|
// this.AddIsPop = true;
|
|
|
this.isPop = true;
|
|
|
},
|
|
|
+ // 获取当前时间
|
|
|
+ getPresentDate() {
|
|
|
+ const currentTime = new Date()
|
|
|
+ const year = currentTime.getFullYear()
|
|
|
+ let month = currentTime.getMonth() + 1 // 月份从0开始，因此需要加1
|
|
|
+ month = (month < 10 ? '0' : '') + month
|
|
|
+ let day = currentTime.getDate()
|
|
|
+ day = (day < 10 ? '0' : '') + day
|
|
|
+
|
|
|
+ let hours = currentTime.getHours()
|
|
|
+ hours = (hours < 10 ? '0' : '') + hours
|
|
|
+
|
|
|
+ let minutes = currentTime.getMinutes()
|
|
|
+ minutes = (minutes < 10 ? '0' : '') + minutes
|
|
|
+
|
|
|
+ console.log(year, month, day, hours, minutes)
|
|
|
+ this.visitTime = `${year}-${month}-${day} ${hours}:${minutes}`
|
|
|
+ // console.log(this.visitTime)
|
|
|
+ },
|
|
|
// 修改与查看记录
|
|
|
updateCred(e, t) {
|
|
|
// console.log("eeeeeeeeeeee", e);
|
|
|
@@ -481,7 +505,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
this.recordData = e;
|
|
|
- console.log('recordData',this.recordData);
|
|
|
+ // console.log('recordData',this.recordData);
|
|
|
this.$forceUpdate();
|
|
|
this.isPop = true;
|
|
|
},
|
|
|
@@ -510,7 +534,7 @@ export default {
|
|
|
this.ajax
|
|
|
.get(this.$store.state.api + "selectStudentDetail", data2)
|
|
|
.then(res => {
|
|
|
- console.log('学生详情',res.data[0][0]);
|
|
|
+ // console.log('学生详情',res.data[0][0]);
|
|
|
this.info=res.data[0][0]
|
|
|
this.classid = res.data[0][0].classid;
|
|
|
this.getClassStudent();
|
|
|
@@ -546,6 +570,12 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
this.termList = yearJuri;
|
|
|
+ this.termList.forEach(i => {
|
|
|
+ if (i.defaultC===1) {
|
|
|
+ this.termValue=i.id
|
|
|
+ }
|
|
|
+ });
|
|
|
+ // console.log('termList',this.termList);
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
this.isLoading = false;
|
|
|
@@ -554,8 +584,11 @@ export default {
|
|
|
},
|
|
|
// 判断导出数据
|
|
|
judgeExport() {
|
|
|
+ // return console.log('导出数据',this.multipleSelection);
|
|
|
+
|
|
|
if (this.multipleSelection.length) {
|
|
|
this.exportExcel();
|
|
|
+
|
|
|
} else {
|
|
|
this.$message({ message: "请先选择要导出的数据", type: "warning" });
|
|
|
return;
|
|
|
@@ -566,14 +599,15 @@ export default {
|
|
|
// var res = res.data[0];
|
|
|
var res = this.multipleSelection;
|
|
|
|
|
|
- // return console.log(res);
|
|
|
+ // console.log('导出数据',res);
|
|
|
//如果value的json字段的key值和想要的headers值不一致时，可做如下更改
|
|
|
//将和下面的Object.fromEntries结合，将json字段的key值改变为要求的excel的header值
|
|
|
var array = [];
|
|
|
for (var i = 0; i < res.length; i++) {
|
|
|
var _json = {};
|
|
|
- _json["记录时间"] = res[i].recordDate;
|
|
|
+ _json["姓名"] = res[i].studentName
|
|
|
_json["班级"] = res[i].className;
|
|
|
+ _json["记录时间"] = res[i].recordDate;
|
|
|
_json["学期"] = res[i].semName;
|
|
|
_json["关联"] = res[i].constus;
|
|
|
_json["维度"] = res[i].tname;
|
|
|
@@ -592,13 +626,13 @@ export default {
|
|
|
//设置每一列的宽度
|
|
|
{ wch: 20 },
|
|
|
{ wch: 30 },
|
|
|
- { wch: 20 },
|
|
|
{ wch: 30 },
|
|
|
{ wch: 30 },
|
|
|
{ wch: 30 },
|
|
|
{ wch: 30 },
|
|
|
{ wch: 30 },
|
|
|
- // { wch: 30 }
|
|
|
+ { wch: 30 },
|
|
|
+ { wch: 30 }
|
|
|
];
|
|
|
XLSX.utils.book_append_sheet(workbook, ws, "sheet1"); //把sheet添加到workbook里，第三个参数是sheet名
|
|
|
XLSX.writeFile(workbook, "观察日记.xlsx");
|
|
|
@@ -610,6 +644,10 @@ export default {
|
|
|
type: "success",
|
|
|
});
|
|
|
},
|
|
|
+ updatePanelB(e){
|
|
|
+ // console.log('出嘎',e);
|
|
|
+ this.$emit("updatePanelA", e);
|
|
|
+ },
|
|
|
// 删除记录
|
|
|
delRecord(e) {
|
|
|
this.$confirm("是否删除?", "提示", {
|
|
|
@@ -623,6 +661,8 @@ export default {
|
|
|
// console.log(res);
|
|
|
// this.selectData();
|
|
|
this.getData();
|
|
|
+ this.$emit("updatePanelA", e);
|
|
|
+
|
|
|
this.$message({
|
|
|
type: "success",
|
|
|
message: "已删除",
|
yuanyiming