feat:增加面授提示

This commit is contained in:
lixg
2022-12-10 15:22:03 +08:00
parent d748163daa
commit 0ec71a065f
7 changed files with 112 additions and 61 deletions

View File

@@ -1,17 +1,29 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-09 09:26:26
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-09 18:36:00
* @FilePath: /fe-manage/public/index.html
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<!DOCTYPE html> <!DOCTYPE html>
<html lang=""> <html lang="">
<head>
<meta charset="utf-8"> <head>
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title><%= htmlWebpackPlugin.options.title %></title> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
</head> <title>京东方大学堂</title>
<body> </head>
<noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <body>
</noscript> <noscript>
<div id="app"></div> <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
<!-- built files will be auto injected --> Please enable it to continue.</strong>
</body> </noscript>
</html> <div id="app"></div>
<!-- built files will be auto injected -->
</body>
</html>

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-09 18:11:04 * @LastEditTime: 2022-12-10 10:37:11
* @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
*/ */
@@ -56,7 +56,7 @@ http.interceptors.response.use(
return response; return response;
} else { } else {
if (code === 1000) { if (code === 1000) {
window.open("https://u-pre.boe.com/web/", '_self'); // window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self'); // window.open("http://111.231.196.214:12013/manage/login", '_self');
} }
console.log("api %o", msg); console.log("api %o", msg);

View File

@@ -29,13 +29,16 @@
</div> </div>
<span style="margin-right: 3px">课程名称</span> <span style="margin-right: 3px">课程名称</span>
</div> </div>
<div class="btnbox"> <div class="btnbox" style="position: relative">
<a-input <a-input
v-model:value="courseName" v-model:value="courseName"
style="width: 384px; height: 32px" style="width: 423px; height: 32px"
placeholder="请输入名称" placeholder="请输入名称最多输入20个字"
:maxlength="20" :maxlength="20"
/> />
<div class="inp_num" style="position: absolute; right: 115px">
<span style="color: #c7cbd2"> {{ courseName.length }}/20 </span>
</div>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -95,7 +98,7 @@
</div> </div>
<span style="margin-right: 3px">授课教师</span> <span style="margin-right: 3px">授课教师</span>
</div> </div>
<div class="btnbox"> <div class="btnbox" style="width: 423px">
<!-- <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"--> <!-- <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"-->
<!-- :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>--> <!-- :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>-->
<ProjectManager <ProjectManager
@@ -238,7 +241,7 @@
</a-checkbox> </a-checkbox>
</div> </div>
</div> </div>
--> -->
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
@@ -358,7 +361,9 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-tag closable color="processing" @close="logT"> <a-tag closable color="processing" @close="logT">
<span style="font-size: 14px; line-height: 33px">{{testName}}</span> <span style="font-size: 14px; line-height: 33px">{{
testName
}}</span>
</a-tag> </a-tag>
</div> </div>
</div> </div>
@@ -405,8 +410,8 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
import { detail } from "../../api/indexCourse"; import { detail } from "../../api/indexCourse";
import { queryAppraiseDetailById } from "../../api/indexInvist"; import { queryAppraiseDetailById } from "../../api/indexInvist";
import {queryWorkDetailById} from "@/api/indexWork"; import { queryWorkDetailById } from "@/api/indexWork";
import {queryExaminationDetailById} from "@/api/indexExam"; import { queryExaminationDetailById } from "@/api/indexExam";
export default { export default {
name: "AddFaceteach", name: "AddFaceteach",
components: { components: {
@@ -609,19 +614,22 @@ export default {
state.EditWorkId = result.homeWorkId; state.EditWorkId = result.homeWorkId;
state.assessmentId = result.evaluateId; state.assessmentId = result.evaluateId;
state.needEval = result.evaluateId; state.needEval = result.evaluateId;
detail({offcourseId:result.offcourseId}).then((res)=>{ detail({ offcourseId: result.offcourseId }).then((res) => {
state.chooseCourseName =res.data.data.name; state.chooseCourseName = res.data.data.name;
}); });
queryAppraiseDetailById({assessmentId:result.evaluateId}).then((res)=>{ queryAppraiseDetailById({ assessmentId: result.evaluateId }).then(
state.assessmentName =res.data.data.assessmentName; (res) => {
}); state.assessmentName = res.data.data.assessmentName;
queryWorkDetailById({workId:result.homeWorkId}).then((res)=>{ }
);
queryWorkDetailById({ workId: result.homeWorkId }).then((res) => {
state.workName = res.data.data.workName; state.workName = res.data.data.workName;
}); });
queryExaminationDetailById({ examinationId: result.testId }).then((res)=>{ queryExaminationDetailById({ examinationId: result.testId }).then(
state.testName = res.data.data.examinationName; (res) => {
}); state.testName = res.data.data.examinationName;
}
);
console.log("state=======", state); console.log("state=======", state);
}); });
}; };
@@ -730,7 +738,7 @@ export default {
await ProjectEditTask(editObj) await ProjectEditTask(editObj)
.then(() => { .then(() => {
console.log("props.EditFaceId", props.EditFaceId); console.log("props.EditFaceId", props.EditFaceId);
// message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); // message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
}) })
.catch(() => { .catch(() => {
//message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);

View File

@@ -31,7 +31,8 @@
/> />
</div> </div>
</div> </div>
<div class="mii_ipt"> <!-- 2022-12-10注释 后面放开 李晓鸽 -->
<!-- <div class="mii_ipt">
<div class="ipt_name">课程分类</div> <div class="ipt_name">课程分类</div>
<div class="select"> <div class="select">
<a-select <a-select
@@ -44,7 +45,7 @@
showSearch showSearch
/> />
</div> </div>
</div> </div> -->
</div> </div>
<div class="mi_btns"> <div class="mi_btns">
<div class="btn btn1" @click="searchList()"> <div class="btn btn1" @click="searchList()">
@@ -98,7 +99,7 @@
<div class="pa"> <div class="pa">
<a-pagination <a-pagination
v-if="tableDataTotal > 10" v-if="tableDataTotal > 10"
showSizeChanger="true" :showSizeChanger="false"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize" :pageSize="pageSize"
@@ -129,7 +130,7 @@
<div class="pa"> <div class="pa">
<a-pagination <a-pagination
v-if="tableDataTotal > 10" v-if="tableDataTotal > 10"
showSizeChanger="true" :showSizeChanger="false"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize" :pageSize="pageSize"
@@ -159,7 +160,7 @@ import {
RouterEditTask, RouterEditTask,
IsExistence, IsExistence,
IsExistenceProject, IsExistenceProject,
IsExistenceProjectTemplate IsExistenceProjectTemplate,
} from "@/api/indexTask"; } from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd"; import { addTempTask } from "../../api/indexTaskadd";
export default { export default {
@@ -572,9 +573,10 @@ export default {
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 1, type: 1,
}).then(res=>{ })
console.log(res) .then((res) => {
console.log("模板项目中是否包含此在线课了", res); console.log(res);
console.log("模板项目中是否包含此在线课了", res);
if (res.data.data.length) { if (res.data.data.length) {
let strdata = res.data.data; let strdata = res.data.data;
let tipStr = ""; let tipStr = "";
@@ -599,21 +601,26 @@ export default {
type: 1, type: 1,
}) })
.then((res) => { .then((res) => {
console.log('新增或者编辑在线课',res) console.log("新增或者编辑在线课", res);
message.destroy(); message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`); message.success(
`${props.edit ? "编辑" : "新增"}模板库任务成功`
);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`); message.error(
`${props.edit ? "编辑" : "新增"}模板库任务失败`
);
}); });
}) });
} }
}).catch(err=>{ })
console.log(err) .catch((err) => {
}) console.log(err);
});
} }
//if(state.addOnlineList.Target==undefined){ //if(state.addOnlineList.Target==undefined){
// closeDrawer(); // closeDrawer();

