fix:修改版本号

This commit is contained in:
lixg
2022-12-07 13:40:56 +08:00
parent a331227ab2
commit 256eaa76aa
6 changed files with 418 additions and 406 deletions

View File

@@ -43,7 +43,7 @@ export default defineComponent({
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
// console.log("router", router.getRoutes(), route); // console.log("router", router.getRoutes(), route);
console.log("版本0.9.3------------"); console.log("版本0.9.4------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52 * @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-07 08:54:55 * @LastEditTime: 2022-12-07 13:40:40
* @FilePath: /fe-manage/src/api/config.js * @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */

View File

@@ -21,24 +21,24 @@
<div class="main_items"> <div class="main_items">
<div class="mi_ipts"> <div class="mi_ipts">
<div class="mii_ipt"> <div class="mii_ipt">
<div class="ipt_name">课程编号</div> <div class="ipt_name">课程信息</div>
<div class="fi_input"> <div class="fi_input">
<a-input <a-input
v-model:value="inputV1" v-model:value="inputV1"
style="width: 240px; height: 40px; border-radius: 8px" style="width: 240px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称" placeholder="请输入课程名称/编号"
maxlength="20" maxlength="20"
/> />
</div> </div>
</div> </div>
<div class="mii_ipt"> <div class="mii_ipt">
<div class="ipt_name">内容分类</div> <div class="ipt_name">课程分类</div>
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="selectV" v-model:value="selectV"
dropdownClassName="dropdown-style" dropdownClassName="dropdown-style"
style="width: 240px" style="width: 240px"
placeholder="请选择" placeholder="请选择课程分类"
:options="options1" :options="options1"
allowClear allowClear
showSearch showSearch
@@ -209,7 +209,7 @@ export default {
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
inputV1: "", inputV1: null,
options1: [ options1: [
{ {
value: "微课", value: "微课",
@@ -223,7 +223,7 @@ export default {
time: undefined, time: undefined,
onlineClassesId: null, onlineClassesId: null,
onlineName: "", onlineName: "",
selectV: "", selectV: null,
selectedRowKeys: [], selectedRowKeys: [],
tableData: [], tableData: [],
addOnlineList: [], addOnlineList: [],
@@ -239,7 +239,8 @@ export default {
state.choicecourse = true; state.choicecourse = true;
ctx.emit("update:addonlineVisible", false); ctx.emit("update:addonlineVisible", false);
ctx.emit("update:edit", false); ctx.emit("update:edit", false);
state.inputV1 = ""; state.inputV1 = null;
state.selectV = null;
state.selectedRowKeys = []; state.selectedRowKeys = [];
state.addOnlineList = []; state.addOnlineList = [];
state.currentPage = 1; state.currentPage = 1;
@@ -258,7 +259,7 @@ export default {
dataIndex: "num", dataIndex: "num",
key: "num", key: "num",
width: "80px", width: "80px",
align: "left", align: "center",
}, },
{ {
title: "名称", title: "名称",
@@ -266,9 +267,10 @@ export default {
key: "name", key: "name",
width: "100px", width: "100px",
align: "center", align: "center",
ellipsis: true,
}, },
{ {
title: "内容分类", title: "课程分类",
dataIndex: "contenttype", dataIndex: "contenttype",
key: "contenttype", key: "contenttype",
width: "80px", width: "80px",
@@ -539,17 +541,13 @@ export default {
}) })
.then(() => { .then(() => {
message.destroy(); message.destroy();
message.success( message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
`${props.edit ? "编辑" : "新增"}任务成功`
);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error( message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
`${props.edit ? "编辑" : "新增"}任务失败`
);
}); });
}); });
} }
@@ -583,7 +581,7 @@ export default {
}; };
//搜索在线列表 //搜索在线列表
const searchList = () => { const searchList = () => {
if (state.inputV1 !== "" || state.selectV !== "") { if (state.inputV1 || state.selectV) {
getAllOnlineText(); getAllOnlineText();
} else { } else {
resetOnline(); resetOnline();
@@ -591,8 +589,8 @@ export default {
}; };
//重置在线信息 //重置在线信息
const resetOnline = () => { const resetOnline = () => {
state.inputV1 = ""; state.inputV1 = null;
state.selectV = ""; state.selectV = null;
state.selectedRowKeys = []; state.selectedRowKeys = [];
state.addOnlineList = []; state.addOnlineList = [];
state.currentPage = 1; state.currentPage = 1;
@@ -763,6 +761,7 @@ export default {
} }
.ant-table-selection-column { .ant-table-selection-column {
padding: 0px !important; padding: 0px !important;
padding-left: 5px !important;
} }
.ant-table-thead > tr > th { .ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1); background-color: rgba(239, 244, 252, 1);

View File

@@ -580,6 +580,7 @@ export default {
// state.addLoading = true; // state.addLoading = true;
queryExaminationDetailById({ examinationId: props.EditTestId }) queryExaminationDetailById({ examinationId: props.EditTestId })
.then((res) => { .then((res) => {
console.log("获取编辑考试信息", res);
formState.examinationName = res.data.data.examinationName; formState.examinationName = res.data.data.examinationName;
formState.workRequirement = res.data.data.workRequirement; formState.workRequirement = res.data.data.workRequirement;
formState.examinationDuration = res.data.data.examinationDuration; formState.examinationDuration = res.data.data.examinationDuration;
@@ -594,6 +595,9 @@ export default {
formState.showAnswers = Number(res.data.data.showAnswers) || 1; formState.showAnswers = Number(res.data.data.showAnswers) || 1;
formState.papaerName = res.data.data.examinationTestName; formState.papaerName = res.data.data.examinationTestName;
state.paperName = res.data.data.examinationTestName; state.paperName = res.data.data.examinationTestName;
// state.paperId=
state.paperId = res.data.data.examinationTestId;
state.paperName = res.data.data.examinationTestName;
if ( if (
res.data.data.examinationEndTime && res.data.data.examinationEndTime &&
res.data.data.examinationStartTime res.data.data.examinationStartTime
@@ -658,7 +662,7 @@ export default {
updateExamination(obj) updateExamination(obj)
.then(async (res) => { .then(async (res) => {
await updateTask(res); await updateTask(res);
closeDrawer(); // closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
@@ -669,7 +673,7 @@ export default {
createExamination(obj) createExamination(obj)
.then(async (res) => { .then(async (res) => {
await updateTask(res); await updateTask(res);
closeDrawer(); // closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
@@ -694,7 +698,8 @@ export default {
}; };
RouterEditTask(editObj1) RouterEditTask(editObj1)
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); console.log("props.edit", props.edit);
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
state.addLoading = false; state.addLoading = false;
closeDrawer(); closeDrawer();
@@ -715,8 +720,9 @@ export default {
// 新增编辑或新增项目 // 新增编辑或新增项目
ProjectEditTask(editObj) ProjectEditTask(editObj)
.then(() => { .then(() => {
//message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer();
}) })
.catch(() => { .catch(() => {
//message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
@@ -732,8 +738,9 @@ export default {
type: 5, type: 5,
}) })
.then(() => { .then(() => {
//message.success( `${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer();
}) })
.catch(() => { .catch(() => {
//message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);

View File

@@ -48,7 +48,10 @@
:data-source="tableData" :data-source="tableData"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
:pagination="false" :pagination="false"
:row-selection="{ selectedRowKeys:selectedRowKeys,onChange:onSelectChange}" :row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
/> />
<div class="pa"> <div class="pa">
<a-pagination <a-pagination
@@ -124,9 +127,9 @@ import { reactive, toRefs } from "vue";
key: "content", key: "content",
align: "center", align: "center",
maxWidth: "13%", maxWidth: "13%",
overflow: 'hidden', overflow: "hidden",
whiteSpace: 'nowrap', whiteSpace: "nowrap",
textOverflow: 'ellipsis', textOverflow: "ellipsis",
}, },
{ {
title: "状态", title: "状态",
@@ -149,19 +152,19 @@ import { reactive, toRefs } from "vue";
key: "time", key: "time",
align: "center", align: "center",
}, },
] ],
}); });
const onSelectChange = (selectedRowKeys, selectedRows) => { const onSelectChange = (selectedRowKeys, selectedRows) => {
if (selectedRowKeys.length > 1) { if (selectedRowKeys.length > 1) {
return return;
}
state.selectedRowKeys = selectedRowKeys
state.evListData = selectedRows[0] ? selectedRows[0] : {}
} }
state.selectedRowKeys = selectedRowKeys;
state.evListData = selectedRows[0] ? selectedRows[0] : {};
};
const closeDrawer = () => { const closeDrawer = () => {
state.selectedRowKeys = [] state.selectedRowKeys = [];
state.evListData = {} state.evListData = {};
state.inputV1 = "" state.inputV1 = "";
ctx.emit("update:EvalListVisible", false); ctx.emit("update:EvalListVisible", false);
}; };
const afterVisibleChange = (bol) => { const afterVisibleChange = (bol) => {
@@ -172,7 +175,7 @@ import { reactive, toRefs } from "vue";
const checkFinish = () => { const checkFinish = () => {
ctx.emit("getEvListData", state.evListData); ctx.emit("getEvListData", state.evListData);
closeDrawer(); closeDrawer();
} };
const changePagination = (page) => { const changePagination = (page) => {
state.currentPage = page; state.currentPage = page;
getAllEvalText(); getAllEvalText();
@@ -194,15 +197,14 @@ import { reactive, toRefs } from "vue";
quiz_price: value.quiz_price, quiz_price: value.quiz_price,
quiz_range: value.quiz_range, quiz_range: value.quiz_range,
}; };
array.push(obj) array.push(obj);
if (obj.title == props.evaluationTypeName) { if (obj.title == props.evaluationTypeName) {
arrayKey.push(obj.key); arrayKey.push(obj.key);
} }
}); });
state.tableData = array; state.tableData = array;
state.selectedRowKeys = arrayKey; state.selectedRowKeys = arrayKey;
} } else {
else{
data.map((value, index) => { data.map((value, index) => {
let obj = { let obj = {
key: index + 1, key: index + 1,
@@ -223,32 +225,31 @@ import { reactive, toRefs } from "vue";
//获取测评列表 //获取测评列表
const getAllEvalText = () => { const getAllEvalText = () => {
let objael = { let objael = {
"keyword": state.inputV1, keyword: state.inputV1,
"user_id": "965341999643234304", user_id: "965341999643234304",
} };
api api
.choiceEvaluation(objael) .choiceEvaluation(objael)
.then((res) => { .then((res) => {
getTableDataList(res.data.data) getTableDataList(res.data.data);
}) })
.catch(()=>{ .catch(() => {});
}) };
}
//搜索测评列表 //搜索测评列表
const searchList = () => { const searchList = () => {
if(state.inputV1 !== ''){ if (state.inputV1 !== "") {
getAllEvalText() getAllEvalText();
} else { } else {
resetData() resetData();
}
} }
};
//重置测评列表 //重置测评列表
const resetData = () => { const resetData = () => {
state.currentPage = 1; state.currentPage = 1;
state.selectedRowKeys = []; state.selectedRowKeys = [];
state.evListData = {} state.evListData = {};
getAllEvalText(); getAllEvalText();
} };
return { return {
...toRefs(state), ...toRefs(state),
afterVisibleChange, afterVisibleChange,
@@ -406,7 +407,7 @@ import { reactive, toRefs } from "vue";
} }
.ant-table-selection-column { .ant-table-selection-column {
padding: 0px !important; padding: 0px !important;
padding-left: 60px !important; padding-left: 5px !important;
} }
.ant-table-thead > tr > th { .ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1); background-color: rgba(239, 244, 252, 1);

View File

@@ -455,7 +455,9 @@
<div class="iconame"> <div class="iconame">
{{ checkType(item.type) }} {{ checkType(item.type) }}
</div> </div>
<div class="icontext">{{ item.name }}</div> <div class="icontext" :title="item.name">
{{ item.name }}
</div>
</div> </div>
</div> </div>
<div class="type"> <div class="type">
@@ -466,7 +468,7 @@
<div class="time"> <div class="time">
<div class="timetext">开始时间</div> <div class="timetext">开始时间</div>
<div class="timetext"> <div class="timetext">
{{ item.startTime !== null ? item.startTime : "" }} {{ item.startTime !== null ? item.startTime : "-" }}
</div> </div>
</div> </div>
<div class="progress"> <div class="progress">
@@ -3751,7 +3753,10 @@ export default {
color: #999ba3; color: #999ba3;
font-size: 14px; font-size: 14px;
margin-left: 12px; margin-left: 12px;
width: 83px; width: 120px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
} }