From 829acf291a848e71e2f7371de575fe1994c2aaba Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 00:38:47 +0800
Subject: [PATCH 1/7] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/SeeStu.vue | 62 +++++-----
src/views/projectcenter/LibraryAdd.vue | 154 ++++++++++++-------------
2 files changed, 108 insertions(+), 108 deletions(-)
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index e55199b7..dce4fedc 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -187,37 +187,37 @@ export default {
showDown: true,
showDown1: false,
stageList: [
- {
- stageName: "阶段1腾飞班阶段1",
- stageId: 1,
- taskProcessList: [
- {
- course: "在线",
- name: "如何成为一个产品经理",
- complete: "已完成",
- },
- {
- course: "直播",
- name: "管理直播课",
- complete: "已完成",
- },
- {
- course: "面授",
- name: "管理面授课",
- complete: "未完成",
- },
- {
- course: "活动",
- name: "管理活动",
- complete: "未完成",
- },
- {
- course: "作业",
- name: "管理者作业",
- complete: "未完成",
- },
- ],
- },
+ // {
+ // stageName: "阶段1腾飞班阶段1",
+ // stageId: 1,
+ // taskProcessList: [
+ // {
+ // course: "在线",
+ // name: "如何成为一个产品经理",
+ // complete: "已完成",
+ // },
+ // {
+ // course: "直播",
+ // name: "管理直播课",
+ // complete: "已完成",
+ // },
+ // {
+ // course: "面授",
+ // name: "管理面授课",
+ // complete: "未完成",
+ // },
+ // {
+ // course: "活动",
+ // name: "管理活动",
+ // complete: "未完成",
+ // },
+ // {
+ // course: "作业",
+ // name: "管理者作业",
+ // complete: "未完成",
+ // },
+ // ],
+ // },
],
stageListActive: 0,
});
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 12bca0b1..d079e3b2 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -700,83 +700,83 @@ export default defineComponent({
const state = reactive({
//任务大纲列表
taskSyllabus: [
- {
- text: "阶段1腾飞班阶段1",
- children: [
- {
- course: "在线",
- name: "时间管理",
- classify: "选修",
- beginTime: "2022-09-10 14:03",
- total: 50, //总人数
- complete: 20, //完成人数
- percent: 40,
- },
- {
- course: "直播",
- name: "管理直播间",
- classify: "必修",
- beginTime: "2022-09-12 14:03",
- total: 50, //总人数
- complete: 10, //完成人数
- percent: 20,
- },
- {
- course: "面授",
- name: "管理面授课",
- classify: "必修",
- beginTime: "2022-09-16 14:03",
- total: 80, //总人数
- complete: 0, //完成人数
- percent: 0,
- },
- {
- course: "活动",
- name: "管理活动",
- classify: "必修",
- beginTime: "2022-09-16 14:03",
- total: 50, //总人数
- complete: 40, //完成人数
- percent: 80,
- },
- {
- course: "作业",
- name: "管理者作业",
- classify: "选修",
- beginTime: "2022-09-16 14:03",
- total: 50, //总人数
- complete: 30, //完成人数
- percent: 60,
- },
- {
- course: "考试",
- name: "管理者考试",
- classify: "必修",
- beginTime: "2022-09-16 14:03",
- total: 50, //总人数
- complete: 50, //完成人数
- percent: 100,
- },
- {
- course: "案例",
- name: "管理直播间",
- classify: "必修",
- beginTime: "2022-09-16 14:03",
- total: 50, //总人数
- complete: 10, //完成人数
- percent: 20,
- },
- {
- course: "外链",
- name: "管理直播间",
- classify: "必修",
- beginTime: "2022-09-16 14:03",
- total: 50, //总人数
- complete: 10, //完成人数
- percent: 20,
- },
- ],
- },
+ // {
+ // text: "阶段1腾飞班阶段1",
+ // children: [
+ // {
+ // course: "在线",
+ // name: "时间管理",
+ // classify: "选修",
+ // beginTime: "2022-09-10 14:03",
+ // total: 50, //总人数
+ // complete: 20, //完成人数
+ // percent: 40,
+ // },
+ // {
+ // course: "直播",
+ // name: "管理直播间",
+ // classify: "必修",
+ // beginTime: "2022-09-12 14:03",
+ // total: 50, //总人数
+ // complete: 10, //完成人数
+ // percent: 20,
+ // },
+ // {
+ // course: "面授",
+ // name: "管理面授课",
+ // classify: "必修",
+ // beginTime: "2022-09-16 14:03",
+ // total: 80, //总人数
+ // complete: 0, //完成人数
+ // percent: 0,
+ // },
+ // {
+ // course: "活动",
+ // name: "管理活动",
+ // classify: "必修",
+ // beginTime: "2022-09-16 14:03",
+ // total: 50, //总人数
+ // complete: 40, //完成人数
+ // percent: 80,
+ // },
+ // {
+ // course: "作业",
+ // name: "管理者作业",
+ // classify: "选修",
+ // beginTime: "2022-09-16 14:03",
+ // total: 50, //总人数
+ // complete: 30, //完成人数
+ // percent: 60,
+ // },
+ // {
+ // course: "考试",
+ // name: "管理者考试",
+ // classify: "必修",
+ // beginTime: "2022-09-16 14:03",
+ // total: 50, //总人数
+ // complete: 50, //完成人数
+ // percent: 100,
+ // },
+ // {
+ // course: "案例",
+ // name: "管理直播间",
+ // classify: "必修",
+ // beginTime: "2022-09-16 14:03",
+ // total: 50, //总人数
+ // complete: 10, //完成人数
+ // percent: 20,
+ // },
+ // {
+ // course: "外链",
+ // name: "管理直播间",
+ // classify: "必修",
+ // beginTime: "2022-09-16 14:03",
+ // total: 50, //总人数
+ // complete: 10, //完成人数
+ // percent: 20,
+ // },
+ // ],
+ // },
],
// 模板编辑列表
managerOptions: [
From 0c0fc13972c520043075a705e22e03c38361197c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 01:06:28 +0800
Subject: [PATCH 2/7] =?UTF-8?q?--=20=E6=8E=88=E8=AF=BE=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/AddFaceteach.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index eda9a8a9..725d498b 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -61,8 +61,8 @@
授课教师:
@@ -675,6 +675,7 @@ export default {
const handleChange2 = (value, label) => {
console.log(`selected ${value}`);
state.memberId = value;
+ // console.log(label)
state.memberValue = label;
};
const handleFocus = () => {
From e6b0be0fe900d06555daf4d119d2cc69e041cce7 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 01:13:00 +0800
Subject: [PATCH 3/7] =?UTF-8?q?--=20=E6=8E=88=E8=AF=BE=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/AddLive.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 9eafbca2..5ac0ce3e 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -107,7 +107,7 @@
{
+ const handleChange2 = (value,label) => {
console.log(`selected ${value}`);
state.inputV3 = value;
+ state.memberValue = label;
};
const handleFocus = () => {
queryMember();
From 0576b172313aba7d18270276dd3f8d1c3bb65677 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 01:15:57 +0800
Subject: [PATCH 4/7] =?UTF-8?q?--=20=E6=89=80=E5=B1=9E=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/examine/ProjectReviewedN.vue | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index 7885ac9b..d609602d 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -116,14 +116,14 @@ export default {
key: "name",
align: "center",
},
-
- {
- title: "所属项目",
- dataIndex: "sourceBelongName",
- key: "sourceBelongName",
- align: "center",
- width: "11%",
- },
+// todo 根项目保存
+ // {
+ // title: "所属项目",
+ // dataIndex: "sourceBelongName",
+ // key: "sourceBelongName",
+ // align: "center",
+ // width: "11%",
+ // },
{
title: "项目经理",
dataIndex: "manager",
From 99ea3719f0fede39a385ecc60a356962b8600c6f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 01:34:01 +0800
Subject: [PATCH 5/7] -- bug
---
src/views/projectcenter/TaskAdd.vue | 4 ++--
src/views/projectcenter/TaskPage.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index b8775535..1775f5a1 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -59,7 +59,7 @@
@@ -73,7 +73,7 @@
{{ element.tit }}
-
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 7ddb0e73..d255e496 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2392,7 +2392,7 @@ export default {
//任务大纲渲染
const getTaskList = () => {
let objtl = {
- projectId: 27,
+ projectId: storage.get("projectId"),
};
apitl
.getProjectDetail(objtl)
From 32983caf867eacf052b1e8e61190957edbbcd598 Mon Sep 17 00:00:00 2001
From: lixg
Date: Thu, 1 Dec 2022 01:56:41 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/PowerList.vue | 4 ++--
src/components/drawers/ProjPowerList.vue | 8 ++++----
src/views/courselibrary/CoursewareManage.vue | 1 +
src/views/learningpath/LearningPath.vue | 1 +
src/views/projectcenter/ProjectAdd.vue | 21 ++++++++++++++++----
src/views/projectcenter/ProjectManage.vue | 1 +
6 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/components/drawers/PowerList.vue b/src/components/drawers/PowerList.vue
index 1ebbbd7b..4ee8e317 100644
--- a/src/components/drawers/PowerList.vue
+++ b/src/components/drawers/PowerList.vue
@@ -289,8 +289,8 @@ export default {
let array = [];
arr.map((value) => {
let obj = {
- key: value.id,
- id: value.memberNo,
+ key: value.authRefId,
+ id: value.authRefId,
name: value.memberName ? value.memberName : "-",
diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue
index bcc28963..f4fa7a54 100644
--- a/src/components/drawers/ProjPowerList.vue
+++ b/src/components/drawers/ProjPowerList.vue
@@ -192,7 +192,7 @@ export default {
console.log("item", item);
state.cancelModal = true;
let obj = {
- id: item.number,
+ id: item.id,
name: item.name,
};
state.cancelAuthInfo = obj;
@@ -311,15 +311,15 @@ export default {
let array = [];
arr.map((value) => {
let obj = {
- key: value.id,
- id: value.id,
+ key: value.memberId,
+ id: value.memberId,
name: value.memberName ? value.memberName : "-",
com: value.orgName ? value.orgName : "-",
gang: "-",
number: value.memberNo ? value.memberNo : "-",
- state: "-",
+ state: value.tagName ? value.tagName : "-",
};
array.push(obj);
});
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index b9664ae0..71ed0c89 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4793,6 +4793,7 @@ export default defineComponent({
pageNo: 20,
pageSize: 1,
studentList: res[0],
+ keyWord: "",
};
console.log("obj", obj);
api1
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index c3d17fef..3f1685be 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -1693,6 +1693,7 @@ export default {
pageNo: 20,
pageSize: 1,
studentList: res[0],
+ keyWord: "",
};
console.log("obj", obj);
api
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 5d106d8e..ef227fae 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -168,7 +168,7 @@
mode="multiple"
:disabled="viewDetail ? true : false"
@popupScroll="memberScroll"
- @search="getMember"
+ @search="searchMember"
>
@@ -446,6 +446,8 @@ export default {
currentPage1: 1, //项目经理
pageSize1: 10, //项目经理
+
+ searchName: null,
});
//分类列表
const classifyList = ref([]);
@@ -799,13 +801,13 @@ export default {
// 项目经理 后续接口调用
const classifyList1 = ref([]);
//获取学员
- const getMember = (e) => {
- console.log("state.classifySelect1", e, state.classifySelect1);
+ const getMember = () => {
+ console.log("state.searchName", state.searchName);
api1
.getMemberInfo({
pageNo: state.currentPage1,
pageSize: state.pageSize1,
- keyWord: e ? e : "",
+ keyWord: state.searchName ? state.searchName : "",
})
.then((res) => {
if (res.data.code === 200) {
@@ -828,6 +830,16 @@ export default {
};
getMember();
+ //搜索学员
+ const searchMember = (e) => {
+ console.log("eee", e);
+ if (e) {
+ state.searchName = e;
+ classifyList1.value = [];
+ getMember();
+ }
+ };
+
//学员滚动加载信息
const memberScroll = (e) => {
// console.log("滚动", e, b);
@@ -1225,6 +1237,7 @@ export default {
templateScroll,
memberScroll,
getMember,
+ searchMember,
};
},
};
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 875aa677..15e46838 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -3521,6 +3521,7 @@ export default {
pageNo: 20,
pageSize: 1,
studentList: res[0],
+ keyWord: "",
};
console.log("obj", obj);
api1
From 6424c8d7044050b499e0e0cde585e05edb71fc91 Mon Sep 17 00:00:00 2001
From: wuyx
Date: Thu, 1 Dec 2022 02:38:03 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8A=95=E7=A5=A8?=
=?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/indexVote.js | 9 +-
src/components/vote/CreateVote.vue | 87 +++++++++++++--
src/components/vote/VoteQuestion.vue | 135 +++++++++++++++--------
src/components/vote/VoteQuestionItem.vue | 86 +++++++++++----
4 files changed, 235 insertions(+), 82 deletions(-)
diff --git a/src/api/indexVote.js b/src/api/indexVote.js
index 0f91f1bb..07d1d268 100644
--- a/src/api/indexVote.js
+++ b/src/api/indexVote.js
@@ -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 deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', obj, {
- headers: {
- 'token': '123',
- 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
- }
-})
+export const deleteVoteStem = (voteStemId) => http.post(`/vote/deleteVoteStem?voteStemId=${voteStemId}`)
//删除题选项息接口
-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)
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 8d4f23d2..36a713f3 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -34,8 +34,10 @@
+
-
+
-

-
题干{{item.id}}
+

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

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