Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

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-08 08:49:37
+ * @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);

src/views/courselibrary/CoursewareManage.vue

@@ -191,6 +191,7 @@
                     alt=""
                   />
                 </div>
+                
                 <span>授课形式</span>
               </div>
               <a-radio-group v-model:value="valueE1">
@@ -220,6 +221,7 @@
                 </div>
               </a-radio-group>
             </div>
+           <!--
             <div class="b_sup" :style="{ display: bs_hs ? 'block' : 'none' }">
               <div class="ofmb_items">
                 <div class="signbox">
@@ -229,6 +231,7 @@
                       alt=""
                     />
                   </div>
+                
                   <span>是否设置目录</span>
                 </div>
                 <a-radio-group v-model:value="valueE2">
@@ -254,7 +257,7 @@
                   </div>
                 </a-radio-group>
               </div>
-            </div>
+            </div> -->
             <div class="b_footer">
               <div class="btn btn5" @click="of_exit1">
                 <div class="btnText">取消</div>
@@ -3381,7 +3384,7 @@ export default defineComponent({
       value4: "",
       //选择线上还是面授
       xzinputV1: "",
-      valueE1: "",
+      valueE1: 2,
       valueE2: "",
       //确定面授
       ft_eidt: false,
@@ -4187,7 +4190,12 @@ export default defineComponent({
       }
     };
     const createft = () => {
-      if (state.bs_hs == false && state.valueE1 != "") {
+      if(!state.valueE1  || !state.xzinputV1){
+        message.destroy();
+        return message.warning("请输入必填项");
+      }
+      console.log(" state.valueE1", state.valueE1,!state.bs_hs && state.valueE1 == 2,state.bs_hs,state.valueE1 == 2);
+      if (state.bs_hs && state.valueE1 == 2) {
         state.of_hs = false;
         // state.ft_hs = true;
         CourseModalRef.value.visibleOpen(null, state.xzinputV1);
@@ -4195,12 +4203,14 @@ export default defineComponent({
         state.valueE1 = "";
         state.teacher = "";
         state.teacherName = "";
+       
         state.qdms_inputV1 = state.xzinputV1;
         state.xzinputV1 = "";
+        console.log("qdms_inputV1", state.qdms_inputV1 );
         getDictList("faceclassPic");
         getTea();
       }
-      if (state.bs_hs && state.valueE1 != "") {
+      if (state.bs_hs && state.valueE1 == 1) {
         state.addOnlineCoursevisible = true;
       }
     };

src/views/courselibrary/courseModal.vue

@@ -31,7 +31,7 @@
       <!-- 审核理由 -->
       <div v-if="statusJuJue" class="statusJuJue">
         <span>审核意见：</span>
-        <span>-</span>
+        <span>{{auditDescription}}</span>
       </div>
       <div class="faceteach" :style="{ display: ft_hs ? 'block' : 'none' }">
         <div class="ft_main">
@@ -372,7 +372,7 @@ import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import FJUpload from "@/components/common/FJUpload";
 import * as moment from "moment";
-
+import * as api2 from "../../api/indexAudit"
 export default defineComponent({
   components: {
     Editor,
@@ -401,6 +401,7 @@ export default defineComponent({
       tags_val: [],
       qdms_inputV6: "",
       imgList: [],
+      auditDescription:"",
     });
 
     const visibleOpen = (offcourseId, name) => {
@@ -640,6 +641,19 @@ 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,
+          pageNo: 1,
+	        pageSize: 1,
+        }
+        api2.auditList(obj).then((res)=>{
+         state.auditDescription = res.data.data.rows[0].description;
+         console.log("state.auditDescription",state.auditDescription);
+        })
+
+      }
 
       state.qdms_inputV1 = item.name;
       state.feng_mian_1 = item.picUrl;

src/views/projectcenter/LibraryAdd.vue

@@ -279,34 +279,43 @@
                 <div class="ntc_body">
                   <div class="ntc_switch">
                     <a-switch
-                      size="small"
+                        size="small"
-                      v-model:checked="checked"
+                        v-model:checked="checked"
-                      @click="changeopclo"
+                        @click="changeopclo"
                     />
-                    <div
+                    <div v-if="(checked==true)" 
-                      class="opclo"
+                      class="opclo">
-                      :style="{ display: hideshow ? 'block' : 'none' }"
-                    >
                       <span>关闭</span>
                     </div>
-                    <div
+                    <div v-if="(checked==false)" 
-                      class="opclo"
+                      class="opclo" >
-                      :style="{ display: hideshow ? 'none' : 'block' }"
-                    >
                       <span>开启</span>
                     </div>
                   </div>
-                  <div
+                  <div v-if="(checked==true)"
-                    class="ntc_content"
+                    class="ntc_content">
-                    :style="{ display: hideshow ? 'block' : 'none' }"
+                  <div class="ntcc_tit">当前公告内容：</div>
-                  >
+                    <div class="textarea">
-                    <div class="ntcc_tit">公告内容</div>
+                    {{noticeContent==""?"暂无公告":noticeContent}}
+                    <div v-if="(editFlag == false)" class="btnarea" >
+                        <div>&nbsp;</div>
+                        <div class="area_btn" @click="editNotice">
+                       
+                          <div class="btnText">编辑</div>
+                        </div>
+                      </div>
+                   
+                    </div>
+              
+                    <template v-if="(editFlag==true)">
+                    <div>&nbsp;</div>
+                    <div class="ntcc_tit" >编辑公告：</div>
                     <div class="textarea">
                       <a-textarea
-                        v-model:value="projectInfo.notice"
+                          v-model:value="projectInfo.notice"
-                        placeholder="公告信息最多输入150个字。"
+                          placeholder="公告信息最多输入150个字。"
-                        :maxlength="textnum"
+                          :maxlength="textnum"
-                        allow-clear
+                          allow-clear
                       />
                       <div class="btnarea">
                         <div>&nbsp;</div>
@@ -315,13 +324,15 @@
                           <div class="btnText">发布</div>
                         </div>
                       </div>
-                    </div>
+                      </div>
+                    </template>
                   </div>
                 </div>
               </div>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
+
         <a-tab-pane key="3" tab="项目积分">
           <div class="split"></div>
           <div class="projectscore">
@@ -852,29 +863,25 @@ export default defineComponent({
       ],
       isEdit: false, // 是否处于编辑状态
       // 基本信息
-      projectInfo: {
+      projectInfo: { },
-        beginTime: null,
+      noticeContent:"",
-        endTime: null,
+      editFlag:false,
-        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.hideshow = !state.hideshow;
+      state.projectInfo.noticeFlag = state.checked?1:0;
+      api
+        .templateEdit( state.projectInfo)
+        .then((res) => {
+          console.log(res);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     };
+
     const changecheck2 = () => {
       state.checked2 = !state.checked2;
     };
@@ -906,6 +913,10 @@ export default defineComponent({
       state.isEdit = false;
       getDetail();
     };
+    const editNotice =()=>{
+      state.editFlag = true ;
+    }
+
     const checkType = (type) => {
       let typeRules = [
         "",
@@ -933,30 +944,16 @@ export default defineComponent({
       api
         .templateDetail(localStorage.getItem("projectTemplateId"))
         .then((res) => {
-          console.log("get model list ----->", res, res.data.data.stageList);
+            console.log("get model list ----->", res, res.data.data.stageList);
 
           state.taskSyllabus = [];
           console.log(res);
-          state.projectInfo.name = res.data.data.projectTemplateInfo.name;
+          state.projectInfo = res.data.data.projectTemplateInfo;
-          state.projectInfo.beginTime = res.data.data.projectTemplateInfo.beginTime;
+     
-          state.projectInfo.endTime = res.data.data.projectTemplateInfo.endTime;
+          state.noticeContent = state.projectInfo.notice;
-          state.projectInfo.manager = res.data.data.projectTemplateInfo.manager;
+          state.checked = state.projectInfo.noticeFlag==1?true:false;
-          state.projectInfo.notice = res.data.data.projectTemplateInfo.notice;
+          console.log("res.data.data.projectTemplateInfo",res.data.data.projectTemplateInfo);
-          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;
-          state.projectId = res.data.data.projectTemplateInfo.projectTemplateId;
           try{
             state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach);
           }catch{
@@ -987,31 +984,16 @@ export default defineComponent({
         });
     };
 
-    // 发布公告
+       // 发布公告
-    const addNotice = () => {
+      const addNotice = () => {
-      console.log("ok====s");
+     // state.projectInfo.notice=
-      let obj = {
+     if(!state.projectInfo.notice){
-        name: state.projectInfo.name,
+      return message.warning("请输入公告内容");
-        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(obj)
+        .templateEdit( state.projectInfo)
         .then((res) => {
+          state.noticeContent = state.projectInfo.notice;
           message.success("公告发布成功");
           console.log(res);
         })
@@ -1019,7 +1001,9 @@ export default defineComponent({
           message.error("公告发布失败" + err);
           console.log(err);
         });
+        state.editFlag =false;
     };
+
     // 删除阶段
     const stateDel = (id) => {
       api
@@ -1051,12 +1035,12 @@ export default defineComponent({
       routered.push({
         path: "/templateAdd",
         query: {
-          projectId: state.projectId,
+          projectTemplateId: state.projectInfo.projectTemplateId,
-          name: state.name,
         },
       });
     };
 
+
     // 新建或编辑阶段
     const stateEdit = () => {
       let obj = {
@@ -1289,7 +1273,8 @@ export default defineComponent({
       editRule,
       handleChange2,
       scoresum,
-      checkedClose
+      checkedClose,
+      editNotice
     };
   },
 });