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

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

Browse Source
This commit is contained in:
Ggysh-7
2022-12-01 21:27:09 +08:00
parent 755a20b407 f1e5288d5d
commit 46edbee03d
36 changed files with 1906 additions and 1641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/App.vue
View File

@@ -28,6 +28,8 @@ import OpenPages from "@/components/OpenPages";
import BreadCrumb from "@/components/BreadCrumb"; 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";
export default defineComponent({ export default defineComponent({
components: { components: {
NavLeft, NavLeft,
@@ -41,7 +43,7 @@ export default defineComponent({
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
// console.log("router", router.getRoutes(), route); // console.log("router", router.getRoutes(), route);
console.log("版本0.08------------"); console.log("版本0.10------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });
@@ -55,20 +57,53 @@ export default defineComponent({
const currentRouteName = computed(() => route.name); const currentRouteName = computed(() => route.name);
function init() {
console.log(store)
initDict('faceclassPic')
initDict('faceclassClass')
initDict('faceclassScene')
initDict('projectLevel')
initDict('projectSys')
getOrgTree()
}
async function initDict(key) {
let list = localStorage.getItem(key)
if (list) {
store.commit('SET_DICT', {key, data:JSON.parse(list)});
return;
}
list = await getDictList(key)
localStorage.setItem(key, JSON.stringify(list));
store.commit('SET_DICT', {key, data:list});
}
const getDictList = (param) => api1.getDict({
pageNo: 1,
pageSize: 20,
setCode: param
}).then((res) => res.data.data.rows)
//获取组织树 //获取组织树
const getOrgTree = () => { const getOrgTree = () => {
const orgtreeList = localStorage.getItem("orgtreeList")
if (orgtreeList) {
store.commit("getOrgtreeList", JSON.parse(orgtreeList));
return;
}
let obj = { let obj = {
keyWord: "", keyWord: "",
id: -1, id: -1,
pageNo: 1, pageNo: 1,
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));
store.commit("getOrgtreeList", res.data.data); store.commit("getOrgtreeList", res.data.data);
} }
}) })
@@ -77,7 +112,7 @@ export default defineComponent({
}); });
}; };
getOrgTree(); init();
return { return {
isLogin, isLogin,
@@ -125,6 +160,7 @@ export default defineComponent({
background: #ffffff; background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
} }
// @media screen and (max-width: 1366px) { // @media screen and (max-width: 1366px) {
// .cmMain { // .cmMain {
// width: 750px; // width: 750px;

2
src/api/config.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52 * @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-30 15:03:21 * @LastEditTime: 2022-12-01 09:02:04
* @FilePath: /fe-manage/src/api/config.js * @FilePath: /fe-manage/src/api/config.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
*/ */

11
src/api/indexVote.js
View File

@@ -60,15 +60,10 @@ export const createVote = (obj) => http.post('/vote/createVote', obj)
export const deleteVoteMessage = (obj) => http.post('/vote/deleteVoteMessage', { params: obj }) export const deleteVoteMessage = (obj) => http.post('/vote/deleteVoteMessage', { params: obj })
//删除题干信息接口 //删除题干信息接口
export const deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', obj, { export const deleteVoteStem = (voteStemId) => http.post(`/vote/deleteVoteStem?voteStemId=${voteStemId}`)
headers: {
'token': '123',
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
}
})
//删除题选项息接口 //删除题选项息接口
export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOption', { params: obj }) export const deleteVoteStemOption = (optionId) => http.post(`/vote/deleteVoteStemOption?optionId=${optionId}`)
//修改投票信息接口 //修改投票信息接口
export const editVote = (obj) => http.post('/vote/editVote', obj) export const editVote = (obj) => http.post('/vote/editVote', obj)
@@ -82,7 +77,7 @@ export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', o
//上传组件 //上传组件
export const fileUp = (obj) => http.post('/file/upload', obj, qs.stringify({ obj })); export const fileUp = (obj) => http.post('/file/upload', obj, qs.stringify({ obj }));
//根据题干ID获取投票任务 //根据题干ID获取投票任务
export const queryVoteDetailById = (obj) => http.post('/vote/queryVoteDetailById', obj) export const queryVoteDetailById = (voteID) => http.post(`/vote/queryVoteDetailById?voteId=${voteID}`)
// 测试方法 // 测试方法
// import * as api from '../../api/index' // import * as api from '../../api/index'

7
src/components/NavTop.vue
View File

@@ -104,9 +104,10 @@ export default {
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");
} }
}) })
.catch((err) => { .catch((err) => {

59
src/components/drawers/AddActive.vue
View File

@@ -136,7 +136,9 @@
</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">
@@ -173,7 +175,9 @@
</div> </div>
</div> </div>
<div class="qdqtbox"> <div class="qdqtbox">
<div class="qtbtn"><div class="btntext">签退</div></div> <div class="qtbtn">
<div class="btntext">签退</div>
</div>
</div> </div>
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
@@ -204,10 +208,12 @@
<div class="btnbox"> <div class="btnbox">
<a-radio-group v-model:value="radioV1"> <a-radio-group v-model:value="radioV1">
<a-radio v-model:checked="checked" :value="1" @click="cloradio1" <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
>仅签到</a-radio >仅签到
</a-radio
> >
<a-radio v-model:checked="checked" :value="2" @click="cloradio1" <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
>签到、签退全部完成</a-radio >签到、签退全部完成
</a-radio
> >
</a-radio-group> </a-radio-group>
</div> </div>
@@ -313,7 +319,7 @@ export default {
state.textV1 = ""; state.textV1 = "";
state.textV2 = ""; state.textV2 = "";
state.time = ""; state.time = "";
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
}; };
@@ -353,7 +359,8 @@ export default {
dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"), dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"),
]; ];
}) })
.catch(() => {}); .catch(() => {
});
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
if (bool && props.edit) { if (bool && props.edit) {
@@ -365,9 +372,9 @@ export default {
state.radioV1 = ""; state.radioV1 = "";
} }
}; };
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.activityId, courseId: res.data.data.activityId,
duration: res.data.data.activityDuration, duration: res.data.data.activityDuration,
@@ -383,7 +390,7 @@ export default {
//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.activityId, courseId: res.data.data.activityId,
duration: res.data.data.activityDuration, duration: res.data.data.activityDuration,
@@ -400,7 +407,7 @@ export default {
//////message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); //////message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
apiTask await apiTask
.addTempTask({ .addTempTask({
courseId: res.data.data.activityId, courseId: res.data.data.activityId,
duration: res.data.data.activityDuration, duration: res.data.data.activityDuration,
@@ -463,9 +470,9 @@ export default {
//更新编辑活动信息 //更新编辑活动信息
api api
.updateActivity(obj) .updateActivity(obj)
.then((res) => { .then(async (res) => {
closeDrawer(); closeDrawer();
updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
message.destroy(); message.destroy();
message.success("更新成功"); message.success("更新成功");
@@ -478,11 +485,11 @@ export default {
//新建活动信息 //新建活动信息
api api
.createActivity(obj) .createActivity(obj)
.then((res) => { .then(async (res) => {
message.destroy(); message.destroy();
message.success("创建成功"); message.success("创建成功");
closeDrawer(); closeDrawer();
updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
}) })
.catch(() => { .catch(() => {
@@ -507,6 +514,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;
} }
.addactiveDrawer { .addactiveDrawer {
.drawerMain { .drawerMain {
.header { .header {
@@ -516,6 +524,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;
@@ -524,40 +533,49 @@ export default {
margin-left: 24px; margin-left: 24px;
} }
} }
.contentMain { .contentMain {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.ant-input { .ant-input {
height: 88px; height: 88px;
width: 384px; width: 384px;
border-radius: 8px; border-radius: 8px;
} }
.ant-picker { .ant-picker {
border-radius: 8px; border-radius: 8px;
} }
.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;
.xkbtn { .xkbtn {
cursor: pointer; cursor: pointer;
width: 130px; width: 130px;
@@ -570,24 +588,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;
@@ -598,15 +621,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;
@@ -616,10 +642,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;
@@ -636,6 +664,7 @@ export default {
} }
} }
} }
.main_btns { .main_btns {
height: 72px; height: 72px;
width: 100%; width: 100%;
@@ -645,6 +674,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;
@@ -654,6 +684,7 @@ export default {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;

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

@@ -251,8 +251,8 @@ export default {
if (props.edit) { if (props.edit) {
api api
.updateDiscuss(obj) .updateDiscuss(obj)
.then((res) => { .then(async(res) => {
updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
message.destroy(); message.destroy();
@@ -265,8 +265,8 @@ export default {
} else { } else {
api api
.createDiscuss(obj) .createDiscuss(obj)
.then((res) => { .then(async(res) => {
updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
message.destroy(); message.destroy();

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

@@ -115,6 +115,7 @@ import { message } from "ant-design-vue";
import {RouterEditTask} from "@/api/indexTask"; import {RouterEditTask} from "@/api/indexTask";
import dayjs from "dayjs"; import dayjs from "dayjs";
import {addTempTask} from "../../api/indexTaskadd"; import {addTempTask} from "../../api/indexTaskadd";
export default { export default {
name: "AddEval", name: "AddEval",
components: { components: {
@@ -201,9 +202,9 @@ export default {
state.evaluationTypeName = ""; state.evaluationTypeName = "";
}; };
//向关卡或阶段渲染 //向关卡或阶段渲染
const updateTask = (value) => { const updateTask = async (value) => {
if (props.isLevel == 1) { if (props.isLevel == 1) {
RouterEditTask({ await RouterEditTask({
chapterId: props.isactive, chapterId: props.isactive,
courseId: Number(value.evaluationId), courseId: Number(value.evaluationId),
name: value.evaluationName, name: value.evaluationName,
@@ -218,7 +219,7 @@ export default {
//message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`); //message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`);
}); });
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
apitaskadd await apitaskadd
.addTask({ .addTask({
duration: 0, duration: 0,
flag: true, flag: true,
@@ -238,7 +239,7 @@ export default {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
addTempTask({ await addTempTask({
courseId: Number(value.evaluationId), courseId: Number(value.evaluationId),
name: value.evaluationName, name: value.evaluationName,
projectTemplateId: props.projectTemplateId, projectTemplateId: props.projectTemplateId,
@@ -309,8 +310,8 @@ export default {
}; };
api api
.updateEvaluation(objei) .updateEvaluation(objei)
.then((res) => { .then(async (res) => {
updateTask(res.data.data); await updateTask(res.data.data);
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
message.destroy(); message.destroy();
@@ -346,8 +347,8 @@ export default {
}; };
api api
.createEvaluation(obj) .createEvaluation(obj)
.then((res) => { .then(async (res) => {
updateTask(res.data.data); await updateTask(res.data.data);
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
message.destroy(); message.destroy();
@@ -380,6 +381,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;
} }
.addevalDrawer { .addevalDrawer {
.drawerMain { .drawerMain {
.header { .header {
@@ -389,6 +391,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;
@@ -397,32 +400,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 {
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;
.checkEval { .checkEval {
cursor: pointer; cursor: pointer;
width: 130px; width: 130px;
@@ -433,34 +443,41 @@ export default {
margin-left: 15px; margin-left: 15px;
color: #fff; color: #fff;
} }
.tag-style { .tag-style {
color: rgb(113, 113, 237); color: rgb(113, 113, 237);
background-color: #d7d1f7; background-color: #d7d1f7;
} }
} }
} }
.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: 56px; margin-left: 56px;
} }
.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;
@@ -470,10 +487,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;
@@ -490,6 +509,7 @@ export default {
} }
} }
} }
.main_btns { .main_btns {
height: 72px; height: 72px;
width: 100%; width: 100%;
@@ -499,6 +519,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;
@@ -508,6 +529,7 @@ export default {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;

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

@@ -61,8 +61,8 @@
<span style="margin-right: 3px">授课教师：</span> <span style="margin-right: 3px">授课教师：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-auto-complete v-model:value="memberValue.label" placeholder="选择老师" style="width: 364px" <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"
:options="options" @search="handleSearch"></a-auto-complete> :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -157,7 +157,8 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-checkbox v-model:checked="completeLeave" <a-checkbox v-model:checked="completeLeave"
@click="completeLeave = !completeLeave">学员请假后记为任务完成</a-checkbox> @click="completeLeave = !completeLeave">学员请假后记为任务完成
</a-checkbox>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -166,8 +167,10 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-checkbox v-model:checked="innerPersion" <a-checkbox v-model:checked="innerPersion"
@click="innerPersion = !innerPersion">允许项目内人员临时到场参加</a-checkbox> @click="innerPersion = !innerPersion">允许项目内人员临时到场参加
<a-checkbox v-model:checked="outPersion" @click="outPersion = !outPersion">允许项目外人员临时到场参加</a-checkbox> </a-checkbox>
<a-checkbox v-model:checked="outPersion" @click="outPersion = !outPersion">允许项目外人员临时到场参加
</a-checkbox>
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
@@ -246,7 +249,8 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-upload @change="handleChange" action="/manageApi/file/upload" v-model:file-list="fileList"> <a-upload @change="handleChange" action="/manageApi/file/upload" v-model:file-list="fileList">
<button class="xkbtn">上传附件</button></a-upload> <button class="xkbtn">上传附件</button>
</a-upload>
</div> </div>
</div> </div>
</div> </div>
@@ -274,6 +278,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";
export default { export default {
name: "AddFaceteach", name: "AddFaceteach",
components: { components: {
@@ -332,7 +337,10 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
projectName: {
type: String,
default: null,
},
}, },
setup(props, ctx) { setup(props, ctx) {
const options = ref([]); const options = ref([]);
@@ -515,18 +523,20 @@ export default {
projectMember: p.concat(p1), projectMember: p.concat(p1),
offcourseId: state.chooseCourse, offcourseId: state.chooseCourse,
offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0, offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0,
testId: state.EditTestId testId: state.EditTestId,
duration:state.duration,
}; };
console.log("obj============", obj, "6" + "9"); console.log("obj============", obj, "6" + "9");
console.log("222222222");
editPlan(obj) editPlan(obj).then(async (res) => {
.then((res) => {
message.destroy(); message.destroy();
message.sucsess(`添加成功`); message.success(`添加成功`);
updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}).catch(() => { }).catch((e) => {
console.log(e)
message.destroy(); message.destroy();
message.error(`添加失败`); message.error(`添加失败`);
}); });
@@ -537,18 +547,19 @@ export default {
//更新任务列表 //更新任务列表
// 新增编辑或新增项目任务 // 新增编辑或新增项目任务
const updateTask = (res) => { const updateTask = async (res) => {
console.log("props.isLevel=====", props.isLevel); console.log("props.isLevel=====", props.isLevel);
if (props.isLevel == 1) { if (props.isLevel == 1) {
let editObj1 = { let editObj1 = {
chapterId: props.isactive, chapterId: props.isactive,
courseId: res.data.data.offcoursePlanId, courseId: res.data.data.offcoursePlanId,
name: res.data.data.name, name: res.data.data.name,
duration: res.data.data.duration,
routerId: props.routerId, routerId: props.routerId,
routerTaskId: props.routerTaskId || 0, routerTaskId: props.routerTaskId || 0,
type: 2, type: 2,
}; };
RouterEditTask(editObj1) await RouterEditTask(editObj1)
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
@@ -569,7 +580,7 @@ export default {
type: 2, type: 2,
}; };
// 新增编辑或新增项目 // 新增编辑或新增项目
ProjectEditTask(editObj) await ProjectEditTask(editObj)
.then(() => { .then(() => {
message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功`); message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功`);
@@ -579,7 +590,7 @@ export default {
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
console.log("dddddddddddd33333333"); console.log("dddddddddddd33333333");
addTempTask({ await addTempTask({
courseId: res.data.data.offcoursePlanId, courseId: res.data.data.offcoursePlanId,
name: res.data.data.name, name: res.data.data.name,
duration: res.data.data.duration, duration: res.data.data.duration,
@@ -668,6 +679,7 @@ export default {
const handleChange2 = (value, label) => { const handleChange2 = (value, label) => {
console.log(`selected ${value}`); console.log(`selected ${value}`);
state.memberId = value; state.memberId = value;
// console.log(label)
state.memberValue = label; state.memberValue = label;
}; };
const handleFocus = () => { const handleFocus = () => {

24
src/components/drawers/AddHomework.vue
View File

@@ -251,14 +251,20 @@ export default {
console.log(args); console.log(args);
}; };
const handleChange = (info) => { const handleChange = (info) => {
console.log("info", info);
if (info.file.status !== "uploading") { if (info.file.status !== "uploading") {
console.log(info.file, info.fileList); console.log(info.file, info.fileList);
state.workEnclosureAddress = info.fileList[0].response.data; state.workEnclosureAddress = info.fileList[0].response.data;
console.log('state.workEnclosureAddress',state.workEnclosureAddress); console.log("state.workEnclosureAddress", state.workEnclosureAddress);
} }
if (info.file.status === "done") { if (info.file.status === "done") {
message.success(`${info.file.name} 文件上传成功`); message.success(`${info.file.name} 文件上传成功`);
console.log("info.file", info.file.response.data);
if (info.file.response && info.file.response.data) {
// console.log("fileList", fileList);
// fileList.value = [info];
}
} else if (info.file.status === "error") { } else if (info.file.status === "error") {
message.error(`${info.file.name} 文件上传失败.`); message.error(`${info.file.name} 文件上传失败.`);
} }
@@ -289,16 +295,18 @@ export default {
let obj = { let obj = {
submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"), submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"), submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
workEnclosureAddress: state.workEnclosureAddress ? state.workEnclosureAddress : "" , workEnclosureAddress: state.workEnclosureAddress
? state.workEnclosureAddress
: "",
workId: props.edit ? props.EditWorkId : 0, workId: props.edit ? props.EditWorkId : 0,
workName: formState.workName, workName: formState.workName,
workRequirement: formState.workRequirement, workRequirement: formState.workRequirement,
}; };
if (props.EditWorkId > 0) { if (props.EditWorkId > 0) {
updateWorkTaskUsing(obj) updateWorkTaskUsing(obj)
.then((res) => { .then(async(res) => {
// console.log("添加成功", res); // console.log("添加成功", res);
updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}) })
@@ -308,9 +316,9 @@ export default {
}); });
} else { } else {
createWorkTask(obj) createWorkTask(obj)
.then((res) => { .then(async(res) => {
console.log("添加成功", res); console.log("添加成功", res);
updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}) })
@@ -413,7 +421,9 @@ export default {
let obj = { let obj = {
submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"), submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"), submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
workEnclosureAddress: state.workEnclosureAddress ? state.workEnclosureAddress : "" , workEnclosureAddress: state.workEnclosureAddress
? state.workEnclosureAddress
: "",
workId: props.EditWorkId > 0 ? props.EditWorkId : 0, workId: props.EditWorkId > 0 ? props.EditWorkId : 0,
workName: formState.workName, workName: formState.workName,
workRequirement: formState.workRequirement, workRequirement: formState.workRequirement,

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

@@ -92,7 +92,6 @@
" "
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>
</div> </div>
@@ -108,7 +107,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-auto-complete <a-auto-complete
v-model:value="memberValue.label" :value="memberValue.label"
show-search show-search
:not-found-content="fetching ? undefined : null" :not-found-content="fetching ? undefined : null"
placeholder="Select a teacher" placeholder="Select a teacher"
@@ -157,7 +156,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="main_item" style="margin-top: -10px"> <div class="main_item" style="margin-top: -10px">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">直播链接：</span> <span style="margin-right: 3px">直播链接：</span>
@@ -192,7 +190,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">评估：</span> <span style="margin-right: 3px">评估：</span>
@@ -223,7 +220,6 @@
/> />
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">考勤设置：</span> <span style="margin-right: 3px">考勤设置：</span>
@@ -279,9 +275,7 @@
style=" style="
width: 88px; width: 88px;
height: 32px; height: 32px;
border-radius: 8px; border-radius: 8px;overflow: hidden; "
overflow: hidden;
"
v-model:value="inputV8" v-model:value="inputV8"
></a-input-number> ></a-input-number>
<span style="color: #999999; margin-left: 8px" <span style="color: #999999; margin-left: 8px"
@@ -310,8 +304,8 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-checkbox <a-checkbox
v-model:checked="checkedC2" v-model:checked="switchC2"
@onclick="checkedC2 = !checkedC2" @onclick="(switchC2 = !switchC2)"
>学员请假后记为任务完成</a-checkbox >学员请假后记为任务完成</a-checkbox
> >
</div> </div>
@@ -337,7 +331,6 @@ 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 { useRouter } from "vue-router"; // import { useRouter } from "vue-router";
function getBase64(img, callback) { function getBase64(img, callback) {
@@ -345,7 +338,6 @@ function getBase64(img, callback) {
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: {
@@ -356,7 +348,6 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
EditLiveId: { EditLiveId: {
type: Number, type: Number,
default: null, default: null,
@@ -431,20 +422,19 @@ export default {
switchC1: "", switchC1: "",
checkedC1: false, checkedC1: false,
checkedC2: false, checkedC2: false,
playback: false,
assessmentId: null, assessmentId: null,
obj: {}, //要传的obj数据 obj: {}, //要传的obj数据
assessment: [], //评估信息 assessment: [], //评估信息
assessmentvalue: null, assessmentvalue: null,
needEval: false, needEval: false,
otherSettings: false, switchC2: false,
assessmentVisible: false, assessmentVisible: false,
}); });
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:addliveVisible", false); ctx.emit("update:addliveVisible", false);
ctx.emit("update:edit", false); ctx.emit("update:edit", false);
state.radioV1 = ""; state.radioV1 = "";
state.playback = false; state.switchC1 = false;
state.inputV6 = ""; state.inputV6 = "";
state.inputV7 = ""; state.inputV7 = "";
state.inputV2 = ""; state.inputV2 = "";
@@ -458,7 +448,7 @@ export default {
state.switchC1 = ""; state.switchC1 = "";
state.imageUrl = ""; state.imageUrl = "";
state.needEval = false; state.needEval = false;
state.otherSettings; state.switchC2=false;
ctx.emit("changeData", false); ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
@@ -504,29 +494,27 @@ export default {
state.inputV7 = res.data.data.afterSignIn; state.inputV7 = res.data.data.afterSignIn;
state.inputV8 = res.data.data.signOutTime; state.inputV8 = res.data.data.signOutTime;
state.textV1 = res.data.data.liveExplain; state.textV1 = res.data.data.liveExplain;
state.radioV1 = res.data.data.standardSettings; state.radioV1 = Number(res.data.data.standardSettings);
//state.= res.data.data //state.= res.data.data
state.assessmentId = res.data.data.assessmentId; state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover; state.imageUrl = res.data.data.liveCover;
state.switchC2 = res.data.data.otherSettings==1?true:false;
}) })
.catch(() => { .catch(() => {
//message.error(`查询失败`); //message.error(`查询失败`);
}); });
}; };
const cloradio1 = (value) => { const cloradio1 = (value) => {
if (state.radioV1 === value.target._value) { if (state.radioV1 === value.target._value) {
state.radioV1 = ""; state.radioV1 = "";
} }
}; };
const handleChange = (info) => { const handleChange = (info) => {
if (info.file.status === "uploading") { if (info.file.status === "uploading") {
state.loading = true; state.loading = true;
console.log("info", info); console.log("info", info);
return; return;
} }
if (info.file.status === "done") { if (info.file.status === "done") {
// Get this url from response in real world. // Get this url from response in real world.
getBase64(info.file.originFileObj, (base64Url) => { getBase64(info.file.originFileObj, (base64Url) => {
@@ -535,20 +523,18 @@ export default {
console.log("imgURL", state.imageUrl); console.log("imgURL", state.imageUrl);
}); });
} }
if (info.file.status === "error") { if (info.file.status === "error") {
state.loading = false; state.loading = false;
message.destroy(); message.destroy();
message.error("upload error"); message.error("upload error");
} }
}; };
const updateTask = (res) => { const updateTask = (res) => {
if (props.isLevel == 1) { if (props.isLevel == 1) {
RouterEditTask({ RouterEditTask({
chapterId: props.isactive, chapterId: props.isactive,
courseId: res.data.data.liveId, courseId: res.data.data.liveId,
duration: res.data.data.duration, duration: res.data.data.liveDuration,
name: res.data.data.liveName, name: res.data.data.liveName,
routerId: props.routerId, routerId: props.routerId,
routerTaskId: props.routerTaskId || 0, routerTaskId: props.routerTaskId || 0,
@@ -565,7 +551,7 @@ export default {
apiTask apiTask
.addTask({ .addTask({
courseId: res.data.data.liveId, courseId: res.data.data.liveId,
duration: res.data.data.duration, 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,
@@ -583,7 +569,7 @@ export default {
console.log("props.projectTemplateId", props.projectTemplateId); console.log("props.projectTemplateId", props.projectTemplateId);
addTempTask({ addTempTask({
courseId: res.data.data.liveId, courseId: res.data.data.liveId,
duration: res.data.data.duration, duration: res.data.data.liveDuration,
name: res.data.data.liveName, name: res.data.data.liveName,
projectTemplateId: props.projectTemplateId, projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
@@ -622,7 +608,6 @@ export default {
message.destroy(); message.destroy();
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"
@@ -631,7 +616,6 @@ export default {
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,
@@ -645,31 +629,31 @@ export default {
liveId: props.edit ? props.EditLiveId : 0, liveId: props.edit ? props.EditLiveId : 0,
liveLink: state.inputV4, liveLink: state.inputV4,
liveName: state.inputV1, liveName: state.inputV1,
livePlayback: state.playback ? "true" : "false", livePlayback: state.switchC1? "1" : "0",
livePlaybackLink: state.playback ? state.inputV5 : "", livePlaybackLink: state.switchC1 ? state.inputV5 : "",
liveTeacherId: state.inputV3, liveTeacherId: state.inputV3,
otherSettings: state.otherSettings, //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.eedEval ? "1" : "0", isEvaluate: state.needEval ? "1" : "0",
}; };
if (props.edit) { if (props.edit) {
api api
.updateLiveBroadcastMessage(state.obj) .updateLiveBroadcastMessage(state.obj)
.then((res) => { .then(async(res) => {
message.destroy(); message.destroy();
message.success("提交成功"); message.success("提交成功");
updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
}) })
.catch(() => {}); .catch(() => {});
} else { } else {
api api
.createLiveBroadcast(state.obj) .createLiveBroadcast(state.obj)
.then((res) => { .then(async(res) => {
message.destroy(); message.destroy();
message.success("提交成功"); message.success("提交成功");
updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
}) })
.catch(() => {}); .catch(() => {});
@@ -689,7 +673,6 @@ export default {
message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!"); message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
return reject(false); return reject(false);
} }
let reader = new FileReader(); let reader = new FileReader();
reader.readAsDataURL(file); reader.readAsDataURL(file);
reader.onload = () => { reader.onload = () => {
@@ -707,11 +690,9 @@ export default {
return resolve(true); return resolve(true);
}; };
}; };
return reject(false); return reject(false);
}); });
}; };
const templateScroll = (e) => { const templateScroll = (e) => {
console.log("滚动", e); console.log("滚动", e);
const { target } = e; const { target } = e;
@@ -760,14 +741,14 @@ export default {
options.value = []; options.value = [];
state.fetching = true; state.fetching = true;
state.currentPage = 1; state.currentPage = 1;
state.memberValue = memberValue; state.memberValue.label = memberValue;
queryMember(); queryMember();
state.fetching = false; state.fetching = false;
}, 300); }, 300);
const handleChange2 = (value,label) => {
const handleChange2 = (value) => {
console.log(`selected ${value}`); console.log(`selected ${value}`);
state.inputV3 = value; state.inputV3 = value;
state.memberValue = label;
}; };
const handleFocus = () => { const handleFocus = () => {
queryMember(); queryMember();
@@ -779,7 +760,6 @@ export default {
state.discussSettings = "false"; state.discussSettings = "false";
} }
}; };
return { return {
...toRefs(state), ...toRefs(state),
afterVisibleChange, afterVisibleChange,
@@ -1013,4 +993,3 @@ export default {
} }
} }
</style> </style>

52
src/components/drawers/AddProject.vue
View File

@@ -217,6 +217,7 @@ import { RouterEditTask } from "@/api/indexTask";
import {message} from "ant-design-vue"; import {message} from "ant-design-vue";
import * as apiProj from "../../api/index.js"; import * as apiProj from "../../api/index.js";
import dayjs from "dayjs"; import dayjs from "dayjs";
export default { export default {
name: "AddProject", name: "AddProject",
props: { props: {
@@ -464,9 +465,9 @@ export default {
}); });
}; };
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.key, courseId: res.key,
name: res.name, name: res.name,
@@ -476,6 +477,7 @@ export default {
}) })
.then(() => { .then(() => {
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
@@ -496,11 +498,13 @@ export default {
state.sameProj = null; state.sameProj = null;
state.sameModal = false; state.sameModal = false;
}; };
const sureSameModal = () => { const sureSameModal = async () => {
// updateTask(state.sameProj); // updateTask(state.sameProj);
state.selectedRows.forEach((item) => { if (state.selectedRows && state.selectedRows.length) {
updateTask(item); for (const item in state.selectedRows) {
}); await updateTask(item);
}
}
state.sameProj = null; state.sameProj = null;
state.sameModal = false; state.sameModal = false;
closeDrawer(); closeDrawer();
@@ -530,17 +534,21 @@ export default {
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important; background-color: #fafafa !important;
} }
.sameModal { .sameModal {
.ant-modal { .ant-modal {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
.ant-modal-content { .ant-modal-content {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
.ant-modal-body { .ant-modal-body {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
padding: 0 !important; padding: 0 !important;
.delete { .delete {
z-index: 999; z-index: 999;
width: 424px; width: 424px;
@@ -561,15 +569,18 @@ export default {
rgba(78, 166, 255, 0) 100% rgba(78, 166, 255, 0) 100%
); );
} }
.del_main { .del_main {
width: 100%; width: 100%;
position: relative; position: relative;
.header { .header {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 20px; padding-top: 20px;
padding-left: 26px; padding-left: 26px;
font-size: 16px; font-size: 16px;
.icon { .icon {
width: 16px; width: 16px;
height: 16px; height: 16px;
@@ -577,6 +588,7 @@ export default {
background-image: url(@/assets/images/taskpage/gan.png); background-image: url(@/assets/images/taskpage/gan.png);
background-size: 100% 100%; background-size: 100% 100%;
} }
.close_exit { .close_exit {
position: absolute; position: absolute;
right: 42px; right: 42px;
@@ -587,6 +599,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.body { .body {
width: 100%; width: 100%;
margin: 34px auto 56px auto; margin: 34px auto 56px auto;
@@ -596,6 +609,7 @@ export default {
flex-direction: column; flex-direction: column;
// background-color: red; // background-color: red;
position: relative; position: relative;
.back { .back {
position: absolute; position: absolute;
top: 30px; top: 30px;
@@ -604,10 +618,12 @@ export default {
color: #666666; color: #666666;
} }
} }
.del_btnbox { .del_btnbox {
display: flex; display: flex;
margin: 30px auto; margin: 30px auto;
justify-content: center; justify-content: center;
.del_btn { .del_btn {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -619,17 +635,20 @@ export default {
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
line-height: 40px; line-height: 40px;
} }
} }
.btn1 { .btn1 {
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff; color: #4ea6ff;
margin-right: 14px; margin-right: 14px;
} }
.btn2 { .btn2 {
background-color: #4ea6ff; background-color: #4ea6ff;
color: #ffffff; color: #ffffff;
@@ -641,6 +660,7 @@ export default {
} }
} }
} }
.addrefDrawer { .addrefDrawer {
.drawerMain { .drawerMain {
// .main_notice { // .main_notice {
@@ -680,6 +700,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;
@@ -688,35 +709,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;
@@ -729,32 +758,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;
} }
@@ -762,6 +799,7 @@ export default {
} }
} }
} }
.main_btns { .main_btns {
height: 72px; height: 72px;
width: 100%; width: 100%;
@@ -771,6 +809,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;
@@ -780,6 +819,7 @@ export default {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;

14
src/components/drawers/AddRef.vue
View File

@@ -176,7 +176,7 @@ export default {
console.log(errors); console.log(errors);
// message.error("handleFinishFailed"); // message.error("handleFinishFailed");
}; };
const updateTask = (res) => { const updateTask = async (res) => {
if (props.isLevel == 1) { if (props.isLevel == 1) {
RouterEditTask({ RouterEditTask({
chapterId: props.isactive, chapterId: props.isactive,
@@ -186,9 +186,9 @@ export default {
routerTaskId: props.routerTaskId || 0, routerTaskId: props.routerTaskId || 0,
type: 7, type: 7,
}) })
.then(() => { .then(async () => {
// message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); // message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false); await ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
state.addLoading = false; state.addLoading = false;
}) })
@@ -254,18 +254,18 @@ export default {
if (props.edit) { if (props.edit) {
api api
.updateLinks(obj) .updateLinks(obj)
.then((res) => { .then(async (res) => {
message.success("编辑成功"); message.success("编辑成功");
updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
}) })
.catch(() => {}); .catch(() => {});
} else { } else {
api api
.createExternalChain(obj) .createExternalChain(obj)
.then((res) => { .then(async (res) => {
message.success("提交成功"); message.success("提交成功");
updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
}) })
.catch(() => {}); .catch(() => {});

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

@@ -727,8 +727,8 @@ export default {
if (props.edit) { if (props.edit) {
// 编辑任务 // 编辑任务
updateExamination(obj) updateExamination(obj)
.then((res) => { .then(async(res) => {
updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
@@ -737,8 +737,8 @@ export default {
} else { } else {
// 创建任务 // 创建任务
createExamination(obj) createExamination(obj)
.then((res) => { .then(async(res) => {
updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
@@ -754,6 +754,7 @@ export default {
if (props.isLevel == 1) { if (props.isLevel == 1) {
let editObj1 = { let editObj1 = {
chapterId: props.isactive, chapterId: props.isactive,
duration: res.data.data.examinationDuration,
courseId: res.data.data.examinationId, courseId: res.data.data.examinationId,
name: res.data.data.examinationName, name: res.data.data.examinationName,
routerId: props.routerId, routerId: props.routerId,
@@ -773,7 +774,7 @@ export default {
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
let editObj = { let editObj = {
courseId: res.data.data.examinationId, courseId: res.data.data.examinationId,
duration: 0, duration: res.data.data.examinationDuration,
name: res.data.data.examinationName, name: res.data.data.examinationName,
projectId: props.projectId, projectId: props.projectId,
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,

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

@@ -289,8 +289,8 @@ export default {
let array = []; let array = [];
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
key: value.id, key: value.authRefId,
id: value.memberNo, id: value.authRefId,
name: value.memberName ? value.memberName : "-", name: value.memberName ? value.memberName : "-",

7
src/components/drawers/ProjCheckPower.vue
View File

@@ -792,12 +792,15 @@ export default {
// 开始 快速选人------------------------------------------------------------------ // 开始 快速选人------------------------------------------------------------------
//选中部门 //选中部门
const departmentSelect = (e, k) => { const departmentSelect = (e, k) => {
if (!k.node.treeChildList) {
console.log("选中的部门", e, k); console.log("选中的部门", e, k);
state.currentPage = 1; state.currentPage = 1;
state.selectedKeys = [k.node.key]; state.selectedKeys = [k.node.key];
state.selectOrgId = k.selectedNodes[0].id; //选中的组织id state.selectOrgId = k.selectedNodes[0].id; //选中的组织id
state.selectOrgName = k.selectedNodes[0].name; //选中的组织名称 state.selectOrgName = k.selectedNodes[0].name; //选中的组织名称
console.log("treeChildList", k.node.treeChildList);
getMember(k.selectedNodes[0].id); getMember(k.selectedNodes[0].id);
}
}; };
//获取学员 //获取学员
const getMember = async (org) => { const getMember = async (org) => {
@@ -831,12 +834,14 @@ export default {
//分页获取学员 //分页获取学员
const changePagination = (page) => { const changePagination = (page) => {
state.currentPage = page; state.currentPage = page;
console.log("1111111");
getMember(state.selectOrgId); getMember(state.selectOrgId);
}; };
//搜索学员 //搜索学员
const handleSearchStu = () => { const handleSearchStu = () => {
deleteDepSelect(); deleteDepSelect();
state.currentPage2 = 1; state.currentPage2 = 1;
console.log("22222");
getMember(); getMember();
}; };
//重置 //重置
@@ -996,7 +1001,7 @@ export default {
// if (state.isSearchOrg) { // if (state.isSearchOrg) {
// searchOrg(e[0]); // searchOrg(e[0]);
// } // }
if (!k.node.children) { if (!k.node.treeChildList) {
state.selectedKeys1 = e.reverse(); state.selectedKeys1 = e.reverse();
if (k.selected) { if (k.selected) {
state.chooseorganization.unshift(k.node); state.chooseorganization.unshift(k.node);

8
src/components/drawers/ProjPowerList.vue
View File

@@ -192,7 +192,7 @@ export default {
console.log("item", item); console.log("item", item);
state.cancelModal = true; state.cancelModal = true;
let obj = { let obj = {
id: item.number, id: item.id,
name: item.name, name: item.name,
}; };
state.cancelAuthInfo = obj; state.cancelAuthInfo = obj;
@@ -311,15 +311,15 @@ export default {
let array = []; let array = [];
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
key: value.id, key: value.memberId,
id: value.id, id: value.memberId,
name: value.memberName ? value.memberName : "-", name: value.memberName ? value.memberName : "-",
com: value.orgName ? value.orgName : "-", com: value.orgName ? value.orgName : "-",
gang: "-", gang: "-",
number: value.memberNo ? value.memberNo : "-", number: value.memberNo ? value.memberNo : "-",
state: "-", state: value.tagName ? value.tagName : "-",
}; };
array.push(obj); array.push(obj);
}); });

24
src/components/drawers/ProjectAudit.vue
View File

@@ -39,7 +39,7 @@
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>资源归属：</span></div> <div class="setc_name"><span>资源归属：</span></div>
<div class="setc_main"> <div class="setc_main">
<span style="color: #999999">{{ sourceBelong }}</span> <span style="color: #999999">{{ sourceBelongName }}</span>
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">
@@ -114,11 +114,12 @@
</template> </template>
<script> <script>
import { toRefs, reactive } from "vue"; import {toRefs, reactive, onMounted} from "vue";
import { getTask } from "../../api/indexTaskadd"; import { getTask } from "../../api/indexTaskadd";
import { toDate } from "../../api/method"; import { toDate } from "../../api/method";
import { auditView } from "../../api/indexAudit"; import { auditView } from "../../api/indexAudit";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import * as api1 from "@/api/index1";
export default { export default {
name: "ProjectAudit", name: "ProjectAudit",
@@ -180,6 +181,8 @@ export default {
noticeFlag: null, //未改 noticeFlag: null, //未改
templateId: null, //未改 templateId: null, //未改
attach: null, attach: null,
calssifyList:[],
faceclassScene:[]
}); });
const closeDrawer = () => { const closeDrawer = () => {
@@ -261,12 +264,11 @@ export default {
state.showDetail = !state.showDetail; state.showDetail = !state.showDetail;
}; };
const subMit = () => { const subMit = () => {
if(!state.valueSuggest){
if (state.valueSuggest == null || state.valueSuggest == undefined || state.valueSuggest == "") { message.error(`请输入审核意见！`);
message.destroy();
message.error("请输入审核意见");
return return
} }
auditView({ auditView({
createId: props.chooseCreateId, createId: props.chooseCreateId,
createName: props.chooseCreater, createName: props.chooseCreater,
@@ -285,7 +287,15 @@ export default {
message.warning("提交失败"); message.warning("提交失败");
}); });
}; };
const getDictList = async (param) => api1.getDict({
pageNo: 1,
pageSize: 20,
setCode: param
}).then((res) => res.data.data.rows)
onMounted(async () => {
state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode })) //内容
state.faceclassScene = (await getDictList("faceclassScene")).map(e => ({ label: e.dictName, value: e.dictCode })) //场景
});
return { return {
...toRefs(state), ...toRefs(state),
closeDrawer, closeDrawer,

3
src/components/drawers/ProjectOwn.vue
View File

@@ -688,8 +688,11 @@ export default {
if (k.node.treeChildList === null) { if (k.node.treeChildList === null) {
state.selectedKeys = [k.node.key]; state.selectedKeys = [k.node.key];
state.selectDepartment = k.node.name; state.selectDepartment = k.node.name;
if (!k.node.treeChildList) {
getPeoples(); getPeoples();
} }
}
// console.log("kkkkkk", k); // console.log("kkkkkk", k);
// state.selectedKeys = [k.node.key]; // state.selectedKeys = [k.node.key];
// state.selectDepartment = k.node.name; // state.selectDepartment = k.node.name;

62
src/components/drawers/SeeStu.vue
View File

@@ -187,37 +187,37 @@ export default {
showDown: true, showDown: true,
showDown1: false, showDown1: false,
stageList: [ stageList: [
{ // {
stageName: "阶段1腾飞班阶段1", // stageName: "阶段1腾飞班阶段1",
stageId: 1, // stageId: 1,
taskProcessList: [ // taskProcessList: [
{ // {
course: "在线", // course: "在线",
name: "如何成为一个产品经理", // name: "如何成为一个产品经理",
complete: "已完成", // complete: "已完成",
}, // },
{ // {
course: "直播", // course: "直播",
name: "管理直播课", // name: "管理直播课",
complete: "已完成", // complete: "已完成",
}, // },
{ // {
course: "面授", // course: "面授",
name: "管理面授课", // name: "管理面授课",
complete: "未完成", // complete: "未完成",
}, // },
{ // {
course: "活动", // course: "活动",
name: "管理活动", // name: "管理活动",
complete: "未完成", // complete: "未完成",
}, // },
{ // {
course: "作业", // course: "作业",
name: "管理者作业", // name: "管理者作业",
complete: "未完成", // complete: "未完成",
}, // },
], // ],
}, // },
], ],
stageListActive: 0, stageListActive: 0,
}); });

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

@@ -7,14 +7,15 @@
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <!-- 2022-11-30注释 后面放开 -->
<!-- <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="main"> <div class="main">
<div class="minatitl"> <div class="minatitl">
<div class="up1">请下载</div> <div class="up1">请下载</div>

146
src/components/vote/AddVote.vue
View File

@@ -1,78 +1,49 @@
<template> <template>
<a-drawer <a-drawer :visible="addvoteVisible" class="drawerStyle addvoteDrawer" width="80%" title="添加投票" placement="right"
:visible="addvoteVisible" @after-visible-change="afterVisibleChange">
class="drawerStyle addvoteDrawer"
width="80%"
title="添加投票"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div v-if="edit" class="headerTitle">编辑投票</div> <div v-if="edit" class="headerTitle">编辑投票</div>
<div v-else class="headerTitle">添加投票</div> <div v-else class="headerTitle">添加投票</div>
<img <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
style="width: 29px; height: 29px; cursor: pointer" @click="closeDrawer" />
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div> </div>
<div class="contentMain"> <div class="contentMain">
<div class="main_left"> <div class="main_left">
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
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" style="width: 424px; height: 32px" placeholder="请输入投票名称"
v-model:value="inputV1" maxlength="20" />
style="width: 424px; height: 32px"
placeholder="请输入投票名称"
maxlength="20"
/>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span>创建投票：</span> <span>创建投票：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<button <button class="xkbtn" @click="showDrawerCreVote">
class="xkbtn"
@click="showDrawerCreVote"
>
{{ ballotId ? "编辑" : "添加" }}投票 {{ ballotId ? "编辑" : "添加" }}投票
</button> </button>
<div v-if="ballotId > 0"> <div v-if="ballotId > 0">
<a-tag closable color="processing" @close="log"> <a-tag closable color="processing" @close="log">
<span style="font-size:14px;line-height: 33px;">删除投票</span> <span style="font-size:14px;line-height: 33px;">删除投票</span>
</a-tag></div> </a-tag>
<div>
<CreateVote
v-model:createVoteVisible="createVoteVisible"
v-model:ballotId="ballotId"
v-model:editChild="editChild"
/>
</div> </div>
<button <div>
class="xkbtn" <CreateVote v-model:createVoteVisible="createVoteVisible" v-model:ballotId="ballotId"
:style="{ display: creVote ? 'block' : 'none' }" v-model:editChild="editChild" />
@click="showDrawerCreVote" </div>
> <button class="xkbtn" :style="{ display: creVote ? 'block' : 'none' }" @click="showDrawerCreVote">
编辑投票 编辑投票
</button> </button>
<div :style="{ display: creVote ? 'block' : 'none' }"> <div :style="{ display: creVote ? 'block' : 'none' }">
@@ -85,11 +56,7 @@
<!-- 创建投票侧弹窗 --> <!-- 创建投票侧弹窗 -->
<div> <div>
<create-vote <create-vote v-model:crevoteVisible="crevotevisible" @getData="getStemId" v-model:ballotId="ballotId" />
v-model:crevoteVisible="crevotevisible"
@getData="getStemId"
v-model:ballotId="ballotId"
/>
</div> </div>
<!-- 创建投票侧弹窗 --> <!-- 创建投票侧弹窗 -->
</div> </div>
@@ -98,11 +65,7 @@
<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" v-model:value="time" :placeholder="[' 开始时间', ' 结束时间']" />
style="width: 424px"
v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -110,15 +73,12 @@
<span style="margin-right: 3px">基础投票数：</span> <span style="margin-right: 3px">基础投票数：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-upload <a-upload @change="handleChange" :multiple="true" :max-count="1" action="/manageApi/vote/baseVoteupload"
@change="handleChange" v-model:file-list="fileList">
:multiple="true"
:max-count="1"
action="/manageApi/vote/baseVoteupload"
v-model:file-list="fileList"
>
<button class="xkbtn">点击上传</button></a-upload> <button class="xkbtn">点击上传</button></a-upload>
<div v-if="voteCount > 0"><a-tag color="processing"> <span style="font-size:14px;line-height: 33px;" >{{voteCount}}票</span></a-tag></div> <div v-if="voteCount > 0"><a-tag color="processing"> <span style="font-size:14px;line-height: 33px;">{{
voteCount
}}票</span></a-tag></div>
</div> </div>
</div> </div>
<div class="main_item" style="margin-top: -25px"> <div class="main_item" style="margin-top: -25px">
@@ -132,12 +92,7 @@
<span style="margin-right: 3px">投票说明：</span> <span style="margin-right: 3px">投票说明：</span>
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea v-model:value="textV1" placeholder="请输入投票说明" allow-clear maxlength="150" />
v-model:value="textV1"
placeholder="请输入投票说明"
allow-clear
maxlength="150"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -292,7 +247,7 @@ export default {
//根据投票id获取投票信息 //根据投票id获取投票信息
const queryVoteInfo = () => { const queryVoteInfo = () => {
api.queryVoteDetailById({voteId:props.EditVoteId}) api.queryVoteDetailById(props.EditVoteId)
.then((res) => { .then((res) => {
console.log('获取投票信息成功', res); console.log('获取投票信息成功', res);
state.inputV1 = res.data.data.voteName; state.inputV1 = res.data.data.voteName;
@@ -398,9 +353,9 @@ export default {
if (props.edit) { if (props.edit) {
api api
.editVote(obj) .editVote(obj)
.then((res) => { .then(async(res) => {
console.log("updte======"); console.log("updte======");
updateToTask(res); await updateToTask(res);
closeDrawer(); closeDrawer();
message.destroy(); message.destroy();
message.success("修改投票信息成功") message.success("修改投票信息成功")
@@ -412,8 +367,8 @@ export default {
} else { } else {
api api
.createVote(obj) .createVote(obj)
.then((res) => { .then(async(res) => {
updateToTask(res); await updateToTask(res);
closeDrawer(); closeDrawer();
message.destroy(); message.destroy();
message.success("创建投票信息成功") message.success("创建投票信息成功")
@@ -456,13 +411,16 @@ export default {
.ant-modal { .ant-modal {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
.ant-modal-content { .ant-modal-content {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
.ant-modal-body { .ant-modal-body {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
padding: 0 !important; padding: 0 !important;
.delete { .delete {
z-index: 999; z-index: 999;
width: 424px; width: 424px;
@@ -470,24 +428,26 @@ export default {
background: #ffffff; background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px; border-radius: 4px;
.del_header { .del_header {
position: absolute; position: absolute;
width: calc(100%); width: calc(100%);
height: 40px; height: 40px;
background: linear-gradient( background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0) 100%);
rgba(78, 166, 255, 0) 100%
);
} }
.del_main { .del_main {
width: 100%; width: 100%;
position: relative; position: relative;
.header { .header {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 20px; padding-top: 20px;
padding-left: 26px; padding-left: 26px;
font-size: 16px; font-size: 16px;
.icon { .icon {
width: 16px; width: 16px;
height: 16px; height: 16px;
@@ -495,6 +455,7 @@ export default {
background-image: url(@/assets/images/coursewareManage/QR.png); background-image: url(@/assets/images/coursewareManage/QR.png);
background-size: 100% 100%; background-size: 100% 100%;
} }
.close_exit { .close_exit {
position: absolute; position: absolute;
right: 42px; right: 42px;
@@ -505,6 +466,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.body { .body {
width: 100%; width: 100%;
margin: 34px auto 56px auto; margin: 34px auto 56px auto;
@@ -513,6 +475,7 @@ export default {
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
position: relative; position: relative;
.back { .back {
position: absolute; position: absolute;
top: 30px; top: 30px;
@@ -521,10 +484,12 @@ export default {
color: #666666; color: #666666;
} }
} }
.del_btnbox { .del_btnbox {
display: flex; display: flex;
margin: 30px auto; margin: 30px auto;
justify-content: center; justify-content: center;
.del_btn { .del_btn {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -535,17 +500,20 @@ export default {
justify-content: center; justify-content: center;
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
line-height: 40px; line-height: 40px;
} }
} }
.btn1 { .btn1 {
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff; color: #4ea6ff;
margin-right: 14px; margin-right: 14px;
} }
.btn2 { .btn2 {
background-color: #4ea6ff; background-color: #4ea6ff;
color: #ffffff; color: #ffffff;
@@ -557,9 +525,11 @@ export default {
} }
} }
} }
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important; background-color: #fafafa !important;
} }
.addvoteDrawer { .addvoteDrawer {
.drawerMain { .drawerMain {
.header { .header {
@@ -569,6 +539,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;
@@ -577,31 +548,38 @@ 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-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;
@@ -613,14 +591,17 @@ export default {
color: #fff; color: #fff;
margin-right: 10px; margin-right: 10px;
} }
.fileTigan { .fileTigan {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 3px 5px; padding: 3px 5px;
background-color: rgba(42, 103, 209, 0.4); background-color: rgba(42, 103, 209, 0.4);
span { span {
margin-right: 5px; margin-right: 5px;
} }
.delBox { .delBox {
width: 13px; width: 13px;
height: 13px; height: 13px;
@@ -631,28 +612,34 @@ 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: 56px; margin-left: 56px;
} }
.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;
@@ -662,10 +649,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;
@@ -682,6 +671,7 @@ export default {
} }
} }
} }
.main_btns { .main_btns {
height: 72px; height: 72px;
width: 100%; width: 100%;
@@ -691,6 +681,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;
@@ -700,6 +691,7 @@ export default {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;

87
src/components/vote/CreateVote.vue
View File

@@ -34,8 +34,10 @@
</div> </div>
<!-- 创建投票侧弹窗 --> <!-- 创建投票侧弹窗 -->
</div> </div>
<div v-for="(item, index) in allFormsData" :key="index"> <div v-for="(item, index) in allFormsData" :key="index">
<VoteQuestion :item="item" :optionId="optionId" @del="handleDel" /> <VoteQuestion v-model:info="information" :item="item" :optionId="optionId" @delOption="delOption"
@del="handleDel" @edits="edits" @addOption="addOption" />
</div> </div>
<div class="footer"> <div class="footer">
@@ -105,6 +107,7 @@ export default {
ballotId: "", ballotId: "",
ballotName: "", ballotName: "",
allFormsData: [], allFormsData: [],
allFormsData1: [],
}); });
// const router = useRouter(); // const router = useRouter();
@@ -139,6 +142,7 @@ export default {
// let renderArr = [...res]; // let renderArr = [...res];
// sortBy(renderArr, "orderNumber"); //序号 // sortBy(renderArr, "orderNumber"); //序号
state.allFormsData = parseData(res); //类型 state.allFormsData = parseData(res); //类型
state.allFormsData1 = parseData(res); //类型
console.log(state.allFormsData); console.log(state.allFormsData);
} }
@@ -271,27 +275,93 @@ export default {
], ],
}; };
state.allFormsData.push(obj); state.allFormsData.push(obj);
state.allFormsData1.push(obj);
}; };
const handleDel = ({ id }) => { const handleDel = ({ id }) => {
console.log('1234523432434234234', id, state.allFormsData)
state.allFormsData.forEach((item, index) => { state.allFormsData.forEach((item, index) => {
if (item.id === id) { if (item.id === id) {
console.log('oooooo', item)
state.allFormsData.splice(index, 1); state.allFormsData.splice(index, 1);
} }
}); });
state.allFormsData.map((item, index) => {
item.id = index + 1; // state.allFormsData.map((item, index) => {
return item; // item.id = index + 1;
}); // return item;
// });
// orderNumber: curItem.orderNumber, // orderNumber: curItem.orderNumber,
}; };
const delOption = (data) => {
console.log('datadatadatadatadata', data, state.allFormsData)
state.allFormsData.forEach((item, index) => {
if (item.voteStemId === data.value.voteStemId) {
state.allFormsData[index].singleList.forEach((ii, nn) => {
if (ii.id == data.value.id) {
console.log(1212121212, state.allFormsData[index].singleList[nn], nn)
state.allFormsData[index].singleList.splice(nn, 1)
console.log('12', state.allFormsData)
}
})
}
});
state.allFormsData1.forEach((item, index) => {
if (item.voteStemId === data.value.voteStemId) {
state.allFormsData1[index].singleList.forEach((ii, nn) => {
if (ii.id == data.value.id) {
console.log(1212121212, state.allFormsData1[index].singleList[nn], nn)
state.allFormsData1[index].singleList.splice(nn, 1)
console.log('33', state.allFormsData1)
}
})
}
});
}
const edits = (data) => {
console.log('我传递过来了吗---111', data, data.value.id, state.allFormsData1)
state.allFormsData1.forEach((item, index) => {
if (item.voteStemId === data.value.voteStemId) {
item.singleList.forEach((ii, nn) => {
if (ii.id === data.value.id) {
// ii.optionName = data.value.inputVal
state.allFormsData1[index].singleList[nn].inputVal = data.value.inputVal
}
})
}
});
console.log('123-456-789', state.allFormsData1)
}
// 增加选项
const addOption = (data) => {
console.log(data)
state.allFormsData1.forEach((item, index) => {
if (item.voteStemId === data.value.voteStemId) {
state.allFormsData1[index].singleList = data.value.singleList
}
});
}
const handleSave = () => { const handleSave = () => {
let resultPost = {}; let resultPost = {};
let filterData = parseItem(restData(state.allFormsData, "type")); let filterData = parseItem(restData(state.allFormsData1, "type"));
console.log("filterData==111", filterData)
if (!state.ballotName) { if (!state.ballotName) {
return message.warning("请输入投票名称"); return message.warning("请输入投票名称");
@@ -305,7 +375,7 @@ export default {
// checkVal(filterData); // checkVal(filterData);
console.log(12121212); console.log(12121212);
console.log(filterData); console.log(filterData);
console.log('111111222223333----0000', state.ballotId)
if (state.ballotId) { if (state.ballotId) {
resultPost = { resultPost = {
ballotId: state.ballotId, ballotId: state.ballotId,
@@ -386,6 +456,9 @@ export default {
handleDel, handleDel,
afterVisibleChange, afterVisibleChange,
closeDrawer, closeDrawer,
edits,
delOption,
addOption
}; };
}, },
}; };

109
src/components/vote/VoteQuestion.vue
View File

@@ -10,38 +10,20 @@
</div> </div>
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">题干{{ item.id }}</div> <div class="inname">题干{{ item.id }}</div>
</div> </div>
<div class="in"> <div class="in">
<a-input <a-input v-model:value="curItem.valueSingle" placeholder="请输入题干名称" show-count :maxlength="20"
v-model:value="curItem.valueSingle" style="border-radius: 8px" />
placeholder="请输入题干名称"
show-count
:maxlength="20"
style="border-radius: 8px"
/>
</div> </div>
</div> </div>
<VoteQuestionItem <VoteQuestionItem v-model:info="info" v-for="(item, index) in curItem.singleList" :key="index" :item="item"
v-for="(item, index) in curItem.singleList" @input="input" @src="imgSrc" @delImg="delImg" @del="del" @edit="edit" />
:key="index"
:item="item"
@input="input"
@src="imgSrc"
@delImg="delImg"
@del="del"
/>
<div class="name"> <div class="name">
<div class="in" style="margin-left: 85px; margin-bottom: 20px"> <div class="in" style="margin-left: 85px; margin-bottom: 20px">
<a-button <a-button type="primary" style="width: 100px;height: 40px;border-radius: 8px;background-color: #409eff;"
type="primary" @click="handleSingleAdd">
style="width: 100px;height: 40px;border-radius: 8px;background-color: #409eff;"
@click="handleSingleAdd"
>
添加选项 添加选项
</a-button> </a-button>
</div> </div>
@@ -76,12 +58,12 @@ export default {
const curItem = ref(props.item); const curItem = ref(props.item);
const handleTypesDel = () => { const handleTypesDel = () => {
emit("del", { id: curItem.value.id, curItem: curItem.value });
console.log("删除题干======", { id: curItem.value.id, curItem: curItem.value }); console.log("删除题干======", { id: curItem.value.id, curItem: curItem.value });
api.deleteVoteStem({voteStemId:3}) api.deleteVoteStem(curItem.value.voteStemId)
.then(() => { .then(() => {
// message.success('删除题干信息成功') // message.success('删除题干信息成功')
emit("del", { id: curItem.value.id, curItem: curItem.value });
}) })
}; };
@@ -92,8 +74,10 @@ export default {
inputVal: "", inputVal: "",
imgVal: "", imgVal: "",
}); });
emit("addOption", curItem);
}; };
const input = ({ id, val }) => { const input = ({ id, val }) => {
console.log(id, val)
curItem.value.singleList.forEach((item) => { curItem.value.singleList.forEach((item) => {
if (item.id === id) { if (item.id === id) {
item.inputVal = val; item.inputVal = val;
@@ -114,7 +98,13 @@ export default {
} }
}); });
}; };
const del = ({ id }) => { const del = ({ id, data }) => {
console.log(data)
api.deleteVoteStemOption(data.value.optionId)
.then(() => {
// message.success('删除题干信息成功')
emit("delOption", data);
})
curItem.value.singleList.forEach((item, index) => { curItem.value.singleList.forEach((item, index) => {
if (item.id === id) { if (item.id === id) {
curItem.value.singleList.splice(index, 1); curItem.value.singleList.splice(index, 1);
@@ -125,6 +115,11 @@ export default {
}; };
const edit = (data) => {
// console.log('111111-223', data.value)
emit("edits", data)
}
return { return {
curItem, curItem,
handleTypesDel, handleTypesDel,
@@ -133,6 +128,7 @@ export default {
imgSrc, imgSrc,
delImg, delImg,
del, del,
edit
}; };
}, },
}; };
@@ -142,10 +138,12 @@ export default {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.title { .title {
color: #000000; color: #000000;
font-size: 18px; font-size: 18px;
@@ -154,10 +152,12 @@ export default {
padding-left: 37px; padding-left: 37px;
//font-weight: 500; //font-weight: 500;
} }
.goback { .goback {
padding-right: 70px; padding-right: 70px;
//padding-top: 37px; //padding-top: 37px;
position: relative; position: relative;
.return { .return {
display: inline-block; display: inline-block;
width: 42px; width: 42px;
@@ -166,6 +166,7 @@ export default {
margin-right: 10px; margin-right: 10px;
background-image: url("../../assets/images/projectadd/return.png"); background-image: url("../../assets/images/projectadd/return.png");
} }
.returntext { .returntext {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
@@ -175,16 +176,19 @@ export default {
} }
} }
} }
.addtype { .addtype {
display: flex; display: flex;
border-bottom: 1px solid rgba(0, 0, 0, 0.1); border-bottom: 1px solid rgba(0, 0, 0, 0.1);
margin-right: 20px; margin-right: 20px;
align-items: center; align-items: center;
margin-left: 41px; margin-left: 41px;
.addtypen { .addtypen {
color: #6f6f6f; color: #6f6f6f;
font-size: 14px; font-size: 14px;
} }
.types { .types {
cursor: pointer; cursor: pointer;
width: 80px; width: 80px;
@@ -197,11 +201,13 @@ export default {
align-items: center; align-items: center;
margin: 20px 10px; margin: 20px 10px;
} }
.typesCur { .typesCur {
color: #fff; color: #fff;
background: #409eff; background: #409eff;
} }
} }
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -210,9 +216,11 @@ export default {
min-width: 690px; min-width: 690px;
margin-left: 38px; margin-left: 38px;
margin-top: 20px; margin-top: 20px;
.tagbox { .tagbox {
display: flex; display: flex;
justify-content: right; justify-content: right;
.tagname { .tagname {
width: 90px; width: 90px;
height: 32px; height: 32px;
@@ -226,6 +234,7 @@ export default {
color: rgba(64, 158, 255, 1); color: rgba(64, 158, 255, 1);
font-size: 16px; font-size: 16px;
} }
.deleteop { .deleteop {
display: flex; display: flex;
justify-content: center; justify-content: center;
@@ -237,6 +246,7 @@ export default {
border: 1px solid #409eff; border: 1px solid #409eff;
border-radius: 8px; border-radius: 8px;
cursor: pointer; cursor: pointer;
.del_text { .del_text {
color: #409eff; color: #409eff;
font-size: 14px; font-size: 14px;
@@ -244,21 +254,25 @@ export default {
} }
} }
} }
.scorebox { .scorebox {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 20px; margin-top: 20px;
margin-left: 70px; margin-left: 70px;
.scoretext { .scoretext {
font-size: 14px; font-size: 14px;
color: #56a3f9; color: #56a3f9;
} }
.number { .number {
display: flex; display: flex;
border: 1px solid #d7e5fd; border: 1px solid #d7e5fd;
border-radius: 5px; border-radius: 5px;
margin: 0 10px; margin: 0 10px;
padding: 5px; padding: 5px;
.btn { .btn {
width: 40px; width: 40px;
height: 40px; height: 40px;
@@ -274,30 +288,36 @@ export default {
line-height: 24px; line-height: 24px;
cursor: pointer; cursor: pointer;
} }
.curBtn { .curBtn {
background: #56a3f9; background: #56a3f9;
color: #fff; color: #fff;
} }
} }
} }
.picture { .picture {
width: 100px; width: 100px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: 20px; margin-top: 20px;
margin-left: 133px; margin-left: 133px;
.pictureimg { .pictureimg {
width: 100px; width: 100px;
height: 100px; height: 100px;
} }
.picturename { .picturename {
color: #6f6f6f; color: #6f6f6f;
font-size: 14px; font-size: 14px;
} }
} }
.options { .options {
display: flex; display: flex;
} }
.delete { .delete {
cursor: pointer; cursor: pointer;
margin-top: 32px; margin-top: 32px;
@@ -306,15 +326,18 @@ export default {
color: #4ea6ff; color: #4ea6ff;
font-size: 14px; font-size: 14px;
} }
.name2 { .name2 {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.name { .name {
width: 60%; width: 60%;
// background-color: lightcoral; // background-color: lightcoral;
display: flex; display: flex;
margin-top: 20px; margin-top: 20px;
//align-items: center; //align-items: center;
//height: 40px; //height: 40px;
// border: 1px solid black; // border: 1px solid black;
@@ -324,25 +347,30 @@ export default {
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
flex-shrink: 0; flex-shrink: 0;
.nameimg { .nameimg {
width: 10px; width: 10px;
height: 10px; height: 10px;
} }
} }
.inname { .inname {
color: #6f6f6f; color: #6f6f6f;
font-size: 14px; font-size: 14px;
margin-left: 7px; margin-left: 7px;
font-weight: 700; font-weight: 700;
} }
.in { .in {
margin-left: 14px; margin-left: 14px;
flex: 1; flex: 1;
.assess { .assess {
display: flex; display: flex;
width: 226px; width: 226px;
height: 40px; height: 40px;
border: 1px solid #56a3f9; border: 1px solid #56a3f9;
//margin-bottom: 20px; //margin-bottom: 20px;
.assesstype { .assesstype {
width: 50%; width: 50%;
@@ -352,6 +380,7 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.assesswhole { .assesswhole {
width: 50%; width: 50%;
background: rgba(86, 163, 249, 0.1); background: rgba(86, 163, 249, 0.1);
@@ -361,6 +390,7 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.ratio { .ratio {
position: absolute; position: absolute;
right: 10px; right: 10px;
@@ -369,24 +399,28 @@ export default {
font-size: 14px; font-size: 14px;
} }
} }
.addimg { .addimg {
cursor: pointer; cursor: pointer;
color: rgba(78, 166, 255, 1); color: rgba(78, 166, 255, 1);
font-size: 14px; font-size: 14px;
} }
.text { .text {
color: rgba(109, 117, 132, 1); color: rgba(109, 117, 132, 1);
font-size: 14px; font-size: 14px;
//line-height: 24px; //line-height: 24px;
} }
.ant-radio-wrapper {
} .ant-radio-wrapper {}
.ant-input { .ant-input {
border-radius: 5px; border-radius: 5px;
// height: 120%; // height: 120%;
width: 100%; width: 100%;
height: 35px; height: 35px;
} }
.ant-select-selector { .ant-select-selector {
border-radius: 5px; border-radius: 5px;
// height: 120%; // height: 120%;
@@ -394,26 +428,32 @@ export default {
height: 40px; height: 40px;
} }
} }
.numberInp { .numberInp {
width: 200px; width: 200px;
.ant-input-number { .ant-input-number {
width: 200px; width: 200px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
} }
// .ant-input-number-input-wrap { // .ant-input-number-input-wrap {
// width: 200px; // width: 200px;
// } // }
} }
} }
} }
.name2 { .name2 {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.opinion { .opinion {
display: flex; display: flex;
margin-top: 30px; margin-top: 30px;
.namebox { .namebox {
width: 120px; width: 120px;
display: flex; display: flex;
@@ -421,27 +461,33 @@ export default {
justify-content: flex-end; justify-content: flex-end;
flex-shrink: 0; flex-shrink: 0;
} }
.in { .in {
margin-left: 14px; margin-left: 14px;
width: 500px; width: 500px;
.ant-input-textarea-show-count { .ant-input-textarea-show-count {
position: relative; position: relative;
height: 110px; height: 110px;
} }
.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;
} }
} }
} }
.footer { .footer {
width: 100%; width: 100%;
margin-top: 31px; margin-top: 31px;
margin-bottom: 14px; margin-bottom: 14px;
.btn { .btn {
display: flex; display: flex;
margin-bottom: 20px; margin-bottom: 20px;
@@ -452,6 +498,7 @@ export default {
.uploadContent { .uploadContent {
display: block !important; display: block !important;
.uploadBtn { .uploadBtn {
margin-left: 120px !important; margin-left: 120px !important;
} }

86
src/components/vote/VoteQuestionItem.vue
View File

@@ -7,41 +7,27 @@
<div class="inname">选项{{ item.id }}</div> <div class="inname">选项{{ item.id }}</div>
</div> </div>
<div class="in"> <div class="in">
<a-input <a-input v-model:value="curItem.inputVal" show-count :maxlength="30" style="border-radius: 8px"
v-model:value="curItem.inputVal" @change="handleInput" />
show-count
:maxlength="30"
style="border-radius: 8px"
@change="handleInput"
/>
</div> </div>
</div> </div>
<div class="delete" @click="handleDel">删除</div> <div class="delete" @click="handleDel">删除</div>
</div> </div>
<div class="name uploadContent"> <div class="name uploadContent">
<a-upload <a-upload v-show="!item.imgVal" class="in uploadBtn" :show-upload-list="false" :before-upload="beforeUpload">
v-show="!item.imgVal"
class="in uploadBtn"
:show-upload-list="false"
:before-upload="beforeUpload"
>
<div class="addimg">+添加图片</div> <div class="addimg">+添加图片</div>
</a-upload> </a-upload>
<div v-show="item.imgVal" class="picture" style="position: relative"> <div v-show="item.imgVal" class="picture" style="position: relative">
<img class="pictureimg" :src="item.imgVal" /> <img class="pictureimg" :src="item.imgVal" />
<div class="picturename" v-show="hasImgName">{{ hasImgName }}</div> <div class="picturename" v-show="hasImgName">{{ hasImgName }}</div>
<img <img style="
style="
cursor: pointer; cursor: pointer;
width: 20px; width: 20px;
height: 20px; height: 20px;
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
" " src="../../assets/images/basicinfo/close.png" @click="handleCancel" />
src="../../assets/images/basicinfo/close.png"
@click="handleCancel"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -67,12 +53,14 @@ export default {
hasImgName: "", hasImgName: "",
}); });
const handleInput = () => { const handleInput = (value) => {
emit("input", { id: curItem.value.id, val: curItem.value.inputVal }); console.log(value.target.value)
emit("edit", curItem)
emit("input", { id: curItem.value.id, val: value.target.value });
}; };
const handleDel = () => { const handleDel = () => {
handleCancel(); handleCancel();
emit("del", { id: curItem.value.id, optionId: curItem.value.optionId }); emit("del", { id: curItem.value.id, optionId: curItem.value.optionId, data: curItem });
}; };
const handleCancel = () => { const handleCancel = () => {
state.hasImgName = ""; state.hasImgName = "";
@@ -124,10 +112,12 @@ export default {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.title { .title {
color: #000000; color: #000000;
font-size: 18px; font-size: 18px;
@@ -136,10 +126,12 @@ export default {
padding-left: 37px; padding-left: 37px;
//font-weight: 500; //font-weight: 500;
} }
.goback { .goback {
padding-right: 70px; padding-right: 70px;
//padding-top: 37px; //padding-top: 37px;
position: relative; position: relative;
.return { .return {
display: inline-block; display: inline-block;
width: 42px; width: 42px;
@@ -148,6 +140,7 @@ export default {
margin-right: 10px; margin-right: 10px;
background-image: url("../../assets/images/projectadd/return.png"); background-image: url("../../assets/images/projectadd/return.png");
} }
.returntext { .returntext {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
@@ -157,16 +150,19 @@ export default {
} }
} }
} }
.addtype { .addtype {
display: flex; display: flex;
border-bottom: 1px solid rgba(0, 0, 0, 0.1); border-bottom: 1px solid rgba(0, 0, 0, 0.1);
margin-right: 20px; margin-right: 20px;
align-items: center; align-items: center;
margin-left: 41px; margin-left: 41px;
.addtypen { .addtypen {
color: #6f6f6f; color: #6f6f6f;
font-size: 14px; font-size: 14px;
} }
.types { .types {
cursor: pointer; cursor: pointer;
width: 80px; width: 80px;
@@ -179,11 +175,13 @@ export default {
align-items: center; align-items: center;
margin: 20px 10px; margin: 20px 10px;
} }
.typesCur { .typesCur {
color: #fff; color: #fff;
background: #409eff; background: #409eff;
} }
} }
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -192,9 +190,11 @@ export default {
min-width: 690px; min-width: 690px;
margin-left: 38px; margin-left: 38px;
margin-top: 20px; margin-top: 20px;
.tagbox { .tagbox {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.tagname { .tagname {
width: 90px; width: 90px;
height: 32px; height: 32px;
@@ -208,6 +208,7 @@ export default {
color: rgba(64, 158, 255, 1); color: rgba(64, 158, 255, 1);
font-size: 16px; font-size: 16px;
} }
.deleteop { .deleteop {
display: flex; display: flex;
justify-content: center; justify-content: center;
@@ -219,6 +220,7 @@ export default {
border: 1px solid #409eff; border: 1px solid #409eff;
border-radius: 8px; border-radius: 8px;
cursor: pointer; cursor: pointer;
.del_text { .del_text {
color: #409eff; color: #409eff;
font-size: 14px; font-size: 14px;
@@ -226,21 +228,25 @@ export default {
} }
} }
} }
.scorebox { .scorebox {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 20px; margin-top: 20px;
margin-left: 70px; margin-left: 70px;
.scoretext { .scoretext {
font-size: 14px; font-size: 14px;
color: #56a3f9; color: #56a3f9;
} }
.number { .number {
display: flex; display: flex;
border: 1px solid #d7e5fd; border: 1px solid #d7e5fd;
border-radius: 5px; border-radius: 5px;
margin: 0 10px; margin: 0 10px;
padding: 5px; padding: 5px;
.btn { .btn {
width: 40px; width: 40px;
height: 40px; height: 40px;
@@ -258,24 +264,29 @@ export default {
} }
} }
} }
.picture { .picture {
width: 100px; width: 100px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: 20px; margin-top: 20px;
margin-left: 133px; margin-left: 133px;
.pictureimg { .pictureimg {
width: 100px; width: 100px;
height: 100px; height: 100px;
} }
.picturename { .picturename {
color: #6f6f6f; color: #6f6f6f;
font-size: 14px; font-size: 14px;
} }
} }
.options { .options {
display: flex; display: flex;
} }
.delete { .delete {
cursor: pointer; cursor: pointer;
margin-top: 32px; margin-top: 32px;
@@ -284,15 +295,18 @@ export default {
color: #4ea6ff; color: #4ea6ff;
font-size: 14px; font-size: 14px;
} }
.name2 { .name2 {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.name { .name {
width: 60%; width: 60%;
// background-color: lightcoral; // background-color: lightcoral;
display: flex; display: flex;
margin-top: 20px; margin-top: 20px;
//align-items: center; //align-items: center;
//height: 40px; //height: 40px;
// border: 1px solid black; // border: 1px solid black;
@@ -302,25 +316,30 @@ export default {
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
flex-shrink: 0; flex-shrink: 0;
.nameimg { .nameimg {
width: 10px; width: 10px;
height: 10px; height: 10px;
} }
} }
.inname { .inname {
color: #6f6f6f; color: #6f6f6f;
font-size: 14px; font-size: 14px;
margin-left: 7px; margin-left: 7px;
font-weight: 700; font-weight: 700;
} }
.in { .in {
margin-left: 14px; margin-left: 14px;
flex: 1; flex: 1;
.assess { .assess {
display: flex; display: flex;
width: 226px; width: 226px;
height: 40px; height: 40px;
border: 1px solid #56a3f9; border: 1px solid #56a3f9;
//margin-bottom: 20px; //margin-bottom: 20px;
.assesstype { .assesstype {
width: 50%; width: 50%;
@@ -330,6 +349,7 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.assesswhole { .assesswhole {
width: 50%; width: 50%;
background: rgba(86, 163, 249, 0.1); background: rgba(86, 163, 249, 0.1);
@@ -339,6 +359,7 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.ratio { .ratio {
position: absolute; position: absolute;
right: 10px; right: 10px;
@@ -347,24 +368,28 @@ export default {
font-size: 14px; font-size: 14px;
} }
} }
.addimg { .addimg {
cursor: pointer; cursor: pointer;
color: rgba(78, 166, 255, 1); color: rgba(78, 166, 255, 1);
font-size: 14px; font-size: 14px;
} }
.text { .text {
color: rgba(109, 117, 132, 1); color: rgba(109, 117, 132, 1);
font-size: 14px; font-size: 14px;
//line-height: 24px; //line-height: 24px;
} }
.ant-radio-wrapper {
} .ant-radio-wrapper {}
.ant-input { .ant-input {
border-radius: 5px; border-radius: 5px;
// height: 120%; // height: 120%;
width: 100%; width: 100%;
height: 35px; height: 35px;
} }
.ant-select-selector { .ant-select-selector {
border-radius: 5px; border-radius: 5px;
// height: 120%; // height: 120%;
@@ -372,26 +397,32 @@ export default {
height: 40px; height: 40px;
} }
} }
.numberInp { .numberInp {
width: 200px; width: 200px;
.ant-input-number { .ant-input-number {
width: 200px; width: 200px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
} }
// .ant-input-number-input-wrap { // .ant-input-number-input-wrap {
// width: 200px; // width: 200px;
// } // }
} }
} }
} }
.name2 { .name2 {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.opinion { .opinion {
display: flex; display: flex;
margin-top: 30px; margin-top: 30px;
.namebox { .namebox {
width: 120px; width: 120px;
display: flex; display: flex;
@@ -399,27 +430,33 @@ export default {
justify-content: flex-end; justify-content: flex-end;
flex-shrink: 0; flex-shrink: 0;
} }
.in { .in {
margin-left: 14px; margin-left: 14px;
width: 500px; width: 500px;
.ant-input-textarea-show-count { .ant-input-textarea-show-count {
position: relative; position: relative;
height: 110px; height: 110px;
} }
.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;
} }
} }
} }
.footer { .footer {
width: 100%; width: 100%;
margin-top: 31px; margin-top: 31px;
margin-bottom: 14px; margin-bottom: 14px;
.btn { .btn {
display: flex; display: flex;
margin-bottom: 20px; margin-bottom: 20px;
@@ -430,6 +467,7 @@ export default {
.uploadContent { .uploadContent {
display: block !important; display: block !important;
.uploadBtn { .uploadBtn {
margin-left: 120px !important; margin-left: 120px !important;
} }

8
src/store/index.js
View File

@@ -24,6 +24,11 @@ export default createStore({
routerId: null, routerId: null,
projectTemplateId: null, projectTemplateId: null,
orgtreeList: [], orgtreeList: [],
faceclassPic: null,
faceclassClass: [],
faceclassScene: [],
projectLevel: [],//项目级别
projectSys: [],//培训分类
}, },
getters: {}, getters: {},
mutations: { mutations: {
@@ -45,6 +50,9 @@ export default createStore({
getOrgtreeList(state, data) { getOrgtreeList(state, data) {
state.orgtreeList = data state.orgtreeList = data
}, },
SET_DICT(state,{key,data}){
state[key] = data
},
SET_projectTemplateId(state, projectTemplateId) { SET_projectTemplateId(state, projectTemplateId) {
state.projectTemplateId = projectTemplateId; state.projectTemplateId = projectTemplateId;
} }

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

@@ -2468,7 +2468,7 @@
</div> </div>
<div class="body"> <div class="body">
<div :style="{ display: del_hs ? 'block' : 'none' }"> <div :style="{ display: del_hs ? 'block' : 'none' }">
<span>您确定要删除此课程吗</span> <span>您确定要删除此学员吗</span>
</div> </div>
<div :style="{ display: copy_hs ? 'block' : 'none' }"> <div :style="{ display: copy_hs ? 'block' : 'none' }">
<span>您确定要复制此课程吗</span> <span>您确定要复制此课程吗</span>
@@ -2638,7 +2638,7 @@ const columns1 = [
case "1": case "1":
return "线上"; return "线上";
case "2": case "2":
return "线下"; return "面授";
} }
}, },
}, },
@@ -3977,6 +3977,7 @@ export default defineComponent({
state.qdms_inputV6 = ""; state.qdms_inputV6 = "";
state.imgList = []; state.imgList = [];
valueHtml.value = ""; valueHtml.value = "";
state.fileList =[];
}; };
const handlePush = (param) => { const handlePush = (param) => {
console.log("state.imgList"); console.log("state.imgList");
@@ -4525,6 +4526,9 @@ export default defineComponent({
options4CurId.value = item.teacherId; options4CurId.value = item.teacherId;
state.qdms_inputV5 = null; state.qdms_inputV5 = null;
state.qdms_inputV6 = item.intro; state.qdms_inputV6 = item.intro;
if(item.attach==""){
state.imgList =[];
}else{
if (item.attach.indexOf(",")) { if (item.attach.indexOf(",")) {
const arr = item.attach.split(","); const arr = item.attach.split(",");
arr.forEach((item) => { arr.forEach((item) => {
@@ -4533,6 +4537,8 @@ export default defineComponent({
} else { } else {
state.imgList = [{ img: item.attach }]; state.imgList = [{ img: item.attach }];
} }
}
valueHtml.value = item.outline; valueHtml.value = item.outline;
getTea(); getTea();
@@ -4685,7 +4691,13 @@ export default defineComponent({
console.log(file); console.log(file);
fileUp(formData).then((res) => { fileUp(formData).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
state.filesList.push(res.data.data); state.fileList.push({
img: res.data.data,
name: file.name,
size: file.size,
});
console.log(state.imgList);
// state.hasImgName = res.data.data;
} }
}); });
return false; return false;
@@ -4793,6 +4805,7 @@ export default defineComponent({
pageNo: 20, pageNo: 20,
pageSize: 1, pageSize: 1,
studentList: res[0], studentList: res[0],
keyWord: "",
}; };
console.log("obj", obj); console.log("obj", obj);
api1 api1
@@ -5108,7 +5121,7 @@ export default defineComponent({
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 50%; top:-100%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
.of_header { .of_header {
position: absolute; position: absolute;

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

@@ -116,14 +116,14 @@ export default {
key: "name", key: "name",
align: "center", align: "center",
}, },
// todo 根项目保存
{ // {
title: "所属项目", // title: "所属项目",
dataIndex: "sourceBelongName", // dataIndex: "sourceBelongName",
key: "sourceBelongName", // key: "sourceBelongName",
align: "center", // align: "center",
width: "11%", // width: "11%",
}, // },
{ {
title: "项目经理", title: "项目经理",
dataIndex: "manager", dataIndex: "manager",

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

@@ -1693,6 +1693,7 @@ export default {
pageNo: 20, pageNo: 20,
pageSize: 1, pageSize: 1,
studentList: res[0], studentList: res[0],
keyWord: "",
}; };
console.log("obj", obj); console.log("obj", obj);
api api

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

@@ -596,7 +596,8 @@
</div> </div>
<div class="xheadb"> <div class="xheadb">
<button class="addx" @click="showAddStu">添加学员</button> <button class="addx" @click="showAddStu">添加学员</button>
<button class="addd" @click="showImpStu">导入学员</button> <!-- 2022-11-30注释 后面放开 -->
<!-- <button class="addd" @click="showImpStu">导入学员</button> -->
<div class="select"> <div class="select">
<a-select <a-select
style="width: 130px" style="width: 130px"
@@ -1277,14 +1278,15 @@ export default {
picUrl: null, picUrl: null,
remark: null, remark: null,
projectNameList: [ projectNameList: [
{ // 2022-11-30注释 后面放开
value: "1", // {
label: "导出信息", // value: "1",
}, // label: "导出信息",
{ // },
value: "2", // {
label: "批量调整关卡", // value: "2",
}, // label: "批量调整关卡",
// },
{ {
value: "3", value: "3",
label: "批量删除", label: "批量删除",
@@ -1292,38 +1294,38 @@ export default {
], ],
// 共享文档列表 // 共享文档列表
docList: [ docList: [
{ // {
name: "测试文档1.doc", // name: "测试文档1.doc",
src: "", // src: "",
}, // },
{ // {
name: "测试文档2.doc", // name: "测试文档2.doc",
src: "", // src: "",
}, // },
{ // {
name: "测试文档3.doc", // name: "测试文档3.doc",
src: "", // src: "",
}, // },
], ],
huodModal: false, huodModal: false,
zhibModal: false, zhibModal: false,
//任务大纲列表 //任务大纲列表
taskSyllabus: [ taskSyllabus: [
{ // {
name: "关卡1 初级产品经理", // name: "关卡1 初级产品经理",
taskList: [ // taskList: [
{ // {
course: "在线", // course: "在线",
name: "时间管理", // name: "时间管理",
classify: "选修", // classify: "选修",
beginTime: "2022-09-10 14:03", // beginTime: "2022-09-10 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 20, //完成人数 // complete: 20, //完成人数
percent: 40, // percent: 40,
routerTaskId: 0, // routerTaskId: 0,
}, // },
], // ],
}, // },
], ],
activeKey: ref("1"), activeKey: ref("1"),
value: ref(" "), value: ref(" "),
@@ -1501,6 +1503,8 @@ export default {
return ( return (
<div class="opa"> <div class="opa">
<div class="opacation"> <div class="opacation">
{/**
2022-11-30注释 后面放开
<span <span
onClick={() => { onClick={() => {
showCheckStu(text.record.studentId); showCheckStu(text.record.studentId);
@@ -1510,6 +1514,9 @@ export default {
> >
查看 查看
</span> </span>
*/}
{/**
2022-11-30注释 后面放开
<span <span
onClick={() => { onClick={() => {
state.visiblene = true; state.visiblene = true;
@@ -1519,6 +1526,7 @@ export default {
> >
调整 调整
</span> </span>
*/}
<span <span
style="color:#4EA6FF;cursor:pointer" style="color:#4EA6FF;cursor:pointer"
onClick={() => { onClick={() => {
@@ -1963,7 +1971,7 @@ export default {
cancelText: "取消", cancelText: "取消",
onOk() { onOk() {
api api
.delStudent({ routerId: 100, studentIds: [id] }) .delStudent({ routerId: state.routerId, studentIds: [id] })
.then((res) => { .then((res) => {
message.success("删除成功"); message.success("删除成功");
getStudent(); getStudent();
@@ -2001,7 +2009,7 @@ export default {
return; return;
} }
let obj = { let obj = {
routerId: 100, routerId: state.routerId,
studentIds: state.selectedRowKeys, studentIds: state.selectedRowKeys,
}; };
api api

111
src/views/learningpath/LevelAddDetail.vue
View File

@@ -59,7 +59,7 @@
<div class="items2"> <div class="items2">
<a-popover <a-popover
placement="topLeft" placement="topLeft"
v-if="element.name.length > 10" v-if="element.name?.length > 10"
> >
<template #content> <template #content>
<div style="width: 130px"> <div style="width: 130px">
@@ -70,7 +70,7 @@
{{ element.name }} {{ element.name }}
</div> </div>
</a-popover> </a-popover>
<div class="nname" v-if="element.name.length <= 10"> <div class="nname" v-if="element.name?.length <= 10">
{{ element.name }} {{ element.name }}
</div> </div>
</div> </div>
@@ -182,7 +182,8 @@
</div> </div>
</div> </div>
<div class="rightt"> <div class="rightt">
<div class="select"> <!-- 2022-11-30注释 后面放开 -->
<!-- <div class="select">
<span>学习模式：</span> <span>学习模式：</span>
<div class="inputbox"> <div class="inputbox">
<input type="text" placeholder="按学习时间解锁" /> <input type="text" placeholder="按学习时间解锁" />
@@ -190,9 +191,8 @@
<div class="btnText">切换模式</div> <div class="btnText">切换模式</div>
</div> </div>
</div> </div>
<!-- 切换模式抽屉 -->
<unlock-mode v-model:unlockModeVisible="unlockModeVisible" /> <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
</div> </div> -->
<div class="line"></div> <div class="line"></div>
<router-link to="/leveladd"> <router-link to="/leveladd">
<div style="display: flex"> <div style="display: flex">
@@ -744,7 +744,8 @@
</div> </div>
</div> </div>
<div class="rightt"> <div class="rightt">
<div class="select"> <!-- 2022-11-30注释 后面放开 -->
<!-- <div class="select">
<span>学习模式：</span> <span>学习模式：</span>
<div class="inputbox"> <div class="inputbox">
<input type="text" placeholder="按学习时间解锁" /> <input type="text" placeholder="按学习时间解锁" />
@@ -752,9 +753,8 @@
<div class="btnText">切换模式</div> <div class="btnText">切换模式</div>
</div> </div>
</div> </div>
<!-- 切换模式抽屉 -->
<unlock-mode v-model:unlockModeVisible="unlockModeVisible" /> <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
</div> </div> -->
<div class="line"></div> <div class="line"></div>
<router-link to="/leveladd"> <router-link to="/leveladd">
<div style="display: flex"> <div style="display: flex">
@@ -1053,7 +1053,7 @@ import { editTask } from "../../api/indexTaskadd";
// import { RouterEditTask } from "@/api/indexTask"; // import { RouterEditTask } from "@/api/indexTask";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { toDate } from "../../api/method"; import { toDate } from "../../api/method";
import UnlockMode from "../../components/drawers/UnlockMode.vue"; // import UnlockMode from "../../components/drawers/UnlockMode.vue";
export default { export default {
name: "LevelAddDetail", name: "LevelAddDetail",
components: { components: {
@@ -1071,7 +1071,7 @@ export default {
AddLive, AddLive,
AddRef, AddRef,
draggable, draggable,
UnlockMode, // UnlockMode,
AddFaceteach, AddFaceteach,
AddProject, AddProject,
}, },
@@ -1082,11 +1082,11 @@ export default {
? JSON.parse(storage.get("routerId")) ? JSON.parse(storage.get("routerId"))
: null, : null,
level: [ level: [
{ // {
chapterId: "1", // chapterId: "1",
remark: "关卡说明", // remark: "关卡说明",
name: "默认关卡", // name: "默认关卡",
}, // },
], ],
tableData: [ tableData: [
// { // {
@@ -1103,78 +1103,15 @@ export default {
// }, // },
], ],
tableData2: [ tableData2: [
{ // {
key: 1, // key: 1,
name: "张三", // name: "张三",
com: "产研部", // com: "产研部",
gang: "产品经理", // gang: "产品经理",
cur: "关卡2", // cur: "关卡2",
jin: "2/10", // jin: "2/10",
time: "2022-07-15 14:00", // time: "2022-07-15 14:00",
}, // },
{
key: 2,
name: "张三",
com: "产研部",
gang: "产品经理",
cur: "关卡2",
jin: "2/10",
time: "2022-07-15 14:00",
},
{
key: 3,
name: "张三",
com: "产研部",
gang: "产品经理",
cur: "关卡2",
jin: "2/10",
time: "2022-07-15 14:00",
},
{
key: 4,
name: "张三",
com: "产研部",
gang: "产品经理",
cur: "关卡1",
jin: "2/10",
time: "2022-07-15 14:00",
},
{
key: 5,
name: "张三",
com: "产研部",
gang: "产品经理",
cur: "关卡1",
jin: "2/10",
time: "2022-07-15 14:00",
},
{
key: 6,
name: "张三",
com: "产研部",
gang: "产品经理",
cur: "关卡2",
jin: "2/10",
time: "2022-07-15 14:00",
},
{
key: 7,
name: "张三",
com: "产研部",
gang: "产品经理",
cur: "关卡2",
jin: "2/10",
time: "2022-07-15 14:00",
},
{
key: 8,
name: "张三",
com: "产研部",
gang: "产品经理",
cur: "关卡2",
jin: "2/10",
time: "2022-07-15 14:00",
},
], ],
//项目抽屉、列表参数 //项目抽屉、列表参数
currentPage: 1, currentPage: 1,

154
src/views/projectcenter/LibraryAdd.vue
View File

@@ -700,83 +700,83 @@ export default defineComponent({
const state = reactive({ const state = reactive({
//任务大纲列表 //任务大纲列表
taskSyllabus: [ taskSyllabus: [
{ // {
text: "阶段1腾飞班阶段1", // text: "阶段1腾飞班阶段1",
children: [ // children: [
{ // {
course: "在线", // course: "在线",
name: "时间管理", // name: "时间管理",
classify: "选修", // classify: "选修",
beginTime: "2022-09-10 14:03", // beginTime: "2022-09-10 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 20, //完成人数 // complete: 20, //完成人数
percent: 40, // percent: 40,
}, // },
{ // {
course: "直播", // course: "直播",
name: "管理直播间", // name: "管理直播间",
classify: "必修", // classify: "必修",
beginTime: "2022-09-12 14:03", // beginTime: "2022-09-12 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 10, //完成人数 // complete: 10, //完成人数
percent: 20, // percent: 20,
}, // },
{ // {
course: "面授", // course: "面授",
name: "管理面授课", // name: "管理面授课",
classify: "必修", // classify: "必修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 80, //总人数 // total: 80, //总人数
complete: 0, //完成人数 // complete: 0, //完成人数
percent: 0, // percent: 0,
}, // },
{ // {
course: "活动", // course: "活动",
name: "管理活动", // name: "管理活动",
classify: "必修", // classify: "必修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 40, //完成人数 // complete: 40, //完成人数
percent: 80, // percent: 80,
}, // },
{ // {
course: "作业", // course: "作业",
name: "管理者作业", // name: "管理者作业",
classify: "选修", // classify: "选修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 30, //完成人数 // complete: 30, //完成人数
percent: 60, // percent: 60,
}, // },
{ // {
course: "考试", // course: "考试",
name: "管理者考试", // name: "管理者考试",
classify: "必修", // classify: "必修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 50, //完成人数 // complete: 50, //完成人数
percent: 100, // percent: 100,
}, // },
{ // {
course: "案例", // course: "案例",
name: "管理直播间", // name: "管理直播间",
classify: "必修", // classify: "必修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 10, //完成人数 // complete: 10, //完成人数
percent: 20, // percent: 20,
}, // },
{ // {
course: "外链", // course: "外链",
name: "管理直播间", // name: "管理直播间",
classify: "必修", // classify: "必修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 10, //完成人数 // complete: 10, //完成人数
percent: 20, // percent: 20,
}, // },
], // ],
}, // },
], ],
// 模板编辑列表 // 模板编辑列表
managerOptions: [ managerOptions: [

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

@@ -158,16 +158,18 @@
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
:value="classifySelect1" v-model:value="classifySelect1"
mode="multiple"
placeholder="请选择项目经理" placeholder="请选择项目经理"
:filterOption="false"
style="width: 100%" style="width: 100%"
:options="classifyList1" :options="classifyList1"
@change="classificationChange1" @change="classificationChange1"
allowClear allowClear
showSearch showSearch
mode="multiple"
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
@popupScroll="memberScroll" @popupScroll="memberScroll"
@search="searchMember"
> >
</a-select> </a-select>
</div> </div>
@@ -188,12 +190,12 @@
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
v-model:value="classifySelect2" v-model:value="projectInfo.sourceBelongId"
style="width: 100%" style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="自动带出 可修改" placeholder="自动带出 可修改"
allow-clear allow-clear
:tree-data="classifyList2" :tree-data="orgtreeList"
:fieldNames="{ :fieldNames="{
children: 'treeChildList', children: 'treeChildList',
label: 'name', label: 'name',
@@ -273,16 +275,11 @@
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
v-model:value="classifySelect3" v-model:value="projectInfo.level"
:options="classifyList3" :options="classifyList3"
style="width: 100%" style="width: 100%"
@change="classificationChange3"
placeholder="请选择项目级别" placeholder="请选择项目级别"
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
:fieldNames="{
label: 'dictName',
value: 'dictCode',
}"
/> />
</div> </div>
</div> </div>
@@ -301,16 +298,11 @@
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
v-model:value="classifySelect4" v-model:value="projectInfo.systemId"
:options="classifyList4" :options="systemOption"
style="width: 100%" style="width: 100%"
@change="classificationChange4"
placeholder="请选择培训分类" placeholder="请选择培训分类"
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
:fieldNames="{
label: 'dictName',
value: 'dictCode',
}"
/> />
</div> </div>
</div> </div>
@@ -402,7 +394,8 @@
<div class="footer"> <div class="footer">
<div class="btn"> <div class="btn">
<a-button v-on:click="createProject" type="primary" class="btn1" <a-button v-on:click="createProject" type="primary" class="btn1"
>确定</a-button >确定
</a-button
> >
<a-button @click="backPage" class="btn2">取消</a-button> <a-button @click="backPage" class="btn2">取消</a-button>
</div> </div>
@@ -410,7 +403,7 @@
</div> </div>
</template> </template>
<script> <script>
import { reactive, toRefs, ref, onUnmounted, computed } from "vue"; import {reactive, toRefs, ref, onUnmounted, onMounted} from "vue";
import {message} from "ant-design-vue"; import {message} from "ant-design-vue";
import {useRouter, useRoute} from "vue-router"; import {useRouter, useRoute} from "vue-router";
import dayjs from "dayjs"; import dayjs from "dayjs";
@@ -419,6 +412,7 @@ import * as api1 from "../../api/index1";
import {storage} from "../../api/storage"; import {storage} from "../../api/storage";
import {toDate, scrollLoad} from "../../api/method"; import {toDate, scrollLoad} from "../../api/method";
import {useStore} from "vuex"; import {useStore} from "vuex";
export default { export default {
name: "projectAdd", name: "projectAdd",
setup() { setup() {
@@ -444,17 +438,24 @@ export default {
viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null, viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
currentPage1: 1, //项目经理 currentPage1: 1, //项目经理
pageSize1: 10, //项目经理 pageSize1: 10, //项目经理,
orgtreeList: [],
projectInfo: {},
classifyList3: [],
systemOption: []
}); });
onMounted(() => {
console.log('onMounted')
state.orgtreeList = [...store.state.orgtreeList]
state.classifyList3 = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
state.systemOption = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
//分类列表 //分类列表
const classifyList = ref([]); const classifyList = ref([]);
//项目封面 //项目封面
const imageUrl = ref(""); const imageUrl = ref("");
// 项目级别
const classifyList3 = ref([
// { value: 1, label: "集团级" },
]);
// 培训分类 // 培训分类
const classifyList4 = ref([ const classifyList4 = ref([
@@ -481,16 +482,13 @@ export default {
picUrl = res.data.data.rows[0].dictValue; picUrl = res.data.data.rows[0].dictValue;
} }
} }
if (param === "projectLevel") {
classifyList3.value = res.data.data.rows;
}
if (param === "projectSys") { if (param === "projectSys") {
classifyList4.value = res.data.data.rows; classifyList4.value = res.data.data.rows;
} }
if ( if (
classifyList.value && classifyList.value &&
imageUrl.value && imageUrl.value &&
classifyList3.value &&
classifyList4.value classifyList4.value
) { ) {
getDictInfo(); getDictInfo();
@@ -503,7 +501,6 @@ export default {
}; };
getDictList("projectClass"); getDictList("projectClass");
getDictList("projectPic"); getDictList("projectPic");
getDictList("projectLevel");
getDictList("projectSys"); getDictList("projectSys");
//获取分类、封面图、项目级别、培训分类---------------字典配置--------------------------- //获取分类、封面图、项目级别、培训分类---------------字典配置---------------------------
//分类、封面图、项目级别、培训分类回显 //分类、封面图、项目级别、培训分类回显
@@ -529,7 +526,6 @@ export default {
const isEdit = ref(false); const isEdit = ref(false);
let peojectID = ""; //项目id let peojectID = ""; //项目id
console.log("store.state.orgtreeList", store.state.orgtreeList);
const editProject = () => { const editProject = () => {
if (routers.query.projectId) { if (routers.query.projectId) {
storage.set("projectAddId", routers.query.projectId); storage.set("projectAddId", routers.query.projectId);
@@ -541,6 +537,7 @@ export default {
.then((res) => { .then((res) => {
if (res.status == 200 && res.data.code == 200) { if (res.status == 200 && res.data.code == 200) {
let info = res.data.data.projectInfo; let info = res.data.data.projectInfo;
state.projectInfo = info;
console.log( console.log(
"classifyList.value.find(item=>item.dictCode===info.category)", "classifyList.value.find(item=>item.dictCode===info.category)",
classifyList.value.find((item) => { classifyList.value.find((item) => {
@@ -580,21 +577,17 @@ export default {
} }
console.log(optionsManage); console.log(optionsManage);
state.classifySelect1 = optionsManage; state.classifySelect1 = optionsManage;
state.classifySelect2 = state.classifySelect2 = info.sourceBelongId
classifyList2.value[info.sourceBelongId - 1];
remark.value = info.remark; remark.value = info.remark;
state.checked = info.boeFlag ? info.boeFlag : false; state.checked = info.boeFlag ? info.boeFlag : false;
state.classifySelect3 = classifyList3.value[info.level];
state.classifySelect4 = classifyList4.value[info.systemId - 1]; state.classifySelect4 = classifyList4.value[info.systemId - 1];
state.checked1 = info.boeFlag ? info.boeFlag : false; state.checked1 = info.boeFlag ? info.boeFlag : false;
// fileList1.value = info.attach.split(","); state.orgtreeList.unshift({id: info.sourceBelongId, name: info.sourceBelongName})
picUrl = info.picUrl; picUrl = info.picUrl;
beginTime = Number(info.beginTime / 1000); beginTime = Number(info.beginTime / 1000);
endTime = Number(info.endTime / 1000); endTime = Number(info.endTime / 1000);
manager = info.manager; manager = info.manager;
managerId = info.managerId; managerId = info.managerId;
sourceBelongIdC = Number(info.sourceBelongId);
courseSyncFlag = info.courseSyncFlag; courseSyncFlag = info.courseSyncFlag;
levels = info.level; levels = info.level;
systemid = info.systemId; systemid = info.systemId;
@@ -614,6 +607,7 @@ export default {
.then((res) => { .then((res) => {
if (res.status == 200 && res.data.code == 200) { if (res.status == 200 && res.data.code == 200) {
let info = res.data.data.projectInfo; let info = res.data.data.projectInfo;
state.projectInfo = info;
console.log("我是从本地存储获取的id", info); console.log("我是从本地存储获取的id", info);
projectName.value = info.name; projectName.value = info.name;
state.classifySelect = classifyList.value[1]; // info.category 分类选择的信息 state.classifySelect = classifyList.value[1]; // info.category 分类选择的信息
@@ -639,11 +633,10 @@ export default {
} }
console.log(optionsManage); console.log(optionsManage);
state.classifySelect1 = optionsManage; state.classifySelect1 = optionsManage;
state.classifySelect2 = state.classifySelect2 = info.sourceBelongId
classifyList2.value[info.sourceBelongId - 1]; state.orgtreeList.unshift({id: info.sourceBelongId, name: info.sourceBelongName})
remark.value = info.remark; remark.value = info.remark;
state.checked = info.boeFlag ? info.boeFlag : false; state.checked = info.boeFlag ? info.boeFlag : false;
state.classifySelect3 = classifyList3.value[info.level];
state.classifySelect4 = classifyList4.value[info.systemId - 1]; state.classifySelect4 = classifyList4.value[info.systemId - 1];
state.checked1 = info.boeFlag ? info.boeFlag : false; state.checked1 = info.boeFlag ? info.boeFlag : false;
@@ -652,7 +645,6 @@ export default {
endTime = Number(info.endTime / 1000); endTime = Number(info.endTime / 1000);
manager = info.manager; manager = info.manager;
managerId = info.managerId; managerId = info.managerId;
sourceBelongIdC = Number(info.sourceBelongId);
courseSyncFlag = info.courseSyncFlag; courseSyncFlag = info.courseSyncFlag;
levels = info.level; levels = info.level;
systemid = info.systemId; systemid = info.systemId;
@@ -798,12 +790,13 @@ export default {
// 项目经理 后续接口调用 // 项目经理 后续接口调用
const classifyList1 = ref([]); const classifyList1 = ref([]);
//获取学员 //获取学员
const getMember = () => { const getMember = (e) => {
console.log("state.classifySelect1", e, state.classifySelect1);
api1 api1
.getMemberInfo({ .getMemberInfo({
pageNo: state.currentPage1, pageNo: state.currentPage1,
pageSize: state.pageSize1, pageSize: state.pageSize1,
keyWord: "", keyWord: e ? e : "",
}) })
.then((res) => { .then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
@@ -817,7 +810,7 @@ export default {
array.push(obj); array.push(obj);
}); });
classifyList1.value = array; classifyList1.value = array;
console.log("获取学员", res.data); console.log("获取学员", res.data, classifyList1.value);
// classifyList1.value = res.data.data.rows; // classifyList1.value = res.data.data.rows;
// state.tableDataTotal = res.data.data.total; // state.tableDataTotal = res.data.data.total;
// return res.data.data.rows; // return res.data.data.rows;
@@ -825,6 +818,17 @@ export default {
}); });
}; };
getMember(); getMember();
//搜索学员
const searchMember = (e) => {
console.log("eee", e);
if (e) {
state.searchName = e;
classifyList1.value = [];
getMember(e);
}
};
//学员滚动加载信息 //学员滚动加载信息
const memberScroll = (e) => { const memberScroll = (e) => {
// console.log("滚动", e, b); // console.log("滚动", e, b);
@@ -867,21 +871,13 @@ export default {
managerId = midstr; managerId = midstr;
}; };
// 资源归属 sourceBelongId 后续给接口 const classificationChange2 = (key, obj) => {
const classifyList2 = computed(() => { state.projectInfo.sourceBelongName = obj[0]
return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
});
let sourceBelongIdC = "";
const classificationChange2 = (key) => {
console.log(`selected ${key}`, classifyList2);
sourceBelongIdC = key;
}; };
//选择项目级别 //选择项目级别
let levels = ""; let levels = "";
const classificationChange3 = (key) => { const classificationChange3 = (key) => {
console.log(`selected ${key}`, classifyList3);
levels = key; levels = key;
}; };
@@ -938,11 +934,10 @@ export default {
} }
console.log(optionsManage); console.log(optionsManage);
state.classifySelect1 = optionsManage; state.classifySelect1 = optionsManage;
state.classifySelect2 = state.classifySelect2 = info.sourceBelongId
classifyList2.value[info.sourceBelongId - 1]; state.orgtreeList.unshift({id: info.sourceBelongId, name: info.sourceBelongName})
remark.value = info.remark; remark.value = info.remark;
state.checked = info.boeFlag ? info.boeFlag : false; state.checked = info.boeFlag ? info.boeFlag : false;
state.classifySelect3 = classifyList3.value[info.level];
state.classifySelect4 = classifyList4.value[info.systemId - 1]; state.classifySelect4 = classifyList4.value[info.systemId - 1];
state.checked1 = info.boeFlag ? info.boeFlag : false; state.checked1 = info.boeFlag ? info.boeFlag : false;
// fileList1.value = info.attach.split(","); // fileList1.value = info.attach.split(",");
@@ -952,7 +947,6 @@ export default {
endTime = Number(info.endTime / 1000); endTime = Number(info.endTime / 1000);
manager = info.manager; manager = info.manager;
managerId = info.managerId; managerId = info.managerId;
sourceBelongIdC = Number(info.sourceBelongId);
courseSyncFlag = info.courseSyncFlag; courseSyncFlag = info.courseSyncFlag;
levels = info.level; levels = info.level;
systemid = info.systemId; systemid = info.systemId;
@@ -1074,11 +1068,12 @@ export default {
endTime: endTime, endTime: endTime,
manager: manager, manager: manager,
managerId: managerId, managerId: managerId,
sourceBelongId: sourceBelongIdC, sourceBelongId: state.projectInfo.sourceBelongId,
sourceBelongName: state.projectInfo.sourceBelongName,
remark: remark["value"], remark: remark["value"],
courseSyncFlag: courseSyncFlag, courseSyncFlag: courseSyncFlag,
level: levels, level: state.projectInfo.level,
systemId: systemid, systemId: state.projectInfo.systemId,
boeFlag: boeFlag, boeFlag: boeFlag,
attach: attach, attach: attach,
type: 3, type: 3,
@@ -1131,7 +1126,8 @@ export default {
endTime: endTime, endTime: endTime,
manager: manager, manager: manager,
managerId: managerId, managerId: managerId,
sourceBelongId: sourceBelongIdC, sourceBelongId: state.projectInfo.sourceBelongId,
sourceBelongName: state.projectInfo.sourceBelongName,
remark: remark["value"], remark: remark["value"],
courseSyncFlag: courseSyncFlag, courseSyncFlag: courseSyncFlag,
level: levels, level: levels,
@@ -1204,8 +1200,6 @@ export default {
beforeUpload1, beforeUpload1,
onRangeChange, onRangeChange,
classifyList1, classifyList1,
classifyList2,
classifyList3,
classifyList4, classifyList4,
classifyList5, classifyList5,
remark, remark,
@@ -1221,6 +1215,8 @@ export default {
templateScroll, templateScroll,
memberScroll, memberScroll,
getMember,
searchMember
}; };
}, },
}; };
@@ -1518,16 +1514,19 @@ export default {
} }
} }
} }
.treeDropdown { .treeDropdown {
// width: 240px !important; // width: 240px !important;
// border-radius: 5px; // border-radius: 5px;
// min-height: 600px !important; // min-height: 600px !important;
.ant-select-tree-list-scrollbar { .ant-select-tree-list-scrollbar {
width: 5px !important; width: 5px !important;
.ant-select-tree-list-scrollbar-thumb { .ant-select-tree-list-scrollbar-thumb {
background-color: #4ea6ff !important; background-color: #4ea6ff !important;
} }
} }
.ant-select-tree-indent-unit { .ant-select-tree-indent-unit {
width: 7px !important; width: 7px !important;
} }

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

@@ -2488,19 +2488,9 @@ export default {
// options={state.projectNameList} // options={state.projectNameList}
dropdownClassName="tabledropdown" dropdownClassName="tabledropdown"
> >
{/* {/**
<a-select-option value="基础信息" label="基础信息"> 2022-11-30注释 后面放开
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
<a-select-option value="存为模版" label="存为模版">
<div
onClick={() => {
showStartModal();
}}
>
存为模版
</div>
</a-select-option> */}
<a-select-option value="复制" label="复制"> <a-select-option value="复制" label="复制">
<div <div
onClick={() => { onClick={() => {
@@ -2510,6 +2500,8 @@ export default {
复制 复制
</div> </div>
</a-select-option> </a-select-option>
*/}
<a-select-option value="删除" label="删除"> <a-select-option value="删除" label="删除">
<div <div
onClick={() => { onClick={() => {
@@ -2587,18 +2579,7 @@ export default {
dropdownClassName="tabledropdown" dropdownClassName="tabledropdown"
> >
{/* {/*
<a-select-option value="基础信息" label="基础信息"> 2022-11-30注释 后面放开
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
<a-select-option value="存为模版" label="存为模版">
<div
onClick={() => {
showStartModal();
}}
>
存为模版
</div>
</a-select-option> */}
<a-select-option value="复制" label="复制"> <a-select-option value="复制" label="复制">
<div <div
onClick={() => { onClick={() => {
@@ -2608,6 +2589,8 @@ export default {
复制 复制
</div> </div>
</a-select-option> </a-select-option>
*/}
</a-select> </a-select>
</div> </div>
</div> </div>
@@ -2675,18 +2658,7 @@ export default {
dropdownClassName="tabledropdown" dropdownClassName="tabledropdown"
> >
{/* {/*
<a-select-option value="基础信息" label="基础信息"> 2022-11-30注释 后面放开
<router-link to="/taskpage">基础信息</router-link>
</a-select-option>
<a-select-option value="存为模版" label="存为模版">
<div
onClick={() => {
showStartModal();
}}
>
存为模版
</div>
</a-select-option> */}
<a-select-option value="复制" label="复制"> <a-select-option value="复制" label="复制">
<div <div
onClick={() => { onClick={() => {
@@ -2696,6 +2668,8 @@ export default {
复制 复制
</div> </div>
</a-select-option> </a-select-option>
*/}
<a-select-option value="删除" label="删除"> <a-select-option value="删除" label="删除">
<div <div
onClick={() => { onClick={() => {
@@ -2805,6 +2779,8 @@ export default {
// options={state.projectNameList} // options={state.projectNameList}
dropdownClassName="tabledropdown" dropdownClassName="tabledropdown"
> >
{/*
2022-11-30注释 后面放开
<a-select-option value="复制" label="复制"> <a-select-option value="复制" label="复制">
<div <div
onClick={() => { onClick={() => {
@@ -2814,6 +2790,8 @@ export default {
复制 复制
</div> </div>
</a-select-option> </a-select-option>
*/}
<a-select-option value="删除" label="删除"> <a-select-option value="删除" label="删除">
<div <div
onClick={() => { onClick={() => {
@@ -2887,6 +2865,8 @@ export default {
// options={state.projectNameList} // options={state.projectNameList}
dropdownClassName="tabledropdown" dropdownClassName="tabledropdown"
> >
{/*
2022-11-30注释 后面放开
<a-select-option value="复制" label="复制"> <a-select-option value="复制" label="复制">
<div <div
onClick={() => { onClick={() => {
@@ -2896,6 +2876,7 @@ export default {
复制 复制
</div> </div>
</a-select-option> </a-select-option>
*/}
</a-select> </a-select>
</div> </div>
</div> </div>
@@ -2957,6 +2938,8 @@ export default {
// options={state.projectNameList} // options={state.projectNameList}
dropdownClassName="tabledropdown" dropdownClassName="tabledropdown"
> >
{/*
2022-11-30注释 后面放开
<a-select-option value="复制" label="复制"> <a-select-option value="复制" label="复制">
<div <div
onClick={() => { onClick={() => {
@@ -2966,6 +2949,8 @@ export default {
复制 复制
</div> </div>
</a-select-option> </a-select-option>
*/}
<a-select-option value="删除" label="删除"> <a-select-option value="删除" label="删除">
<div <div
onClick={() => { onClick={() => {
@@ -3180,6 +3165,8 @@ export default {
// options={state.projectNameList} // options={state.projectNameList}
dropdownClassName="tabledropdown" dropdownClassName="tabledropdown"
> >
{/*
2022-11-30注释 后面放开
<a-select-option value="复制" label="复制"> <a-select-option value="复制" label="复制">
<div <div
onClick={() => { onClick={() => {
@@ -3189,6 +3176,8 @@ export default {
复制 复制
</div> </div>
</a-select-option> </a-select-option>
*/}
<a-select-option value="删除" label="删除"> <a-select-option value="删除" label="删除">
<div <div
onClick={() => { onClick={() => {
@@ -3230,6 +3219,8 @@ export default {
// options={state.projectNameList} // options={state.projectNameList}
dropdownClassName="tabledropdown" dropdownClassName="tabledropdown"
> >
{/*
2022-11-30注释 后面放开
<a-select-option value="复制" label="复制"> <a-select-option value="复制" label="复制">
<div <div
onClick={() => { onClick={() => {
@@ -3239,6 +3230,8 @@ export default {
复制 复制
</div> </div>
</a-select-option> </a-select-option>
*/}
<a-select-option value="存为模版" label="存为模版"> <a-select-option value="存为模版" label="存为模版">
<div <div
onClick={() => { onClick={() => {
@@ -3295,6 +3288,8 @@ export default {
存为模版 存为模版
</div> </div>
</a-select-option> </a-select-option>
{/*
2022-11-30注释 后面放开
<a-select-option value="复制" label="复制"> <a-select-option value="复制" label="复制">
<div <div
onClick={() => { onClick={() => {
@@ -3304,6 +3299,8 @@ export default {
复制 复制
</div> </div>
</a-select-option> </a-select-option>
*/}
<a-select-option value="删除" label="删除"> <a-select-option value="删除" label="删除">
<div <div
onClick={() => { onClick={() => {
@@ -3345,6 +3342,8 @@ export default {
存为模版 存为模版
</div> </div>
</a-select-option> </a-select-option>
{/*
2022-11-30注释 后面放开
<a-select-option value="复制" label="复制"> <a-select-option value="复制" label="复制">
<div <div
onClick={() => { onClick={() => {
@@ -3354,6 +3353,7 @@ export default {
复制 复制
</div> </div>
</a-select-option> </a-select-option>
*/}
<a-select-option value="基础信息" label="基础信息"> <a-select-option value="基础信息" label="基础信息">
<div <div
@@ -3521,6 +3521,7 @@ export default {
pageNo: 20, pageNo: 20,
pageSize: 1, pageSize: 1,
studentList: res[0], studentList: res[0],
keyWord: "",
}; };
console.log("obj", obj); console.log("obj", obj);
api1 api1

15
src/views/projectcenter/TaskAdd.vue
View File

@@ -59,7 +59,7 @@
<div class="items2"> <div class="items2">
<a-popover <a-popover
placement="topLeft" placement="topLeft"
v-if="element.tit.length > 10" v-if="element.tit?.length > 10"
> >
<template #content> <template #content>
<div style="width: 130px"> <div style="width: 130px">
@@ -73,7 +73,7 @@
{{ element.tit }} {{ element.tit }}
</div> </div>
</a-popover> </a-popover>
<div class="nname" v-if="element.tit.length <= 10"> <div class="nname" v-if="element.tit?.length <= 10">
{{ element.tit }} {{ element.tit }}
</div> </div>
</div> </div>
@@ -124,18 +124,17 @@
</div> </div>
</div> </div>
<div class="rightt"> <div class="rightt">
<div class="select"> <!-- 2022-11-30注释 后面放开 -->
<!-- <div class="select">
<span>学习模式：</span> <span>学习模式：</span>
<div class="inputbox"> <div class="inputbox">
<input type="text" placeholder="按学习时间解锁" /> <input type="text" placeholder="按学习时间解锁" />
<!-- v-model:unlockModeVisible="unlockModeVisible" -->
<div class="bottonbox" @click="showModeVisible"> <div class="bottonbox" @click="showModeVisible">
<div class="btnText">切换模式</div> <div class="btnText">切换模式</div>
</div> </div>
<!-- 切换模式抽屉 -->
<unlock-mode v-model:unlockModeVisible="unlockModeVisible" /> <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
</div> </div>
</div> </div> -->
<div class="line"></div> <div class="line"></div>
<!-- <img class="img2" src="../../assets/images/projectadd/keep.png" /> <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
<div class="pub">保存</div> <div class="pub">保存</div>
@@ -1036,7 +1035,7 @@ import * as apistage from "../../api/indexStage";
import * as apimove from "../../api/indexMovetask"; import * as apimove from "../../api/indexMovetask";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import { storage } from "../../api/storage"; import { storage } from "../../api/storage";
import UnlockMode from "../../components/drawers/UnlockMode.vue"; // import UnlockMode from "../../components/drawers/UnlockMode.vue";
// import * as api1 from "../../api/index1"; // import * as api1 from "../../api/index1";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
export default { export default {
@@ -1055,7 +1054,7 @@ export default {
AddEval, AddEval,
AddInvist, AddInvist,
AddVote, AddVote,
UnlockMode, // UnlockMode,
}, },
setup() { setup() {
const router = useRouter(); const router = useRouter();

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

@@ -318,9 +318,10 @@
<div class="split"></div> <div class="split"></div>
<div class="onerow"> <div class="onerow">
<div class="taskmain">任务大纲</div> <div class="taskmain">任务大纲</div>
<button class="btn" @click="showFaceIn" v-if="morFaceT"> <!-- 2022-11-30注释 后面放开 -->
<!-- <button class="btn" @click="showFaceIn" v-if="morFaceT">
批量面授报名 批量面授报名
</button> </button> -->
<router-link to="/taskadd"> <router-link to="/taskadd">
<button to="/taskadd" class="edit"> <button to="/taskadd" class="edit">
<img <img
@@ -567,7 +568,8 @@
placeholder="请输入小组名称" placeholder="请输入小组名称"
/> />
</div> </div>
<div <!-- 2022-11-30注释 后面放开 -->
<!-- <div
style=" style="
display: flex; display: flex;
align-items: center; align-items: center;
@@ -597,14 +599,10 @@
value: 'id', value: 'id',
}" }"
></a-tree-select> ></a-tree-select>
<!-- <a-select
v-model:value="valuestub" </div> -->
placeholder="请选择部门" <!-- 2022-11-30注释 后面放开 -->
:options="bum" <!-- <div
@change="handleChangeBum"
/> -->
</div>
<div
style=" style="
display: flex; display: flex;
align-items: center; align-items: center;
@@ -618,7 +616,7 @@
:options="goodstuList" :options="goodstuList"
@change="handleChangeGood" @change="handleChangeGood"
/> />
</div> </div> -->
</div> </div>
<div class="groupright"> <div class="groupright">
<div class="btn1" @click="searchStu"> <div class="btn1" @click="searchStu">
@@ -636,10 +634,11 @@
<img src="../../assets/images/courseManage/add0.png" /> <img src="../../assets/images/courseManage/add0.png" />
<span class="btn1text">添加学员</span> <span class="btn1text">添加学员</span>
</div> </div>
<div class="btn2" @click="showImportStu"> <!-- 2022-11-30注释 后面放开 -->
<!-- <div class="btn2" @click="showImportStu">
<img src="../../assets/images/courseManage/reset2.png" /> <img src="../../assets/images/courseManage/reset2.png" />
<span class="btn2text">导入学员</span> <span class="btn2text">导入学员</span>
</div> </div> -->
<div class="btn2" @click="showAllDelete"> <div class="btn2" @click="showAllDelete">
<img src="../../assets/images/projectadd/delete.png" /> <img src="../../assets/images/projectadd/delete.png" />
<span class="btn2text">批量删除</span> <span class="btn2text">批量删除</span>
@@ -805,10 +804,10 @@
></a-tab-pane> ></a-tab-pane>
</a-tabs> </a-tabs>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="5" tab="项目积分"> <a-tab-pane key="5" tab="项目积分" disabled>
<ProjectScore :projectId="projectId"></ProjectScore> <ProjectScore :projectId="projectId"></ProjectScore>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="6" tab="排行榜"> <a-tab-pane key="6" tab="排行榜" disabled>
<div class="split"></div> <div class="split"></div>
<div class="content6"> <div class="content6">
<div class="title">排行榜</div> <div class="title">排行榜</div>
@@ -2393,7 +2392,7 @@ export default {
//任务大纲渲染 //任务大纲渲染
const getTaskList = () => { const getTaskList = () => {
let objtl = { let objtl = {
projectId: 27, projectId: storage.get("projectId"),
}; };
apitl apitl
.getProjectDetail(objtl) .getProjectDetail(objtl)
@@ -2920,6 +2919,8 @@ export default {
{text.record.excellent ? "取消优秀" : "优秀学员"} {text.record.excellent ? "取消优秀" : "优秀学员"}
</div> </div>
{/**
2022-11-30注释 后面放开
<div <div
class="studentopea2" class="studentopea2"
onClick={() => { onClick={() => {
@@ -2930,6 +2931,7 @@ export default {
> >
查看 查看
</div> </div>
*/}
<div class="studentSelect"> <div class="studentSelect">
<a-select <a-select
style="width: 50px" style="width: 50px"
@@ -3132,9 +3134,10 @@ export default {
: value.source == 3 : value.source == 3
? "受众添加" ? "受众添加"
: "-", //加入方式 : "-", //加入方式
stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间 stutime: toDate(value.beginStudyTime, "Y-M-D"), //开始学习时间
}; };
array.push(obj); array.push(obj);
console.log("stutime", obj.stutime);
}); });
state.tabledata = array; state.tabledata = array;
}; };
@@ -3711,6 +3714,7 @@ export default {
groupList: res[2], groupList: res[2],
projectId: state.projectId, projectId: state.projectId,
studentList: res[0], studentList: res[0],
projectGroupId: 0,
}; };
console.log("obj", obj); console.log("obj", obj);
api api

15
src/views/projectcenter/temTask.vue
View File

@@ -68,7 +68,7 @@
<div class="items2"> <div class="items2">
<a-popover <a-popover
placement="topLeft" placement="topLeft"
v-if="element.tit.length > 10" v-if="element.tit?.length > 10"
> >
<template #content> <template #content>
<div style="width: 130px"> <div style="width: 130px">
@@ -82,7 +82,7 @@
{{ element.tit }} {{ element.tit }}
</div> </div>
</a-popover> </a-popover>
<div class="nname" v-if="element.tit.length <= 10"> <div class="nname" v-if="element.tit?.length <= 10">
{{ element.tit }} {{ element.tit }}
</div> </div>
</div> </div>
@@ -133,18 +133,17 @@
</div> </div>
</div> </div>
<div class="rightt"> <div class="rightt">
<div class="select"> <!-- 2022-11-30注释 后面放开 -->
<!-- <div class="select">
<span>学习模式：</span> <span>学习模式：</span>
<div class="inputbox"> <div class="inputbox">
<input type="text" placeholder="按学习时间解锁" /> <input type="text" placeholder="按学习时间解锁" />
<!-- v-model:unlockModeVisible="unlockModeVisible" -->
<div class="bottonbox" @click="showModeVisible"> <div class="bottonbox" @click="showModeVisible">
<div class="btnText">切换模式</div> <div class="btnText">切换模式</div>
</div> </div>
<!-- 切换模式抽屉 -->
<unlock-mode v-model:unlockModeVisible="unlockModeVisible" /> <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
</div> </div>
</div> </div> -->
<div class="line"></div> <div class="line"></div>
<!-- <img class="img2" src="../../assets/images/projectadd/keep.png" /> <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
<div class="pub">保存</div> <div class="pub">保存</div>
@@ -1049,7 +1048,7 @@ import { message } from "ant-design-vue";
import * as api from "../../api/indexTemplate"; import * as api from "../../api/indexTemplate";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import { storage } from "../../api/storage"; import { storage } from "../../api/storage";
import UnlockMode from "../../components/drawers/UnlockMode.vue"; // import UnlockMode from "../../components/drawers/UnlockMode.vue";
// import * as api1 from "../../api/index1"; // import * as api1 from "../../api/index1";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
const drawercolumns = [ const drawercolumns = [
@@ -1107,7 +1106,7 @@ export default {
AddEval, AddEval,
AddInvist, AddInvist,
AddVote, AddVote,
UnlockMode, // UnlockMode,
}, },
setup() { setup() {
const router = useRouter(); const router = useRouter();