diff --git a/src/App.vue b/src/App.vue index 10b3b0a8..e75658e9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.9.5------------"); + console.log("版本0.9.6------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/config.js b/src/api/config.js index 573241e8..773efa21 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -56,7 +56,7 @@ http.interceptors.response.use( return response; } else { if (code === 1000) { - // window.open("https://u-pre.boe.com/web/", '_self'); + window.open("https://u-pre.boe.com/web/", '_self'); // window.open("http://111.231.196.214:12013/manage/login", '_self'); } console.log("api %o", msg); diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue index 58f2bf68..ff637f60 100644 --- a/src/components/drawers/NoticePub.vue +++ b/src/components/drawers/NoticePub.vue @@ -103,7 +103,7 @@ export default { return message.warning("请输入公告内容"); } else { let obj = { - notice: state.noticeContent1, + notice: state.noticeContent, projectId: props.projectId, title: "", }; @@ -147,7 +147,7 @@ export default { .noticeTitle { margin-left: 32px; margin-right: 32px; - // padding-top: 20px; + margin-bottom: 100px; .notitle { height: 55px; border-bottom: 1px solid #ededed; diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue index 84b6402e..0730c4da 100644 --- a/src/components/drawers/ProjPowerList.vue +++ b/src/components/drawers/ProjPowerList.vue @@ -323,7 +323,7 @@ export default { name: value.memberName ? value.memberName : "-", com: value.orgName ? value.orgName : "-", - gang: "-", + gang: value.positionMgrLevel ? value.positionMgrLevel : "-", number: value.memberNo ? value.memberNo : "-", state: value.tagName ? value.tagName : "-", }; diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index 19ffebf8..db80bbe0 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -116,7 +116,8 @@
+
+
+
+
-
+
+
+
+ 模拟 Ajax 异步设置内容
"; - console.log("toolbar222222222222222"); - console.log(editorRef.value); - // const toolbar = DomEditor.getToolbar(editorRef.value); - // const menu = editorRef.value.getAllMenuKeys(); - // const bar = toolbar.getConfig().toolbarKeys; - // console.log(menu); - // console.log(bar); - }, 3500); - }); + // onMounted(() => { + // setTimeout(() => { + // // valueHtml.value = "模拟 Ajax 异步设置内容
"; + // console.log(editorRef.value); + // // const toolbar = DomEditor.getToolbar(editorRef.value); + // // const menu = editorRef.value.getAllMenuKeys(); + // // const bar = toolbar.getConfig().toolbarKeys; + // // console.log(menu); + // // console.log(bar); + // }, 3500); + // }); const toolbarConfig = { excludeKeys: ["insertVideo", "insertImage"], }; @@ -478,7 +481,7 @@ export default defineComponent({ formData.append("file", file); fileUp(formData).then((res) => { if (res.data.code === 200) { - // 最后插入图片 + // 最后插入图片 url alt href insertFn(res.data.data, file.name, res.data.data); } }); @@ -487,11 +490,15 @@ export default defineComponent({ const handleCreated = (editor) => { editorRef.value = editor; // 记录 editor 实例,重要! }; + // const handleDestory = () => { + // const editor = editorRef.value; + // if (editor == null) return; + // editor.destroy(); + // }; // 组件销毁时,也及时销毁编辑器 - onBeforeUnmount(() => { - const editor = editorRef.value; - if (editor == null) return; - editor.destroy(); + onUnmounted(() => { + console.log("组件销毁时,也及时销毁编辑器"); + // handleDestory(); }); // 富文本 eeeeeeeeeeeeee @@ -620,7 +627,9 @@ export default defineComponent({ if (param === "review") { //新建时点击审核按钮 submitReview(res.data.data.offcourseId); - } else visibleClose(); + } else { + visibleClose(); + } } }); }; @@ -641,22 +650,22 @@ export default defineComponent({ if (Number(item.auditStatus) === 2 && Number(item.status) === 0) { state.statusTingQi = 0; } - if(Number(item.auditStatus) === -1){ - let obj ={ - offcourseId:offcourseId, - type:2, + if (Number(item.auditStatus) === -1) { + let obj = { + offcourseId: offcourseId, + type: 2, pageNo: 1, - pageSize: 1, + pageSize: 1, + }; + const res = await api2.auditList(obj).then((res) => { + if (res.data.code === 200) return res.data.data; + }); + if (res.rows && res.rows.length > 0) { + state.auditDescription = res.rows[0].description + ? res.rows[0].description + : "-"; + console.log("state.auditDescription", state.auditDescription); } - api2.auditList(obj).then((res)=>{ - - if(res.data.data.rows &&res.data.data.rows.length > 0){ - state.auditDescription = res.data.data.rows[0].description?res.data.data.rows[0].description :"-"; - console.log("state.auditDescription",state.auditDescription); - } - - }) - } state.qdms_inputV1 = item.name; @@ -670,7 +679,6 @@ export default defineComponent({ state.member = { value: item.teacherId, name: item.teacher }; valueHtml.value = item.outline; state.attach = item.attach; - state.ft_hs = true; }; const handleTagChange = () => { @@ -720,15 +728,15 @@ export default defineComponent({ visibleClose, handleTagChange, handleTagClose, - handleCreated, handlePush, - submitReview, reviewClick, + editorRef, valueHtml, mode: "simple", // 或 'simple' toolbarConfig, editorConfig, + handleCreated, }; }, }); diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 32befa33..5cdf6459 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -125,7 +125,8 @@