diff --git a/src/App.vue b/src/App.vue index 73dde7df..7b16dfab 100644 --- a/src/App.vue +++ b/src/App.vue @@ -43,7 +43,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.9.4------------"); + console.log("版本0.9.5------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/config.js b/src/api/config.js index 12ebbb91..ad08a305 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-07 13:41:47 + * @LastEditTime: 2022-12-08 08:48:26 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -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/common/BaseUpload.vue b/src/components/common/BaseUpload.vue new file mode 100644 index 00000000..3920b81e --- /dev/null +++ b/src/components/common/BaseUpload.vue @@ -0,0 +1,85 @@ + + diff --git a/src/components/common/FJUpload.vue b/src/components/common/FJUpload.vue new file mode 100644 index 00000000..90500d44 --- /dev/null +++ b/src/components/common/FJUpload.vue @@ -0,0 +1,202 @@ + + + \ No newline at end of file diff --git a/src/components/common/Upload.vue b/src/components/common/Upload.vue deleted file mode 100644 index 93d8e718..00000000 --- a/src/components/common/Upload.vue +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/src/components/project/ProjectLevel.vue b/src/components/project/ProjectLevel.vue index c8eeee67..539865a9 100644 --- a/src/components/project/ProjectLevel.vue +++ b/src/components/project/ProjectLevel.vue @@ -1,17 +1,22 @@ + + diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index f6cb0dd5..18a4ff18 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -1,394 +1,125 @@ - + diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 87504234..652a32ee 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -283,33 +283,24 @@ v-model:checked="checked" @click="changeopclo" /> -
+
关闭
-
+
开启
-
-
当前公告内容:
-
- {{noticeContent==""?"暂无公告":noticeContent}} -
-
 
-
- -
编辑
-
-
- -
- - +
@@ -845,8 +835,6 @@ export default defineComponent({ edit: true, fileList:[], attachSwitch:true, - editFlag:false, - noticeContent:"", // 共享文档列表 docList: [ { @@ -864,25 +852,29 @@ export default defineComponent({ ], isEdit: false, // 是否处于编辑状态 // 基本信息 - projectInfo: {}, + projectInfo: { + beginTime: null, + endTime: null, + name: null, + manager: null, + notice: null, + sourceBelongId: null, + remark: "", + courseSyncFlag: false, + level: null, + systemId: null, + boeFlag: false, + status: null, + picUrl: null, + noticeFlag: null, + }, }); const value = ref(""); const textnum = "150"; const routered = useRouter(); const changeopclo = () => { - state.projectInfo.noticeFlag = state.checked?1:0; - api - .templateEdit( state.projectInfo) - .then((res) => { - console.log(res); - }) - .catch((err) => { - console.log(err); - }); + state.hideshow = !state.hideshow; }; - const editNotice =()=>{ - state.editFlag = true ; - } const changecheck2 = () => { state.checked2 = !state.checked2; }; @@ -945,13 +937,25 @@ export default defineComponent({ state.taskSyllabus = []; console.log(res); - state.projectInfo = res.data.data.projectTemplateInfo; - - state.noticeContent = state.projectInfo.notice; - state.checked = state.projectInfo.noticeFlag==1?true:false; - console.log("state.checked", state.checked); - console.log("state.projectInfo",state.projectInfo); - console.log("res.data.data.projectTemplateInfo",res.data.data.projectTemplateInfo); + state.projectInfo.name = res.data.data.projectTemplateInfo.name; + state.projectInfo.beginTime = res.data.data.projectTemplateInfo.beginTime; + state.projectInfo.endTime = res.data.data.projectTemplateInfo.endTime; + state.projectInfo.manager = res.data.data.projectTemplateInfo.manager; + state.projectInfo.notice = res.data.data.projectTemplateInfo.notice; + state.projectInfo.sourceBelongId = res.data.data.projectTemplateInfo.sourceBelongId; + state.projectInfo.managerId = res.data.data.projectTemplateInfo.managerId; + state.projectInfo.remark = res.data.data.projectTemplateInfo.remark; + state.projectInfo.courseSyncFlag = res.data.data.projectTemplateInfo.courseSyncFlag; + state.projectInfo.level = res.data.data.projectTemplateInfo.level; + state.projectInfo.systemId = res.data.data.projectTemplateInfo.systemId; + state.projectInfo.boeFlag = res.data.data.projectTemplateInfo.boeFlag; + state.projectInfo.noticeFlag = res.data.data.projectTemplateInfo.noticeFlag; + state.projectInfo.remark = res.data.data.projectTemplateInfo.remark; + state.projectInfo.status = res.data.data.projectTemplateInfo.status; + state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl; + state.picUrl = res.data.data.projectTemplateInfo.picUrl; + state.projectInfo.attach = res.data.data.projectTemplateInfo.attach; + state.projectInfo.category = res.data.data.projectTemplateInfo.category; try{ state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach); }catch{ @@ -984,14 +988,29 @@ export default defineComponent({ // 发布公告 const addNotice = () => { - // state.projectInfo.notice= - if(!state.projectInfo.notice){ - return message.warning("请输入公告内容"); - } + console.log("ok====s"); + let obj = { + name: state.projectInfo.name, + category: state.projectInfo.category, + picUrl: state.projectInfo.picUrl, + manager: state.projectInfo.manager, + managerId: state.projectInfo.managerId || 0, + sourceBelongId: state.projectInfo.sourceBelongId, + level: state.projectInfo.level, + systemId: state.projectInfo.systemId, + boeFlag: state.projectInfo.boeFlag ? 1 : 0, + courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0, + notice: state.projectInfo.notice, + noticeFlag: state.projectInfo.noticeFlag, + projectTemplateId: localStorage.getItem("projectTemplateId"), + remark: state.projectInfo.remark, + status: state.projectInfo.status, + attach: state.projectInfo.attach, + }; + console.log("obj======", obj); api - .templateEdit( state.projectInfo) + .templateEdit(obj) .then((res) => { - state.noticeContent = state.projectInfo.notice; message.success("公告发布成功"); console.log(res); }) @@ -999,7 +1018,6 @@ export default defineComponent({ message.error("公告发布失败" + err); console.log(err); }); - state.editFlag =false; }; // 删除阶段 const stateDel = (id) => { @@ -1270,8 +1288,7 @@ export default defineComponent({ editRule, handleChange2, scoresum, - checkedClose, - editNotice + checkedClose }; }, }); @@ -2200,7 +2217,6 @@ export default defineComponent({ .ntc_content { .ntcc_tit { margin-bottom: 16px; - font-weight: 600; } .textarea { display: flex; diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue index a8ccf876..db81a6fd 100644 --- a/src/views/projectcenter/templateAdd.vue +++ b/src/views/projectcenter/templateAdd.vue @@ -4,10 +4,10 @@
创建/编辑单层模板
返回
@@ -17,164 +17,119 @@
模板名称
分类
- - +
-
-
+
+
封面图
-
- - + + avatar -
- - -
-
- -
-
+ /> +
+ + 高宽比为16:9 (如:800*450) png或jpg图片 + +
项目时间
项目经理
- - +
资源归属
- +
@@ -183,11 +138,11 @@
@@ -196,523 +151,157 @@
同步学习记录
- 同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)
项目级别
- +
培训体系
- +
是否BOEU实施
- BOEU实施 + + +
- - -