diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index c2e38b3f..7d98ba2b 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -374,6 +374,7 @@ export default {
};
//搜索案例列表
const searchList = () => {
+ state.selectedRowKeys = [];
if (state.inputV1 !== "") {
getAllCaseText();
} else {
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 963c697c..10771461 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -692,6 +692,8 @@ export default {
//搜索在线列表
const searchList = () => {
if (state.inputV1 || state.selectV) {
+ state.selectedRowKeys = [];
+ state.addOnlineList = [];
getAllOnlineText();
} else {
resetOnline();
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 98d6dbe1..7c2f3944 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -374,9 +374,11 @@ export default {
// this.selectedRows = selectedRows;
// };
const searchProjectList = () => {
+ state.selectedRowKeys = [];
getAllProjText();
};
const resetProjectList = () => {
+ state.selectedRowKeys = [];
state.inputV1 = "";
state.inputV2 = "";
state.inputV3 = "";
diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue
index 74fab40c..7fe7da38 100644
--- a/src/components/drawers/AssessmentAll.vue
+++ b/src/components/drawers/AssessmentAll.vue
@@ -9,7 +9,7 @@
maxlength="20"
/>
-
+
@@ -144,14 +144,19 @@ export default {
assessmentId: null,
assessmentName: null,
});
+ const afterVisibleChange=()=>{
+
+ }
const closeDrawer = () => {
ctx.emit("update:assessmentVisible", false);
+
};
//清空所选
const clearLine = () => {
console.log("state.selectedRowKeys", state.selectedRowKeys);
state.selectedRowKeys = [];
state.addOnlineList = [];
+ state.inputV1 = "";
};
const queryInfo = () => {
//if (props.edit) {
@@ -185,8 +190,8 @@ export default {
assessmentId: info.assessmentId,
name: info.assessmentName,
num: num,
- creator: info.createUser ? info.createUser : "-",
- time: dayjs(info.createTime).format("YYYY-MM-DD"),
+ creator: info.createUserName ? info.createUserName : "-",
+ time: dayjs(info.createTime).format("YYYY-MM-DD HH:mm"),
};
//更新讨论信息
state.assessment = obj;
@@ -277,8 +282,8 @@ export default {
assessmentId: value.assessmentId,
num: num,
name: value.assessmentName ? value.assessmentName : "-",
- creator: value.createUser ? value.createUser : "-",
- time: dayjs(value.createTime).format("YYYY-MM-DD"),
+ creator: value.createUserName ? value.createUserName : "-",
+ time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
};
array.push(obj);
});
@@ -287,6 +292,7 @@ export default {
};
//获取全部评估信息接口
const getAllInvistText = () => {
+
api
.queryAssessmentDetailList({
assessmentName: state.inputV1,
@@ -308,9 +314,15 @@ export default {
// state.createLoading = false;
});
};
-
+ //重置评估信息
+ const searchList = () => {
+ state.selectedRowKeys = [];
+
+ getAllInvistText();
+ };
//重置评估信息
const resetInvist = () => {
+ state.selectedRowKeys = [];
state.inputV1 = "";
getAllInvistText();
};
@@ -321,10 +333,7 @@ export default {
state.selectedRowKeys,
state.assessmentId
);
- if (!state.assessmentId) {
- clearLine();
- }
-
+ state.inputV1 = "";
queryInfo();
getAllInvistText();
});
@@ -332,10 +341,11 @@ export default {
() => props.assessmentId,
() => {
if (!props.assessmentId) {
- clearLine();
+ clearLine();
state.assessment = null;
} else {
queryInfo();
+ console.log("dd");
}
console.log("props.assessmentId", props.assessmentId);
},
@@ -353,6 +363,8 @@ export default {
resetInvist,
handelChangePage,
queryInfo,
+ searchList,
+ afterVisibleChange,
};
},
};
diff --git a/src/components/drawers/AssessmentList.vue b/src/components/drawers/AssessmentList.vue
index 5ee947cf..0566d5a6 100644
--- a/src/components/drawers/AssessmentList.vue
+++ b/src/components/drawers/AssessmentList.vue
@@ -202,8 +202,8 @@ export default {
assessmentId: value.assessmentId,
num: num,
name: value.assessmentName ? value.assessmentName : "-",
- creator: value.createUser ? value.createUser : "-",
- time: dayjs(value.createTime).format("YYYY-MM-DD"),
+ creator: value.createUserName ? value.createUserName : "-",
+ time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
};
array.push(obj);
});
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index 1054c356..94b2aaee 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -243,6 +243,7 @@ export default {
};
//搜索测评列表
const searchList = () => {
+ state.selectedRowKeys = [];
if (state.inputV1 !== "") {
getAllEvalText();
} else {
diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index 94a76617..67115e24 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -63,16 +63,12 @@
:unCheckedValue="0"
:disabled="true"
>
同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)
-
+
-
+
项目说明:
{{ projectInfo.remark }}
diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index 441eb6d2..b8babf4a 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -527,6 +527,7 @@ export default {
};
//搜索
const search = () => {
+ state.selectedRows = [];
//重新获取列表
getClassList();
};
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index 3acf79fc..521584ae 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -245,6 +245,7 @@ export default {
// };
//获取选择考试列表
const getManageList = () => {
+ state.selectedRowKeys = [];
let obj = {
keyWord: state.inputPname,
pageIndex: state.currentPage,
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 7767d488..0978e4f8 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -507,6 +507,7 @@ const auditRowSelection = computed(() => ({
}));
const closeDrawer = () => {
visiable.value = false;
+ stuData.value = [];
};
const openDrawer = () => {
visiable.value = true;
@@ -574,6 +575,7 @@ const auditChangePagination = (page) => {
const resetStu = () => {
deleteDepSelect();
nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
+
};
//清空选择部门信息
const deleteDepSelect = () => {
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 6182d080..e80069b3 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -6,7 +6,7 @@
style="padding-left: 20px; margin-right: 0px"
>
-
+
-
+
({
- columnWidth: 10,
+ columnWidth: 20,
selectedRowKeys: stuSelectKeys.value,
onChange: onStuSelectChange,
preserveSelectedRowKeys: true,
@@ -264,9 +265,16 @@ function getStuList() {
});
}
-function reset() {}
+function reset() {
+ tableParam.value.studentName="";
+}
function bathDel() {
+ if( stuSelectKeys.value &&
+ stuSelectKeys.value.length == 0){
+ message.destroy();
+ return message.warning("请先选中学员");
+ }
stuSelectKeys.value &&
stuSelectKeys.value.length &&
delStudentList({
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index b47e954f..61446229 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -49,16 +49,21 @@
placeholder="请输入创建人"
/>
+
+
+
@@ -144,6 +149,7 @@
import { onMounted, reactive, toRefs } from "vue";
import { auditedlist } from "../../api/indexAudit";
import * as moment from "moment";
+import dayjs from "dayjs";
export default {
name: "ProjectViewed",
@@ -324,8 +330,8 @@ export default {
const getProjList = () => {
state.loading=true
let objn = {
- beginTime: state.valueDate ? state.valueDate[0] : "",
- endTime: state.valueDate ? state.valueDate[1] : "",
+ beginTime: state.valueDate ? dayjs(state.valueDate[0]).format("YYYY-MM-DD") : "",
+ endTime: state.valueDate ? dayjs(state.valueDate[1]).format("YYYY-MM-DD") : "",
createName: state.valuecreater,
manager: state.valuename,
name: state.valueproj,
@@ -408,6 +414,7 @@ export default {
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 00cbb91d..e970fa48 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -24,12 +24,17 @@
>
+
+
@@ -414,7 +419,7 @@ export default {
if (state.projectTime) {
startTime = toDate(
new Date(state.projectTime[0].$d).getTime() / 1000,
- "Y-M-D"
+ "Y-M-D hh:mm"
);
endTime = toDate(
new Date(state.projectTime[1].$d).getTime() / 1000,
@@ -865,6 +870,26 @@ export default {
display: block;
clear: both;
}
+.addTimeBox {
+ position: relative;
+ display: flex;
+ align-items: center;
+
+ .addTime {
+ position: absolute;
+ z-index: 10;
+ margin-left: 10px;
+ color: rgba(0, 0, 0, 0.4);
+ }
+
+ .ant-picker {
+ padding-left: 85px;
+ }
+
+ .ant-picker-range .ant-picker-active-bar {
+ margin-left: 85px;
+ }
+}
.out {
//display: flex;
display: block;