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

src/App.vue

@@ -41,7 +41,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.05------------");
+    console.log("版本0.06------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

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-11-29 17:09:48
+ * @LastEditTime: 2022-11-30 15:03:21
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -53,7 +53,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');
       }
       console.log("api %o", msg);
     }

src/api/index1.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-29 18:17:23
+ * @LastEditTime: 2022-11-30 10:39:27
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -130,7 +130,7 @@ export const orgtree = () => http.get("/org/tree");
 //获取积分列表
 export const noticeList = (projectId) =>
 	http.post(
-		`http://localhost:8080/api/admin/project/noticeList?projectId=` +
+		`/admin/project/noticeList?projectId=` +
 		projectId +
 		``
 	);

src/components/drawers/AddFaceteach.vue

@@ -92,7 +92,7 @@
             </div>
             <div class="btnbox">
               <a-auto-complete
-                v-model:value="memberValue"
+                v-model:value="memberValue.label"
                 show-search
                 :not-found-content="fetching ? undefined : null"
                 placeholder="Select a teacher"
@@ -458,7 +458,7 @@ export default {
     });
     const clear = () => {
       state.courseName = "";
-      state.memberValue = null;
+      state.memberValue = {};
       state.duration = null;
       state.address = null;
       state.before=null;
@@ -569,7 +569,7 @@ export default {
       if (
         state.courseName == "" ||
         state.chooseCourse == null ||
-        state.memberValue == "" ||
+        state.memberValue == {} ||
         state.chooseTime == [] ||
         state.duration == "" ||
         state.address == ""
@@ -718,9 +718,9 @@ export default {
     };
     // 获取员工
     const queryMember = () => {
-      if (!state.memberValue) return;
+      if (!state.memberValue || !state.memberValue.label) return;
       let obj = {
-        keyWord: state.memberValue,
+        keyWord: state.memberValue.label,
         id: 0,
         org: 0,
         pageNo: state.currentPage,
@@ -747,7 +747,7 @@ export default {
       options.value = [];
       state.fetching = true;
       state.currentPage = 1;
-      state.memberValue = memberValue;
+      state.memberValue.label = memberValue;
       queryMember();
       state.fetching = false;
     }, 300);

src/components/drawers/AddTest.vue

@@ -16,7 +16,7 @@
         />
       </div>
 
-      <div style="display: flex; flex-direction: row; padding-top:32px;">
+      <div style="display: flex; flex-direction: row; padding-top: 32px">
         <button
           style="width: 100px"
           @click="changeOuter(1)"
@@ -32,7 +32,6 @@
           外部考试
         </button>
       </div>
-
       <a-form
         v-if="isOuter == 1"
         ref="formRef"
@@ -267,7 +266,6 @@
                     style="width: 88px; height: 32px; margin-left: 35px"
                   />
                 </a-form-item>
-
                 <span style="margin-left: 8px">分</span>
               </div>
             </div>
@@ -311,7 +309,6 @@
           <a-button class="btn2" html-type="submit">确定</a-button>
         </div>
       </a-form>
-
       <a-form
         v-else
         ref="formRef"
@@ -342,7 +339,6 @@
                 </a-form-item>
               </div>
             </div>
-
             <div class="main_item">
               <div class="btnbox">
                 <a-form-item
@@ -383,8 +379,6 @@
           <a-button class="btn2" html-type="submit">确定</a-button>
         </div>
       </a-form>
-
-
     </div>
     <!--  加载动画 -->
     <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
@@ -406,7 +400,6 @@ import STest from "./SelectTest.vue";
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 import { addTempTask } from "../../api/indexTaskadd";
 import dayjs from "dayjs";
-
 export default {
   name: "AddTest",
   components: {
@@ -461,7 +454,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    projectTemplateId:{
+    projectTemplateId: {
       type: Number,
       default: null,
     },
@@ -469,9 +462,9 @@ export default {
   setup(props, ctx) {
     const formState = reactive({
       examinationName: "",
-      examinationDuration:0,
+      examinationDuration: 0,
       examinationLimit: "",
-      passLine:null,
+      passLine: null,
       examinationEndTime: "",
       examinationExplain: "",
       questionArrangement: 1,
@@ -479,7 +472,7 @@ export default {
       showAnalysis: 2,
       showAnswers: 2,
       choosedTime: "",
-      paperName:"",
+      paperName: "",
       choosedTest: [
         {
           key: 1,
@@ -501,8 +494,8 @@ export default {
       STvisible: false, //选择试卷抽屉
       paperId: null, //试卷id 子组件传过来给考试抽屉创建考试信息需要
       paperName: "", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用
-      id:"",
+      id: "",
-      testName:"",
+      testName: "",
       choosedTestList: [
         {
           value: "提高核心竞争力",
@@ -623,7 +616,6 @@ export default {
         },
       ],
     };
-
     const options1 = ref([
       {
         label: "math",
@@ -637,11 +629,9 @@ export default {
     const handleFinish = () => {
       updateTest();
     };
-
     const handleFinishFailed = () => {
       message.error("handleFinishFailed");
     };
-
     const resetForm = () => {
       formRef.value.resetFields();
       state.paperName = "";
@@ -649,12 +639,10 @@ export default {
       state.id = "";
       state.testName = "";
     };
-
     const handleValidate = (...args) => {
       console.log(args);
     };
     const closeDrawer = () => {
-     
       formState.choosedTime = "";
       ctx.emit("update:addtestVisible", false);
       ctx.emit("update:edit", false);
@@ -669,11 +657,9 @@ export default {
         queryTest();
       }
     };
-
     const selectTest = () => {
       state.STvisible = true;
     };
-
     const delTag = () => {
       state.paperId = 0;
       state.paperName = "";
@@ -734,8 +720,8 @@ export default {
         scoringModel: formState.scoringModel,
         showAnalysis: formState.showAnalysis,
         showAnswers: formState.showAnswers,
-        examinationTestId:state.id,
+        examinationTestId: state.id,
-        examinationTestName:state.testName,
+        examinationTestName: state.testName,
       };
       if (props.edit) {
         // 编辑任务
@@ -759,12 +745,11 @@ export default {
           });
       }
     };
-
     const updateTask = (res) => {
       state.EditTestId = res.data.data.examinationId;
-      if(props.faceLevel){
+      if (props.faceLevel) {
         state.EditTestId = res.data.data.examinationId;
-      }else{
+      } else {
         if (props.isLevel == 1) {
           let editObj1 = {
             chapterId: props.isactive,
@@ -822,9 +807,7 @@ export default {
             });
         }
       }
-  
     };
-
     const cloradio1 = (value) => {
       if (value != "") {
         formState.showAnswers = "";
@@ -864,8 +847,8 @@ export default {
     const getData = (value) => {
       state.paperId = value.paperId;
       state.paperName = value.testName;
-      state.id =  value.id
+      state.id = value.id;
-      state.testName = value.testName
+      state.testName = value.testName;
     };
     return {
       formState,

src/views/courselibrary/CoursewareManage.vue

@@ -4813,7 +4813,7 @@ export default defineComponent({
           deptList: res[1],
           groupList: res[2],
           offcourseId: state.offcourseId,
-          offcoursePlanId: "",
+          offcoursePlanId: state.offcoursePlanId, //开课id
           studentList: res[0],
         };
         console.log("obj", obj);

src/views/examine/CourseReviewedN.vue

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-16 20:59:33
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-24 16:21:04
+ * @LastEditTime: 2022-11-29 22:30:01
  * @FilePath: /fe-manage/src/views/examine/CourseReviewedN.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -592,6 +592,7 @@ export default {
       state.chooseId = id;
       state.chooseCreater = creater;
       state.chooseOffId = offId;
+      getFaceList();
     };
     const closeCourAuditModal = () => {
       state.courAuditModal = false;

src/views/learningpath/LearningPath.vue

@@ -210,7 +210,7 @@
                 class="learnBgItem"
                 :style="{
                   border:
-                    learnPathBg === item.dictCode
+                    pathBgId === item.dictCode
                       ? '2px solid rgba(78, 166, 255, 1)'
                       : '1px solid #C7CBD2',
                   'background-image': 'url(' + item.dictValue + ')',
@@ -344,7 +344,7 @@
                 class="learnBgItem"
                 :style="{
                   border:
-                    learnPathBg2 === item.dictCode
+                    pathBgId === item.dictCode
                       ? '2px solid rgba(78, 166, 255, 1)'
                       : '1px solid #ccc',
                   'background-image': 'url(' + item.dictValue + ')',
@@ -670,7 +670,7 @@
             class="learnBgItem"
             :style="{
               border:
-                learnPathBg2 === item.id
+                pathBgId === item.id
                   ? '2px solid rgba(78, 166, 255, 1)'
                   : '1px solid #ccc',
               'background-image': 'url(' + item.source + ')',
@@ -749,8 +749,8 @@ export default {
         //   source: require("../../assets/images/leveladd/1.png"),
         // },
       ],
-      learnPathBg: null, //创建路径选择的路径图背景
+      // learnPathBg: null, //创建路径选择的路径图背景
-      learnPathBg2: null, //编辑路径选择的路径图背景
+      // learnPathBg2: null, //编辑路径选择的路径图背景
       pub: false, //发布弹窗
       checked: false, //发布弹窗switch
       checkedTeacher: false, //发布弹窗勾选
@@ -784,7 +784,8 @@ export default {
       ], //归属组织
       organizationSelectName: null, //归属组织选择名称
       organizationSelectId: null, //归属组织选择id
-      pathBg: "", //路径图选择背景
+      pathBg: null, //路径图选择背景
+      pathBgId: null, //路径图选择id
       pathIntro: "", //路径说明
       createLoading: false, //创建路径loading
       deletePathId: null, //删除路径id
@@ -849,6 +850,7 @@ export default {
       // console.log("打开创建路径弹窗");
       state.pathName = "";
       state.pathBg = "";
+      state.pathBgId = "";
       state.organizationSelectName = null;
       state.organizationSelectId = null;
       state.pathIntro = "";
@@ -857,6 +859,7 @@ export default {
     const handleOut1 = () => {
       state.pathName = "";
       state.pathBg = "";
+      state.pathBgId = "";
       state.organizationSelectName = null;
       state.organizationSelectId = null;
       state.pathIntro = "";
@@ -865,11 +868,13 @@ export default {
     };
     const chooseImg = (item) => {
       // console.log(item);
-      state.learnPathBg = item.dictCode;
+      state.pathBgId = item.dictCode;
+      state.pathBg = item.dictValue;
     };
     const chooseImg2 = (item) => {
       // console.log(item);
-      state.learnPathBg2 = item.dictCode;
+      state.pathBgId = item.dictCode;
+      state.pathBg = item.dictValue;
     };
     //发布弹窗
     const showPub = (routerId) => {
@@ -1141,14 +1146,9 @@ export default {
                       <div
                         class="jc"
                         onClick={() => {
-                          console.log("text.record", text.record);
+                          // console.log("text.record", text.record);
-                          state.out1 = true;
+
-                          state.pathName = text.record.manager;
+                          getLearnPathInfo(text.record);
-                          // state.pathBg = "";
-                          // state.organizationSelectName = null;
-                          // state.organizationSelectId = null;
-                          state.pathIntro = text.record.remark;
-                          state.editPathId = text.record.id;
                         }}
                       >
                         编辑
@@ -1418,11 +1418,14 @@ export default {
         message.destroy();
         return message.warning("请输入路径图名称");
       }
-
+      if (!state.organizationSelectName) {
-      // if (!state.organizationSelectName){
+        message.destroy();
-      // 	 message.destroy();
+        return message.warning("请选择归属组织");
-      // 	 return message.warning("请选择归属组织");
+      }
-      // }
+      if (!state.pathBg) {
+        message.destroy();
+        return message.warning("请选择背景图");
+      }
       state.lpLoading = true;
       let obj = {
         name: state.pathName,
@@ -1520,17 +1523,39 @@ export default {
           console.log("删除失败", err);
         });
     };
+
+    //获取路径图详细信息
+    const getLearnPathInfo = (item) => {
+      state.out1 = true;
+      state.pathName = item.manager;
+      state.pathBg = "";
+      state.pathBgId = "";
+      state.organizationSelectName = null;
+      state.organizationSelectId = null;
+      state.pathIntro = item.remark;
+      state.editPathId = item.id;
+      console.log("state.imgData", state.imgData);
+      let arr = state.imgData;
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].dictCode === state.pathBgId) {
+          state.pathBgId = arr[i].dictValue;
+        }
+      }
+    };
     //编辑学习路径图
     const editLearnPath = () => {
       if (!state.pathName) {
         message.destroy();
         return message.warning("请输入路径图名称");
       }
-
+      if (!state.organizationSelectName) {
-      // if (!state.organizationSelectName){
+        message.destroy();
-      // 	 message.destroy();
+        return message.warning("请选择归属组织");
-      // 	 return message.warning("请选择归属组织");
+      }
-      // }
+      if (!state.pathBgId) {
+        message.destroy();
+        return message.warning("请选择背景图");
+      }
       // state.createLoading = true;
       let obj = {
         routerId: state.editPathId,

src/views/learningpath/LevelAdd.vue

@@ -616,7 +616,7 @@
                   <div style="width: 5px; display: inline-block"></div>
                   <span class="yi">项</span>
                   <span class="zon">列表选项总数：</span>
-                  <span class="th">{{ tableData.length }}</span>
+                  <span class="th">{{ tableDataTotal }}</span>
                   <span class="yi"> 条</span>
                 </div>
               </div>
@@ -648,6 +648,7 @@
                     @change="pageChange"
                     class="pagination"
                     style="display: block"
+                    v-if="tableDataTotal > 10"
                   />
                 </div>
               </div>
@@ -1333,7 +1334,7 @@ export default {
       fileList: [],
       docChecked: true,
       currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: -1,
       pageSize: 10,
       visiblene: false,
       sh: false,
@@ -1494,6 +1495,7 @@ export default {
           key: "opacation",
           width: 140,
           align: "center",
+          fixed: "right",
           scopedSlots: { customRender: "action" }, //引入的插槽
           customRender: (text) => {
             return (
@@ -1642,13 +1644,14 @@ export default {
         name: "",
         pageNo: state.currentPage,
         pageSize: 10,
-        routerId: 100,
+        routerId: state.routerId,
       };
       api
         .getStudent(obj)
         .then((res) => {
           console.log("获取学员列表", res);
           let data = res.data.data.rows || null;
+          state.tableDataTotal = res.data.data.total;
           state.tableData = [];
           if (data.length) {
             for (let i in data) {
@@ -1656,7 +1659,7 @@ export default {
               state.tableData.push({
                 key: data[i].studentId,
                 com: data[i].userInfoBo.deptName,
-                name: data[i].userInfoBo.userName,
+                name: data[i].name,
                 gang: data[i].userInfoBo.jobName,
                 cur: data[i].currentChapterName || "0",
                 jin: data[i].completeChapterCnt + "/" + data[i].totalChapterCnt,
@@ -2086,6 +2089,7 @@ export default {
           .then((res) => {
             console.log("添加学员成功", res);
             message.success("添加学员成功");
+            getStudent();
           })
           .catch((err) => {
             console.log("添加学员失败", err);

src/views/projectcenter/ProjectManage.vue

@@ -576,7 +576,7 @@
     <!-- 编辑多层项目弹窗 - end -->
     <!-- 创建多层子项目弹窗 -->
     <div>
-      <a-modalbe
+      <a-modal
         v-model:visible="doublesonpro"
         :title="null"
         @ok="closeModal3"
@@ -705,7 +705,7 @@
             >
           </div>
         </div>
-      </a-modalbe>
+      </a-modal>
     </div>
     <!-- 创建多层子项目弹窗 -->
     <!-- 编辑多层子项目弹窗 start-->
@@ -2054,9 +2054,10 @@ export default {
       console.log("点击发布");
       let obj = {
         projectId: state.releaseProjectId,
+        type: 4,
       };
       api
-        .releaseProject(obj)
+        .handleProject(obj)
         .then((res) => {
           console.log("发布成功", res);
           message.destroy();
@@ -2081,7 +2082,7 @@ export default {
     const recallProject = () => {
       let obj = {
         projectId: state.recallProjectId,
-        type: 0,
+        type: -4,
       };
       api
         .handleProject(obj)

src/views/projectcenter/SonProject.vue

@@ -672,6 +672,9 @@ export default {
             // state.tableDataTotal = res.data.data.total;
             // return res.data.data.rows;
           }
+        })
+        .catch((err) => {
+          console.log("获取学员失败", err);
         });
     };
     getMember();

src/views/projectcenter/TaskPage.vue

@@ -576,12 +576,33 @@
                       "
                     >
                       <div class="groupname" style="width: 42px">部门：</div>
-                      <a-select
+                      <a-tree-select
+                        :getPopupContainer="
+                          (triggerNode) => {
+                            return triggerNode.parentNode || document.body;
+                          }
+                        "
+                        v-model:value="valuestub"
+                        :dropdown-style="{
+                          maxHeight: '400px',
+                          overflow: 'auto',
+                        }"
+                        placeholder="请选择部门"
+                        :options="bum"
+                        @change="handleChangeBum"
+                        :tree-data="bum"
+                        :fieldNames="{
+                          children: 'treeChildList',
+                          label: 'name',
+                          value: 'id',
+                        }"
+                      ></a-tree-select>
+                      <!-- <a-select
                         v-model:value="valuestub"
                         placeholder="请选择部门"
                         :options="bum"
                         @change="handleChangeBum"
-                      />
+                      /> -->
                     </div>
                     <div
                       style="
@@ -1645,7 +1666,7 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, onMounted, watch } from "vue";
+import { reactive, toRefs, onMounted, watch, computed } from "vue";
 import { useRoute } from "vue-router";
 import { useRouter } from "vue-router";
 // import { CaretRightOutlined } from "@ant-design/icons-vue";
@@ -1685,6 +1706,7 @@ import { toDate } from "../../api/method";
 import projSet from "../../components/Modals/projSet";
 import { overview } from "../../api/indexProjStu";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
+import { useStore } from "vuex";
 export default {
   name: "taskPage",
   components: {
@@ -1709,6 +1731,7 @@ export default {
     TwoDimensionalCode,
   },
   setup() {
+    const store = useStore();
     const state = reactive({
       projectId: storage.get("projectId")
         ? JSON.parse(storage.get("projectId"))
@@ -1734,11 +1757,11 @@ export default {
         },
       ],
       bum: [
-        {
+        // {
-          id: 1,
+        //   id: 1,
-          value: "",
+        //   value: "",
-          label: "",
+        //   label: "",
-        },
+        // },
       ],
       changeGoods: [], //更改是否优秀的id数组
       choosedStageId: 1, // 选择的阶段id
@@ -2362,6 +2385,10 @@ export default {
     console.log("route:", router.query.id);
 
     // 输入接入 -- start --
+    // 资源归属 sourceBelongId 后续给接口
+    state.bum = computed(() => {
+      return store.state.orgtreeList ? store.state.orgtreeList : [];
+    });
 
     //任务大纲渲染
     const getTaskList = () => {
@@ -3192,6 +3219,7 @@ export default {
     const getStu = (obj) => {
       let objf = obj || {
         deptIds: [], //部门
+        groupId: 0,
         groupName: "",
         name: "",
         pageNo: state.currentPageStu,
@@ -3199,8 +3227,9 @@ export default {
         projectId: state.projectId,
         topFlag: "",
       };
-      getProjStu(objf).then((res) => {
+      getProjStu(objf)
-        console.log(res.data, "获取学员列表");
+        .then((res) => {
+          console.log("获取学员列表", res.data);
           if (res.data.code === 200) {
             let leng = res.data.data.rows.length;
             state.total = res.data.data.total;
@@ -3210,6 +3239,9 @@ export default {
               // studentData();
             }
           }
+        })
+        .catch((err) => {
+          console.log("获取学员列表失败", err);
         });
     };
     //获取项目信息
@@ -3275,18 +3307,18 @@ export default {
             : "-";
         // state.fileList=info.attach.split(",")
         let d = info.attach.indexOf(",");
-        console.log(info.attach, "xgo", info.attach.length);
+        // console.log(info.attach, "xgo", info.attach.length);
         if (info.attach.length == 0) {
           return;
         } else if (info.attach.length !== 0 && d == -1) {
           return;
         } else {
-          console.log(info.attach, "xgo");
+          // console.log(info.attach, "xgo");
           // let str = JSON.parse(info.attach)
           // console.log("赚回来",str)
           // let luj = info.attach.split(",")
           let luj = info.attach;
-          console.log("lulj", luj);
+          // console.log("lulj", luj);
           console.log("赚回来", JSON.parse(luj));
           state.fileList = JSON.parse(luj);
           // state.fileList = luj
@@ -3686,6 +3718,7 @@ export default {
           .then((res) => {
             console.log("添加学员成功", res);
             message.success("添加学员成功");
+            getStu();
           })
           .catch((err) => {
             console.log("添加学员失败", err);