From 959b048915281a8bf5101e87c76120595fbb1194 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Sun, 4 Dec 2022 11:12:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E5=BE=85=E5=AE=A1=E6=A0=B8=E8=AF=BE?=
=?UTF-8?q?=E7=A8=8B=E9=A2=84=E8=A7=88=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B7=B2?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=A0=B8=E8=AF=B4?=
=?UTF-8?q?=E6=98=8E=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/examine/CourseReviewedN.vue | 25 ++++++++++++++++---------
src/views/examine/ProjectReviewed.vue | 5 ++++-
2 files changed, 20 insertions(+), 10 deletions(-)
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
};
},
};
From ad9ce6c3e2d778fbb1a448e612ec587f9ce3ae1d Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Sun, 4 Dec 2022 11:45:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E5=BA=93=E5=88=86?=
=?UTF-8?q?=E9=A1=B5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=8C=E9=9A=90?=
=?UTF-8?q?=E8=97=8F=E5=AD=A6=E4=B9=A0=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/projectcenter/TemplateLibrary.vue | 42 ++++++++++++++++-----
1 file changed, 33 insertions(+), 9 deletions(-)
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
};
},
});
From 8e0d6ae313d59fbcb580b03d1a3fd97169710c39 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Sun, 4 Dec 2022 11:53:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE/=E8=B7=AF=E5=BE=84?=
=?UTF-8?q?=E5=9B=BE=E4=BB=BB=E5=8A=A1=E5=A4=A7=E7=BA=B2=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/learningpath/LevelAdd.vue | 2 +-
src/views/projectcenter/LibraryAdd.vue | 4 ++--
src/views/projectcenter/TaskPage.vue | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
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 b7c8d745..896718db 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: ''
}}