From 63ba48e539f7614a5e7a89a1ec650d8b27345603 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 6 Dec 2022 07:58:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=90=8D=E7=A7=B0=EF=BC=8Cmessage=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E7=BB=9F=E4=B8=80warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ AssessmentList.vue | 19 +- src/components/drawers/AddEval.vue | 22 +- src/components/drawers/AddFaceteach.vue | 4 +- src/components/drawers/AddLive.vue | 5 +- src/components/drawers/AddOnline.vue | 4 +- src/components/drawers/AddProject.vue | 2 +- src/components/drawers/AddTest.vue | 221 +++++------------- src/components/drawers/AddVotebak.vue | 2 +- src/components/drawers/CreVote.vue | 6 +- src/components/drawers/SelectTest.vue | 5 +- src/components/vote/AddVote.vue | 6 +- src/views/projectcenter/ClassAdd.vue | 2 +- src/views/projectcenter/SonProject.vue | 2 +- src/views/projectcenter/templateAdd.vue | 2 +- .../research/components/ResearchAddPin.vue | 4 +- 15 files changed, 109 insertions(+), 197 deletions(-) diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue index 0be19b7f..9775accb 100644 --- a/src/components/drawers/ AssessmentList.vue +++ b/src/components/drawers/ AssessmentList.vue @@ -93,6 +93,10 @@ export default { titleTag: { type: Boolean, default: false, + }, + assessmentName:{ + type:String, + default: null, } }, setup(props, ctx) { @@ -105,7 +109,8 @@ export default { tableDataTotal: 0, tableData: [], selectedRowKeys: [], - assessmentId:null + assessmentId:null, + assessmentName:null, }); const closeDrawer = () => { state.selectedRowKeys = []; @@ -157,13 +162,17 @@ export default { const rowSelection = { type: "radio", onSelect: (selectedRows) => { + state.assessment =selectedRows; - state.assessmentId = selectedRows.assessmentId; + + /* state.assessmentId = selectedRows.assessmentId; ctx.emit("checkedAss", state.assessment); ctx.emit("update:assessmentId", state.assessmentId); + ctx.emit("update:assessmentName", state.assessment.name); + console.log("state.assessment",state.assessment); state.selectedRowKeys = []; - closeDrawer(); - }, + closeDrawer();*/ + }, }; // const onSelectChange = (selectedRowKeys) => { // if(selectedRowKeys.length>2){return} @@ -179,6 +188,8 @@ export default { state.assessmentId = selectRow[0].assessmentId; ctx.emit("checkedAss", state.assessment); ctx.emit("update:assessmentId", state.assessmentId); + ctx.emit("update:assessmentName", state.assessment.name); + state.selectedRowKeys = []; closeDrawer(); }; diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 930d5e9b..bd913849 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -33,11 +33,15 @@ - - {{ - evaluationTypeName - }} - +
+ + {{evaluationTypeName}} + +
+ +
@@ -259,11 +263,11 @@ export default { const editInvistText = () => { if (!state.inputV1) { message.destroy(); - return message.info("请输入测评名称"); + return message.warning("请输入测评名称"); } if (!state.evaluationTypeId) { message.destroy(); - return message.info("请选择测评"); + return message.warning("请选择测评"); } let objei = { evaluationName: state.inputV1, @@ -295,11 +299,11 @@ export default { const createEvalText = () => { if (!state.inputV1) { message.destroy(); - return message.info("请输入测评名称"); + return message.warning("请输入测评名称"); } if (!state.evaluationTypeId) { message.destroy(); - return message.info("请选择测评"); + return message.warning("请选择测评"); } let obj = { evaluationName: state.inputV1, diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index ad5eaee1..fca1980e 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -193,7 +193,7 @@
- 删除评估 + {{assessmentName}}
{ diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 1dedcb9a..4cc9fc5b 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -207,7 +207,7 @@
删除评估{{assessmentName}}
@@ -215,6 +215,7 @@ v-model:assessmentVisible="assessmentVisible" v-model:titleTag="titleTag" v-model:assessmentId="assessmentId" + v-model:assessmentName="assessmentName" />
@@ -401,6 +402,7 @@ export default { type: Number, default: null, }, + }, setup(props, ctx) { // const router = useRouter(); @@ -439,6 +441,7 @@ export default { needEval: false, switchC2: false, assessmentVisible: false, + assessmentName:"", }); const closeDrawer = () => { ctx.emit("update:addliveVisible", false); diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 0850304e..d0270c04 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -460,7 +460,7 @@ export default { } } message.destroy(); - message.info("在线课（" + tipStr + "）重复添加"); + message.warning("在线课（" + tipStr + "）重复添加"); return; } else { state.addOnlineList.map((value) => { @@ -521,7 +521,7 @@ export default { } } message.destroy(); - message.info("在线课（" + tipStr + "）重复添加"); + message.warning("在线课（" + tipStr + "）重复添加"); return; } else { state.addOnlineList.map((value) => { diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 23dc5b6c..bf00676c 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -466,7 +466,7 @@ export default { closeSameModal(); closeDrawer(); message.destroy(); - message.info("添加成功"); + message.warning("添加成功"); return; } if (origin.length == 0) { diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 2b2f5b5d..0128d5ea 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -48,6 +48,13 @@
+
+ +
+
+
+
+ +
选择考试 - + + - 删除考试 + {{paperName}} @@ -130,6 +122,12 @@
+
+ +
+
+ +
{ - if (!value) { - return Promise.reject("请输入考试名称"); - } - }; - /* - let checkChoosedTest = async (_rule, value) => { - if (!value) { - return Promise.reject("请选择考试"); - } - };*/ - let checkChoosedTime = async (_rule, value) => { - if (!value.length) { - return Promise.reject("请选择时间"); - } - }; - - let checkExaminationDuration = async (_rule, value) => { - if (!value) { - return Promise.reject("请输入考试时长"); - } - }; - let checkLimit = async (_rule, value) => { - if (!value) { - return Promise.reject("请输入考试限制"); - } - }; - let checkShowAnswers = async (_rule, value) => { - if (!value) { - return Promise.reject("请输入作业名称"); - } - }; - let checkShowAnalysis = async (_rule, value) => { - if (!value) { - return Promise.reject("请输入作业名称"); - } - }; - let checkScoringModel = async (_rule, value) => { - if (!value) { - return Promise.reject("请输入作业名称"); - } - }; - - let checkQuestionArrangement = async (_rule, value) => { - if (!value) { - return Promise.reject("请输入作业名称"); - } - }; - const rules = { - examinationName: [ - { - required: true, - validator: checkExaminationName, - trigger: "change", - }, - ], - - /* - choosedTest: [ - { - required: true, - validator: checkChoosedTest, - trigger: "change", - }, - ],*/ - choosedTime: [ - { - required: true, - validator: checkChoosedTime, - trigger: "change", - }, - ], - examinationDuration: [ - { - required: true, - validator: checkExaminationDuration, - trigger: "change", - }, - ], - limit: [ - { - required: true, - validator: checkLimit, - trigger: "change", - }, - ], - showAnswers: [ - { - validator: checkShowAnswers, - trigger: "change", - }, - ], - showAnalysis: [ - { - validator: checkShowAnalysis, - trigger: "change", - }, - ], - scoringModel: [ - { - validator: checkScoringModel, - trigger: "change", - }, - ], - - questionArrangement: [ - { - validator: checkQuestionArrangement, - trigger: "change", - }, - ], - }; const options1 = ref([ { label: "math", @@ -644,7 +529,7 @@ export default { updateTest(); }; const handleFinishFailed = () => { - message.error("handleFinishFailed"); + // message.error("handleFinishFailed"); }; const resetForm = () => { formRef.value.resetFields(); @@ -747,10 +632,24 @@ export default { examinationTestId: state.paperId, examinationTestName: state.paperName, }; - if (!(state.paperId > 0)) { + + if (!formState.examinationName) { message.destroy(); - return message.error("请选择考试"); + return message.warning("请输入考试名称"); } + if (!state.paperId) { + message.destroy(); + return message.warning("请输入选择考试"); + } + if (!formState.choosedTime) { + message.destroy(); + return message.warning("请输入开始结束时间"); + } + if (!formState.examinationDuration) { + message.destroy(); + return message.warning("请输入考试时长"); + } + if (props.edit) { // 编辑任务 updateExamination(obj) @@ -862,12 +761,8 @@ export default { const changeOuter = (value) => { state.isOuter = value; }; - const chooseTest = (index) => { - for (let i in state.choosedTestList) { - if (state.choosedTestList[i].key == formState.choosedTest[index].key) - return; - } - state.choosedTestList.push(formState.choosedTest[index]); + const chooseTest = () => { + }; const closeTag = (removedTag) => { const tags = state.choosedTestList.filter( @@ -900,7 +795,7 @@ export default { formRef, delTag, // layout, - rules, + updateTest, queryTest, changeOuter, diff --git a/src/components/drawers/AddVotebak.vue b/src/components/drawers/AddVotebak.vue index 49da2ff7..bd07dd52 100644 --- a/src/components/drawers/AddVotebak.vue +++ b/src/components/drawers/AddVotebak.vue @@ -305,7 +305,7 @@ export default { const updateVoteInfo = () => { if (!state.inputV1) { message.destroy(); - return message.info("请输入投票名称"); + return message.warning("请输入投票名称"); } if (state.basevote == "") { diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue index 109f2c2f..72541977 100644 --- a/src/components/drawers/CreVote.vue +++ b/src/components/drawers/CreVote.vue @@ -215,19 +215,19 @@ export default { const createQueTit = () => { if (!state.inputV1) { message.destroy(); - return message.info("请输入投票名称"); + return message.warning("请输入投票名称"); } for (let i = 0; i < state.questions.length; i++) { if (!state.questions[i].inputV) { message.destroy(); - return message.info("请输入题干"); + return message.warning("请输入题干"); } } for (let i = 0; i < state.questions.length; i++) { for (let k = 0; k < state.questions[i].options.length; k++) { if (!state.questions[i].options[k].opvalue) { message.destroy(); - return message.info("请输入选项"); + return message.warning("请输入选项"); } } } diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue index ea5f1e99..87ff0335 100644 --- a/src/components/drawers/SelectTest.vue +++ b/src/components/drawers/SelectTest.vue @@ -65,7 +65,7 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, - hideSelectAll: true, + type: 'radio', }" :scroll="{ x: 900 }" :pagination="false" @@ -215,9 +215,6 @@ export default { }; const onSelectChange = (selectedRowKeys, selectedRows) => { - if (selectedRowKeys.length > 1) { - return; - } state.selectedRowKeys = selectedRowKeys; state.SelectTestData = selectedRows[0]; }; diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 0c87fcd5..993efd68 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -403,11 +403,11 @@ export default { const updateVoteInfo = () => { if (!state.inputV1) { message.destroy(); - return message.info("请输入投票名称"); + return message.warning("请输入投票名称"); } if (!state.ballotId) { message.destroy(); - return message.info("请创建题干信息"); + return message.warning("请创建题干信息"); } if (!state.time) { @@ -415,7 +415,7 @@ export default { return message.warning("请输入直播时间"); } if (!state.basevote) { - return message.info("请上传投票基数"); + return message.warning("请上传投票基数"); } if (state.time != undefined) { state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD"); diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue index 404af865..b23dc47d 100644 --- a/src/views/projectcenter/ClassAdd.vue +++ b/src/views/projectcenter/ClassAdd.vue @@ -621,7 +621,7 @@ export default { const beforeUpload1 = () => { return new Promise((resovle, reject) => { if (uplodaFileCount) { - message.info("上传文件数量已达最大数量"); + message.warning("上传文件数量已达最大数量"); return reject(false); } return resovle(true); diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue index 8e1fa816..35fcb067 100644 --- a/src/views/projectcenter/SonProject.vue +++ b/src/views/projectcenter/SonProject.vue @@ -621,7 +621,7 @@ export default { const beforeUpload1 = () => { return new Promise((resovle, reject) => { if (uplodaFileCount) { - message.info("上传文件数量已达最大数量"); + message.warning("上传文件数量已达最大数量"); return reject(false); } return resovle(true); diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue index 0d1050b7..a8ccf876 100644 --- a/src/views/projectcenter/templateAdd.vue +++ b/src/views/projectcenter/templateAdd.vue @@ -488,7 +488,7 @@ export default { const beforeUpload1 = () => { return new Promise((resovle, reject) => { if (uplodaFileCount) { - message.info("上传文件数量已达最大数量"); + message.warning("上传文件数量已达最大数量"); return reject(false); } return resovle(true); diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue index ea4caa3e..c56d9e4f 100644 --- a/src/views/research/components/ResearchAddPin.vue +++ b/src/views/research/components/ResearchAddPin.vue @@ -212,7 +212,7 @@ export default { const minChange = (e) => { if (e > curItem.value.maxScore) - return message.info("最低分不能超过最高分"); + return message.warning("最低分不能超过最高分"); curItem.value.minScore = e; let arr = state.scoreListClone.concat([]); arr.map((value, index) => { @@ -224,7 +224,7 @@ export default { }; const maxChange = (e) => { if (e < curItem.value.minScore) - return message.info("最高分不能低于最低分"); + return message.warning("最高分不能低于最低分"); curItem.value.maxScore = e; let arr = state.scoreListClone.concat([]); arr.map((value, index) => { From 83e33e162506cda7be1d2ff2490bdf8abe476fc8 Mon Sep 17 00:00:00 2001 From: lixg Date: Tue, 6 Dec 2022 09:03:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/api/config.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/App.vue b/src/App.vue index 1b6d2cc8..235c735b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -43,7 +43,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.18------------"); + console.log("版本0.9.1------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/config.js b/src/api/config.js index cb3897da..7eca520f 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-05 21:56:56 + * @LastEditTime: 2022-12-06 09:02:40 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -55,10 +55,10 @@ http.interceptors.response.use( if (code === 0 || code === 200) { return response; } else { - // if (code === 1000) { - // window.open("https://u-pre.boe.com/web/", '_self'); - // // window.open("http://111.231.196.214:12013/manage/login", '_self'); - // } + if (code === 1000) { + window.open("https://u-pre.boe.com/web/", '_self'); + // window.open("http://111.231.196.214:12013/manage/login", '_self'); + } console.log("api %o", msg); } return response; From f3b8b3c3df63cb62c52cec5d8976d1545f3b91e2 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 6 Dec 2022 09:15:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/NoticeHis.vue | 2 +- src/views/courselibrary/CoursewareManage.vue | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue index 2970dbfb..22d89d06 100644 --- a/src/components/drawers/NoticeHis.vue +++ b/src/components/drawers/NoticeHis.vue @@ -117,7 +117,7 @@ export default { width: 74%; display: flex; justify-content: space-between; - margin-bottom: 20px; + margin-bottom: 66px; .itemcontent { width: 500px; word-break: break-all; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index fa4f0ade..7bd3b9da 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -686,10 +686,10 @@
取消
-
确定
+
保存
-
已保存
+
未提交
提交审核
@@ -4544,11 +4544,6 @@ export default defineComponent({ }; //保存面授课 const handlePush = (param) => { - //state.isEdit = 1; - - console.log("========", state.addLoading); - console.log("state.imgList"); - console.log(state.imgList); let files = ""; if (state.imgList.length) { state.imgList.forEach((item) => { @@ -4556,7 +4551,7 @@ export default defineComponent({ }); } files = files.slice(0, files.length - 1); - console.log(files); + console.log("filesfiles",files); const postData = { offcourseId: state.offcourseId, //不传代表新增 name: state.qdms_inputV1, @@ -4594,9 +4589,10 @@ export default defineComponent({ edit(postData).then((res) => { if (res.data.code === 200) { getTableDate(); - ft_exit(); + // ft_exit(); rest(); state.addLoading = false; + state.isEdit = 1; // console.log("res.data", res.data); if (param === "review") { //新建时点击审核按钮 @@ -5064,10 +5060,9 @@ export default defineComponent({ }; //获取教师 const getTea = async () => { - console.log("获取授课教师信息33333333333"); + options4CurName.value = state.teacher; options4CurId.value = state.teacherId; - const item1 = await getMemberInfoApi({ pageNo: state.currentPageTea1, pageSize: state.pageSizeTea1, @@ -5411,6 +5406,8 @@ export default defineComponent({ //提交审核 const reviewClick = () => { console.log("ft_eidt", state.ft_eidt); + handlePush("review"); + /* if (state.ft_eidt) { //编辑面授课 submitReview(); @@ -5419,6 +5416,7 @@ export default defineComponent({ //shouke handlePush("review"); } + */ }; const submitReview = (id) => { state.addLoading = true; From 6edbaec1bc12c40514896e589e9827c939d0abf4 Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Tue, 6 Dec 2022 11:53:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=95=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 13 +++++----- src/assets/del.png | Bin 0 -> 3351 bytes src/components/vote/AddVote.vue | 41 ++++++++++++++------------------ 3 files changed, 25 insertions(+), 29 deletions(-) create mode 100644 src/assets/del.png diff --git a/package-lock.json b/package-lock.json index ffd1602e..e6b33dde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "ant-design-vue": "^3.2.12", "axios": "^1.1.3", "core-js": "^3.8.3", + "dayjs": "^1.11.6", "element-plus": "^2.2.17", "element-resize-detector": "^1.2.4", "html2canvas": "^1.4.1", @@ -4949,9 +4950,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.5", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz", - "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==" + "version": "1.11.6", + "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz", + "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==" }, "node_modules/debug": { "version": "4.3.4", @@ -15686,9 +15687,9 @@ } }, "dayjs": { - "version": "1.11.5", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz", - "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==" + "version": "1.11.6", + "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz", + "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==" }, "debug": { "version": "4.3.4", diff --git a/src/assets/del.png b/src/assets/del.png new file mode 100644 index 0000000000000000000000000000000000000000..1f1e422b61cbe169afdc1002e1ee5236b77ca964 GIT binary patch literal 3351 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 DG}ZI1 literal 0 HcmV?d00001 diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 993efd68..e9b80808 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -129,13 +129,22 @@ action="/manageApi/vote/baseVoteupload" v-model:file-list="fileList" > --> - + +
@@ -286,36 +295,22 @@ export default { // 限制文件格式上传 const beforeUpload = (file) => { - console.log(file); if (file.type.indexOf("sheet") == -1) { message.destroy(); message.error("请上传正确的文件格式"); - console.log(state.fileList); - state.fileList = []; - return; + return false; } - // let resFileList = [...info.fileList]; - - // resFileList.map((file) => { - // if (file.response) { - // // Component will show file.url as link - // file.url = file.response.url; - // console.log("file========", file); - // console.log("file========", file.response); - // state.voteCount = file.response.data; - // } - // }); - const formData = new FormData(); formData.append("uploadFile", file); baseVoteupload(formData).then((res) => { if (res.data.code === 200) { - console.log(res); + state.basevote = res.data.data; } }); + return false; }; //删除题干信息接口