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/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; diff --git a/src/assets/del.png b/src/assets/del.png new file mode 100644 index 00000000..1f1e422b Binary files /dev/null and b/src/assets/del.png differ 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/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/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 c79d3ec4..04f452c2 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -1,20 +1,20 @@