View File

@@ -69,7 +69,7 @@ export default {
onMounted(() => { onMounted(() => {
console.log("onMounted"); console.log("onMounted");
init() init();
}); });
function getMember() { function getMember() {

View File

@@ -630,7 +630,17 @@
<span style="color: #6f6f6f">{{ item.name }}</span> <span style="color: #6f6f6f">{{ item.name }}</span>
</div> --> </div> -->
<div class="file_name"> <div class="file_name">
<span style="color: #6f6f6f;width:140px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.slice(item.lastIndexOf('/')+1) }}</span> <span
style="
color: #6f6f6f;
width: 140px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ item.slice(item.lastIndexOf("/") + 1) }}</span
>
</div> </div>
<!-- 条件渲染 s --> <!-- 条件渲染 s -->
<!-- <div class="file_size"> <!-- <div class="file_size">
@@ -1280,7 +1290,7 @@
</div> </div>
<div class="pa"> <div class="pa">
<a-pagination <a-pagination
showSizeChanger="true" :showSizeChanger="false"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize1" :pageSize="pageSize1"
@@ -1975,7 +1985,17 @@
<div class="file_img"></div> <div class="file_img"></div>
<div class="file_detail"> <div class="file_detail">
<div class="file_name"> <div class="file_name">
<span style="color: #6f6f6f;width:140px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.slice(item.lastIndexOf('/')+1) }}</span> <span
style="
color: #6f6f6f;
width: 140px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ item.slice(item.lastIndexOf("/") + 1) }}</span
>
</div> </div>
<!-- 条件渲染 s --> <!-- 条件渲染 s -->
<!-- <div class="file_size"> <!-- <div class="file_size">
@@ -2910,7 +2930,7 @@ const columns1 = [
dataIndex: "operation", dataIndex: "operation",
key: "operation", key: "operation",
fixed: "right", fixed: "right",
align: "center", align: "right",
}, },
]; ];
//列表操作在线面授管理 //列表操作在线面授管理
@@ -3295,7 +3315,6 @@ export default defineComponent({
], ],
//在线面授管理学习记录 //在线面授管理学习记录
tableData3: [ tableData3: [
{ {
key: 1, key: 1,
projectName: "刘莉", projectName: "刘莉",
@@ -3431,7 +3450,7 @@ export default defineComponent({
value4: "", value4: "",
//选择线上还是面授 //选择线上还是面授
xzinputV1: "", xzinputV1: "",
valueE1:2, valueE1: 2,
valueE2: "", valueE2: "",
//确定面授 //确定面授
ft_eidt: false, ft_eidt: false,
@@ -4273,8 +4292,12 @@ export default defineComponent({
message.destroy(); message.destroy();
return message.warning("请输入必填项"); return message.warning("请输入必填项");
} }
console.log("state.bs_hs && state.valueE1 == 2",state.bs_hs , state.valueE1 == 2); console.log(
"state.bs_hs && state.valueE1 == 2",
state.bs_hs,
state.valueE1 == 2
);
if (state.valueE1 === 2) { if (state.valueE1 === 2) {
state.of_hs = false; state.of_hs = false;
// state.ft_hs = true; // state.ft_hs = true;
@@ -5156,7 +5179,7 @@ export default defineComponent({
// size: file.size, // size: file.size,
// }); // });
// console.log(state.filesList); // console.log(state.filesList);
console.log(res.data.data) console.log(res.data.data);
state.filesList = [res.data.data]; state.filesList = [res.data.data];
// state.hasImgName = res.data.data; // state.hasImgName = res.data.data;
} }

View File

@@ -1884,6 +1884,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.d { .d {
// margin-top: 8px; // margin-top: 8px;
// color: #ff4e4e; // color: #ff4e4e;