Merge remote-tracking branch 'origin/develop' into develop

src/api/config.js

@@ -2,11 +2,11 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 17:51:50
+ * @LastEditTime: 2022-12-14 20:56:10
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 import axios from "axios";
 import router from "@/router";
 // import { getCookie } from '../api/method'
@@ -20,7 +20,7 @@ const http = axios.create({
   baseURL: process.env.VITE_BASE_API,
   timeout: 1000 * 15,
   // headers: { "Content-Type": "multipart/form-data" },
-    headers: {"Content-Type": "application/json"},
+  headers: { "Content-Type": "application/json" },
 });
 
 http.interceptors.request.use(
@@ -50,14 +50,14 @@ http.interceptors.response.use(
   (response) => {
     // console.log('response', response)
     const {
-            data: {code, msg},
+      data: { code, msg },
     } = response;
     // console.log('code', code)
     if (code === 0 || code === 200) {
       return response;
     } else {
       if (code === 1000) {
-                process.env.NODE_ENV === 'development' ? router.push({path: 'login'}) : (window.location.href = process.env.VITE_LOGIN_URL)
+        process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VITE_LOGIN_URL)
       }
       console.log("api %o", msg);
     }

src/api/method.js

@@ -278,7 +278,7 @@ const organizationalTree = []
 //嵌套页面
 const iframeUrl = "https://u-pre.boe.com/pc/iframe"
 //学员端路由
-const studentUrl = 'https://u.boe.com/pc/uc/study/courses'
+const studentUrl = 'https://u-pre.boe.com/pc/loading'
 
 //二维码
 const codeUrl = "https://u-pre.boe.com"

src/components/drawers/AddProject.vue

@@ -54,7 +54,7 @@
               </div>
             </div>
           </div>
-          <div class="mi_btns" style="margin-left:0px;">
+          <div class="mi_btns" style="margin-left: 0px">
             <div class="btn btn1">
               <div class="search"></div>
               <div class="btnText" @click="searchProjectList()">搜索</div>
@@ -225,8 +225,9 @@
 import { reactive, toRefs } from "vue";
 import { RouterEditTask } from "@/api/indexTask";
 import { message } from "ant-design-vue";
-import * as apiProj from "../../api/index.js";
+// import * as apiProj from "../../api/index.js";
 import dayjs from "dayjs";
+import * as indexAudit from "../../api/indexAudit";
 
 export default {
   name: "AddProject",
@@ -309,28 +310,28 @@ export default {
           title: "项目名称",
           dataIndex: "name",
           key: "projectName",
-          width:"40%",
+          width: "40%",
           ellipsis: true,
         },
         {
           title: "项目经理",
           dataIndex: "manager",
           key: "manager",
-          width:"20%",
+          width: "20%",
           align: "center",
         },
         {
           title: "创建人",
           dataIndex: "creater",
           key: "creater",
-          width:"20%",
+          width: "20%",
           align: "center",
         },
         {
           title: "创建时间",
           dataIndex: "time",
           key: "time",
-          width:"20%",
+          width: "20%",
           align: "center",
         },
       ];
@@ -400,8 +401,8 @@ export default {
     // TODO 这里后续需要给接口或者改动
     // 获取所有，确定分页位置
     const getCurrentPage = () => {
-      apiProj
+      indexAudit
-        .getProjectList({
+        .auditlist({
           createName: state.inputV1,
           manager: state.inputV2,
           name: state.inputV3,
@@ -450,8 +451,8 @@ export default {
         status: 3,
       });
 
-      apiProj
+      indexAudit
-        .getProjectList({
+        .auditlist({
           createName: state.inputV3,
           manager: state.inputV2,
           name: state.inputV1,
@@ -551,7 +552,7 @@ export default {
 
     const updateTask = async (res) => {
       if (props.isLevel == 1) {
-        if(!props.isactive){
+        if (!props.isactive) {
           message.destroy();
           return message.warning("请先选中关卡");
         }
@@ -991,7 +992,6 @@ export default {
         color: #fff;
       }
     }
-    
   }
 }
 </style>

src/views/projectcenter/ProjectAdd.vue

@@ -36,12 +36,19 @@
               class="nameimg"
               src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">项目名称</div>
+            <div class="inname">
+              {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
+            </div>
           </div>
           <div class="in">
-            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name"
+            <NameInput
-                       v-model:validate="projectInfo.validate" :maxlength="30" show-count
+              placeholder="请输入项目名称"
-                       :id="projectInfo.projectId"></NameInput>
+              v-model:value="projectInfo.name"
+              v-model:validate="projectInfo.validate"
+              :maxlength="30"
+              show-count
+              :id="projectInfo.projectId"
+            ></NameInput>
           </div>
         </div>
         <div class="name flex-top">
@@ -217,7 +224,7 @@
             <div class="inname" style="margin-top: 13px">审核意见</div>
           </div>
           <div class="description">
-           {{auditDescription}}
+            {{ auditDescription }}
           </div>
         </div>
       </div>
@@ -256,28 +263,27 @@
           class="btn1"
           style="margin-left: 20px"
           >确定
-        </a-button
+        </a-button>
-        >
       </div>
     </div>
   </div>
 </template>
 <script>
-import {onMounted, reactive, toRefs, watch} from "vue";
+import { onMounted, reactive, toRefs, watch } from "vue";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
-import {useRoute, useRouter} from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import * as api from "../../api/index";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 // import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
-import {changeOwnership, scrollLoad} from "@/api/method";
+import { changeOwnership, scrollLoad } from "@/api/method";
-import {storage} from "../../api/storage";
+import { storage } from "../../api/storage";
 import * as api2 from "../../api/indexAudit";
-import {validateName} from "@/api/index1";
+import { validateName } from "@/api/index1";
 
 export default {
   name: "projectAdd",
@@ -308,7 +314,7 @@ export default {
       },
       classifyList5: [],
       courseSyncFlag: false,
-      auditDescription:"",
+      auditDescription: "",
     });
 
     // 封面图选择
@@ -324,6 +330,8 @@ export default {
       state.viewDetail = routers.query.viewDetail;
       getProjectInfo();
       getTemplate();
+      state.ptojectType = routers.query.ptojectType;
+      // console.log("routers.query.ptojectType", routers.query.ptojectType);
     });
 
     watch(routers.query, () => {
@@ -361,14 +369,15 @@ export default {
               };
               api2.auditList(obj).then((d) => {
                 if (d.data.code === 200) {
-                let res =d.data.data;
+                  let res = d.data.data;
                   if (res.rows && res.rows.length > 0) {
                     let i = res.rows.length;
-                  state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
+                    state.auditDescription = res.rows[i - 1].description
+                      ? res.rows[i - 1].description
+                      : "-";
                   }
                 }
               });
-        
             }
           });
     }
@@ -446,7 +455,7 @@ export default {
       return true;
     }
 
-    const createProject = async() => {
+    const createProject = async () => {
       console.log("保存", state.projectInfo);
       if (!validate(state.projectInfo, errorMsgs)) {
         return;
@@ -457,10 +466,14 @@ export default {
         message.warning('项目名称重复，请修改名称！');
         return;
       }*/
-        const offName = await validateName({name:state.projectInfo.name, type:1, id:state.projectInfo.projectId}).then(res => {
+      const offName = await validateName({
+        name: state.projectInfo.name,
+        type: 1,
+        id: state.projectInfo.projectId,
+      }).then((res) => {
         return res.data.data == 1;
       });
-         if(offName){
+      if (offName) {
         message.destroy();
         return message.warning("项目名称重复，请重新填写");
       }
@@ -469,14 +482,14 @@ export default {
       api.createProject(state.projectInfo).then((res) => {
         state.projectInfo.projectId ||
           changeOwnership("project", res.data.data.projectId, [
-          {id: res.data.data.createId, name: res.data.data.createName},
+            { id: res.data.data.createId, name: res.data.data.createName },
           ]);
         message.destroy();
         message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
         // router.back();
         router.push({
           path: "/taskpage",
-          query: {projectId: res.data.data.projectId},
+          query: { projectId: res.data.data.projectId },
         });
         storage.set("projectId", res.data.data.projectId);
       });
@@ -701,7 +714,7 @@ export default {
       .name2 {
         display: flex;
         align-items: flex-start;
-        .description{
+        .description {
           margin-top: 14px;
           margin-left: 11px;
         }

src/views/projectcenter/ProjectManage.vue

@@ -1595,6 +1595,7 @@ export default {
                         parentId: value.record.projectId,
                         parentName:
                           value.record.parentName + "——" + value.record.name,
+                        ptojectType: 3,
                       },
                     });
                   }}