hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-13 04:46:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/views/projectcenter/ProjectAdd.vue
#	src/views/projectcenter/ProjectManage.vue
This commit is contained in:
yuping
2022-12-10 16:41:41 +08:00
parent 7864c1ec0f d3517aee53
commit c15e2c2809
4 changed files with 818 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/components/NavLeft.vue
View File

@@ -153,8 +153,8 @@
<router-link to="/coursemanage">课件管理</router-link> <router-link to="/coursemanage">课件管理</router-link>
</a-menu-item> </a-menu-item>
</a-sub-menu> </a-sub-menu>
<!-- 2022-12-10注释 后面放开 -->
<a-menu-item key="sub4" @titleClick="titleClick"> <!-- <a-menu-item key="sub4" @titleClick="titleClick">
<div class="imgBox"> <div class="imgBox">
<img <img
style="width: 19px; height: 19px" style="width: 19px; height: 19px"
@@ -162,9 +162,9 @@
/> />
</div> </div>
<span>考试中心</span> <span>考试中心</span>
</a-menu-item> </a-menu-item> -->
<!-- 2022-12-10注释 后面放开 -->
<a-menu-item key="sub5" @titleClick="titleClick"> <!-- <a-menu-item key="sub5" @titleClick="titleClick">
<div class="imgBox"> <div class="imgBox">
<img <img
style="width: 16px; height: 16px" style="width: 16px; height: 16px"
@@ -172,9 +172,9 @@
/> />
</div> </div>
<router-link to="/researchmanage">评估管理</router-link> <router-link to="/researchmanage">评估管理</router-link>
</a-menu-item> </a-menu-item> -->
<!-- 2022-12-10注释 后面放开 -->
<a-menu-item key="sub6" @titleClick="titleClick"> <!-- <a-menu-item key="sub6" @titleClick="titleClick">
<div class="imgBox"> <div class="imgBox">
<img <img
style="width: 17px; height: 15px" style="width: 17px; height: 15px"
@@ -182,9 +182,9 @@
/> />
</div> </div>
<span>报表中心</span> <span>报表中心</span>
</a-menu-item> </a-menu-item> -->
<!-- 2022-12-10注释 后面放开 -->
<a-menu-item key="sub7" @titleClick="titleClick"> <!-- <a-menu-item key="sub7" @titleClick="titleClick">
<div class="imgBox"> <div class="imgBox">
<img <img
style="width: 17px; height: 18px" style="width: 17px; height: 18px"
@@ -192,9 +192,9 @@
/> />
</div> </div>
<span>教师管理</span> <span>教师管理</span>
</a-menu-item> </a-menu-item> -->
<!-- 2022-12-10注释 后面放开 -->
<a-menu-item key="sub8" @titleClick="titleClick"> <!-- <a-menu-item key="sub8" @titleClick="titleClick">
<div class="imgBox"> <div class="imgBox">
<img <img
style="width: 20px; height: 20px" style="width: 20px; height: 20px"
@@ -202,18 +202,17 @@
/> />
</div> </div>
<span>证书中心</span> <span>证书中心</span>
<!-- <router-link to="/certificatecenter">证书中心</router-link> --> </a-menu-item> -->
</a-menu-item> <!-- <a-menu-item key="sub9" @titleClick="titleClick">
<a-menu-item key="sub9" @titleClick="titleClick">
<div class="imgBox"> <div class="imgBox">
<img <img
style="width: 19px; height: 18px" style="width: 19px; height: 18px"
src="../assets/images/navleft/system.png" src="../assets/images/navleft/system.png"
/> />
</div> </div>
<span>系统管理</span> <span>系统管理</span> -->
<!-- <router-link to="/systemmanage">系统管理</router-link> --> <!-- <router-link to="/systemmanage">系统管理</router-link> -->
</a-menu-item> <!-- </a-menu-item> -->
</a-menu> </a-menu>
</div> </div>
<div <div
@@ -243,8 +242,8 @@
<a-menu-item key="sub3" @titleClick="titleClick"> <a-menu-item key="sub3" @titleClick="titleClick">
<router-link to="/coursewaremanage">课程</router-link> <router-link to="/coursewaremanage">课程</router-link>
</a-menu-item> </a-menu-item>
<!-- 2022-12-10注释 后面放开 -->
<a-menu-item key="sub4" @titleClick="titleClick"> <!-- <a-menu-item key="sub4" @titleClick="titleClick">
<span>考试</span> <span>考试</span>
</a-menu-item> </a-menu-item>
@@ -265,7 +264,7 @@
</a-menu-item> </a-menu-item>
<a-menu-item key="sub9" @titleClick="titleClick"> <a-menu-item key="sub9" @titleClick="titleClick">
<span>系统</span> <span>系统</span>
</a-menu-item> </a-menu-item> -->
</a-menu> </a-menu>
</div> </div>
</div> </div>

