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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-03 19:57:20 +08:00
parent e117dcdae4 14033bab39
commit 966c47d3f1
24 changed files with 1361 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/App.vue
View File

@@ -1,27 +1,27 @@
<template>
<div id="container" v-if="!isLogin">
<nav-top />
<nav-top/>
<div style="display: flex">
<nav-left />
<nav-left/>
<div style="flex: 1; display: flex; flex-direction: column; width: 0">
<open-pages />
<bread-crumb />
<open-pages/>
<bread-crumb/>
<main>
<a-config-provider :locale="zhCN">
<router-view />
<router-view/>
</a-config-provider>
</main>
</div>
</div>
</div>
<div id="container" v-if="isLogin">
<router-view />
<router-view/>
</div>
</template>
<script>
import { computed, defineComponent, ref, watch } from "vue";
import { useRouter, useRoute } from "vue-router";
import { useStore } from "vuex";
import {computed, defineComponent, ref, watch} from "vue";
import {useRouter, useRoute} from "vue-router";
import {useStore} from "vuex";
import NavLeft from "@/components/NavLeft";
import NavTop from "@/components/NavTop";
import OpenPages from "@/components/OpenPages";
@@ -29,6 +29,7 @@ import BreadCrumb from "@/components/BreadCrumb";
import zhCN from "ant-design-vue/es/locale/zh_CN";
import * as api from "./api/index1";
import * as api1 from "@/api/index1";
import * as api2 from "@/api/index";
export default defineComponent({
components: {
@@ -49,16 +50,17 @@ export default defineComponent({
});
watch(
() => route.path,
() => {
route.path === "/login" && (isLogin.value = true);
}
() => route.path,
() => {
route.path === "/login" && (isLogin.value = true);
}
);
const currentRouteName = computed(() => route.name);
function init() {
console.log(store);
getUserInfo();
initDict("faceclassPic");
initDict("faceclassClass");
initDict("faceclassScene");
@@ -70,25 +72,30 @@ export default defineComponent({
getOrgTree();
}
async function getUserInfo() {
const userInfo = await api2.userInfo()
store.commit("SET_USER", userInfo);
}
async function initDict(key) {
let list = localStorage.getItem(key);
if (list) {
store.commit("SET_DICT", { key, data: JSON.parse(list) });
store.commit("SET_DICT", {key, data: JSON.parse(list)});
return;
}
list = await getDictList(key);
localStorage.setItem(key, JSON.stringify(list));
store.commit("SET_DICT", { key, data: list });
store.commit("SET_DICT", {key, data: list});
}
const getDictList = (param) =>
api1
.getDict({
pageNo: 1,
pageSize: 20,
setCode: param,
})
.then((res) => res.data.data.rows);
api1
.getDict({
pageNo: 1,
pageSize: 20,
setCode: param,
})
.then((res) => res.data.data.rows);
//获取组织树
const getOrgTree = () => {
@@ -104,18 +111,18 @@ export default defineComponent({
pageSize: 20,
};
api
.getOrgInfo(obj)
.then((res) => {
console.log("组织树获取成功", res);
if (res.data.code === 200) {
// state.treeData = res.data.data;
localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
store.commit("getOrgtreeList", res.data.data);
}
})
.catch((err) => {
console.log("组织树获取失败", err);
});
.getOrgInfo(obj)
.then((res) => {
console.log("组织树获取成功", res);
if (res.data.code === 200) {
// state.treeData = res.data.data;
localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
store.commit("getOrgtreeList", res.data.data);
}
})
.catch((err) => {
console.log("组织树获取失败", err);
});
};
init();
@@ -134,7 +141,7 @@ export default defineComponent({
// font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
// sans-serif;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
Microsoft YaHei, Arial, sans-serif;
Microsoft YaHei, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;

17
src/api/index.js
View File

@@ -18,28 +18,28 @@ import http from "./config";
* name: user
* }
* }).then(res => console.log(res))
*
*
* 接口传参三种方式（post/put/patch）
*
*
* 1.'Content-Type'= 'multipart/form-data'，传参格式为 formData。
* （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'）
* （request的Header:'Content-Type'= 'multipart/form-data'）
* var formData=new FormData();
* formData.append('user',123456);formData.append('pass',12345678);
* axios.post("/notice",formData).then()
*
*
* 2.'Content-Type'= 'application/x-www-form-urlencoded'，传参格式为 query 形式,使用$qs.stringify。
* （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'）
* （request的Header:'Content-Type'= 'application/x-www-form-urlencoded'）
* let data = {"code":"1234","name":"yyyy"};
* axios.post(`${this.$url}/test/testRequest`,qs.stringify({data})).then()
*
*
* 3.'Content-Type'= 'application/json，传参格式为 raw (JSON格式)。
* （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'）
* （request的Header:'Content-Type'= 'application/json;charset=UTF-8'）
* let data = {"code":"1234","name":"yyyy"}
* axios.post(`${this.$url}/test/testRequest`,data).then()
*
*
*/
@@ -52,7 +52,7 @@ export const createProject = (obj) => http.post('/admin/project/edit', obj)
export const getProjectList = (obj) => http.post('/admin/project/list', obj)
// 获取项目详情信息（包含阶段及任务列表）
export const getProjectDetail = (obj) => http.get('/admin/project/detail', { params: obj })
export const getProjectDetail = (obj) => http.get('/admin/project/detail', {params: obj})
//发布项目
export const releaseProject = (obj) => http.post('/admin/project/publish', obj)
//获取项目学员
@@ -70,10 +70,11 @@ export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail',
//获取模版列表
export const getTemplate = (obj) => http.post('/admin/project/template/list', obj)
//获取模版详细信息
export const getTemplateDetail = (obj) => http.get('/admin/project/template/detail', { params: obj })
export const getTemplateDetail = (obj) => http.get('/admin/project/template/detail', {params: obj})
//获取项目统计
export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } })
export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', {params: {projectId: projectId}})
export const login = (obj) => http.post('/admin/CheckUser/userLogin', obj)
export const userInfo = () => http.get('/admin/CheckUser/userInfo')

BIN
src/assets/images/leveladd/pinggu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/assets/images/leveladd/xiangmu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 785 B

72
src/components/NavTop.vue
View File

@@ -2,8 +2,8 @@
<div class="navTop">
<div class="navTopMain">
<img
style="width: 205px; height: 29px; margin-left: 37px; margin-top: 22px"
src="../assets/images/navtop/logo.png"
style="width: 205px; height: 29px; margin-left: 37px; margin-top: 22px"
src="../assets/images/navtop/logo.png"
/>
<div class="navTopRight">
<div class="role">
@@ -11,10 +11,10 @@
<div class="roleArrow"></div>
<div class="roleItems">
<div
v-for="(value, index) in roleList"
:key="index"
class="roleItem"
@click="changeRole(value)"
v-for="(value, index) in roleList"
:key="index"
class="roleItem"
@click="changeRole(value)"
>
{{ value.name }}
</div>
@@ -22,14 +22,14 @@
</div>
<div class="user">
<img
style="
style="
width: 40px;
height: 40px;
margin-left: 8px;
border-radius: 15px;
margin-right: 10px;
"
:src="avatar"
:src="avatar"
/>
<div style="margin-right: 20px">{{ username }}</div>
</div>
@@ -47,20 +47,21 @@
</div> -->
<div class="signOutMain" @click="logOut">
<img
style="width: 27px; height: 27px"
src="../assets/images/navtop/signout.png"
style="width: 27px; height: 27px"
src="../assets/images/navtop/signout.png"
/>
<span class="signOut">登出</span>
</div>
</div>
</div>
</div>
<down-load v-model:downloadVisible="visible" />
<down-load v-model:downloadVisible="visible"/>
</template>
<script>
import { reactive, toRefs } from "vue";
import {reactive, toRefs} from "vue";
import DownLoad from "../components/drawers/DownLoad";
import * as api from "../api/index1";
export default {
name: "NavTop",
components: {
@@ -100,24 +101,32 @@ export default {
};
const getUser = () => {
api
.getUser()
.then((res) => {
console.log("获取登录信息成功", res);
if (res.data.code === 200) {
state.username = res.data.data.realName;
// state.avatar = res.data.data.avatar
// ? res.data.data.avatar
// : require("../assets/images/avatar.png");
state.avatar = require("../assets/images/avatar.png");
}
})
.catch((err) => {
console.log("获取登录信息失败", err);
});
.getUser()
.then((res) => {
console.log("获取登录信息成功", res);
if (res.data.code === 200) {
state.username = res.data.data.realName;
// state.avatar = res.data.data.avatar
// ? res.data.data.avatar
// : require("../assets/images/avatar.png");
state.avatar = require("../assets/images/avatar.png");
}
})
.catch((err) => {
console.log("获取登录信息失败", err);
});
};
getUser();
const logOut = () => {
localStorage.removeItem('faceclassPic');
localStorage.removeItem('faceclassClass');
localStorage.removeItem('faceclassScene');
localStorage.removeItem('projectLevel');
localStorage.removeItem('projectSys');
localStorage.removeItem('pathmapPic');
localStorage.removeItem('projectClass');
localStorage.removeItem('projectPic');
window.open("https://u-pre.boe.com/web/", "_self");
};
return {
@@ -142,9 +151,11 @@ export default {
display: flex;
justify-content: space-between;
background-color: rgba(255, 255, 255, 1);
.navTopRight {
display: flex;
}
.role {
display: flex;
align-items: center;
@@ -154,6 +165,7 @@ export default {
line-height: 36px;
cursor: pointer;
position: relative;
.roleArrow {
width: 13px;
height: 7px;
@@ -161,6 +173,7 @@ export default {
background-image: url(../assets/images/navtop/down.png);
background-size: 100%;
}
.roleItems {
width: 109px;
height: 90px;
@@ -174,22 +187,27 @@ export default {
display: none;
z-index: 100;
}
.roleItem {
font-size: 14px;
font-weight: 400;
color: rgba(79, 81, 86, 1);
line-height: 36px;
}
.roleItem:hover {
color: #4ea6ff;
}
}
.role:hover .roleItems {
display: block;
}
.role:hover .roleArrow {
background-image: url(../assets/images/navtop/up.png);
}
.user {
margin-left: 37px;
display: flex;
@@ -199,12 +217,14 @@ export default {
color: #b3bdc4;
line-height: 36px;
}
.signOutMain {
cursor: pointer;
margin-right: 29px;
display: flex;
align-items: center;
}
.signOut {
font-size: 16px;
font-weight: 400;

9
src/components/common/Upload.vue Normal file
View File

@@ -0,0 +1,9 @@
<template>
<div>12312</div>
</template>
<script setup>
import {reactive} from "vue";
const options = reactive([]);
</script>

23
src/components/drawers/ AssessmentList.vue
View File

@@ -47,7 +47,11 @@
expandRowByClick="true"
@expand="expandTable"
:pagination="false"
:row-selection="rowSelection"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
type: 'radio',
}"
filterMultiple:false
/>
@@ -101,9 +105,10 @@ export default {
tableDataTotal: 0,
tableData: [],
selectedRowKeys: [],
assessmentId:null,
assessmentId:null
});
const closeDrawer = () => {
state.selectedRowKeys = [];
ctx.emit("update:assessmentVisible", false);
ctx.emit("update:titleTag", true);
@@ -165,6 +170,19 @@ export default {
// state.selectedRowKeys = selectedRowKeys;
// };
const onSelectChange = (selectedRowKeys, selectRow) => {
console.log("selectedRowKeys changed: ", selectedRowKeys, selectRow);
state.selectedRowKeys = selectedRowKeys;
state.selectedRows = selectRow;
console.log(selectRow)
state.assessment =selectRow[0];
state.assessmentId = selectRow[0].assessmentId;
ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessmentId);
state.selectedRowKeys = [];
closeDrawer();
};
const handelChangePage = (page, pageSize) => {
state.currentPage = page;
state.pageSize = pageSize;
@@ -222,6 +240,7 @@ export default {
getAllInvistText,
resetInvist,
handelChangePage,
onSelectChange
};
},
};

198
src/components/drawers/AddDiscuss.vue
View File

@@ -1,18 +1,18 @@
<template>
<a-drawer
:visible="adddiscussVisible"
class="drawerStyle addrefDrawer"
width="80%"
placement="right"
@after-visible-change="afterVisibleChange"
:visible="adddiscussVisible"
class="drawerStyle addrefDrawer"
width="80%"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}讨论</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="contentMain">
@@ -21,19 +21,19 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">讨论名称：</span>
</div>
<div class="btnbox">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 32px"
placeholder="请输入讨论名称"
show-count
:maxlength="20"
v-model:value="inputV1"
style="width: 424px; height: 32px"
placeholder="请输入讨论名称"
show-count
:maxlength="20"
/>
</div>
</div>
@@ -43,11 +43,11 @@
</div>
<div class="textarea">
<a-textarea
v-model:value="textV1"
placeholder="请输入讨论说明"
allow-clear
show-count
:maxlength="200"
v-model:value="textV1"
placeholder="请输入讨论说明"
allow-clear
show-count
:maxlength="200"
/>
</div>
</div>
@@ -57,7 +57,8 @@
</div>
<div class="btnbox">
<a-checkbox v-model:checked="checkedC1" @change="checkRadio"
>允许评论</a-checkbox
>允许评论
</a-checkbox
>
</div>
</div>
@@ -71,12 +72,13 @@
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
import {reactive, toRefs} from "vue";
import * as api from "../../api/indexDiscuss";
import * as apiTask from "../../api/indexTaskadd";
import { RouterEditTask } from "@/api/indexTask";
import { message } from "ant-design-vue";
import { addTempTask } from "../../api/indexTaskadd";
import {RouterEditTask} from "@/api/indexTask";
import {message} from "ant-design-vue";
import {addTempTask} from "../../api/indexTaskadd";
export default {
name: "AddDiscuss",
props: {
@@ -170,15 +172,16 @@ export default {
if (props.edit) {
//编辑讨
api
.getDiscussDetail({ discussId: props.EditDiscussId })
.then((res) => {
//更新讨论信息
state.inputV1 = res.data.data.discussName;
state.textV1 = res.data.data.discussExplain;
state.checkedC1 =
res.data.data.discussSettings == "true" ? true : false;
})
.catch(() => {});
.getDiscussDetail({discussId: props.EditDiscussId})
.then((res) => {
//更新讨论信息
state.inputV1 = res.data.data.discussName;
state.textV1 = res.data.data.discussExplain;
state.checkedC1 =
res.data.data.discussSettings == "true" ? true : false;
})
.catch(() => {
});
}
};
const afterVisibleChange = (bool) => {
@@ -186,9 +189,9 @@ export default {
queryDiscuss();
}
};
const updateTask = (res) => {
const updateTask = async (res) => {
if (props.isLevel == 1) {
RouterEditTask({
await RouterEditTask({
chapterId: props.isactive,
courseId: res.data.data.discussId,
name: res.data.data.discussName,
@@ -196,28 +199,28 @@ export default {
routerTaskId: props.routerTaskId || 0,
type: 8,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
apiTask
.addTask({
courseId: res.data.data.discussId,
name: res.data.data.discussName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 8,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
await apiTask
.addTask({
courseId: res.data.data.discussId,
name: res.data.data.discussName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 8,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 3) {
console.log("");
addTempTask({
@@ -228,12 +231,12 @@ export default {
stageId: props.chooseStageId || 0,
type: 8,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
}
};
const updateDiscussInfo = () => {
@@ -250,32 +253,32 @@ export default {
};
if (props.edit) {
api
.updateDiscuss(obj)
.then(async (res) => {
await updateTask(res);
closeDrawer();
ctx.emit("changeData", false);
message.destroy();
message.success("创建讨论成功");
})
.catch(() => {
message.destroy();
message.error("创建讨论失败");
});
.updateDiscuss(obj)
.then(async (res) => {
await updateTask(res);
closeDrawer();
ctx.emit("changeData", false);
message.destroy();
message.success("创建讨论成功");
})
.catch(() => {
message.destroy();
message.error("创建讨论失败");
});
} else {
api
.createDiscuss(obj)
.then(async (res) => {
await updateTask(res);
closeDrawer();
ctx.emit("changeData", false);
message.destroy();
message.success("创建讨论成功");
})
.catch(() => {
message.destroy();
message.error("创建讨论失败");
});
.createDiscuss(obj)
.then(async (res) => {
await updateTask(res);
closeDrawer();
ctx.emit("changeData", false);
message.destroy();
message.success("创建讨论成功");
})
.catch(() => {
message.destroy();
message.error("创建讨论失败");
});
}
};
return {
@@ -293,6 +296,7 @@ export default {
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important;
}
.addrefDrawer {
.drawerMain {
.header {
@@ -302,6 +306,7 @@ export default {
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -310,35 +315,43 @@ export default {
margin-left: 24px;
}
}
.contentMain {
display: flex;
justify-content: space-between;
.main_left {
margin-top: 32px;
padding-right: 30px;
flex: 1;
border-right: 1px solid #e8e8e8;
.main_item {
display: flex;
align-items: center;
margin-top: 32px;
margin-bottom: 32px;
.signbox {
width: 120px;
display: flex;
justify-content: end;
align-items: center;
.sign {
margin-right: 5px;
}
}
.btnbox {
display: flex;
flex: 1;
align-items: center;
.ant-input {
height: 100%;
}
.xkbtn {
cursor: pointer;
width: 130px;
@@ -351,32 +364,40 @@ export default {
}
}
}
.main_item2 {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
.signbox {
width: 120px;
display: flex;
justify-content: end;
align-items: center;
.sign {
margin-right: 5px;
}
}
.textarea {
width: 423px;
.ant-input {
width: 100%;
}
.ant-input-textarea-show-count {
position: relative;
}
.ant-input-textarea-show-count::after {
position: absolute;
right: 10px;
bottom: 0px;
}
.ant-input {
border-radius: 8px;
}
@@ -384,6 +405,7 @@ export default {
}
}
}
.main_btns {
height: 72px;
width: 100%;
@@ -393,6 +415,7 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
@@ -402,6 +425,7 @@ export default {
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;

4
src/components/drawers/AddEval.vue
View File

@@ -287,7 +287,7 @@ export default {
})
.catch(() => {
message.destroy();
message.success("创建测评失败");
message.error("创建测评失败");
});
}
//创建测评信息
@@ -324,7 +324,7 @@ export default {
})
.catch(() => {
message.destroy();
message.success("创建测评失败");
message.error("创建测评失败");
});
};

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

@@ -28,11 +28,15 @@
</div>
<span style="margin-right: 3px">选择课程：</span>
</div>
<div class="btnbox" @click="showDrawerSelFacet">
<button class="xkbtn">
{{ chooseCourse == null ? "选择" : "修改" }}面授课
</button>
<div v-if="chooseCourse > 0">
<div class="btnbox">
<button class="xkbtn" @click="showDrawerSelFacet">
<!--
{{ chooseCourse == null ? "选择" : chooseCourseName }}面授课
</button> -->
{{ chooseCourse == null ? "选择" : "重选" }}面授课
</button>
<div v-if="chooseCourse">
<a-tag closable color="processing" @close="logC">
<span style="font-size:14px;line-height: 33px;">删除课程</span>
</a-tag>
@@ -41,7 +45,7 @@
</div>
<!-- 选择面授侧弹窗 -->
<div>
<sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse"/>
<sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse" v-model:chooseCourseName="chooseCourseName"/>
</div>
<!-- 选择面授侧弹窗 -->
</div>
@@ -61,8 +65,9 @@
<span style="margin-right: 3px">授课教师：</span>
</div>
<div class="btnbox">
<a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"
:options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>
<!-- <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"-->
<!-- :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>-->
<ProjectManager v-model:value="memberValue.value" v-model:name="memberValue.label"></ProjectManager>
</div>
</div>
<div class="main_item">
@@ -278,6 +283,7 @@ import dayjs from "dayjs";
import AssessmentList from "../drawers/ AssessmentList.vue";
// import { toDate } from "../../api/method";、
import {addTempTask} from "../../api/indexTaskadd";
import ProjectManager from "@/components/project/ProjectManager";
export default {
name: "AddFaceteach",
@@ -286,6 +292,7 @@ export default {
AddHomework,
AddTest,
AssessmentList,
ProjectManager,
},
props: {
addfaceteachVisible: {
@@ -368,6 +375,7 @@ export default {
chooseTime: [],
fileList: [],
chooseCourse: null, //选择的在线课程
chooseCourseName: null, //选择的在线课程
assessmentId: null,
EditTestId: null,
EditWorkId: null,
@@ -416,6 +424,7 @@ export default {
const logC = e => {
state.chooseCourse = null;
state.chooseCourseName = null;
console.log(e);
};
const logW = e => {

5
src/components/drawers/AddInvist.vue
View File

@@ -54,7 +54,7 @@
>
<span class="title"
>名称：
<span class="data">{{ assessment1.createName }}</span>
<span class="data">{{ assessment1.assessmentName }}</span>
</span>
<span class="title"
>题数：
@@ -184,6 +184,8 @@ export default {
const closeDrawer = () => {
ctx.emit("update:addinvistVisible", false);
ctx.emit("update:edit", false);
state.assessment = null;
state.assessment1 = null;
state.inputV1 = "";
// ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId);
@@ -205,6 +207,7 @@ export default {
api
.queryAppraiseDetailById({ assessmentId: props.EditInvistId })
.then((res) => {
console.log(res)
//更新讨论信息
state.assessment1 = res.data.data;
})

469
src/components/drawers/AddLive.vue
View File

@@ -1,20 +1,20 @@
<!-- 直播抽屉 -->
<template>
<a-drawer
:visible="addliveVisible"
class="drawerStyle addliveDrawer"
width="80%"
title="添加直播"
placement="right"
@after-visible-change="afterVisibleChange"
:visible="addliveVisible"
class="drawerStyle addliveDrawer"
width="80%"
title="添加直播"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}直播</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="contentMain">
@@ -23,18 +23,18 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">直播名称：</span>
</div>
<div class="btnbox">
<a-input
v-model:value="inputV1"
style="width: 400px; height: 32px"
placeholder="请输入考试名称"
maxlength="20"
v-model:value="inputV1"
style="width: 400px; height: 32px"
placeholder="请输入考试名称"
maxlength="20"
/>
</div>
</div>
@@ -44,10 +44,10 @@
</div>
<div class="textarea">
<a-textarea
v-model:value="textV1"
placeholder="请输入考试说明"
allow-clear
maxlength="364px"
v-model:value="textV1"
placeholder="请输入考试说明"
allow-clear
maxlength="364px"
/>
</div>
</div>
@@ -55,17 +55,17 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">直播时间：</span>
</div>
<div class="btnbox">
<a-range-picker
style="width: 424px"
v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']"
style="width: 424px"
v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
</div>
@@ -73,24 +73,24 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">直播时长：</span>
</div>
<div class="btnbox">
<a-input-number
:min="0"
:max="300"
:precision="0"
style="
:min="0"
:max="300"
:precision="0"
style="
width: 364px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV2"
v-model:value="inputV2"
></a-input-number>
<span style="margin-left: 5px">分钟</span>
</div>
@@ -99,50 +99,40 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">授课老师：</span>
</div>
<div class="btnbox">
<a-auto-complete
:value="memberValue.label"
show-search
:not-found-content="fetching ? undefined : null"
placeholder="Select a teacher"
style="width: 364px"
:options="options"
@focus="handleFocus"
@change="handleChange2"
@popupScroll="templateScroll"
@search="handleSearch"
></a-auto-complete>
<ProjectManager v-model:value="memberValue.value"
v-model:name="memberValue.label"></ProjectManager>
</div>
</div>
<div class="mbl_items2">
<div class="item_nam">
<div class="asterisk_icon">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 14px">直播封面</span>
</div>
<div class="item_inp">
<a-upload
name="avatar"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
:before-upload="beforeUpload"
name="avatar"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
:before-upload="beforeUpload"
>
<img
class="i_upload_img"
v-if="imageUrl"
:src="imageUrl"
alt="avatar"
class="i_upload_img"
v-if="imageUrl"
:src="imageUrl"
alt="avatar"
/>
<div class="i_upload" v-else>
<div class="addimg">
@@ -162,9 +152,9 @@
</div>
<div class="btnbox">
<a-input
v-model:value="inputV4"
style="width: 424px; height: 32px"
placeholder="请输入直播链接"
v-model:value="inputV4"
style="width: 424px; height: 32px"
placeholder="请输入直播链接"
/>
</div>
</div>
@@ -173,7 +163,7 @@
<span style="margin-right: 3px">回放设置：</span>
</div>
<div class="btnbox">
<a-switch v-model:checked="switchC1" @click="PlayBack" />
<a-switch v-model:checked="switchC1"/>
</div>
</div>
<div v-if="switchC1">
@@ -183,9 +173,9 @@
</div>
<div class="btnbox">
<a-input
v-model:value="inputV5"
style="width: 424px; height: 32px"
placeholder="请输入回放链接"
v-model:value="inputV5"
style="width: 424px; height: 32px"
placeholder="请输入回放链接"
/>
</div>
</div>
@@ -196,9 +186,10 @@
</div>
<div class="btnbox2">
<a-checkbox
v-model:checked="needEval"
@click="needEval = !needEval"
>需要评估</a-checkbox
v-model:checked="needEval"
@click="needEval = !needEval"
>需要评估
</a-checkbox
>
</div>
</div>
@@ -206,17 +197,17 @@
<div class="signbox"></div>
<div class="btnbox">
<button class="xkbtn" @click="showAssessment">选择评估</button>
<div v-if="assessmentId > 0">
<a-tag closable color="processing" @close="logA">
<div v-if="(assessmentId !== '0')">
<a-tag closable @close="removePG" color="processing">
<span style="font-size: 14px; line-height: 33px"
>删除评估</span
>删除评估</span
>
</a-tag>
</div>
<AssessmentList
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
v-model:assessmentId="assessmentId"
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
v-model:assessmentId="assessmentId"
/>
</div>
</div>
@@ -226,38 +217,40 @@
</div>
<div class="kqszbox">
<div class="qdqtbox">
<div class="qdbtn"><div class="btntext">签到</div></div>
<div class="qdbtn">
<div class="btntext">签到</div>
</div>
</div>
<div class="setbox">
<div class="timerbox">
<span>开始前：</span>
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV6"
v-model:value="inputV6"
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
<div class="timerbox">
<span>开始后：</span>
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV7"
v-model:value="inputV7"
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
@@ -306,9 +299,10 @@
</div>
<div class="btnbox">
<a-checkbox
v-model:checked="switchC2"
@onclick="switchC2 = !switchC2"
>学员请假后记为任务完成</a-checkbox
v-model:checked="switchC2"
@onclick="switchC2 = !switchC2"
>学员请假后记为任务完成
</a-checkbox
>
</div>
</div>
@@ -322,28 +316,32 @@
</a-drawer>
</template>
<script>
import { reactive, toRefs, ref } from "vue";
import { message } from "ant-design-vue";
import {reactive, toRefs, ref} from "vue";
import {message} from "ant-design-vue";
import * as api from "../../api/indexLiveBroadcast";
import * as apiTask from "../../api/indexTaskadd";
import { toDate } from "@/api/method";
import { RouterEditTask } from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd";
import { getMemberInfo } from "@/api/index1";
import {toDate} from "@/api/method";
import {RouterEditTask} from "@/api/indexTask";
import {addTempTask} from "../../api/indexTaskadd";
import {getMemberInfo} from "@/api/index1";
import dayjs from "dayjs";
import { fileUp } from "../../api/indexEval";
import {fileUp} from "../../api/indexEval";
import AssessmentList from "../drawers/ AssessmentList.vue";
import { debounce } from "lodash-es";
import {debounce} from "lodash-es";
import ProjectManager from "@/components/project/ProjectManager";
// import { useRouter } from "vue-router";
function getBase64(img, callback) {
const reader = new FileReader();
reader.addEventListener("load", () => callback(reader.result));
reader.readAsDataURL(img);
}
export default {
name: "AddLive",
components: {
AssessmentList,
ProjectManager,
},
props: {
addliveVisible: {
@@ -460,51 +458,55 @@ export default {
queryLive();
}
api
.queryAssessmentDetailList({
assessmentName: "",
pageNo: 1,
pageSize: 200,
releaseStatus: "",
searchEndTime: "",
searchStartTime: "",
})
.then((res) => {
res.data.data.rows.forEach((item) => {
let obj = item;
obj.value = item.assessmentId;
obj.label = item.assessmentName;
state.assessment.push(obj);
.queryAssessmentDetailList({
assessmentName: "",
pageNo: 1,
pageSize: 200,
releaseStatus: "",
searchEndTime: "",
searchStartTime: "",
})
.then((res) => {
res.data.data.rows.forEach((item) => {
let obj = item;
obj.value = item.assessmentId;
obj.label = item.assessmentName;
state.assessment.push(obj);
});
});
});
};
const queryLive = () => {
let d = props.EditLiveId;
api
.getLiveBroadcastInfor({ liveId: d })
.then((res) => {
state.inputV1 = res.data.data.liveName;
state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD"),
];
state.inputV2 = res.data.data.liveDuration;
state.inputV3 = res.data.data.liveTeacherId;
//state.fileList= res.data.data
state.inputV4 = res.data.data.liveLink;
state.inputV5 = res.data.data.livePlaybackLink;
state.inputV6 = res.data.data.beforeSignIn;
state.inputV7 = res.data.data.afterSignIn;
state.inputV8 = res.data.data.signOutTime;
state.textV1 = res.data.data.liveExplain;
state.radioV1 = Number(res.data.data.standardSettings);
//state.= res.data.data
state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover;
state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
})
.catch(() => {
//message.error(`查询失败`);
});
.getLiveBroadcastInfor({liveId: d})
.then((res) => {
console.log("获取的数据",res)
state.inputV1 = res.data.data.liveName;
state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD"),
];
state.inputV2 = res.data.data.liveDuration;
state.inputV3 = res.data.data.liveTeacherId;
//state.fileList= res.data.data
state.inputV4 = res.data.data.liveLink;
state.inputV5 = res.data.data.livePlaybackLink;
state.inputV6 = res.data.data.beforeSignIn;
state.inputV7 = res.data.data.afterSignIn;
state.inputV8 = res.data.data.signOutTime;
state.textV1 = res.data.data.liveExplain;
state.radioV1 = Number(res.data.data.standardSettings);
//state.= res.data.data
state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover;
state.switchC1 = res.data.data.livePlayback === '1' ? true : false;
state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
state.needEval = res.data.data.isEvaluate == '1' ? true : false;
state.memberValue = {value: res.data.data.liveTeacherId || '', label: res.data.data.liveTeacherName || ''};
})
.catch(() => {
//message.error(`查询失败`);
});
};
const cloradio1 = (value) => {
if (state.radioV1 === value.target._value) {
@@ -542,31 +544,31 @@ export default {
routerTaskId: props.routerTaskId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
apiTask
.addTask({
courseId: res.data.data.liveId,
duration: res.data.data.liveDuration,
name: res.data.data.liveName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
.addTask({
courseId: res.data.data.liveId,
duration: res.data.data.liveDuration,
name: res.data.data.liveName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
console.log("props.projectTemplateId", props.projectTemplateId);
addTempTask({
@@ -578,13 +580,13 @@ export default {
stageId: props.chooseStageId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}
};
const showAssessment = () => {
@@ -611,65 +613,71 @@ export default {
return message.warning("直播时长需大于0");
}
let startTime = toDate(
new Date(state.time[0].$d).getTime() / 1000,
"Y-M-D"
new Date(state.time[0].$d).getTime() / 1000,
"Y-M-D"
);
let endTime = toDate(
new Date(state.time[1].$d).getTime() / 1000,
"Y-M-D"
new Date(state.time[1].$d).getTime() / 1000,
"Y-M-D"
);
state.obj = {
afterSignIn: state.inputV6,
beforeSignIn: state.inputV7,
assessmentId: state.assessmentId == null ? 0 : state.assessmentId,
assessmentId: state.assessmentId == null || state.assessmentId == "" ? 0 : Number(state.assessmentId),
liveCover: state.imageUrl, //直播封面
liveDuration: state.inputV2,
liveDuration: Number(state.inputV2),
liveEndTime: endTime,
liveStartTime: startTime,
liveExplain: state.textV1,
liveFlag: "",
liveId: props.edit ? props.EditLiveId : 0,
liveId: props.edit ? Number(props.EditLiveId) : 0,
liveLink: state.inputV4,
liveName: state.inputV1,
livePlayback: state.switchC1 ? "1" : "0",
livePlaybackLink: state.switchC1 ? state.inputV5 : "",
liveTeacherId: state.inputV3,
liveTeacherId: Number(state.memberValue.value),
liveTeacherName: state.memberValue.label,
otherSettings: state.switchC2 ? "1" : "0", //1或0
signOutTime: state.inputV8,
signOutTime: state.inputV8,
standardSettings: state.radioV1, //1或2
isEvaluate: state.needEval ? "1" : "0",
};
console.log('我是要更新的数据',state.obj )
if (props.edit) {
api
.updateLiveBroadcastMessage(state.obj)
.then(async(res) => {
message.destroy();
message.success("提交成功");
await updateTask(res);
closeDrawer();
})
.catch(() => {});
.updateLiveBroadcastMessage(state.obj)
.then(async (res) => {
console.log(res)
message.destroy();
message.success("提交成功");
await updateTask(res);
closeDrawer();
})
.catch((err) => {
console.log(err)
});
} else {
api
.createLiveBroadcast(state.obj)
.then(async(res) => {
message.destroy();
message.success("提交成功");
await updateTask(res);
closeDrawer();
})
.catch(() => {});
.createLiveBroadcast(state.obj)
.then(async (res) => {
message.destroy();
message.success("提交成功");
await updateTask(res);
closeDrawer();
})
.catch(() => {
});
}
};
const beforeUpload = (file) => {
return new Promise((resolve, reject) => {
const isJpgOrPng =
file.type === "image/jpg" ||
file.type === "image/jpeg" ||
file.type === "image/png" ||
file.type === "image/svg" ||
file.type === "image/bmp" ||
file.type === "image/gif";
file.type === "image/jpg" ||
file.type === "image/jpeg" ||
file.type === "image/png" ||
file.type === "image/svg" ||
file.type === "image/bmp" ||
file.type === "image/gif";
if (!isJpgOrPng) {
message.destroy();
message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
@@ -697,7 +705,7 @@ export default {
};
const templateScroll = (e) => {
console.log("滚动", e);
const { target } = e;
const {target} = e;
const scrllHeight = target.scrollHeight - target.scrollTop;
const clientHeight = target.clientHeight;
// console.log("scrllHeight", scrllHeight, clientHeight);
@@ -723,20 +731,20 @@ export default {
pageSize: state.pageSize,
};
getMemberInfo(obj)
.then((res) => {
let data = res.data.data.rows;
state.totalPages = res.data.data.total;
for (let i in data) {
options.value.push({
value: data[i].id,
label: data[i].realName,
});
}
})
.catch((err) => {
message.destroy();
message.error("获取员工失败" + err);
});
.then((res) => {
let data = res.data.data.rows;
state.totalPages = res.data.data.total;
for (let i in data) {
options.value.push({
value: data[i].id,
label: data[i].realName,
});
}
})
.catch((err) => {
message.destroy();
message.error("获取员工失败" + err);
});
};
const handleSearch = debounce((memberValue) => {
console.log("fetching user", memberValue);
@@ -762,6 +770,14 @@ export default {
state.discussSettings = "false";
}
};
// 删除评估
const removePG = () => {
console.log("11111")
state.assessmentId = "";
state.isEvaluate = "0";
}
return {
...toRefs(state),
afterVisibleChange,
@@ -778,6 +794,7 @@ export default {
templateScroll,
handleSearch,
showAssessment,
removePG
};
},
};
@@ -786,6 +803,7 @@ export default {
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important;
}
.addliveDrawer {
.drawerMain {
.header {
@@ -795,6 +813,7 @@ export default {
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -803,32 +822,39 @@ export default {
margin-left: 24px;
}
}
.contentMain {
display: flex;
justify-content: space-between;
.main_left {
padding-right: 30px;
flex: 1;
border-right: 1px solid #e8e8e8;
margin-top: 32px;
.main_item {
display: flex;
align-items: center;
margin-top: 32px;
margin-bottom: 32px;
.signbox {
width: 120px;
display: flex;
justify-content: end;
align-items: center;
.sign {
margin-right: 5px;
}
}
.btnbox {
display: flex;
flex: 1;
align-items: center;
.xkbtn {
cursor: pointer;
width: 130px;
@@ -841,24 +867,29 @@ export default {
}
}
}
.main_item2 {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
.signbox {
width: 120px;
display: flex;
justify-content: end;
align-items: center;
.sign {
margin-right: 5px;
}
}
.kqszbox {
.qdqtbox {
margin-left: 5px;
cursor: pointer;
}
.qdbtn,
.qtbtn {
width: 75px;
@@ -869,15 +900,18 @@ export default {
display: flex;
align-items: center;
justify-content: center;
.btntext {
color: #387df7;
}
}
.setbox {
display: flex;
flex-wrap: wrap;
margin-top: 10px;
margin-bottom: 24px;
.timerbox {
margin-top: 6px;
margin-right: 32px;
@@ -887,10 +921,12 @@ export default {
}
}
}
.btnbox2 {
display: flex;
flex-direction: column;
justify-content: flex-start;
.xkbtn {
cursor: pointer;
width: 130px;
@@ -905,20 +941,24 @@ export default {
}
}
}
.mbl_items2 {
display: flex;
align-items: start;
margin-top: 10px;
margin-bottom: 10px;
.i_bottom {
margin-bottom: 30px;
}
.item_nam {
width: 100px;
display: flex;
align-items: center;
justify-content: flex-end;
white-space: nowrap;
.asterisk_icon {
width: 10px;
height: 10px;
@@ -926,13 +966,16 @@ export default {
margin-top: -15px;
}
}
.item_inp {
flex: 1;
.i_upload_img {
width: 100px;
height: 100px;
border-radius: 8px;
}
.i_upload {
width: 100px;
height: 100px;
@@ -941,8 +984,10 @@ export default {
text-align: center;
align-items: center;
cursor: pointer;
.addimg {
position: relative;
.heng {
position: absolute;
top: 50px;
@@ -950,6 +995,7 @@ export default {
width: 50px;
border: 1px solid #4ea6ff;
}
.shu {
position: absolute;
top: 25px;
@@ -963,6 +1009,7 @@ export default {
}
}
}
.main_btns {
height: 72px;
width: 100%;
@@ -972,6 +1019,7 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
@@ -981,6 +1029,7 @@ export default {
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;

40
src/components/drawers/AddTest.vue
View File

@@ -114,26 +114,20 @@
</a-menu>
</template>
</a-dropdown> -->
<span style="margin-left: 10px">
<a-tag
class="tag-style"
v-if="paperName != ''"
:closable="true"
@close="delTag"
>{{ paperName }}</a-tag
>
<!-- <a-tag
class="tag-style"
v-for="item in choosedTestList"
:closable="true"
@close="closeTag(item.key)"
:key="item.key"
>{{ item.value }}</a-tag
> -->
</span>
<a-tag v-if="paperName != ''" closable color="processing" @close="delTag">
<span style="font-size:14px;line-height: 33px;">删除考试</span>
</a-tag>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="btnbox">
<a-form-item has-feedback label="考试时间" name="choosedTime">
@@ -721,9 +715,13 @@ export default {
scoringModel: formState.scoringModel,
showAnalysis: formState.showAnalysis,
showAnswers: formState.showAnswers,
examinationTestId: state.id,
examinationTestName: state.testName,
examinationTestId: state.paperId,
examinationTestName: state.paperName,
};
if(!(state.paperId >0)){
message.destroy();
return message.error("请选择考试");
}
if (props.edit) {
// 编辑任务
updateExamination(obj)
@@ -732,6 +730,7 @@ export default {
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`编辑失败`);
});
} else {
@@ -742,6 +741,7 @@ export default {
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`创建失败`);
});
}
@@ -852,6 +852,7 @@ export default {
state.id = value.id;
state.testName = value.testName;
};
return {
formState,
afterVisibleChange,
@@ -876,6 +877,7 @@ export default {
chooseTest,
closeTag,
getData,
...toRefs(state),
};
},

342
src/components/drawers/SelFacet.vue
View File

@@ -1,19 +1,19 @@
<template>
<a-drawer
:visible="selfacetVisible"
class="drawerStyle selfacetDrawer"
width="80%"
title="添加在线"
placement="right"
@after-visible-change="afterVisibleChange"
:visible="selfacetVisible"
class="drawerStyle selfacetDrawer"
width="80%"
title="添加在线"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">选择面授</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="contentMain">
@@ -23,27 +23,29 @@
<div class="ipt_name">课程信息：</div>
<div class="fi_input">
<a-input
v-model:value="name"
style="width: 240px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称"
v-model:value="name"
style="width: 240px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称"
/>
</div>
</div>
<!--
<div class="mii_ipt">
<div class="ipt_name">课程状态：</div>
<div class="select fitems">
<a-select
v-model:value="auditStatus"
dropdownClassName="dropdown-style"
style="width: 200px"
placeholder="请选择状态"
:options="options1"
allowClear
showSearch
>
</a-select>
</div>
<a-select
v-model:value="auditStatus"
dropdownClassName="dropdown-style"
style="width: 200px"
placeholder="请选择状态"
:options="options1"
allowClear
showSearch
>
</a-select>
</div>
</div>
-->
</div>
<div class="mi_btns">
<div class="btn btn1" @click="search">
@@ -57,88 +59,88 @@
</div>
</div>
<div class="main_notice">
<div class="mntc_left">
<div class="notice_icon"></div>
<div v-if="offcourse == null">
<div class="mntc_left">
<div class="notice_icon"></div>
<div v-if="offcourse == null">
<span class="title"
>已选择 <span class="data">0</span> 条</span
>已选择 <span class="data">0</span> 条</span
>
</div>
<div v-else>
</div>
<div v-else>
<span class="title"
>已选择 <span class="data">1</span> 条;</span
>已选择 <span class="data">1</span> 条;</span
>
<span class="title"
>课程编号：
<span class="title"
>课程编号：
<span class="data">{{ offcourse.offcourseId }}</span>
</span>
<span class="title"
>名称：
<span class="title"
>名称：
<span class="data">{{
offcourse.name
}}</span>
offcourse.name
}}</span>
</span>
<span class="title"
>分类：
<span class="title"
>分类：
<span class="data">{{
offcourse.categoryId
}}</span>
offcourse.categoryId
}}</span>
</span>
<span class="title"
>授课老师：
<span class="title"
>授课老师：
<span class="data">{{
offcourse.teacherId
}}</span>
offcourse.teacherId
}}</span>
</span>
<span class="title"
>创建人：
<span class="title"
>创建人：
<span class="data">{{ offcourse.createUser }}</span>
</span>
</div>
</div>
</div>
</div>
</div>
<div class="main_table">
<a-table
class="ant-table-striped"
:row-class-name="
class="ant-table-striped"
:row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null)
"
:row-selection="rowSelection"
:columns="columns1"
:data-source="classTableData"
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
:row-selection="rowSelection"
:columns="columns1"
:data-source="classTableData"
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
/>
<div class="pa">
<div class="pa" style="display:flex;justify-content:center;padding:20px;">
<a-pagination
v-if="total > 10"
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePaginationStu"
v-if="tableDataTotal > 10"
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePaginationStu"
/>
</div>
</div>
</div>
</div>
</a-drawer>
</template>
<script>
//import { ApiFilled } from "@ant-design/icons-vue";
import { reactive, toRefs, ref } from "vue";
import {reactive, toRefs, computed} from "vue";
// import { planList } from "../../api/indexTaskadd";
import {detail} from "../../api/indexCourse";
import { list } from "../../api/indexTaskadd";
import { toDate } from "../../api/method";
// import {detail} from "../../api/indexCourse";
import {list} from "../../api/indexTaskadd";
import {toDate} from "../../api/method";
const columns1 = [
{
@@ -196,6 +198,10 @@ export default {
type: Number,
default: null,
},
chooseCourseName: {
type: String,
default: null,
},
titleTag: {
type: Boolean,
default: false,
@@ -221,59 +227,75 @@ export default {
valueContent: null, //内容分类
selectedRows: [], //选择的数据
selectedRowKeys: [],
titleTag:false,
offcourse:null,
auditStatus:null,
name:null,
titleTag: false,
offcourse: null,
auditStatus: null,
name: null,
courseInfo:[]
});
const rowSelection = {
type: "radio",
onSelect: (selectedRows) => {
state.chooseCourse=selectedRows.num;
console.log(selectedRows,"==========",state.chooseCourse);
closeDrawer();
},
};
const rowSelection = computed(() => {
console.log(3333333333)
console.log(state.selectedRows)
return {
type: "radio",
selectedRowKeys: state.selectedRows,
onSelect: (selectedRows) => {
console.log('select')
state.chooseCourse = selectedRows.num;
state.chooseCourseName = selectedRows.name;
console.log(selectedRows, "==========", state.chooseCourse);
closeDrawer();
},
onChange: (selectedRows) => {
console.log('onChange')
state.selectedRows = selectedRows
},
}
})
const closeDrawer = () => {
ctx.emit("update:selfacetVisible", false);
ctx.emit("update:chooseCourse", state.chooseCourse);
state.chooseCourse && ctx.emit("update:chooseCourse", state.chooseCourse);
state.chooseCourseName && ctx.emit("update:chooseCourseName", state.chooseCourseName);
};
const afterVisibleChange = (bool) => {
if(bool){
state.chooseCourse=props.chooseCourse;
getClassList();
getFaceInfo();
if (bool) {
state.chooseCourse = props.chooseCourse;
state.chooseCourseName = props.chooseCourseName;
state.selectedRows = props.chooseCourse ? [props.chooseCourse] : [];
getClassList();
// getFaceInfo();
}
};
// const showDrawerSelFacet = () => {
// state.selfacetvisible = true;
// };
const getFaceInfo =()=>{
detail({offcourseId:36}).then((res) => {
state.chooseCourse = res.data.data;
}).catch();
}
// const getFaceInfo = () => {
// detail({offcourseId: 36}).then((res) => {
// state.courseInfo = res.data.data;
// }).catch();
// }
//获取面授课列表
const getClassList = (obj) => {
let objn = obj || {
auditStatus:state.auditStatus,
name:state.name,
pageNo:state.currentPage,
pageSize:state.pageSize
auditStatus:2,
name: state.name,
pageNo: state.currentPage,
pageSize: state.pageSize
};
list(objn)
.then((res) => {
console.log(res.data.data.rows);
let result = res.data.data;
state.tableDataTotal = result.total;
getClassData(result.rows);
})
.catch((err) => {
console.log("获取列表失败", err.data);
});
.then((res) => {
console.log('面授课列表', res.data.data);
let result = res.data.data;
state.tableDataTotal = result.total;
getClassData(result.rows);
})
.catch((err) => {
console.log("获取列表失败", err.data);
});
};
const getClassData = (tabledata) => {
@@ -294,7 +316,7 @@ export default {
});
state.classTableData = array;
};
/**
const options1 = ref([
{
value: 0,
@@ -308,16 +330,13 @@ export default {
value: 2,
label: "已审核",
},
{
value: -1,
label: "审核未通过",
},
]);
]);*/
const handleChange = (value, option) => {
console.log("改变了", value, option);
console.log(state.valueContent);
};
//搜索
//搜索
const search = () => {
//重新获取列表
getClassList();
@@ -339,7 +358,7 @@ export default {
// showDrawerSelFacet,
afterVisibleChange,
closeDrawer,
options1,
columns1,
getClassData,
handleChange,
@@ -366,6 +385,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -374,6 +394,7 @@ export default {
margin-left: 24px;
}
}
.contentMain {
.main_items {
display: flex;
@@ -381,23 +402,28 @@ export default {
margin-bottom: 12px;
margin-top: 32px;
flex-wrap: wrap;
.mi_ipts {
display: flex;
margin-bottom: 20px;
.mii_ipt {
display: flex;
align-items: center;
margin-right: 24px;
.ipt_name {
white-space: nowrap;
}
}
}
.mi_btns {
display: flex;
margin-left: 38px;
margin-bottom: 20px;
cursor: pointer;
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
@@ -408,9 +434,11 @@ export default {
justify-content: center;
margin-left: 14px;
flex-shrink: 0;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
@@ -418,78 +446,96 @@ export default {
margin-left: 5px;
}
}
.btn1 {
background: rgb(64, 158, 255);
.search {
width: 15px;
height: 17px;
background-image: url("@/assets/images/coursewareManage/search0.png");
}
.btnText {
color: rgb(255, 255, 255);
}
}
.btn2 {
background: rgb(255, 255, 255);
.search {
width: 15px;
height: 17px;
background-image: url("@/assets/images/coursewareManage/reset1.png");
}
.btnText {
color: rgb(64, 158, 255);
}
}
.btn1:hover {
background: rgb(255, 255, 255);
.search {
background-image: url("@/assets/images/courseManage/search1.png");
}
.btnText {
color: #388be1;
}
}
.btn2:hover {
background: rgba(64, 158, 255, 1);
.search {
background-image: url("@/assets/images/courseManage/reset0.png");
}
.btnText {
color: #ffffff;
}
}
}
}
.main_notice {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 32px;
height: 40px;
background-color: #e9f6fe;
.mntc_left {
display: flex;
align-items: center;
.title {
color: rgba(0, 0, 0, 0.65);
margin-right: 17px;
}
.data {
color: #388be1;
}
.notice_icon {
width: 14px;
height: 14px;
margin-right: 9px;
margin-left: 9px;
background-image: url(@/assets/images/coursewareManage/gan.png);
background-size: 100% 100%;
}
}
.mntc_right {
cursor: pointer;
}
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 32px;
height: 40px;
background-color: #e9f6fe;
.mntc_left {
display: flex;
align-items: center;
.title {
color: rgba(0, 0, 0, 0.65);
margin-right: 17px;
}
.data {
color: #388be1;
}
.notice_icon {
width: 14px;
height: 14px;
margin-right: 9px;
margin-left: 9px;
background-image: url(@/assets/images/coursewareManage/gan.png);
background-size: 100% 100%;
}
}
.mntc_right {
cursor: pointer;
}
}
}
.main_btns {
@@ -501,6 +547,7 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
@@ -510,6 +557,7 @@ export default {
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;

51
src/components/project/ProjectManager.vue
View File

@@ -1,13 +1,13 @@
<template>
<a-select
v-model:value="managerArray"
placeholder="请选择项目经理"
:placeholder="placeholder"
:filterOption="false"
style="width: 100%"
:options="options"
allowClear
showSearch
mode="multiple"
:mode="mode"
:disabled="disabled"
@popupScroll="memberScroll"
@search="searchMember"
@@ -28,15 +28,26 @@ export default {
props: {
value: {
type: Number,
type: String,
default: ''
},
name: {
type: Number,
type: String,
default: ''
},
disabled: {
type: Boolean,
default: false
},
placeholder: {
type: String,
default: '请选择'
},
// 'multiple' | 'tags'
mode: {
type: String,
default: 'select'
},
},
setup(props, ctx) {
const state = reactive({
@@ -46,9 +57,9 @@ export default {
loading: false,
init: false
});
const getMemberThrottle = throttle(getMember, 500)
watch(() => state.memberParam, getMemberThrottle)
watch(()=>state.memberParam.keyWord , throttle(getMember, 500))
watch(()=>state.memberParam.pageNo , throttle(getPushMember, 500))
watch(props, init)
onMounted(() => {
@@ -62,15 +73,21 @@ export default {
getMemberData()
}
function getPushMember() {
state.loading = true
getMemberData()
}
function getMemberData() {
console.log('getMemberData')
api1.getMemberInfo(state.memberParam).then((res) => {
const list = res.data.data.rows.filter(e => !props.value?.includes(e.id + '')).map(e => ({
const list = res.data.data.rows.filter(e => !(props.value + '')?.includes(e.id + '')).map(e => ({
label: e.realName,
value: e.id
}));
if (state.memberParam.pageNo === 1 && props.value) {
const arrManagerId = props.value.split(',')
const arrManagerId = (props.value + '').split(',')
const arrManager = props.name.split(',')
state.options = [...arrManager.map((e, i) => ({label: e, value: arrManagerId[i]})), ...list]
} else state.options.push(...list)
@@ -93,11 +110,12 @@ export default {
function init() {
console.log('init--', props)
if (props.value !== state.managerArray.join(',')) {
console.log(Array.isArray(state.managerArray))
if ((props.value + '') !== (Array.isArray(state.managerArray) ? state.managerArray.join(',') : (state.managerArray + ''))) {
if (props.value) {
const arrManager = props.name.split(',')
const arrManagerId = props.value.split(',')
state.managerArray = arrManagerId
const arrManagerId = (props.value + '').split(',')
state.managerArray = props.mode === 'select' ? props.value : arrManagerId;
state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
} else {
state.managerArray = []
@@ -115,9 +133,14 @@ export default {
}
function change(e, l) {
console.log('change')
ctx.emit('update:value', e.join(','))
ctx.emit('update:name', l.map(t => t.label).join(','))
console.log('change', l)
if (Array.isArray(l)) {
ctx.emit('update:value', l.map(t => t.value).join(','))
ctx.emit('update:name', l.map(t => t.label).join(','))
} else {
ctx.emit('update:value', l.value)
ctx.emit('update:name', l.label)
}
}
return {

104
src/store/index.js
View File

@@ -6,60 +6,64 @@
* @FilePath: /fe-manage/src/store/index.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import { createStore } from "vuex";
import {createStore} from "vuex";
// import * as api from '../api/index1'
export default createStore({
state: {
openpages: localStorage.getItem("openpages")
? JSON.parse(localStorage.getItem("openpages"))
: [
{
pagename: "学习路径图",
href: "/learningpath",
active: true,
state: {
openpages: localStorage.getItem("openpages")
? JSON.parse(localStorage.getItem("openpages"))
: [
{
pagename: "学习路径图",
href: "/learningpath",
active: true,
},
],
assessmentName: "",
routerId: null,
projectTemplateId: null,
userInfo: {},
orgtreeList: [],
faceclassPic: null,
faceclassClass: [],
faceclassScene: [],
projectLevel: [],//项目级别
projectSys: [],//培训分类
pathmapPic: [],//学习路径背景图
},
getters: {},
mutations: {
chengeOpenpages(state, list) {
// console.log('list', list)
state.openpages = list;
},
chengeRouterId(state, routerId) {
// console.log('list', list)
state.routerId = routerId;
},
],
assessmentName: "",
routerId: null,
projectTemplateId: null,
orgtreeList: [],
faceclassPic: null,
faceclassClass: [],
faceclassScene: [],
projectLevel: [],//项目级别
projectSys: [],//培训分类
pathmapPic: [],//学习路径背景图
},
getters: {},
mutations: {
chengeOpenpages(state, list) {
// console.log('list', list)
state.openpages = list;
},
chengeRouterId(state, routerId) {
// console.log('list', list)
state.routerId = routerId;
},
SET_assessmentName(state, name) {
state.assessmentName = name;
console.log("state.assessmentName");
console.log(state.assessmentName);
},
//获取组织树
getOrgtreeList(state, data) {
state.orgtreeList = data
},
SET_DICT(state, { key, data }) {
state[key] = data
},
SET_projectTemplateId(state, projectTemplateId) {
state.projectTemplateId = projectTemplateId;
}
SET_assessmentName(state, name) {
state.assessmentName = name;
console.log("state.assessmentName");
console.log(state.assessmentName);
},
//获取组织树
getOrgtreeList(state, data) {
state.orgtreeList = data
},
SET_DICT(state, {key, data}) {
state[key] = data
},
SET_USER(state, userInfo) {
state.userInfo = userInfo
},
SET_projectTemplateId(state, projectTemplateId) {
state.projectTemplateId = projectTemplateId;
}
},
actions: {},
modules: {},
},
actions: {},
modules: {},
});

523
src/views/courselibrary/CoursewareManage.vue
View File

File diff suppressed because it is too large Load Diff

16
src/views/examine/CourseReviewedN.vue
View File

@@ -390,12 +390,12 @@ export default {
key: "status",
align: "center",
},
{
title: "转审",
dataIndex: "change",
key: "change",
align: "center",
},
// {
// title: "转审",
// dataIndex: "change",
// key: "change",
// align: "center",
// },
{
title: "创建人",
dataIndex: "creater",
@@ -637,12 +637,16 @@ export default {
state.courAuditModal = false;
message.destroy();
message.success("审核提交成功");
state.valueSugg = null;
state.valuepass="1";
getFaceList();
})
.catch((err) => {
console.log(err);
message.destroy();
message.warning("审核提交失败");
state.valueSugg = null;
state.valuepass="1";
});
};
onMounted(async () => {

45
src/views/learningpath/LearningPath.vue
View File

@@ -161,26 +161,7 @@
</div>
<div class="inname">归属组织</div>
<div class="select in">
<a-tree-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="organizationSelectName"
style="width: 270px"
placeholder="请选择组织"
:tree-data="organizationList"
:options="organizationList"
@change="selectorganization"
allowClear
showSearch
:fieldNames="{
children: 'treeChildList',
label: 'name',
value: 'id',
}"
></a-tree-select>
<OrgClass v-model:value="organizationSelectId" v-model:name="organizationSelectName"></OrgClass>
</div>
<!-- <div class="in">
<a-input
@@ -295,26 +276,7 @@
</div>
<div class="inname">归属组织</div>
<div class="select in">
<a-tree-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="organizationSelectName"
style="width: 270px"
placeholder="请选择组织"
:options="organizationList"
:tree-data="organizationList"
@change="selectorganization"
allowClear
showSearch
:fieldNames="{
children: 'treeChildList',
label: 'name',
value: 'id',
}"
></a-tree-select>
<OrgClass v-model:value="organizationSelectId" v-model:name="organizationSelectName"></OrgClass>
</div>
<!-- <div class="in">
<a-input
@@ -707,6 +669,7 @@ import {
} from "../../api/method";
import { storage } from "../../api/storage";
import { useStore } from "vuex";
import OrgClass from "@/components/project/OrgClass";
export default {
name: "learningPath",
components: {
@@ -715,7 +678,7 @@ export default {
// QueryRight,
// ManageRight,
ProjOwnerShip,
OrgClass,
ProjPowerList,
ProjCheckShip,
},

42
src/views/learningpath/LevelAdd.vue
View File

@@ -415,31 +415,33 @@
>
<img
:src="
item.type === 1
item.type == 1
? require('../../assets/images/leveladd/zai.png')
: type === 2
: item.type == 2
? require('../../assets/images/leveladd/mian.png')
: item.type === 3
: item.type == 3
? require('../../assets/images/leveladd/an.png')
: item.type === 4
: item.type == 4
? require('../../assets/images/leveladd/zuo.png')
: item.type === 5
: item.type == 5
? require('../../assets/images/leveladd/kao.png')
: item.type === 6
: item.type == 6
? require('../../assets/images/leveladd/zhi.png')
: item.type === 7
: item.type == 7
? require('../../assets/images/leveladd/wai.png')
: item.type === 8
: item.type == 8
? require('../../assets/images/leveladd/tao.png')
: item.type === 9
: item.type == 9
? require('../../assets/images/leveladd/huo.png')
: item.type === 10
: item.type == 10
? require('../../assets/images/leveladd/ce.png')
: item.type === 11
? require('../../assets/images/leveladd/diao.png')
: item.type === 12
: item.type == 11
? require('../../assets/images/leveladd/pinggu.png')
: item.type == 12
? require('../../assets/images/leveladd/tou.png')
: null
: item.type == 13
? require('../../assets/images/leveladd/tou.png')
: require('../../assets/images/leveladd/xiangmu.png')
"
/>
</div>
@@ -458,11 +460,11 @@
</div>
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">{{ item.beginTime }}</div>
<div class="timetext">{{ item.startTime!==null?item.startTime[0]+'-'+ item.startTime[1]+'-'+item.startTime[2]:''}}</div>
</div>
<div class="progress">
<div class="progresstext">
{{ item.complete }}/{{ item.total }}人
{{ item.complete?item.complete:0 }}/{{ item.total?item.total:0 }}人
</div>
<div style="display: flex">
<a-progress
@@ -472,7 +474,7 @@
trailColor="rgba(253, 209, 98, 0.2)"
/>
<span class="progresstext" style="margin-left: 10px"
>{{ item.percent }}%</span
>{{ item.percent?item.percent:0 }}%</span
>
</div>
</div>
@@ -996,7 +998,7 @@
<div class="header">
<div class="icon"></div>
<span>活动管理</span>
<div class="close_exit" @click="closehuodModal"></div>
<!-- <div class="close_exit" @click="closehuodModal"></div> -->
</div>
<div class="body">
<div><img src="../../assets/images/taskpage/erweima.png" /></div>
@@ -1886,6 +1888,7 @@ export default {
const getOverview = () => {
getRouterOverview(state.routerId)
.then((res) => {
console.log(res)
Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
levelList.routerInfoOverview[item] =
res.data.data.routerInfoOverview[item] || 0;
@@ -1898,7 +1901,7 @@ export default {
// console.log(r)
// })
state.addLoading = false;
console.log("项目概览--" + res);
console.log("项目概览--", res);
})
.catch((err) => {
state.addLoading = false;
@@ -1910,6 +1913,7 @@ export default {
const myGetRouterDetail = () => {
GetRouterDetail(state.routerId)
.then((res) => {
console.log('router-list',res)
if (res.data.data.routerInfo.status == 1) {
state.nodata = false;
}

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

@@ -124,7 +124,8 @@
<div class="inname">项目经理</div>
</div>
<div class="in">
<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"></ProjectManager>
<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
mode="multiple"></ProjectManager>
</div>
</div>
<div class="name">
@@ -201,10 +202,10 @@
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<!-- <img-->
<!-- class="nameimg"-->
<!-- src="../../assets/images/basicinfo/asterisk.png"-->
<!-- />-->
<div class="inname">是否BOEU实施</div>
</div>
<div class="in">
@@ -346,6 +347,7 @@ export default {
let obj = {
pageNo: state.currentPage,
pageSize: state.pageSize,
status: 1
};
api.getTemplate(obj).then((res) => {
state.totalPages = Number(res.data.data.pages);

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

File diff suppressed because it is too large Load Diff

43
src/views/projectcenter/TaskPage.vue
View File

@@ -383,31 +383,33 @@
>
<img
:src="
item.type == '1'
item.type == 1
? require('../../assets/images/leveladd/zai.png')
: item.type == '2'
: item.type == 2
? require('../../assets/images/leveladd/mian.png')
: item.type == '3'
: item.type == 3
? require('../../assets/images/leveladd/an.png')
: item.type == '4'
: item.type == 4
? require('../../assets/images/leveladd/zuo.png')
: item.type == '5'
: item.type == 5
? require('../../assets/images/leveladd/kao.png')
: item.type == '6'
: item.type == 6
? require('../../assets/images/leveladd/zhi.png')
: item.type == '7'
: item.type == 7
? require('../../assets/images/leveladd/wai.png')
: item.type == '8'
: item.type == 8
? require('../../assets/images/leveladd/tao.png')
: item.type == '9'
: item.type == 9
? require('../../assets/images/leveladd/huo.png')
: item.type == '10'
: item.type == 10
? require('../../assets/images/leveladd/ce.png')
: item.type == '11'
? require('../../assets/images/leveladd/diao.png')
: item.type == '12'
: item.type == 11
? require('../../assets/images/leveladd/pinggu.png')
: item.type == 12
? require('../../assets/images/leveladd/tou.png')
: null
: item.type == 13
? require('../../assets/images/leveladd/tou.png')
: require('../../assets/images/leveladd/xiangmu.png')
"
/>
</div>
@@ -427,11 +429,11 @@
</div>
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">{{ item.createTime }}</div>
<div class="timetext">{{item.startTime!==null?item.startTime[0]+'-'+ item.startTime[1]+'-'+item.startTime[2]:''}}</div>
</div>
<div class="progress">
<div class="progresstext">
{{ item.finishStuCnt }}/{{ item.totalStuCnt }}人
{{ item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 }}/{{ item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0 }}人
</div>
<div style="display: flex">
<a-progress
@@ -442,7 +444,7 @@
/>
<span class="progresstext" style="margin-left: 10px"
>{{
(item.finishStuCnt / item.totalStuCnt) * 100
(item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 / item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0) * 100
}}%</span
>
</div>
@@ -3248,8 +3250,10 @@ export default {
}).then((res) => {
console.log("get task", res.data.data);
let info = res.data.data.projectInfo;
let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
let end = toDate(info.endTime / 1000, "Y-M-D h:m");
// let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
let start = info.beginTime
// let end = toDate(info.endTime / 1000, "Y-M-D h:m");
let end = info.endTime
state.tstartTime = info.beginTime;
state.tendTime = info.endTime;
state.tsourceBelong = info.sourceBelongId;
@@ -3823,6 +3827,7 @@ export default {
templateProject,
changeGrouped,
deFile,
toDate
};
},
};

5
vue.config.js
View File

@@ -14,9 +14,8 @@ module.exports = defineConfig({
port: 8080,
proxy: {
"/manageApi": {
// target:"http://192.168.56.245:30001/",
target: "http://localhost:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
changeOrigin: true, //表示是否改变原域名
target:"http://111.231.196.214:30001/",
changeOrigin: true, //表示是否改变原域名
// secure: false,
// ws: false, //表示WebSocket协议
pathRewrite: {