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

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

Browse Source
This commit is contained in:
zhangyc
2022-12-01 02:43:11 +08:00
parent a7eb3ccf66 ef0f55f198
commit 6be6404bc1
17 changed files with 386 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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)

5
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">
@@ -676,6 +676,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 = () => {

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

@@ -107,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"
@@ -745,9 +745,10 @@ export default {
queryMember(); queryMember();
state.fetching = false; state.fetching = false;
}, 300); }, 300);
const handleChange2 = (value) => { const handleChange2 = (value,label) => {
console.log(`selected ${value}`); console.log(`selected ${value}`);
state.inputV3 = value; state.inputV3 = value;
state.memberValue = label;
}; };
const handleFocus = () => { const handleFocus = () => {
queryMember(); queryMember();

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 : "-",

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);
}); });

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,
}); });

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
}; };
}, },
}; };

135
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" <div class="inname">题干{{ item.id }}</div>
src="../../assets/images/basicinfo/asterisk.png"
/>
<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>
@@ -58,7 +40,7 @@ export default {
VoteQuestionItem, VoteQuestionItem,
}, },
props: { props: {
num:{ num: {
type: Number, type: Number,
default: null, default: null,
}, },
@@ -68,22 +50,22 @@ export default {
return {}; return {};
}, },
}, },
}, },
setup(props,{ emit }) { setup(props, { emit }) {
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 });
}) })
}; };
const handleSingleAdd = () => { const handleSingleAdd = () => {
@@ -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,17 +98,28 @@ 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);
} }
}); });
}; };
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;
} }

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

@@ -4793,6 +4793,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

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

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: [

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

@@ -168,7 +168,7 @@
mode="multiple" mode="multiple"
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
@popupScroll="memberScroll" @popupScroll="memberScroll"
@search="getMember" @search="searchMember"
> >
</a-select> </a-select>
</div> </div>
@@ -446,6 +446,8 @@ export default {
currentPage1: 1, //项目经理 currentPage1: 1, //项目经理
pageSize1: 10, //项目经理 pageSize1: 10, //项目经理
searchName: null,
}); });
//分类列表 //分类列表
const classifyList = ref([]); const classifyList = ref([]);
@@ -799,13 +801,13 @@ export default {
// 项目经理 后续接口调用 // 项目经理 后续接口调用
const classifyList1 = ref([]); const classifyList1 = ref([]);
//获取学员 //获取学员
const getMember = (e) => { const getMember = () => {
console.log("state.classifySelect1", e, state.classifySelect1); console.log("state.searchName", state.searchName);
api1 api1
.getMemberInfo({ .getMemberInfo({
pageNo: state.currentPage1, pageNo: state.currentPage1,
pageSize: state.pageSize1, pageSize: state.pageSize1,
keyWord: e ? e : "", keyWord: state.searchName ? state.searchName : "",
}) })
.then((res) => { .then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
@@ -828,6 +830,16 @@ export default {
}; };
getMember(); getMember();
//搜索学员
const searchMember = (e) => {
console.log("eee", e);
if (e) {
state.searchName = e;
classifyList1.value = [];
getMember();
}
};
//学员滚动加载信息 //学员滚动加载信息
const memberScroll = (e) => { const memberScroll = (e) => {
// console.log("滚动", e, b); // console.log("滚动", e, b);
@@ -1225,6 +1237,7 @@ export default {
templateScroll, templateScroll,
memberScroll, memberScroll,
getMember, getMember,
searchMember,
}; };
}, },
}; };

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

@@ -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

4
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>

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

@@ -2392,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)