diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 00e854ba..074cbc25 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -230,13 +230,14 @@
@@ -319,7 +320,7 @@ import { reactive, toRefs, onMounted, ref } from "vue";
import { list, courseAuditView, courseDetail } from "../../api/indexAudit";
import { toDate } from "../../api/method";
import { message } from "ant-design-vue";
-import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
+import { Editor } from "@wangeditor/editor-for-vue";
import { iframeUrl } from "../../api/method";
import * as api1 from "@/api/index1";
@@ -327,7 +328,7 @@ export default {
name: "CoursereViewedN",
components: {
Editor,
- Toolbar,
+ // Toolbar,
},
setup() {
const state = reactive({
@@ -505,7 +506,7 @@ export default {
state.faceDetailObj = result;
heroImg.value.src = result.picUrl
valueHtml.value = result.outline
- attachMap.value = result.attach.split(",")
+ attachMap.value = result.attach==""?[]:result.attach.split(",")
console.log(result, attachMap.value);
})
.catch((err) => {
@@ -654,6 +655,11 @@ export default {
//获取分类列表
state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode }))
});
+
+ // 禁止用户编辑文本框内容
+ const onEditorFocus = (event) => {
+ event.enable(false);
+ }
return {
...toRefs(state),
getFaceList,
@@ -671,7 +677,8 @@ export default {
valueHtml,
attachMap,
contentList11,
- sceneist11
+ sceneist11,
+ onEditorFocus
};
},
};
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index 3daa7d81..cd88764e 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -188,6 +188,7 @@ export default {
key: "topName",
align: "center",
width: "10%",
+ customRender: ({record: {parentId,name}}) => {parentId==0?name:(parentId)}
,
},
{
title: "项目经理",
@@ -219,6 +220,7 @@ export default {
dataIndex: "description",
key: "description",
align: "center",
+ customRender: ({record: {auditList,description}}) => {auditList.length!==0?auditList[auditList.length-1].description?auditList[auditList.length-1].description:'-':description?description:'-'}
,
},
{
@@ -290,6 +292,7 @@ export default {
status: 1,
};
auditedlist(objn).then((res) => {
+ console.log('获取已审核项目列表数据',res)
let result = res.data.data;
state.total = res.data.data.total;
state.tableData1 = result.rows
@@ -347,7 +350,7 @@ export default {
reset,
closeProjAuditModal,
showProjAuditModal,
- setAudit,
+ setAudit
};
},
};
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 3643d9ae..cbb4af89 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -460,7 +460,7 @@
开始时间
-
{{ item.startTime!==null?item.startTime[0]+'-'+ item.startTime[1]+'-'+item.startTime[2]:''}}
+
{{ item.startTime!==null?item.startTime:''}}
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 570bbce7..1bd5c887 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -15,7 +15,7 @@
-

+

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index de5963c0..2c62cbb2 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -431,7 +431,7 @@
开始时间
{{
- item.startTime !== null ? item.startTime[0] + '-' + item.startTime[1] + '-' + item.startTime[2] : ''
+ item.startTime !== null ? item.startTime: ''
}}
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index 9c8b3eca..4f45c301 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -37,8 +37,23 @@
@@ -73,13 +88,13 @@ const columns1 = [
key: "creator",
align: "center",
},
- {
- title: "最近学习时间",
- width: "25%",
- dataIndex: "stutime",
- key: "stutime",
- align: "center",
- },
+ // {
+ // title: "最近学习时间",
+ // width: "25%",
+ // dataIndex: "stutime",
+ // key: "stutime",
+ // align: "center",
+ // },
{
title: "操作",
width: "22%",
@@ -100,6 +115,7 @@ export default defineComponent({
currentPage: 1,
pageSize: 10,
total:50,
+ tableDataTotal:0,
tableData1: [
{
key: "1",
@@ -180,6 +196,12 @@ export default defineComponent({
getLibraryList();
})
+ // 翻页
+ const changePagination = (page) => {
+ pagination.current = page;
+ getLibraryList();
+ };
+
// 获取模板列表
const getLibraryList = () => {
let date = Math.ceil(new Date(state.time).getTime() / 1000);
@@ -193,6 +215,7 @@ export default defineComponent({
}
api.templateList(obj).then((res) => {
state.tableData1 = []
+ state.tableDataTotal = res.data.data.total;
console.log(res);
let resData = res.data.data.rows
if (resData.length) {
@@ -253,6 +276,7 @@ export default defineComponent({
resetLevel,
pagination,
toLibraryAdd,
+ changePagination
};
},
});