2
src/components/drawers/AddFaceteach.vue
View File

@@ -36,7 +36,7 @@
<a-input <a-input
v-model:value="courseName" v-model:value="courseName"
style="width: 423px; height: 32px" style="width: 423px; height: 32px"
placeholder="请输入名称，最多输入20个字" placeholder="请输入名称"
:maxlength="20" :maxlength="20"
/> />
<div class="inp_num" style="position: absolute; right: 7px"> <div class="inp_num" style="position: absolute; right: 7px">

40
src/views/projectcenter/ProjectAdd.vue
View File

@@ -77,7 +77,10 @@
height: 100px; height: 100px;
margin-bottom: 4px; margin-bottom: 4px;
margin-right: 4px; margin-right: 4px;
" :src="src.value" alt="avatar"/> "
:src="src.value"
alt="avatar"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -242,7 +245,13 @@
<div class="footer"> <div class="footer">
<div class="btn"> <div class="btn">
<a-button @click="backPage" class="btn2">取消</a-button> <a-button @click="backPage" class="btn2">取消</a-button>
<a-button v-on:click="createProject" type="primary" class="btn1" style="margin-left: 20px">确定</a-button> <a-button
v-on:click="createProject"
type="primary"
class="btn1"
style="margin-left: 20px"
>确定</a-button
>
</div> </div>
</div> </div>
</div> </div>
@@ -253,6 +262,7 @@ 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 * 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 TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass"; import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
@@ -265,6 +275,7 @@ export default {
components: { components: {
ProjectManager, ProjectManager,
ProjectLevel, ProjectLevel,
// ProjectClass,
TrainClass, TrainClass,
OrgClass, OrgClass,
}, },
@@ -314,10 +325,21 @@ export default {
state.projectInfo.parentName = routers.query.parentName; state.projectInfo.parentName = routers.query.parentName;
state.projectInfo.parentId = routers.query.parentId; state.projectInfo.parentId = routers.query.parentId;
state.projectInfo.projectId = routers.query.projectId; state.projectInfo.projectId = routers.query.projectId;
(state.projectInfo.projectId || state.projectInfo.parentId) && api.getProjectDetail({projectId: state.projectInfo.projectId || state.projectInfo.parentId}) (state.projectInfo.projectId || state.projectInfo.parentId) &&
.then(res => { api
state.projectInfo = {...res.data.data.projectInfo, ...state.projectInfo}; .getProjectDetail({
state.projectInfo.rangeTime = [state.projectInfo.beginTime, state.projectInfo.endTime,]; projectId:
state.projectInfo.projectId || state.projectInfo.parentId,
})
.then((res) => {
state.projectInfo = {
...res.data.data.projectInfo,
...state.projectInfo,
};
state.projectInfo.rangeTime = [
state.projectInfo.beginTime,
state.projectInfo.endTime,
];
state.courseSyncFlag = !!state.projectInfo.courseSyncFlag; state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
}); });
} }
@@ -419,8 +441,10 @@ export default {
}; };
function managerChange(e, l, d) { function managerChange(e, l, d) {
!state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongId = d) !state.projectInfo.sourceBelongId &&
!state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongName = d) (state.projectInfo.sourceBelongId = d);
!state.projectInfo.sourceBelongId &&
(state.projectInfo.sourceBelongName = d);
} }
return { return {

8
src/views/projectcenter/ProjectManage.vue
View File

@@ -822,6 +822,7 @@ import * as api from "../../api/index";
import * as api1 from "../../api/index1"; import * as api1 from "../../api/index1";
import { storage } from "../../api/storage"; import { storage } from "../../api/storage";
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
// import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass"; import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass"; import OrgClass from "@/components/project/OrgClass";
import dayjs from "dayjs"; import dayjs from "dayjs";
@@ -835,6 +836,7 @@ export default {
ProjPowerList, ProjPowerList,
ProjCheckShip, ProjCheckShip,
ProjectManager, ProjectManager,
// ProjectClass,
OrgClass, OrgClass,
TrainClass, TrainClass,
// ProjManageShip // ProjManageShip
@@ -1790,8 +1792,10 @@ export default {
); );
function managerChange(e, l, d) { function managerChange(e, l, d) {
!state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongId = d) !state.projectInfo.sourceBelongId &&
!state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongName = d) (state.projectInfo.sourceBelongId = d);
!state.projectInfo.sourceBelongId &&
(state.projectInfo.sourceBelongName = d);
} }
return { return {