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

17
src/api/index.js
View File

@@ -18,28 +18,28 @@ import http from "./config";
* name: user * name: user
* } * }
* }).then(res => console.log(res)) * }).then(res => console.log(res))
* *
* 接口传参三种方式（post/put/patch） * 接口传参三种方式（post/put/patch）
* *
* 1.'Content-Type'= 'multipart/form-data'，传参格式为 formData。 * 1.'Content-Type'= 'multipart/form-data'，传参格式为 formData。
* （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'） * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'）
* （request的Header:'Content-Type'= 'multipart/form-data'） * （request的Header:'Content-Type'= 'multipart/form-data'）
* var formData=new FormData(); * var formData=new FormData();
* formData.append('user',123456);formData.append('pass',12345678); * formData.append('user',123456);formData.append('pass',12345678);
* axios.post("/notice",formData).then() * axios.post("/notice",formData).then()
* *
* 2.'Content-Type'= 'application/x-www-form-urlencoded'，传参格式为 query 形式,使用$qs.stringify。 * 2.'Content-Type'= 'application/x-www-form-urlencoded'，传参格式为 query 形式,使用$qs.stringify。
* （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'） * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'）
* （request的Header:'Content-Type'= 'application/x-www-form-urlencoded'） * （request的Header:'Content-Type'= 'application/x-www-form-urlencoded'）
* let data = {"code":"1234","name":"yyyy"}; * let data = {"code":"1234","name":"yyyy"};
* axios.post(`${this.$url}/test/testRequest`,qs.stringify({data})).then() * axios.post(`${this.$url}/test/testRequest`,qs.stringify({data})).then()
* *
* 3.'Content-Type'= 'application/json，传参格式为 raw (JSON格式)。 * 3.'Content-Type'= 'application/json，传参格式为 raw (JSON格式)。
* （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'） * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'）
* （request的Header:'Content-Type'= 'application/json;charset=UTF-8'） * （request的Header:'Content-Type'= 'application/json;charset=UTF-8'）
* let data = {"code":"1234","name":"yyyy"} * let data = {"code":"1234","name":"yyyy"}
* axios.post(`${this.$url}/test/testRequest`,data).then() * 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 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) 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 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 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="navTop">
<div class="navTopMain"> <div class="navTopMain">
<img <img
style="width: 205px; height: 29px; margin-left: 37px; margin-top: 22px" style="width: 205px; height: 29px; margin-left: 37px; margin-top: 22px"
src="../assets/images/navtop/logo.png" src="../assets/images/navtop/logo.png"
/> />
<div class="navTopRight"> <div class="navTopRight">
<div class="role"> <div class="role">
@@ -11,10 +11,10 @@
<div class="roleArrow"></div> <div class="roleArrow"></div>
<div class="roleItems"> <div class="roleItems">
<div <div
v-for="(value, index) in roleList" v-for="(value, index) in roleList"
:key="index" :key="index"
class="roleItem" class="roleItem"
@click="changeRole(value)" @click="changeRole(value)"
> >
{{ value.name }} {{ value.name }}
</div> </div>
@@ -22,14 +22,14 @@
</div> </div>
<div class="user"> <div class="user">
<img <img
style=" style="
width: 40px; width: 40px;
height: 40px; height: 40px;
margin-left: 8px; margin-left: 8px;
border-radius: 15px; border-radius: 15px;
margin-right: 10px; margin-right: 10px;
" "
:src="avatar" :src="avatar"
/> />
<div style="margin-right: 20px">{{ username }}</div> <div style="margin-right: 20px">{{ username }}</div>
</div> </div>
@@ -47,20 +47,21 @@
</div> --> </div> -->
<div class="signOutMain" @click="logOut"> <div class="signOutMain" @click="logOut">
<img <img
style="width: 27px; height: 27px" style="width: 27px; height: 27px"
src="../assets/images/navtop/signout.png" src="../assets/images/navtop/signout.png"
/> />
<span class="signOut">登出</span> <span class="signOut">登出</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<down-load v-model:downloadVisible="visible" /> <down-load v-model:downloadVisible="visible"/>
</template> </template>
<script> <script>
import { reactive, toRefs } from "vue"; import {reactive, toRefs} from "vue";
import DownLoad from "../components/drawers/DownLoad"; import DownLoad from "../components/drawers/DownLoad";
import * as api from "../api/index1"; import * as api from "../api/index1";
export default { export default {
name: "NavTop", name: "NavTop",
components: { components: {
@@ -100,24 +101,32 @@ export default {
}; };
const getUser = () => { const getUser = () => {
api api
.getUser() .getUser()
.then((res) => { .then((res) => {
console.log("获取登录信息成功", res); console.log("获取登录信息成功", res);
if (res.data.code === 200) { if (res.data.code === 200) {
state.username = res.data.data.realName; state.username = res.data.data.realName;
// state.avatar = res.data.data.avatar // state.avatar = res.data.data.avatar
// ? res.data.data.avatar // ? res.data.data.avatar
// : require("../assets/images/avatar.png"); // : require("../assets/images/avatar.png");
state.avatar = require("../assets/images/avatar.png"); state.avatar = require("../assets/images/avatar.png");
} }
}) })
.catch((err) => { .catch((err) => {
console.log("获取登录信息失败", err); console.log("获取登录信息失败", err);
}); });
}; };
getUser(); getUser();
const logOut = () => { 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"); window.open("https://u-pre.boe.com/web/", "_self");
}; };
return { return {
@@ -142,9 +151,11 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
.navTopRight { .navTopRight {
display: flex; display: flex;
} }
.role { .role {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -154,6 +165,7 @@ export default {
line-height: 36px; line-height: 36px;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
.roleArrow { .roleArrow {
width: 13px; width: 13px;
height: 7px; height: 7px;
@@ -161,6 +173,7 @@ export default {
background-image: url(../assets/images/navtop/down.png); background-image: url(../assets/images/navtop/down.png);
background-size: 100%; background-size: 100%;
} }
.roleItems { .roleItems {
width: 109px; width: 109px;
height: 90px; height: 90px;
@@ -174,22 +187,27 @@ export default {
display: none; display: none;
z-index: 100; z-index: 100;
} }
.roleItem { .roleItem {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(79, 81, 86, 1); color: rgba(79, 81, 86, 1);
line-height: 36px; line-height: 36px;
} }
.roleItem:hover { .roleItem:hover {
color: #4ea6ff; color: #4ea6ff;
} }
} }
.role:hover .roleItems { .role:hover .roleItems {
display: block; display: block;
} }
.role:hover .roleArrow { .role:hover .roleArrow {
background-image: url(../assets/images/navtop/up.png); background-image: url(../assets/images/navtop/up.png);
} }
.user { .user {
margin-left: 37px; margin-left: 37px;
display: flex; display: flex;
@@ -199,12 +217,14 @@ export default {
color: #b3bdc4; color: #b3bdc4;
line-height: 36px; line-height: 36px;
} }
.signOutMain { .signOutMain {
cursor: pointer; cursor: pointer;
margin-right: 29px; margin-right: 29px;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.signOut { .signOut {
font-size: 16px; font-size: 16px;
font-weight: 400; 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" expandRowByClick="true"
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="false"
:row-selection="rowSelection" :row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
type: 'radio',
}"
filterMultiple:false filterMultiple:false
/> />
@@ -101,9 +105,10 @@ export default {
tableDataTotal: 0, tableDataTotal: 0,
tableData: [], tableData: [],
selectedRowKeys: [], selectedRowKeys: [],
assessmentId:null, assessmentId:null
}); });
const closeDrawer = () => { const closeDrawer = () => {
state.selectedRowKeys = [];
ctx.emit("update:assessmentVisible", false); ctx.emit("update:assessmentVisible", false);
ctx.emit("update:titleTag", true); ctx.emit("update:titleTag", true);
@@ -165,6 +170,19 @@ export default {
// state.selectedRowKeys = selectedRowKeys; // 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) => { const handelChangePage = (page, pageSize) => {
state.currentPage = page; state.currentPage = page;
state.pageSize = pageSize; state.pageSize = pageSize;
@@ -222,6 +240,7 @@ export default {
getAllInvistText, getAllInvistText,
resetInvist, resetInvist,
handelChangePage, handelChangePage,
onSelectChange
}; };
}, },
}; };

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

104
src/store/index.js
View File

@@ -6,60 +6,64 @@
* @FilePath: /fe-manage/src/store/index.js * @FilePath: /fe-manage/src/store/index.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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' // import * as api from '../api/index1'
export default createStore({ export default createStore({
state: { state: {
openpages: localStorage.getItem("openpages") openpages: localStorage.getItem("openpages")
? JSON.parse(localStorage.getItem("openpages")) ? JSON.parse(localStorage.getItem("openpages"))
: [ : [
{ {
pagename: "学习路径图", pagename: "学习路径图",
href: "/learningpath", href: "/learningpath",
active: true, 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: "", SET_assessmentName(state, name) {
routerId: null, state.assessmentName = name;
projectTemplateId: null, console.log("state.assessmentName");
orgtreeList: [], console.log(state.assessmentName);
faceclassPic: null, },
faceclassClass: [], //获取组织树
faceclassScene: [], getOrgtreeList(state, data) {
projectLevel: [],//项目级别 state.orgtreeList = data
projectSys: [],//培训分类 },
pathmapPic: [],//学习路径背景图 SET_DICT(state, {key, data}) {
}, state[key] = data
getters: {}, },
mutations: { SET_USER(state, userInfo) {
chengeOpenpages(state, list) { state.userInfo = userInfo
// console.log('list', list) },
state.openpages = list; SET_projectTemplateId(state, projectTemplateId) {
}, state.projectTemplateId = projectTemplateId;
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;
}
}, },
actions: {}, actions: {},
modules: {}, 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", key: "status",
align: "center", align: "center",
}, },
{ // {
title: "转审", // title: "转审",
dataIndex: "change", // dataIndex: "change",
key: "change", // key: "change",
align: "center", // align: "center",
}, // },
{ {
title: "创建人", title: "创建人",
dataIndex: "creater", dataIndex: "creater",
@@ -637,12 +637,16 @@ export default {
state.courAuditModal = false; state.courAuditModal = false;
message.destroy(); message.destroy();
message.success("审核提交成功"); message.success("审核提交成功");
state.valueSugg = null;
state.valuepass="1";
getFaceList(); getFaceList();
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
message.destroy(); message.destroy();
message.warning("审核提交失败"); message.warning("审核提交失败");
state.valueSugg = null;
state.valuepass="1";
}); });
}; };
onMounted(async () => { onMounted(async () => {

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

@@ -161,26 +161,7 @@
</div> </div>
<div class="inname">归属组织</div> <div class="inname">归属组织</div>
<div class="select in"> <div class="select in">
<a-tree-select <OrgClass v-model:value="organizationSelectId" v-model:name="organizationSelectName"></OrgClass>
: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>
</div> </div>
<!-- <div class="in"> <!-- <div class="in">
<a-input <a-input
@@ -295,26 +276,7 @@
</div> </div>
<div class="inname">归属组织</div> <div class="inname">归属组织</div>
<div class="select in"> <div class="select in">
<a-tree-select <OrgClass v-model:value="organizationSelectId" v-model:name="organizationSelectName"></OrgClass>
: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>
</div> </div>
<!-- <div class="in"> <!-- <div class="in">
<a-input <a-input
@@ -707,6 +669,7 @@ import {
} from "../../api/method"; } from "../../api/method";
import { storage } from "../../api/storage"; import { storage } from "../../api/storage";
import { useStore } from "vuex"; import { useStore } from "vuex";
import OrgClass from "@/components/project/OrgClass";
export default { export default {
name: "learningPath", name: "learningPath",
components: { components: {
@@ -715,7 +678,7 @@ export default {
// QueryRight, // QueryRight,
// ManageRight, // ManageRight,
ProjOwnerShip, ProjOwnerShip,
OrgClass,
ProjPowerList, ProjPowerList,
ProjCheckShip, ProjCheckShip,
}, },

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

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

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

@@ -124,7 +124,8 @@
<div class="inname">项目经理</div> <div class="inname">项目经理</div>
</div> </div>
<div class="in"> <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> </div>
<div class="name"> <div class="name">
@@ -201,10 +202,10 @@
</div> </div>
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <!-- <img-->
class="nameimg" <!-- class="nameimg"-->
src="../../assets/images/basicinfo/asterisk.png" <!-- src="../../assets/images/basicinfo/asterisk.png"-->
/> <!-- />-->
<div class="inname">是否BOEU实施</div> <div class="inname">是否BOEU实施</div>
</div> </div>
<div class="in"> <div class="in">
@@ -346,6 +347,7 @@ export default {
let obj = { let obj = {
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
status: 1
}; };
api.getTemplate(obj).then((res) => { api.getTemplate(obj).then((res) => {
state.totalPages = Number(res.data.data.pages); 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 <img
:src=" :src="
item.type == '1' item.type == 1
? require('../../assets/images/leveladd/zai.png') ? require('../../assets/images/leveladd/zai.png')
: item.type == '2' : item.type == 2
? require('../../assets/images/leveladd/mian.png') ? require('../../assets/images/leveladd/mian.png')
: item.type == '3' : item.type == 3
? require('../../assets/images/leveladd/an.png') ? require('../../assets/images/leveladd/an.png')
: item.type == '4' : item.type == 4
? require('../../assets/images/leveladd/zuo.png') ? require('../../assets/images/leveladd/zuo.png')
: item.type == '5' : item.type == 5
? require('../../assets/images/leveladd/kao.png') ? require('../../assets/images/leveladd/kao.png')
: item.type == '6' : item.type == 6
? require('../../assets/images/leveladd/zhi.png') ? require('../../assets/images/leveladd/zhi.png')
: item.type == '7' : item.type == 7
? require('../../assets/images/leveladd/wai.png') ? require('../../assets/images/leveladd/wai.png')
: item.type == '8' : item.type == 8
? require('../../assets/images/leveladd/tao.png') ? require('../../assets/images/leveladd/tao.png')
: item.type == '9' : item.type == 9
? require('../../assets/images/leveladd/huo.png') ? require('../../assets/images/leveladd/huo.png')
: item.type == '10' : item.type == 10
? require('../../assets/images/leveladd/ce.png') ? require('../../assets/images/leveladd/ce.png')
: item.type == '11' : item.type == 11
? require('../../assets/images/leveladd/diao.png') ? require('../../assets/images/leveladd/pinggu.png')
: item.type == '12' : item.type == 12
? require('../../assets/images/leveladd/tou.png') ? require('../../assets/images/leveladd/tou.png')
: null : item.type == 13
? require('../../assets/images/leveladd/tou.png')
: require('../../assets/images/leveladd/xiangmu.png')
" "
/> />
</div> </div>
@@ -427,11 +429,11 @@
</div> </div>
<div class="time"> <div class="time">
<div class="timetext">开始时间</div> <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>
<div class="progress"> <div class="progress">
<div class="progresstext"> <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>
<div style="display: flex"> <div style="display: flex">
<a-progress <a-progress
@@ -442,7 +444,7 @@
/> />
<span class="progresstext" style="margin-left: 10px" <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 }}%</span
> >
</div> </div>
@@ -3248,8 +3250,10 @@ export default {
}).then((res) => { }).then((res) => {
console.log("get task", res.data.data); console.log("get task", res.data.data);
let info = res.data.data.projectInfo; let info = res.data.data.projectInfo;
let start = toDate(info.beginTime / 1000, "Y-M-D h:m"); // let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
let end = toDate(info.endTime / 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.tstartTime = info.beginTime;
state.tendTime = info.endTime; state.tendTime = info.endTime;
state.tsourceBelong = info.sourceBelongId; state.tsourceBelong = info.sourceBelongId;
@@ -3823,6 +3827,7 @@ export default {
templateProject, templateProject,
changeGrouped, changeGrouped,
deFile, deFile,
toDate
}; };
}, },
}; };

5
vue.config.js
View File

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