This commit is contained in:
Ggysh-7
2022-11-25 22:00:04 +08:00
48 changed files with 3937 additions and 1756 deletions

2
.gitignore vendored
View File

@@ -21,3 +21,5 @@ pnpm-debug.log*
*.njsproj
*.sln
*.sw?
fe-manage.iml
package-lock.json

1002
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -89,6 +89,7 @@ export default defineComponent({
});
};
orgTree();
return {
routes,
name: currentRouteName,

View File

@@ -2,11 +2,12 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-23 09:59:26
* @LastEditTime: 2022-11-25 17:33:03
* @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import axios from "axios";
// import { getCookie } from '../api/method'
// const Qs = require("qs");
// axios.defaults.headers.post["Content-Type"] =
@@ -24,15 +25,16 @@ const http = axios.create({
http.interceptors.request.use(
(config) => {
const token = localStorage.getItem("token");
// const token = getCookie('token')
// console.log('token', token)
if (token) {
// config.headers.token = token;
config.headers.token = token; //测试1111
} else {
console.log("当前请求页面无token,请执行操作!!!");
// 此处测试默认配置token
// config.headers.token = "123456";
config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzODQwMTIsImV4cCI6MTY2OTM5MTIxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjAxNTU1M0RELTQ0NUUtNjlENC0zNTFGLUREOUExQTU2NDIwRSIsInVJZCI6Ijk2NTM0MTk5OTY0MzIzNDMwNCIsInBlcm1pc3Npb24iOiIifQ==.654058829fa6a65bf1477f6fc78cc6009304be484c9c49c0944147930c341f6c"
config.headers.token = "123456";
// config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzMDA4MDksImV4cCI6MTY2OTMwODAwOSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.bb3e0e031513761003d5c3bfeaf16e364bdf8fe7bc4cf691a05a74dc454afbfb";
}
return config;
},
@@ -44,12 +46,15 @@ http.interceptors.request.use(
http.interceptors.response.use(
(response) => {
// console.log('response', response)
const {
data: { code, msg },
} = response;
// console.log('code', code)
if (code === 0 || code === 200) {
return response;
} else {
// window.open("https://u-pre.boe.com/web/", '_self');
console.log("api %o", msg);
}
return response;

View File

@@ -2,13 +2,13 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-04 22:45:31
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-24 15:11:25
* @LastEditTime: 2022-11-25 14:56:59
* @FilePath: /fe-manage/src/api/index1.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import http from "./config";
import qs from "qs";
// import { getCookie } from '../api/method'
/**
* 接口传参数方式get
* axios.get('/user', {
@@ -104,7 +104,8 @@ export const getMemberInfo = (obj) => http.post('/admin/orgStruct/getMemberInfo'
export const getAudienceInfo = (obj) => http.post('/admin/orgStruct/getAudienceInfo', obj)
//获取授权(修改版)
export const optionAuthPerm = (obj) => http.post('/admin/AuthPerm/optionAuthPerm', obj)
//获取用户登录
export const getUser = () => http.post('/admin/CheckUser/login')
// 获取组织结构树

View File

@@ -3,10 +3,12 @@ import http from "./config";
/**
* 1
*/
//添加课程学员
//1添加课程学员
export const addStudent = (obj) =>
http.post("/admin/offcourse/addStudent", obj);
//删除开课
//2面授课审核
export const auditView = (obj) => http.post("/admin/offcourse/auditView", obj);
//3删除开课
export const deletePlan = (obj) =>
http.delete(
"/admin/offcourse/deletePlan",
@@ -15,40 +17,44 @@ export const deletePlan = (obj) =>
headers: { "Content-Type": "application/x-www-form-urlencoded" },
}
);
//获取面授课详情
//4获取面授课详情
export const detail = (obj) =>
http.post("/admin/offcourse/detail", obj, {
headers: { "Content-Type": "application/x-www-form-urlencoded" },
});
//获取面授课开课详情
//5获取面授课开课详情
export const detailPlan = (obj) =>
http.post("/admin/offcourse/detailPlan", obj, {
headers: { "Content-Type": "application/x-www-form-urlencoded" },
});
//新建或编辑面授课
//6新建或编辑面授课
export const edit = (obj) => http.post("/admin/offcourse/edit", obj);
//新建或编辑面授课开课
//7新建或编辑面授课开课
export const editPlan = (obj) => http.post("/admin/offcourse/editPlan", obj);
//课程导出
//8课程导出
export const exportP = (obj) => http.post("/admin/offcourse/export", obj);
//操作面授课(发布,撤回,删除,审核,停用)
//9操作面授课(发布,撤回,删除,审核,停用)
export const handle = (obj) => http.post("/admin/offcourse/handle", obj);
//学员操作-支持批量
//10学员操作-支持批量
export const handleStudent = (obj) =>
http.post("/admin/offcourse/handleStudent", obj);
//获取面授课列表
//11获取面授课列表
export const list = (obj) => http.post("/admin/offcourse/list", obj);
//获取面授课已审核列表
//12获取面授课已审核列表
export const listReview = (obj) =>
http.post("/admin/offcourse/listReview", obj);
//面授课开课列表
//13面授课开课列表
export const planList = (obj) => http.post("/admin/offcourse/planList", obj);
//学员导出
//14学员导出
export const studentExport = (obj) =>
http.post("/admin/offcourse/studentExport", obj);
//获取学员列表
//15获取学员列表
export const studentList = (obj) =>
http.post("/admin/offcourse/studentList", obj);
//学习记录列表
//16学习记录列表
export const studyRecordList = (obj) =>
http.post("/admin/offcourse/studyRecordList", obj);
// 获取员工信息
export const getMemberInfoApi = (obj) =>
http.post("/admin/orgStruct/getMemberInfo", obj);

View File

@@ -9,6 +9,15 @@ export const queryExaminationDetailById = (obj) => http.post('/examination/query
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
}
});
// 创建考试信息接口
export const updateExamination = (obj) => http.post('/examination/updateExamination', obj);
// 查询用户答卷信息-三方
export const queryUserAnswerDetail = (id) => http.get(`/examination/updateExamination?aloneId=${id}`);
// 查询用户答卷列表-三方
export const queryUserAnswerPageDetailList = (obj) => http.post('/examination/queryUserAnswerPageDetailList', obj);
// 获取试卷列表接口-三方
export const queryExaminationPaperList = (obj) => http.post('/examination/queryExaminationPaperList', obj);
// 考试列表查询接三方
export const queryExaminationList = (obj) => http.post('/examination/queryExaminationList', obj);
// 获取考试任务列表的接口-三方
export const queryExaminationAloneExtendList = (obj) => http.post('/examination/queryExaminationAloneExtendList', obj);
// 对接三方考试任务保存接口-三方
export const examinationTaskSave = (obj) => http.post('/examination/examinationTaskSave', obj);

14
src/api/indexStu.js Normal file
View File

@@ -0,0 +1,14 @@
import http from "./config";
/**
* 1
*/
//获取受众信息
export const getAudienceInfoApi = (obj) =>
http.post("/admin/orgStruct/getAudienceInfo", obj);
//获取员工信息
export const getMemberInfoApi = (obj) =>
http.post("/admin/orgStruct/getMemberInfo", obj);
//获取所有组织
export const getOrgInfoApi = (obj) =>
http.post("/admin/orgStruct/getOrgInfo", obj);

View File

@@ -162,11 +162,47 @@ function autoComma(number) {
return 0;
}
}
//把token存到cookie
//name 字段名 value 字段值 perpetual 有效期
const setCookie = (name, value, perpetual) => {
console.log('存储token到cookie')
let exdate = new Date()
exdate.setDate(perpetual * 24 * 60 * 60 * 1000) //exdate.setDate(exdate.getDate() + 365)
document.cookie = name + '=' + value + ';expires=' + exdate.toGMTString()
//永久有效
//document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT'
}
//获取cookie数据
//先写一个方法
function getCookie(name) {
//1.获取cookie字符串
var cookies = document.cookie;
//通过;来分割字符串
var cookie = cookies.split("; ");
// console.log('cookie', cookie)
//遍历,使键值对匹配上
for (var i = 0; i < cookie.length; i++) {
var arr = cookie[i].split("token=");
// console.log('arr', arr)
console.log('name', name)
// if (arr[0] == name) {
// console.log('arr[1]', arr[1])
// return arr[1];
// }
// console.log('arr[1]', arr[1])
return arr[1]
}
return "";
}
//最后通
//新建延迟
const commonData = {
timeout: 50
timeout: 50,
}
// const organizationalTree = [
// {
// title: "京东方",
@@ -376,6 +412,8 @@ export {
getWeek,
autoComma,
formatNumber,
setCookie,
getCookie,
commonData,
organizationalTree,
iframeUrl,

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -23,15 +23,15 @@
<div class="user">
<img
style="
width: 30px;
height: 31px;
width: 40px;
height: 40px;
margin-left: 8px;
border-radius: 15px;
margin-right: 10px;
"
src="../assets/images/img.jpg"
src="../assets/images/avatar.png"
/>
<div>李玉冰</div>
<div>{{ username }}</div>
</div>
<div
class="signOutMain"
@@ -49,7 +49,7 @@
style="width: 27px; height: 27px"
src="../assets/images/navtop/signout.png"
/>
<span class="signOut">退</span>
<span class="signOut"></span>
</div>
</div>
</div>
@@ -59,6 +59,7 @@
<script>
import { reactive, toRefs } from "vue";
import DownLoad from "../components/drawers/DownLoad";
import * as api from "../api/index1";
export default {
name: "NavTop",
components: {
@@ -67,14 +68,17 @@ export default {
setup() {
const state = reactive({
selectRole: "管理员",
username: "",
roleList: [
{
id: 1,
name: "管理员",
go: "/manage/learningpath",
},
{
id: 2,
name: "学员",
go: "https://u.boe.com/pc/uc/study/courses",
},
],
@@ -84,6 +88,7 @@ export default {
state.roleList.map((item) => {
if (value.name === item.name) {
state.selectRole = item.name;
window.open(item.go, "_self");
}
});
};
@@ -91,6 +96,21 @@ export default {
state.visible = true;
console.log("点击下载", state.visible);
};
const getUser = () => {
api
.getUser()
.then((res) => {
console.log("获取登录信息成功", res);
if (res.data.code === 200) {
state.username = res.data.data.realName;
}
})
.catch((err) => {
console.log("获取登录信息失败", err);
});
};
getUser();
return {
...toRefs(state),
changeRole,

View File

@@ -228,6 +228,7 @@ import * as apiTask from "../../api/indexTaskadd";
import { RouterEditTask } from "@/api/indexTask";
import { message } from "ant-design-vue";
import dayjs from "dayjs";
export default {
name: "AddActive",
// components: {
@@ -332,8 +333,7 @@ export default {
dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"),
];
})
.catch(() => {
});
.catch(() => {});
};
const afterVisibleChange = (bool) => {
if (bool && props.edit) {

View File

@@ -49,7 +49,10 @@
:row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null)
"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
@@ -83,6 +86,7 @@ import * as api from "../../api/indexCase.js";
import * as apiTask from "../../api/indexTaskadd";
import { message } from "ant-design-vue";
import { RouterEditTask } from "@/api/indexTask";
// import { addTempTask } from "../../api/indexTaskadd";
// import dayjs from "dayjs";
export default {
@@ -150,12 +154,12 @@ export default {
ctx.emit("update:edit", false);
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
state.inputV1=""
state.selectedRowKeys=[]
state.inputV1 = "";
state.selectedRowKeys = [];
};
const afterVisibleChange = (bol) => {
if (bol == true) {
getAllCaseText()
getAllCaseText();
}
};
const tableDataFunc = () => {
@@ -188,7 +192,7 @@ export default {
};
const onSelectChange = (selectedRowKeys, selectedRows) => {
if (selectedRowKeys.length > 2) {
return
return;
}
state.selectedRowKeys = selectedRowKeys;
state.apiTaskList = selectedRows;
@@ -220,20 +224,19 @@ export default {
const getAllCaseText = () => {
api
.queryCasesDetailList({
"keyWord": state.inputV1,
"orderAsc": true,
"orderField": "",
"pageIndex": 0,
"pageSize": 0,
"top": true
keyWord: state.inputV1,
orderAsc: true,
orderField: "",
pageIndex: 0,
pageSize: 0,
top: true,
})
.then((res) => {
if (res.status === 200) {
getTableDate(res.data.data);
}
})
.catch(() => {
});
.catch(() => {});
};
const updateTask = () => {
if (props.isLevel == 1) {
@@ -260,48 +263,51 @@ export default {
for (let i = 0; i < state.apiTaskList.length; i++) {
apiTask
.addTask({
"courseId": state.apiTaskList[i].casesId,
"duration": 0,
"flag": true,
"name": state.apiTaskList[i].title,
"projectId": props.projectId,
"projectTaskId": props.projectTaskId,
"stageId": Number(props.chooseStageId),
"type": 3,
courseId: state.apiTaskList[i].casesId,
duration: 0,
flag: true,
name: state.apiTaskList[i].title,
projectId: props.projectId,
projectTaskId: props.projectTaskId,
stageId: Number(props.chooseStageId),
type: 3,
})
.then(() => {
message.destroy()
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy()
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}
} else if (props.isLevel == 3) {
for (let i = 0; i < state.apiTaskList.length; i++) {
console.log(state.apiTaskList[i],'state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId');
console.log(
state.apiTaskList[i],
"state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId"
);
apiTask
.addTask({
"courseId": state.apiTaskList[i].caseid,
"duration": 0,
"flag": true,
"name": state.apiTaskList[i].caseName,
"projectId": props.projectId,
"projectTemplateId": props.projectTemplateId,
"stageId": props.chooseStageId,
"type": 3,
courseId: state.apiTaskList[i].caseid,
duration: 0,
flag: true,
name: state.apiTaskList[i].caseName,
projectId: props.projectId,
projectTemplateId: props.projectTemplateId,
stageId: props.chooseStageId,
type: 3,
})
.then(() => {
message.destroy()
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy()
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}

View File

@@ -76,6 +76,7 @@ import * as api from "../../api/indexDiscuss";
import * as apiTask from "../../api/indexTaskadd";
import { RouterEditTask } from "@/api/indexTask";
import { message } from "ant-design-vue";
import { addTempTask } from "../../api/indexTaskadd";
export default {
name: "AddDiscuss",
props: {
@@ -165,8 +166,7 @@ export default {
state.checkedC1 =
res.data.data.discussSettings == "true" ? true : false;
})
.catch(() => {
});
.catch(() => {});
}
};
const afterVisibleChange = (bool) => {
@@ -191,7 +191,8 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
apiTask.addTask({
apiTask
.addTask({
courseId: res.data.data.discussId,
duration: res.data.data.discussExplain,
name: res.data.data.discussName,
@@ -199,16 +200,29 @@ export default {
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 8,
})
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 3) {
apiTask.addTask({
console.log("");
addTempTask({
courseId: res.data.data.discussId,
duration: res.data.data.discussExplain,
name: res.data.data.discussName,
projectId: props.projectId,
projectTaskTemplateId: props.projectTaskTemplateId || 0,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 8,
})
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
}
};
@@ -232,8 +246,7 @@ export default {
closeDrawer();
ctx.emit("changeData", false);
})
.catch(() => {
});
.catch(() => {});
} else {
api
.createDiscuss(obj)
@@ -242,8 +255,7 @@ export default {
closeDrawer();
ctx.emit("changeData", false);
})
.catch(() => {
});
.catch(() => {});
}
};
return {

View File

@@ -114,6 +114,7 @@ import * as apitaskadd from "../../api/indexTaskadd";
import { message } from "ant-design-vue";
import { RouterEditTask } from "@/api/indexTask";
import dayjs from "dayjs";
import { addTempTask } from "../../api/indexTaskadd";
export default {
name: "AddEval",
components: {
@@ -174,7 +175,6 @@ export default {
const checkFinish = (value)=> {
state.evaluationTypeId = value.quiz_kid ? value.quiz_kid : null
state.evaluationTypeName = value.title ? value.title : ""
console.log(state.evaluationTypeId,'state.evaluationTypeId',state.evaluationTypeName,'state.evaluationTypeName');
}
const closeDrawer = () => {
ctx.emit("update:addevalVisible", false);
@@ -182,14 +182,14 @@ export default {
state.inputV1 = "";
state.time = undefined;
state.description = "";
state.evaluationTypeId= 0,
state.evaluationTypeName= "",
(state.evaluationTypeId = 0),
(state.evaluationTypeName = ""),
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
};
const afterVisibleChange = (bool) => {
if (props.edit && bool) {
queryInvistById()
queryInvistById();
}
};
const showEvalDrawer = () => {
@@ -197,9 +197,9 @@ export default {
};
//删除标签要清除子组件传过来的参数
const delTag = () => {
state.evaluationTypeId= 0
state.evaluationTypeName= ""
}
state.evaluationTypeId = 0;
state.evaluationTypeName = "";
};
//向关卡或阶段渲染
const updateTask = (value) => {
if (props.isLevel == 1) {
@@ -212,7 +212,9 @@ export default {
type: 10,
})
.then(() => {
message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`);
message.success(
`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`
);
})
.catch(() => {
message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`);
@@ -230,21 +232,19 @@ export default {
type: 10,
})
.then(() => {
message.destroy()
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
})
.catch(() => {
message.destroy()
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
apitaskadd
.addTask({
console.log("");
addTempTask({
duration: 0,
flag: true,
courseId: Number(value.evaluationId),
name: value.evaluationName,
projectTemplateId: props.projectTemplateId,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 10,
@@ -260,12 +260,11 @@ export default {
//根据id获取测评信息
const queryInvistById = () => {
let objqi = {
evaluationId : props.EditEvalId
}
evaluationId: props.EditEvalId,
};
api
.queryEvaluationDetailById(objqi)
.then((res) => {
console.log(res,'获取到的信息');
message.destroy()
message.success("获取测评信息成功");
state.inputV1 = res.data.data.evaluationName
@@ -310,7 +309,7 @@ export default {
evaluationPictureAddress: "",
evaluationTag: "",
updateTime: "",
}
};
api
.updateEvaluation(objei)
.then((res) => {
@@ -348,10 +347,12 @@ export default {
.createEvaluation(obj)
.then((res) => {
updateTask(res.data.data);
message.success("创建成功");
closeDrawer();
ctx.emit("changeData", false);
})
.catch(() => {
message.error("创建失败");
});
};

View File

@@ -100,11 +100,19 @@
<span style="margin-right: 3px">授课教师</span>
</div>
<div class="btnbox">
<a-input
v-model:value="inputV2"
style="width: 384px; height: 32px"
placeholder="请输入授课教师"
/>
<a-auto-complete
v-model:value="memberValue"
show-search
:not-found-content="fetching ? undefined : null"
placeholder="Select a teacher"
style="width: 364px"
:options="options"
@focus="handleFocus"
@blur="handleBlur"
@change="handleChange2"
@popupScroll="templateScroll"
@search="handleSearch"
></a-auto-complete>
</div>
</div>
<div class="main_item">
@@ -374,18 +382,21 @@
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
import { reactive, toRefs, ref } from "vue";
import SelFacet from "../../components/drawers/SelFacet.vue";
import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue";
import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
// import * as method from "../../api/method"
import { message } from "ant-design-vue";
import { getMemberInfo } from "@/api/index1";
import { debounce } from "lodash-es";
import { queryFaceDetailById, editPlan } from "../../api/indexFace";
import dayjs from "dayjs";
import AssessmentList from "../drawers/ AssessmentList.vue";
// import { toDate } from "../../api/method";
import { queryWorkDetailById } from "../../api/indexWork";
import { addTempTask } from "../../api/indexTaskadd";
export default {
name: "AddFaceteach",
components: {
@@ -442,17 +453,25 @@ export default {
},
},
setup(props, ctx) {
const options = ref([]);
const state = reactive({
selfacetvisible: false,
addhomeworkvisible: false,
addtestvisible: false,
memberValue: null,
fetching: false,
totalPages: 0,
currentPage: 1,
tableDataTotal: 100,
memberId: 0,
pageSize: 10,
inputV1: "",
inputV2: "",
inputV3: "",
inputV4: "",
inputV5: "",
inputV6: "",
inputV7: "",
inputV4: null,
inputV5: null,
inputV6: null,
inputV7: null,
testV1: "",
radioV1: "",
radioV2: "",
@@ -598,19 +617,21 @@ export default {
} else {
let obj = {
address: state.inputV4,
afterStart: state.inputV6,
applyFlag: 1,
attach: JSON.stringify(state.fileList),
beforeEnd: state.inputV7,
beforeStart: state.inputV5,
// beginTime: dayjs(state.chooseTime[0]).format("YYYY-MM-DD"),
afterStart: state.inputV6 || 0,
beforeEnd: state.inputV7 || 0,
beforeStart: state.inputV5 || 0,
// beginTime: dayjs(state.chooseTime[0]).format("YYYY-MM-DD hh-mm-ss"),
beginTime: parseInt(
new Date(state.chooseTime[0].$d).getTime() / 1000
),
// beginTime: "",
completeType: state.radioV1 == "1" ? 2 : 1,
description: state.textV1,
// endTime: dayjs(state.chooseTime[1]).format("YYYY-MM-DD"),
endTime: parseInt(new Date(state.chooseTime[0].$d).getTime() / 1000),
// endTime: dayjs(state.chooseTime[1]).format("YYYY-MM-DD hh-mm-ss"),
endTime: parseInt(new Date(state.chooseTime[1].$d).getTime() / 1000),
// endTime: "",
evalFlag: state.checkedAssessment == true ? 1 : 0,
evaluateId:
state.chooseMent == null ? 0 : state.chooseMent.assessmentId,
@@ -622,9 +643,9 @@ export default {
projectMember: state.radioV2 == "1" ? 1 : 0,
signFlag: 0,
signWordFlag: 0,
teacherId: 0,
teacherId: state.memberId,
testId: 0,
teacher: state.inputV2,
// teacher: state.inputV2,
};
if (props.edit) {
@@ -699,17 +720,15 @@ export default {
message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
let editObj = {
addTempTask({
courseId: res.data.data.offcoursePlanId,
duration: 0,
name: res.data.data.name,
projectTemplateId: props.projecTempaltetId,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 2,
};
// 新增编辑或新增项目
ProjectEditTask(editObj)
})
.then(() => {
message.success(
`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功`
@@ -751,6 +770,66 @@ export default {
state.chooseMent = value;
state.chooseMentName = value.name;
};
// 员工滚动
const templateScroll = (e) => {
console.log("滚动", e);
const { target } = e;
const scrllHeight = target.scrollHeight - target.scrollTop;
const clientHeight = target.clientHeight;
// console.log("scrllHeight", scrllHeight, clientHeight);
if (scrllHeight === 0 && clientHeight === 0) {
state.currentPage = 1;
} else if (scrllHeight - clientHeight == 0) {
// 下拉到底部时
if (state.currentPage < state.totalPages) {
// 如果滑到底部,则加载下一页
state.currentPage++;
// queryMember();
}
}
};
// 获取员工
const queryMember = () => {
if (!state.memberValue) return;
let obj = {
keyWord: state.memberValue,
id: 0,
org: 0,
pageNo: state.currentPage,
pageSize: state.pageSize,
};
getMemberInfo(obj)
.then((res) => {
let data = res.data.data.rows;
state.totalPages = res.data.data.total;
for (let i in data) {
options.value.push({
value: data[i].id,
label: data[i].realName,
});
}
})
.catch((err) => {
message.error("获取员工失败" + err);
});
};
const handleSearch = debounce((memberValue) => {
console.log("fetching user", memberValue);
options.value = [];
state.fetching = true;
state.currentPage = 1;
state.memberValue = memberValue;
queryMember();
state.fetching = false;
}, 300);
const handleChange2 = (value, label) => {
console.log(`selected ${value}`);
state.memberId = value;
state.inputV2 = label;
};
const handleFocus = () => {
queryMember();
};
return {
...toRefs(state),
showDrawerSelFacet,
@@ -771,6 +850,11 @@ export default {
showAssessment,
faceAssess,
// change,
options,
handleFocus,
handleSearch,
handleChange2,
templateScroll,
};
},
};

View File

@@ -116,6 +116,7 @@ import {
} from "@/api/indexWork";
import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
import dayjs from "dayjs";
import { addTempTask } from "../../api/indexTaskadd";
export default {
name: "AddHomework",
@@ -362,15 +363,15 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
let editObj = {
console.log("");
addTempTask({
courseId: res.data.data.workId,
name: res.data.data.workName,
projectId: props.edit ? props.projectId : 0,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 4,
};
ProjectEditTask(editObj)
})
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);

View File

@@ -106,6 +106,7 @@ import { message } from "ant-design-vue";
import AssessmentList from "./ AssessmentList.vue";
import { RouterEditTask } from "@/api/indexTask";
import * as api from "../../api/indexInvist";
import { addTempTask } from "../../api/indexTaskadd";
export default {
name: "AddInvist",
components: {
@@ -247,8 +248,8 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
apiTask
.addTask({
console.log("");
addTempTask({
courseId: state.assessment.assessmentId,
name: state.assessment.name,
projectId: props.projectId,

View File

@@ -107,31 +107,35 @@
<span style="margin-right: 3px">授课老师</span>
</div>
<div class="btnbox">
<a-select
v-model:value="value"
<a-auto-complete
v-model:value="memberValue"
show-search
:not-found-content="fetching ? undefined : null"
placeholder="Select a teacher"
style="width: 364px"
:options="options"
:filter-option="filterOption"
@focus="handleFocus"
@blur="handleBlur"
@change="handleChange2"
></a-select>
@popupScroll="templateScroll"
@search="handleSearch"
></a-auto-complete>
</div>
</div>
<div class="main_item2">
<div class="signbox">
<span style="margin-right: 3px">直播封面</span>
</div>
<div class="textarea" style="overflow: hidden">
<div
class="textarea"
style="overflow: hidden; width: 102px; height: 102px"
>
<a-upload
v-model:file-list="fileList"
name="avatar"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
action="/api/file/upload"
action="/manageApi/file/upload"
:before-upload="beforeUpload"
@change="handleChange"
>
@@ -320,7 +324,10 @@ import * as api from "../../api/indexLiveBroadcast";
import * as apiTask from "../../api/indexTaskadd";
import { toDate } from "@/api/method";
import { RouterEditTask } from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd";
import { getMemberInfo } from "@/api/index1";
import dayjs from "dayjs";
import { debounce } from "lodash-es";
// import { useRouter } from "vue-router";
function getBase64(img, callback) {
const reader = new FileReader();
@@ -328,7 +335,6 @@ function getBase64(img, callback) {
reader.readAsDataURL(img);
}
export default {
name: "AddLive",
props: {
@@ -379,10 +385,14 @@ export default {
},
setup(props, ctx) {
// const router = useRouter();
const options = ref([]);
const state = reactive({
currentPage: 1,
tableDataTotal: 100,
pageSize: 10,
fetching: false,
totalPages: 0,
memberValue: null, // 授课老师关键词
inputV1: "", //*直播名称
time: "", //*直播时间
inputV2: "", //*直播时长
@@ -471,6 +481,7 @@ export default {
state.radioV1 = res.data.data.standardSettings;
//state.= res.data.data
state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover;
})
.catch(() => {
message.error(`查询失败`);
@@ -486,6 +497,7 @@ export default {
const handleChange = (info) => {
if (info.file.status === "uploading") {
state.loading = true;
console.log("info", info);
return;
}
@@ -494,6 +506,7 @@ export default {
getBase64(info.file.originFileObj, (base64Url) => {
state.imageUrl = base64Url;
state.loading = false;
console.log("imgURL", state.imageUrl);
});
}
@@ -557,12 +570,12 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
apiTask
.addTask({
console.log("");
addTempTask({
courseId: res.data.data.liveId,
duration: res.data.data.duration,
name: res.data.data.liveName,
projectTemplateId: props.projectTemplateId,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 6,
@@ -609,7 +622,7 @@ export default {
afterSignIn: state.inputV6,
beforeSignIn: state.inputV7,
assessmentId: state.assessmentId == null ? 0 : state.assessmentId,
// liveCover: state.fileList,//直播封面
liveCover: state.imageUrl, //直播封面
liveDuration: state.inputV2,
liveEndTime: endTime,
liveStartTime: startTime,
@@ -633,8 +646,7 @@ export default {
updateTask(res);
closeDrawer();
})
.catch(() => {
});
.catch(() => {});
} else {
api
.createLiveBroadcast(state.obj)
@@ -643,20 +655,67 @@ export default {
updateTask(res);
closeDrawer();
})
.catch(() => {
});
.catch(() => {});
}
};
const templateScroll = (e) => {
console.log("滚动", e);
const { target } = e;
const scrllHeight = target.scrollHeight - target.scrollTop;
const clientHeight = target.clientHeight;
// console.log("scrllHeight", scrllHeight, clientHeight);
if (scrllHeight === 0 && clientHeight === 0) {
state.currentPage = 1;
} else if (scrllHeight - clientHeight == 0) {
// 下拉到底部时
if (state.currentPage < state.totalPages) {
// 如果滑到底部,则加载下一页
state.currentPage++;
// queryMember();
}
}
};
// 获取员工
const queryMember = () => {
if (!state.memberValue) return;
let obj = {
keyWord: state.memberValue,
id: 0,
org: 0,
pageNo: state.currentPage,
pageSize: state.pageSize,
};
getMemberInfo(obj)
.then((res) => {
let data = res.data.data.rows;
state.totalPages = res.data.data.total;
for (let i in data) {
options.value.push({
value: data[i].id,
label: data[i].realName,
});
}
})
.catch((err) => {
message.error("获取员工失败" + err);
});
};
const handleSearch = debounce((memberValue) => {
console.log("fetching user", memberValue);
options.value = [];
state.fetching = true;
state.currentPage = 1;
state.memberValue = memberValue;
queryMember();
state.fetching = false;
}, 300);
const options = ref([]);
const handleChange2 = (value) => {
console.log(`selected ${value}`);
};
const handleBlur = () => {
console.log("blur");
state.inputV3 = value;
};
const handleFocus = () => {
console.log("focus");
queryMember();
};
const checkRadio = () => {
if (state.checkedC1) {
@@ -665,9 +724,6 @@ export default {
state.discussSettings = "false";
}
};
const filterOption = (input, option) => {
return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0;
};
const handleChangeAssessment = (option) => {
state.assessmentId = option.assessmentId;
};
@@ -679,13 +735,14 @@ export default {
handleChange,
beforeUpload,
updateLiveBroadcast,
filterOption,
handleBlur,
handleFocus,
handleChange2,
options,
checkRadio,
handleChangeAssessment,
queryMember,
templateScroll,
handleSearch,
};
},
};

View File

@@ -59,7 +59,9 @@
<div class="mntc_left">
<div class="notice_icon"></div>
<span style="color: rgba(0, 0, 0, 0.65); margin-right: 17px"
>已选择 <span style="color: #388be1">{{ selectedRowKeys.length }}</span> </span
>已选择
<span style="color: #388be1">{{ selectedRowKeys.length }}</span>
</span
>
<span style="color: rgba(0, 0, 0, 0.65)"
>列表选项总计<span>{{ tableDataTotal }}</span> </span
@@ -113,6 +115,7 @@ import * as apiTask from "../../api/indexTaskadd";
import { message } from "ant-design-vue";
import { RouterEditTask } from "@/api/indexTask";
import dayjs from "dayjs";
import { addTempTask } from "../../api/indexTaskadd";
export default {
name: "AddOnline",
props: {
@@ -238,15 +241,15 @@ export default {
const onSelected = (record) => {
state.assessmentId = record.assessmentId;
state.assessmentName = record.name;
}
};
const onSelectChange = (selectedRowKeys, b) => {
state.selectedRowKeys = selectedRowKeys
state.selectedRowKeys = selectedRowKeys;
console.log(b);
}
};
//清空所选
const clearLine = () => {
state.selectedRowKeys=[]
}
state.selectedRowKeys = [];
};
const handelChangePage = (page, pageSize) => {
state.currentPage = page;
state.pageSize = pageSize;
@@ -283,8 +286,7 @@ export default {
state.tableDataTotal = Number(res.data.data.total);
}
})
.catch(() => {
});
.catch(() => {});
};
const updateTask = () => {
if (props.isLevel == 1) {
@@ -297,14 +299,14 @@ export default {
type: 1,
})
.then(() => {
message.destroy()
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
closeDrawer();
state.addLoading = false;
})
.catch(() => {
message.destroy()
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
@@ -318,33 +320,32 @@ export default {
type: 1,
})
.then(() => {
message.destroy()
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy()
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
apiTask
.addTask({
addTempTask({
courseId: state.assessmentId,
name: state.assessmentName,
projectTemplateId: props.projectTemplateId,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 1,
})
.then(() => {
message.destroy()
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy()
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}

View File

@@ -470,6 +470,7 @@ export default {
})
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
closeDrawer();
})
.catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);

View File

@@ -92,6 +92,7 @@ import * as api from "../../api/indexExternalChain";
import * as apiTask from "../../api/indexTaskadd";
import { message } from "ant-design-vue";
import { RouterEditTask } from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd";
export default {
name: "AddRef",
props: {
@@ -159,7 +160,6 @@ export default {
};
const afterVisibleChange = () => {
if (props.edit) {
queryRef();
}
@@ -202,7 +202,9 @@ export default {
type: 7,
})
.then(() => {
message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
message.success(
`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`
);
ctx.emit("changeData", false);
closeDrawer();
})
@@ -210,17 +212,19 @@ export default {
message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
apiTask
.addTask({
console.log("");
addTempTask({
courseId: res.data.data.linkId,
name: res.data.data.linkName,
projectTempalteId: props.projectTemplateId,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 7,
})
.then(() => {
message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
message.success(
`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`
);
ctx.emit("changeData", false);
closeDrawer();
})
@@ -254,9 +258,7 @@ export default {
message.success("编辑成功");
updateTask(res);
})
.catch(() => {
});
.catch(() => {});
} else {
api
.createExternalChain(obj)
@@ -264,9 +266,7 @@ export default {
message.success("提交成功");
updateTask(res);
})
.catch(() => {
});
.catch(() => {});
}
};
// 查询任务

View File

@@ -324,9 +324,9 @@ import {
queryExaminationDetailById,
updateExamination,
} from "@/api/indexExam";
import STest from "./SelectTest.vue"
import STest from "./SelectTest.vue";
import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd";
import dayjs from "dayjs";
export default {
@@ -594,8 +594,8 @@ export default {
};
const selectTest = () => {
state.STvisible = true
}
state.STvisible = true;
};
const queryTest = () => {
state.addLoading = true;
@@ -717,7 +717,8 @@ export default {
message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
let editObj = {
console.log("");
addTempTask({
courseId: res.data.data.examinationId,
duration: 0,
name: res.data.data.examinationName,
@@ -725,9 +726,7 @@ export default {
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 5,
};
// 新增编辑或新增项目
ProjectEditTask(editObj)
})
.then(() => {
message.success(
`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`
@@ -779,7 +778,7 @@ export default {
const getData = (value) => {
state.paperId = value.paperId;
state.paperName = value.testName;
}
};
return {
formState,
afterVisibleChange,

View File

@@ -0,0 +1,354 @@
<!-- 评估列表 -->
<template>
<a-drawer
:visible="assessmentVisible"
class="drawerStyle addinvistDrawer"
width="70%"
title="添加评估"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div v-if="edit" class="headerTitle">编辑评估</div>
<div v-else class="headerTitle">添加评估</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="contentMain">
<div class="main_left">
<div class="main_item">
<div class="fi_input">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 40px"
placeholder="请输入评估名称"
maxlength="20"
/>
</div>
<div class="btns" @click="getAllInvistText">
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
<div class="btnsn" @click="resetInvist">
<div class="search"></div>
<div class="btnText">重置</div>
</div>
</div>
<div class="main_item2">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:pagination="false"
:row-selection="rowSelection"
filterMultiple:false
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="handelChangePage"
/>
</div>
</div>
</div>
</div>
</div>
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
import * as api from "../../api/indexInvist.js";
import dayjs from "dayjs";
export default {
name: "AssessmentList",
// components: {
// },
props: {
assessmentVisible: {
type: Boolean,
default: false,
},
isface: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const state = reactive({
assessmentVisible: false,
assessment: null,
inputV1: "",
currentPage: 1,
pageSize: 10,
tableDataTotal: 0,
tableData: [],
selectedRowKeys: [],
});
const closeDrawer = () => {
ctx.emit("update:assessmentVisible", false);
};
const afterVisibleChange = (bool) => {
console.log("state getAllInvistText", bool);
if (props.assessmentVisible) {
getAllInvistText();
}
};
const tableDataFunc = () => {
const columns = [
{
title: "名称",
dataIndex: "name",
// width: "30%",
key: "name",
width: "150px",
align: "left",
className: "classify",
},
{
title: "题数",
dataIndex: "num",
key: "num",
width: "80px",
align: "center",
},
{
title: "创建人",
dataIndex: "creator",
key: "creator",
width: "150px",
align: "center",
},
{
title: "创建时间",
dataIndex: "time",
key: "time",
width: "200px",
align: "center",
},
];
return columns;
};
const rowSelection = {
type: "radio",
onSelect: (selectedRows) => {
state.assessment = selectedRows;
console.log("selectedRows=======", state.assessment);
if (props.isface == 1) {
ctx.emit("faceAssess", state.assessment);
} else {
ctx.emit("checkedAss", state.assessment);
}
state.selectedRowKeys = [];
closeDrawer();
},
};
// const onSelectChange = (selectedRowKeys) => {
// if(selectedRowKeys.length>2){return}
// state.selectedRowKeys = selectedRowKeys;
// };
const handelChangePage = (page, pageSize) => {
state.currentPage = page;
state.pageSize = pageSize;
getAllInvistText();
};
const getTableDate = (tableData) => {
let data = tableData;
let array = [];
data.map((value, index) => {
let obj = {
key: index,
assessmentId: value.assessmentId,
num: value.essayQuestionVoList.length,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"),
};
array.push(obj);
});
(state.selectedRowKeys = []), (state.tableData = array);
};
//获取全部评估信息接口
const getAllInvistText = () => {
api
.queryAssessmentDetailList({
assessmentName: state.inputV1,
pageNo: state.currentPage,
pageSize: state.pageSize,
})
.then((res) => {
let arr = res.data.data.rows;
if (res.status === 200) {
// console.log("获取全部评估信息", res.data.data);
getTableDate(arr);
state.tableDataTotal = Number(res.data.data.total);
}
})
.catch((err) => {
console.log("获取全部评估信息接口失败", err);
// state.createLoading = false;
});
};
//重置评估信息
const resetInvist = () => {
state.inputV1 = "";
getAllInvistText();
};
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
tableDataFunc,
rowSelection,
getAllInvistText,
resetInvist,
handelChangePage,
};
},
};
</script>
<style lang="scss">
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important;
}
.addinvistDrawer {
.drawerMain {
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
margin-left: 24px;
}
}
.contentMain {
display: flex;
justify-content: space-between;
.main_left {
padding-right: 30px;
margin-top: 32px;
.main_item {
display: flex;
align-items: center;
margin-bottom: 32px;
.fi_input {
margin-right: 20px;
}
.btns {
margin-right: 20px;
padding: 0px 26px 0px 26px;
height: 38px;
background: #409eff;
border-radius: 8px;
//border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
width: 15px;
height: 17px;
background-image: url("../../assets/images/courseManage/search0.png");
background-size: 100% 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
}
.btnsn {
padding: 0px 26px 0px 26px;
height: 38px;
background: #ffffff;
border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
width: 16px;
height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
background-size: 100% 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #409eff;
line-height: 36px;
margin-left: 5px;
}
}
}
.main_item2 {
.pa {
width: 100%;
margin: 15px auto;
display: flex;
justify-content: center;
}
}
}
}
.main_btns {
height: 72px;
width: 100%;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
}
}
}
</style>

View File

@@ -72,6 +72,8 @@
<script>
import { toRefs,reactive } from '@vue/reactivity';
import { message } from 'ant-design-vue';
import {queryUserAnswerDetail} from '@/api/indexExam';
export default {
name:"CheckWork",
props:{
@@ -164,6 +166,14 @@ export default {
}
const afterVisibleChange = (bool) => {
console.log(bool);
if(bool == true) {getQue()}
}
const getQue = () => {
queryUserAnswerDetail(1).then(res => {
console.log(res)
}).catch(err =>{
message.error('用户答卷信息获取失败'+err)
})
}
return{
...toRefs(state),

View File

@@ -148,13 +148,16 @@ import { reactive, toRefs } from "vue";
},
]
});
// const onSelect = (record)=> {
// state.evaluationTypeName = record.title
// state.evaluationTypeId = record.quiz_code
// };
const onSelectChange = (selectedRowKeys,selectedRows)=> {
if(selectedRowKeys.length>1){
if(state.selectedRowKeys.length>1){
return
}
state.selectedRowKeys = selectedRowKeys
state.evListData = selectedRows[0] ? selectedRows[0] : []
console.log('state.evListData',state.evListData);
}
const closeDrawer = () => {
ctx.emit("update:EvalListVisible", false);
@@ -168,7 +171,11 @@ import { reactive, toRefs } from "vue";
}
};
const checkFinish =() =>{
ctx.emit("getEvListData", state.evListData);
let EvListDate = {
Id : state.evaluationTypeId,
Name : state.evaluationTypeName,
}
ctx.emit("getEvListDate", EvListDate);
closeDrawer();
}
const changePagination = (page) => {
@@ -223,7 +230,6 @@ import { reactive, toRefs } from "vue";
key:index+1,
status:value.status,
quiz_code:value.quiz_code,
quiz_kid:value.quiz_kid,
title:value.title,
theme_desc:value.theme_desc,
quiz_price:value.quiz_price,

View File

@@ -29,11 +29,15 @@
</div>
<div class="btns">
<div class="btn btn1" style="margin-right: 20px">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchAuth"
>
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
<div class="btn btn2">
<div class="btn btn2" @click="resetAuth">
<div class="img2"></div>
<div class="wz">重置</div>
</div>
@@ -50,13 +54,13 @@
@expand="expandTable"
:scroll="{ x: 900 }"
:pagination="false"
/>
</div>
<div class="tableBox">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
@@ -64,6 +68,7 @@
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePagination"
/>
</div>
</div>
@@ -127,6 +132,7 @@
<script>
import { toRefs, reactive } from "vue";
import * as api from "../../api/index1";
export default {
name: "PowerList",
props: {
@@ -134,6 +140,10 @@ export default {
type: Boolean,
default: false,
},
selectPathId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
@@ -143,98 +153,31 @@ export default {
closable: false, //modal右上角的关闭按钮
pageSize: 10,
currentPage: 1,
tableDataTotal: 100,
tableDataTotal: -1,
selectedRowKeys: [],
cancelModal: false, //取消授权弹窗
closeCancel: false, //取消授权弹窗关闭图标
tableData: [
{
key: 1,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 2,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 3,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 4,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 5,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 6,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "归属权",
},
{
key: 7,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "查看权",
},
{
key: 8,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 9,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 10,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
// {
// key: 1,
// name: "张三",
// com: "产研部",
// gang: "产品经理",
// number: "20201234",
// state: "管理权",
// },
],
});
const closeDrawer = () => {
ctx.emit("update:PLvisible", false);
};
const afterVisibleChange = (bool) => {
console.log("state", bool, props);
if (bool) {
optionAuthPerm();
}
};
const onSelectChange = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
@@ -325,20 +268,64 @@ export default {
];
return columns;
};
//‘获取权限名单
const optionAuthPerm = () => {
let obj = {
keyWord: state.name ? state.name : "",
type: 1,
tag: 1,
opt: 1,
refId: props.selectPathId,
pageNo: state.currentPage,
pageSize: state.pageSize,
};
console.log("获取权限名单obj", obj);
api
.optionAuthPerm(obj)
.then((res) => {
console.log("获取权限名单成功", res);
if (res.data.code === 200) {
state.tableDataTotal = res.data.data.total;
}
})
.catch((err) => {
console.log("获取权限名单失败", err);
});
};
//分页
const changePagination = (page) => {
state.currentPage = page;
optionAuthPerm();
};
//查询
const searchAuth = () => {
state.currentPage = 1;
optionAuthPerm();
};
//重置
const resetAuth = () => {
state.currentPage = 1;
state.name = null;
optionAuthPerm();
};
return {
...toRefs(state),
closeDrawer,
afterVisibleChange,
onSelectChange,
tableDataFunc,
showCancelModal,
closeCancelModal,
changePagination,
searchAuth,
resetAuth,
};
},
};
</script>
<style lang="scss">
.copyModal {
.ant-modal {
width: 424px !important;

View File

@@ -29,11 +29,15 @@
</div>
<div class="btns">
<div class="btn btn1" style="margin-right: 20px">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchAuth"
>
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
<div class="btn btn2">
<div class="btn btn2" @click="resetAuth">
<div class="img2"></div>
<div class="wz">重置</div>
</div>
@@ -55,6 +59,7 @@
<div class="tableBox">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
@@ -62,6 +67,7 @@
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePagination"
/>
</div>
</div>
@@ -126,6 +132,7 @@
<script>
import { toRefs, reactive } from "vue";
import * as api from "../../api/index1";
export default {
name: "ProjPowerList",
props: {
@@ -133,6 +140,10 @@ export default {
type: Boolean,
default: false,
},
selectProjectId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
@@ -142,98 +153,31 @@ export default {
closable: false, //modal右上角的关闭按钮
pageSize: 10,
currentPage: 1,
tableDataTotal: 100,
tableDataTotal: -1,
selectedRowKeys: [],
cancelModal: false, //取消授权弹窗
closeCancel: false, //取消授权弹窗关闭图标
tableData: [
{
key: 1,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 2,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 3,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 4,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 5,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 6,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "归属权",
},
{
key: 7,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "查看权",
},
{
key: 8,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 9,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
{
key: 10,
name: "张三",
com: "产研部",
gang: "产品经理",
number: "20201234",
state: "管理权",
},
// {
// key: 1,
// name: "张三",
// com: "产研部",
// gang: "产品经理",
// number: "20201234",
// state: "管理权",
// },
],
});
const closeDrawer = () => {
ctx.emit("update:ProjPvisible", false);
};
const afterVisibleChange = (bool) => {
console.log("state", bool, props);
if (bool) {
optionAuthPerm();
}
};
const onSelectChange = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
@@ -324,6 +268,48 @@ export default {
];
return columns;
};
//‘获取权限名单
const optionAuthPerm = () => {
let obj = {
keyWord: state.name ? state.name : "",
type: 2,
tag: 1,
opt: 1,
refId: props.selectProjectId,
pageNo: state.currentPage,
pageSize: state.pageSize,
};
console.log("获取权限名单obj", obj);
api
.optionAuthPerm(obj)
.then((res) => {
console.log("获取权限名单成功", res);
if (res.data.code === 200) {
state.tableDataTotal = res.data.data.total;
}
})
.catch((err) => {
console.log("获取权限名单失败", err);
});
};
//分页
const changePagination = (page) => {
state.currentPage = page;
optionAuthPerm();
};
//查询
const searchAuth = () => {
state.currentPage = 1;
optionAuthPerm();
};
//重置
const resetAuth = () => {
state.currentPage = 1;
state.name = null;
optionAuthPerm();
};
return {
...toRefs(state),
closeDrawer,
@@ -331,6 +317,10 @@ export default {
tableDataFunc,
showCancelModal,
closeCancelModal,
afterVisibleChange,
changePagination,
searchAuth,
resetAuth,
};
},
};

View File

@@ -559,8 +559,6 @@ export default {
//获取选中部门的人员信息
const getPeoples = () => {
let obj = {
keyWord: "",
id: 0,
org: state.selectedKeys[0],
pageNo: state.currentPage,
pageSize: state.pageSize,
@@ -569,7 +567,7 @@ export default {
state.tableDataTotal = 0;
return;
}
// console.log("obj", obj);
console.log("obj", obj);
api
.getMemberInfo(obj)
.then((res) => {

View File

@@ -166,42 +166,15 @@ export default {
setup(props, ctx) {
const state = reactive({
classTableData: [
{
key: "1",
num: "JDF2022071100001",
name: "时间管理课程",
content: "通用力",
teacher: "BOE教师",
creator: "管理员",
time: "2022-10-31 23:12:00",
},
{
key: "2",
num: "JDF2022071100001",
name: "时间管理课程",
content: "通用力",
teacher: "BOE教师",
creator: "管理员",
time: "2022-10-31 23:12:00",
},
{
key: "3",
num: "JDF2022071100001",
name: "时间管理课程",
content: "通用力",
teacher: "BOE教师",
creator: "管理员",
time: "2022-10-31 23:12:00",
},
{
key: "4",
num: "JDF2022071100001",
name: "时间管理课程",
content: "通用力",
teacher: "BOE教师",
creator: "管理员",
time: "2022-10-31 23:12:00",
},
// {
// key: "1",
// num: "JDF2022071100001",
// name: "时间管理课程",
// content: "通用力",
// teacher: "BOE教师",
// creator: "管理员",
// time: "2022-10-31 23:12:00",
// }
],
currentPage: 1,
tableDataTotal: null,
@@ -233,10 +206,10 @@ export default {
const getClassList = (obj) => {
let objn = obj || {
auditStatus: 0,
beginTime: 0,
// beginTime: 0,
categoryId: 0,
createName: "",
endTime: 0,
// endTime: 0,
name: "",
pageNo: state.currentPage,
pageSize: 10,
@@ -263,10 +236,10 @@ export default {
let obj = {
key: value.offcourseId,
num: value.offcourseId,
name: value.name,
teacher: value.teacher,
creator: value.teacher,
time: toDate(value.publishTime / 1000, "Y-M-D"),
name: value.name || "-",
teacher: value.teacher || "-",
creator: value.createName || "-",
time: toDate(value.publishTime / 1000, "Y-M-D h:m"),
categoryId: value.categoryId,
//需要判断content
};
@@ -290,11 +263,11 @@ export default {
const search = () => {
let obj = {
auditStatus: 0,
beginTime: 0,
// beginTime: 0,
categoryId: 0, //分类
createName: "",
endTime: 0,
name: "",
// endTime: 0,
name: state.valueClass,
pageNo: state.currentPage,
pageSize: 10,
projectName: "",

View File

@@ -39,7 +39,7 @@
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTaskList"
@click="getManageList"
>
<div class="img1"></div>
<div class="wz">搜索</div>
@@ -112,7 +112,7 @@
<script>
import { toRefs, reactive } from "vue";
import * as api from "../../api/indexTest";
import * as api from "../../api/indexExam";
import { message } from "ant-design-vue";
import { iframeUrl } from "../../api/method";
export default {
@@ -131,7 +131,7 @@ export default {
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
tableDataTotal: 50,
projectName: "",
tableData: [],
selectedRowKeys: [],
@@ -205,7 +205,9 @@ export default {
};
const onChange = (pageNumber) => {
console.log("Page: ", pageNumber);
state.pageNo = pageNumber;
state.currentPage = pageNumber;
getManageList();
};
const onSelectChange = (selectedRowKeys, selectedRows) => {
@@ -237,21 +239,16 @@ export default {
});
state.tableData = array;
};
//获取任务管理列表
//获取选择考试列表
const getManageList = () => {
let obj = {
// "keyWord": "",
// "pageIndex": 0,
// "pageSize": 0,
// "published": true,
keyWord: "",
orderAsc: true,
orderFiled: "",
pageIndex: 0,
pageSize: 0,
"keyWord": state.inputPname,
"pageIndex": state.pageSize,
"pageSize": state.pageSize,
"published": true
};
api
.queryExaminationPaper(obj)
.queryExaminationList(obj)
.then((res) => {
getTableDate(res.data.data);
message.success("获取选择考试列表成功");
@@ -262,35 +259,6 @@ export default {
});
};
//搜索任务列表 没接口
const searchTaskList = () => {
let objser = {
name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
projectId: 27,
// projectTaskId: props.projectTaskId,
projectTaskId: 370,
status: -1,
};
if (state.name !== "" || state.projectName !== "") {
api
.taskStudentList(objser)
.then((res) => {
state.pageNo = res.data.data.pageNo;
state.pageSize = res.data.data.pageSize;
state.pageSize = res.data.data.pageSize;
let newArr = [];
for (let i = 0; i < res.data.data.rows.length; i++) {
if (res.data.data.rows[i].userInfoBo.userName == state.name)
newArr.push(res.data.data.rows[i].userInfoBo);
}
state.tabledata = newArr;
})
.catch(() => {});
}
};
//重置任务列表
const resetTaskList = () => {
state.inputPname = "";
@@ -312,7 +280,6 @@ export default {
tableDataFunc,
onChange,
getManageList,
searchTaskList,
resetTaskList,
};
},

File diff suppressed because it is too large Load Diff

View File

@@ -126,7 +126,7 @@
<script>
import { toRefs, reactive } from "vue";
import { message } from 'ant-design-vue';
import * as api from "../../api/index";
import * as api from "../../api/indexExam";
import CQue from './CheckQue.vue'
export default {
name: "TestManage",
@@ -434,15 +434,17 @@ export default {
//获取任务管理列表
const getManageList = () => {
let obj = {
// name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
// projectId: 27,
projectTaskId: props.projectTaskId,
status: 0,
aid:0,
orderAsc:'',
orderField:'',
pageIndex:1,
pageSize:10,
refId:'',
refType:'',
testId:''
};
api
.taskStudentList(obj)
.queryUserAnswerPageDetailList(obj)
.then((res) => {
state.pageNo = res.data.data.pageNo;
state.pageSize = res.data.data.pageSize;
@@ -455,34 +457,34 @@ export default {
};
//搜索任务列表
const searchTaskList = () => {
let objser = {
// name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
// projectId: 27,
projectTaskId: props.projectTaskId,
status: 0,
};
if (state.name !== "" || state.projectName !== "") {
api
.taskStudentList(objser)
.then((res) => {
state.pageNo = res.data.data.pageNo;
state.pageSize = res.data.data.pageSize;
state.pageSize = res.data.data.pageSize;
let newArr = [];
for (let i = 0; i < res.data.data.rows.length; i++) {
if (res.data.data.rows[i].userInfoBo.userName == state.name)
newArr.push(res.data.data.rows[i].userInfoBo);
}
state.tabledata = newArr;
})
.catch((err) => {
console.log("搜索任务列表失败", err);
});
}
};
// const searchTaskList = () => {
// let objser = {
// // name: "",
// pageNo: state.pageNo,
// pageSize: state.pageSize,
// // projectId: 27,
// projectTaskId: props.projectTaskId,
// status: 0,
// };
// if (state.name !== "" || state.projectName !== "") {
// api
// .taskStudentList(objser)
// .then((res) => {
// state.pageNo = res.data.data.pageNo;
// state.pageSize = res.data.data.pageSize;
// state.pageSize = res.data.data.pageSize;
// let newArr = [];
// for (let i = 0; i < res.data.data.rows.length; i++) {
// if (res.data.data.rows[i].userInfoBo.userName == state.name)
// newArr.push(res.data.data.rows[i].userInfoBo);
// }
// state.tabledata = newArr;
// })
// .catch((err) => {
// console.log("搜索任务列表失败", err);
// });
// }
// };
//重置任务列表
const resetTaskList = () => {
@@ -504,7 +506,7 @@ export default {
godie,
onChange,
getManageList,
searchTaskList,
// searchTaskList,
resetTaskList,
};
},
@@ -666,7 +668,7 @@ export default {
background-color: #eff4fc !important;
}
th,th.h {
th.h {
background-color: #eff4fc !important;
}

View File

@@ -26,20 +26,20 @@ export function traverseArr(arr, traverseObj, saveOld = false) {
return newArr;
}
// export function deepClone(obj) {
// let result = typeof obj.splice === "function" ? [] : {};
// if (obj && typeof obj === "object") {
// for (let key in obj) {
// if (obj[key] && typeof obj[key] === "object") {
// result[key] = deepClone(obj[key]);
// } else {
// result[key] = obj[key];
// }
// }
// return result;
// }
// return obj;
// }
export function deepClone(obj) {
let result = typeof obj.splice === "function" ? [] : {};
if (obj && typeof obj === "object") {
for (let key in obj) {
if (obj[key] && typeof obj[key] === "object") {
result[key] = deepClone(obj[key]);
} else {
result[key] = obj[key];
}
}
return result;
}
return obj;
}
export function deepCloneFilterString(obj, fillterKeys) {
let result = typeof obj.splice === "function" ? [] : {};
@@ -95,6 +95,14 @@ export function getdateToTime(date) {
return `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d} ${hh}:${mm}`;
}
export function getdateToDate(date) {
let now = new Date(parseInt(date)),
y = now.getFullYear(),
m = now.getMonth() + 1,
d = now.getDate();
return `${y}${m < 10 ? "0" + m : m}${d < 10 ? "0" + d : d}`;
}
//计算两个时间之间的时间差 多少天时分秒
export function intervalTime(startTime) {
const curTime = new Date().getTime(); //计算当前时间戳
@@ -117,3 +125,47 @@ export function intervalTime(startTime) {
seconds,
};
}
// 分片处理
export function batchLoadList(
sourceData,
dataTotal,
splitNumber = 10,
callback,
complete
) {
if (sourceData.length <= splitNumber) {
typeof callback === "function" && callback(sourceData);
typeof callback === "function" && complete();
return;
}
let first = 0;
const intTime = parseInt(String(dataTotal / splitNumber));
const floatTime = sourceData.length % splitNumber;
const total = intTime + (floatTime > 0 ? 1 : 0);
for (let i = 0; i < total; i += 1) {
const end = first + splitNumber;
const splitArray = sourceData.slice(first, end);
setTimeout(() => {
typeof callback === "function" && callback(splitArray);
if (i === total - 1) {
// 分片处理完成
typeof callback === "function" && complete();
}
});
first = end;
}
}
export function newFile(code) {
const blob = new Blob([code], {
type: "application/vnd.ms-excel",
});
const linkNode = document.createElement("a");
linkNode.style.display = "none";
linkNode.href = URL.createObjectURL(blob); //生成一个Blob URL
document.body.appendChild(linkNode);
linkNode.click(); //模拟在按钮上的一次鼠标单击
URL.revokeObjectURL(linkNode.href); // 释放URL 对象
document.body.removeChild(linkNode);
}

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-09 09:26:26
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-24 16:16:10
* @LastEditTime: 2022-11-25 17:35:53
* @FilePath: /fe-manage/src/views/courselibrary/CourseManage.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -13,8 +13,10 @@
id="iframe"
style="width: 100%; height: 100%"
:src="iframeUrl + '/course/coursewares'"
frameborder="0"
name="myframe"
sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
security="restricted"
sandbox=""
></iframe>
</div>
</template>

File diff suppressed because it is too large Load Diff

View File

@@ -167,7 +167,7 @@ export default {
key: "opt",
align: "center",
customRender: () => {
return <div>审核日志</div>;
return <div style="color:#387DF7">审核日志</div>;
},
},
],
@@ -198,7 +198,9 @@ export default {
console.log("获取已审核课程成功", res.data.data);
let result = res.data.data.rows;
state.total = res.data.data.total;
if (res.data.data.total > 0) {
setTableData(result);
}
})
.catch((err) => {
console.log("获取已审核课程失败", err);
@@ -210,13 +212,22 @@ export default {
data.map((item) => {
let obj = {
number: item.offcourseId,
name: item.name,
name: item.name || "- ",
type: item.type == 1 ? "线上" : "线下",
content: item.categoryId,
status: item.auditStatus == 2 ? "通过" : "拒绝",
status:
item.auditStatus == 0
? "未提交"
: item.auditStatus == 1
? "提交待审核"
: item.auditStatus == 2
? "通过"
: item.auditStatus == -1
? "拒绝"
: "-",
creater: item.createName,
time: "-",
msg: item.description,
msg: item.description || "-",
};
array.push(obj);
});

View File

@@ -500,7 +500,7 @@ export default {
return (
<div>
<span
style="cursor:pointer"
style="cursor:pointer;color:#387DF7"
onClick={() => {
showAudit(
value.record.createId,
@@ -512,7 +512,7 @@ export default {
审核
</span>
&nbsp;
<span style="cursor:pointer">预览</span>
<span style="cursor:pointer;color:#387DF7">预览</span>
</div>
);
},
@@ -529,10 +529,10 @@ export default {
const getFaceList = (obj) => {
let objn = obj || {
auditStatus: 1,
beginTime: 0,
// beginTime: 0,
categoryId: 0,
createName: "",
endTime: 0,
// endTime: 0,
name: "",
pageNo: state.currentPage,
pageSize: 10,
@@ -560,10 +560,19 @@ export default {
name: item.name,
type: item.type == 1 ? "线上" : "线下",
content: item.categoryId,
status: "待审核",
status:
item.status == 0
? "未提交"
: item.status == 1
? "待审核"
: item.status == 2
? "通过"
: item.status == -1
? "拒绝"
: "-",
change: "-",
creater: item.createName,
time: toDate(item.createTime, "Y-M-D h-m"),
time: toDate(item.createTime, "Y-M-D h:m"),
createrId: item.createId,
offId: item.offcourseId,
};
@@ -580,10 +589,11 @@ export default {
const search = () => {
let obj = {
auditStatus: 1,
beginTime: 0,
categoryId: state.valueproj,
// beginTime: 0,
// categoryId: state.valueproj,
categoryId: 0,
createName: state.valuecreater,
endTime: 0,
// endTime: 0,
name: state.valuename,
pageNo: state.currentPage,
pageSize: 10,

View File

@@ -242,7 +242,7 @@ export default {
onClick={() => {
showProjAuditModal(value.record.id);
}}
style="cursor:pointer"
style="cursor:pointer;color:#387DF7"
>
审核日志
</span>
@@ -330,11 +330,24 @@ export default {
// 需要加上
// name: getName(item),
// belong: getBelong(item),
manager: item.manager,
status: item.status == 2 ? "通过" : "拒绝",
manager: item.manager || "-",
status:
item.status == 0
? "草稿"
: item.status == 1
? "待审核"
: item.status == 2
? "通过"
: item.status == 3
? "发布"
: item.status == -1
? "已结束"
: item.status == -2
? "拒绝"
: "-",
creater: item.createName,
time: toDate(item.beginTime, "Y-M-D h-m"),
msg: item.description,
time: toDate(item.beginTime, "Y-M-D h:m"),
msg: item.description || "-",
id: item.projectId,
};
array.push(obj);

View File

@@ -194,7 +194,7 @@ export default {
return (
<div>
<span
style="cursor:pointer"
style="cursor:pointer;color:#387DF7"
onClick={() => {
showProjAudit(
value.record.projectId,
@@ -260,8 +260,21 @@ export default {
number: item.projectId,
name: getName(item),
belong: getBelong(item),
manager: item.manager,
status: "待审核",
manager: item.manager || "-",
status:
item.status == 0
? "草稿"
: item.status == 1
? "待审核"
: item.status == 2
? "通过"
: item.status == 3
? "发布"
: item.status == -1
? "已结束"
: item.status == -2
? "拒绝"
: "-",
creater: item.createName,
time: toDate(item.createTime, "Y-M-D h-m"),
projectId: item.projectId,

View File

@@ -589,7 +589,7 @@
<!-- 管理权抽屉 -->
<manage-right v-model:Managevisible="Managevisible" />
<!-- 授权名单抽屉 -->
<power-list v-model:PLvisible="PLvisible" />
<power-list v-model:PLvisible="PLvisible" :selectPathId="selectPathId" />
<!-- 创建路径loading -->
@@ -646,7 +646,11 @@ import QueryRight from "../../components/drawers/QueryRight";
import ManageRight from "../../components/drawers/ManageRight";
import * as api from "../../api/index1";
import { message } from "ant-design-vue";
import { toDate, commonData } from "../../api/method";
import {
toDate,
commonData,
// setCookie
} from "../../api/method";
import { storage } from "../../api/storage";
export default {
name: "learningPath",
@@ -858,6 +862,8 @@ export default {
lpLoading: false,
learnBgMore: false, //是否显示更多学习路径背景
selectPathId: null, //选择的
});
const selectProjectName = (value, index) => {
console.log("value", value, index);
@@ -1035,8 +1041,9 @@ export default {
const showOwner = () => {
state.Ownervisible = true;
};
const showPower = () => {
const showPower = (id) => {
state.PLvisible = true;
state.selectPathId = id;
};
const showQuery = () => {
state.Queryvisible = true;
@@ -1228,7 +1235,7 @@ export default {
<a-select-option value="权限名单" label="权限名单">
<div
onClick={() => {
showPower();
showPower(text.record.id);
}}
>
权限名单
@@ -1642,6 +1649,9 @@ export default {
onMounted(() => {
// console.log("执行");
getLearnPath();
// let cookie =
// "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzNjI4OTAsImV4cCI6MTY2OTM3MDA5MCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.2e68ae110cf0e8f157d8312301c0ca8104d6ec2a2a294052d5497c06019ed3d8";
// setCookie("token", cookie, 10);
});
return {

View File

@@ -272,13 +272,14 @@
</div>
</a-tab-pane>
<a-tab-pane key="2" tab="公告" force-render>
<div class="notice">
<div class="split"></div>
<div class="ntc_tit"><span>公告</span></div>
<hr color="#E8E8E8" />
<a-tabs v-model:activeKey="activeKeyNotice">
<a-tab-pane key="11" tab="公告">
<div class="notice">
<div class="ntc_body">
<div class="ntc_switch">
<a-switch v-model:checked="checked" @click="changeopclo" />
<a-switch size="small" v-model:checked="checked" @click="changeopclo" />
<div
class="opclo"
:style="{ display: hideshow ? 'block' : 'none' }"
@@ -316,6 +317,10 @@
</div>
</div>
</a-tab-pane>
</a-tabs>
</a-tab-pane>
<a-tab-pane key="3" tab="项目积分">
<div class="split"></div>
<div class="projectscore">
@@ -326,7 +331,7 @@
<div class="pjc_body">
<div class="groupright">
<div class="spandiv"><span class="spantext">规则</span></div>
<div v-if="edit" class="btns">
<div v-if="edit" class="btns" style="display:none">
<div class="btn1" @click="edit = !edit">
<img src="../../assets/images/projectadd/edit1.png" />
<span class="btn1text">编辑</span>
@@ -646,11 +651,9 @@ import { message } from "ant-design-vue";
import * as api from "@/api/indexTemplate"
import { useRouter } from "vue-router";
import {scoreRule,setScoreRule} from "@/api/indexTaskadd"
import { useStore } from "vuex";
export default defineComponent({
name: "LibraryAdd",
setup() {
const store = useStore();
const state = reactive({
//任务大纲列表
taskSyllabus: [
@@ -812,6 +815,9 @@ export default defineComponent({
level: null,
systemId: null,
boeFlag: false,
status:null,
picUrl: null,
noticeFlag: null,
}
});
const value = ref("");
@@ -875,12 +881,12 @@ export default defineComponent({
});
// 获取详情
const getDetail = () => {
api.templateDetail(store.state.projectTemplateId).then(res => {
api.templateDetail(localStorage.getItem('projectTemplateId')).then(res => {
state.taskSyllabus = []
console.log(res);
state.projectInfo.name = res.data.data.projectTemplateInfo.name
let time = new Date(Number(res.data.data.projectTemplateInfo.createTime))
state.projectInfo.beginTime = time.toLocaleDateString()
state.projectInfo.beginTime = res.data.data.projectTemplateInfo.beginTime
state.projectInfo.endTime = res.data.data.projectTemplateInfo.endTime
state.projectInfo.manager = res.data.data.projectTemplateInfo.manager
state.projectInfo.notice = res.data.data.projectTemplateInfo.notice
state.projectInfo.sourceBelongId = res.data.data.projectTemplateInfo.sourceBelongId
@@ -890,6 +896,9 @@ export default defineComponent({
state.projectInfo.level = res.data.data.projectTemplateInfo.level
state.projectInfo.systemId = res.data.data.projectTemplateInfo.systemId
state.projectInfo.boeFlag = res.data.data.projectTemplateInfo.boeFlag
state.projectInfo.noticeFlag = res.data.data.projectTemplateInfo.noticeFlag
state.projectInfo.remark = res.data.data.projectTemplateInfo.remark
state.projectInfo.status = res.data.data.projectTemplateInfo.status
state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl
let data = res.data.data.stageList;
for(let i in data) {
@@ -917,9 +926,9 @@ export default defineComponent({
let obj = {
"name": state.projectInfo.name,
"category": state.projectInfo.category,
"picUrl": "x",
"beginTime": Number(state. projectInfo.beginTime) || 1,
"endTime": 1,
"picUrl": state.projectInfo.picUrl,
"beginTime": new Date(state.projectInfo.beginTime).getTime(),
"endTime": new Date(state.projectInfo.endTime).getTime(),
"manager": state.projectInfo.manager,
"managerId": state.projectInfo.managerId || 0,
"sourceBelongId": state.projectInfo.sourceBelongId,
@@ -929,7 +938,7 @@ export default defineComponent({
"courseSyncFlag": state.projectInfo.courseSyncFlag? 1:0,
"notice": state.projectInfo.notice,
"noticeFlag": 0,
"projectTemplateId": store.state.projectTemplateId,
"projectTemplateId": localStorage.getItem('projectTemplateId'),
"remark": "",
"status": 0,
};
@@ -976,7 +985,7 @@ export default defineComponent({
const stateEdit = () => {
let obj={
"name": "",
"projectTemplateId": store.state.projectTemplateId,
"projectTemplateId": localStorage.getItem('projectTemplateId'),
"remark": "",
"stageId": 0
}
@@ -996,7 +1005,7 @@ export default defineComponent({
"flag": true,
"name": "",
"projectTaskId": 0,
"projectTemplateId": store.state.projectTemplateId,
"projectTemplateId": localStorage.getItem('projectTemplateId'),
"stageId": 0,
"type": 0
}
@@ -1010,7 +1019,7 @@ export default defineComponent({
}
const getScoreRule = () => {
scoreRule({
projectId: store.state.projectTemplateId,
projectId: localStorage.getItem('projectTemplateId'),
})
.then((res) => {
console.log("获取了项目积分规则", res.data.data);
@@ -1065,7 +1074,7 @@ export default defineComponent({
},
],
leaderScore: state.seven1,
projectId: store.state.projectTemplateId,
projectId: localStorage.getItem('projectTemplateId'),
signScore: state.six1,
topCompleteCourseItem: [
{
@@ -1607,7 +1616,7 @@ export default defineComponent({
}
.ntc_body {
margin-left: 34px;
margin-left: 35px;
margin-right: 34px;
.ntc_switch {
display: flex;

View File

@@ -195,7 +195,7 @@
tree-default-expand-all
:tree-data="classifyList2"
:fieldNames="{
children: 'children',
children: 'treeChildList',
label: 'name',
value: 'id',
}"
@@ -769,6 +769,7 @@ export default {
{ value: 2, label: "将小米" },
{ value: 3, label: "刘孟君" },
]);
//获取
//选择处理项目经理
let manager = "";

View File

@@ -1124,7 +1124,10 @@
:selectProjectId="selectProjectId"
/>
<!-- 授权名单抽屉 -->
<proj-power-list v-model:ProjPvisible="ProjPvisible" />
<proj-power-list
v-model:ProjPvisible="ProjPvisible"
:selectProjectId="selectProjectId"
/>
<!-- 查看权抽屉 -->
<proj-check-ship
v-model:ProjCheckvisible="ProjCheckvisible"
@@ -2253,7 +2256,7 @@ export default {
<a-select-option value="权限名单" label="权限名单">
<div
onClick={() => {
showProjPrower();
showProjPrower(value.record.projectId);
}}
>
权限名单
@@ -2273,7 +2276,7 @@ export default {
<div
onClick={() => {
console.log("点击了111");
showProjCheck();
showProjCheck(value.record.projectId);
}}
>
查看权
@@ -2355,7 +2358,7 @@ export default {
<a-select-option value="权限名单" label="权限名单">
<div
onClick={() => {
showProjPrower();
showProjPrower(value.record.projectId);
}}
>
权限名单
@@ -2375,7 +2378,7 @@ export default {
<div
onClick={() => {
console.log("点击了111");
showProjCheck();
showProjCheck(value.record.projectId);
}}
>
查看权
@@ -2444,7 +2447,7 @@ export default {
<a-select-option value="权限名单" label="权限名单">
<div
onClick={() => {
showProjPrower();
showProjPrower(value.record.projectId);
}}
>
权限名单
@@ -2464,7 +2467,7 @@ export default {
<div
onClick={() => {
console.log("点击了111");
showProjCheck();
showProjCheck(value.record.projectId);
}}
>
查看权
@@ -2565,7 +2568,7 @@ export default {
<a-select-option value="权限名单" label="权限名单">
<div
onClick={() => {
showProjPrower();
showProjPrower(value.record.projectId);
}}
>
权限名单
@@ -2585,7 +2588,7 @@ export default {
<div
onClick={() => {
console.log("点击了111");
showProjCheck();
showProjCheck(value.record.projectId);
}}
>
查看权
@@ -2659,7 +2662,7 @@ export default {
<a-select-option value="权限名单" label="权限名单">
<div
onClick={() => {
showProjPrower();
showProjPrower(value.record.projectId);
}}
>
权限名单
@@ -2679,7 +2682,7 @@ export default {
<div
onClick={() => {
console.log("点击了111");
showProjCheck();
showProjCheck(value.record.projectId);
}}
>
查看权
@@ -2732,7 +2735,7 @@ export default {
<a-select-option value="权限名单" label="权限名单">
<div
onClick={() => {
showProjPrower();
showProjPrower(value.record.projectId);
}}
>
权限名单
@@ -2752,7 +2755,7 @@ export default {
<div
onClick={() => {
console.log("点击了111");
showProjCheck();
showProjCheck(value.record.projectId);
}}
>
查看权
@@ -2906,7 +2909,7 @@ export default {
<a-select-option value="权限名单" label="权限名单">
<div
onClick={() => {
showProjPrower();
showProjPrower(value.record.projectId);
}}
>
权限名单
@@ -2926,7 +2929,7 @@ export default {
<div
onClick={() => {
console.log("点击了111");
showProjCheck();
showProjCheck(value.record.projectId);
}}
>
查看权
@@ -3257,10 +3260,12 @@ export default {
state.ProjOwnervisible = true;
state.selectProjectId = id;
};
const showProjPrower = () => {
const showProjPrower = (id) => {
state.selectProjectId = id;
state.ProjPvisible = true;
};
const showProjCheck = () => {
const showProjCheck = (id) => {
state.selectProjectId = id;
state.ProjCheckvisible = true;
};
const showProjManage = () => {

View File

@@ -48,7 +48,6 @@
import { reactive, defineComponent, toRefs, onMounted } from "vue";
import { message } from "ant-design-vue";
import { useRouter } from "vue-router";
import { useStore } from "vuex";
import * as api from "@/api/indexTemplate"
const columns1 = [
@@ -93,7 +92,6 @@ const columns1 = [
export default defineComponent({
name: "TemplateLibrary",
setup() {
const store = useStore();
// 编辑页面跳转过来时候,自动填充表格
const router = useRouter();
const state = reactive({
@@ -101,7 +99,7 @@ export default defineComponent({
time:null,
currentPage: 1,
pageSize: 10,
total:0,
total:50,
tableData1: [
{
key: "1",
@@ -244,7 +242,7 @@ export default defineComponent({
};
const toLibraryAdd = (id) => {
router.push("/libraryAdd");
store.state.projectTemplateId = id
localStorage.setItem("projectTemplateId",id);
}
return {

View File

@@ -1045,7 +1045,6 @@
import draggable from "vuedraggable";
import { storage } from "../../api/storage";
import UnlockMode from "../../components/drawers/UnlockMode.vue";
import {useStore} from "vuex";
// import * as api1 from "../../api/index1";
const drawercolumns = [
@@ -1106,7 +1105,6 @@
UnlockMode,
},
setup() {
const store = useStore();
const state = reactive({
projectId: storage.get("projectId")
? JSON.parse(storage.get("projectId"))
@@ -1509,7 +1507,7 @@
const getTask = () => {
state.tableData = []
api
.templateDetail(store.state.projectTemplateId)
.templateDetail(localStorage.getItem('projectTemplateId'))
.then((res) => {
if (res.status == 200) {
console.log("22222", res.data.data.stageList);
@@ -1710,7 +1708,7 @@
if (state.updateStageID) {
let obj = {
name: state.valuesname,
projectTemplateId: store.state.projectTemplateId,
projectTemplateId: localStorage.getItem("templateStageId"),
remark: state.valuesnotice,
stageId:state.updateStageID,
};
@@ -1732,7 +1730,7 @@
} else {
let obj = {
name: state.valuesname,
projectTemplateId: store.state.projectTemplateId,
projectTemplateId: localStorage.getItem("templateStageId"),
remark: state.valuesnotice,
stageId:0,
};

View File

@@ -318,14 +318,12 @@ import { useRouter, useRoute } from "vue-router";
// import dayjs from "dayjs";
import * as api from "../../api/indexTemplate";
import { storage } from "../../api/storage";
import {useStore} from "vuex";
// import { toDate } from "../../api/method";
import dayjs from "dayjs";
export default {
name: "projectAdd",
setup() {
const store = useStore();
// 编辑页面跳转过来时候,自动填充表格
const routers = useRoute();
const isEdit = ref(false);
@@ -641,7 +639,7 @@ export default {
"courseSyncFlag": state.projectInfo.courseSyncFlag? 1:0,
"notice": "",
"noticeFlag": 0,
"projectTemplateId": store.state.projectTemplateId,
"projectTemplateId": localStorage.getItem("projectTemplateId"),
"remark": "",
"status": 0,

View File

@@ -8,13 +8,12 @@
*/
const { defineConfig } = require("@vue/cli-service");
module.exports = defineConfig({
publicPath: '/manage',
publicPath: "/manage",
// transpileDependencies: true,
devServer: {
port: 8080,
proxy: {
"/manageApi": {
// target:"http://192.168.19.246:30001",
// target:"http://192.168.100.208:30001",
target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
changeOrigin: true, //表示是否改变原域名