hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-21 16:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2022-12-03 19:57:55 +08:00
parent fc6478dd28 966c47d3f1
commit b49e47749d
14 changed files with 1647 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

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

2
src/api/config.js
View File

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

4
src/components/drawers/AddFaceteach.vue
View File

@@ -30,7 +30,11 @@
</div>
<div class="btnbox">
<button class="xkbtn" @click="showDrawerSelFacet">
<!--
{{ chooseCourse == null ? "选择" : chooseCourseName }}面授课
</button> -->
{{ chooseCourse == null ? "选择" : "重选" }}面授课
</button>
<div v-if="chooseCourse">
<a-tag closable color="processing" @close="logC">

40
src/components/drawers/AddTest.vue
View File

@@ -114,26 +114,20 @@
</a-menu>
</template>
</a-dropdown> -->
<span style="margin-left: 10px">
<a-tag
class="tag-style"
v-if="paperName != ''"
:closable="true"
@close="delTag"
>{{ paperName }}</a-tag
>
<!-- <a-tag
class="tag-style"
v-for="item in choosedTestList"
:closable="true"
@close="closeTag(item.key)"
:key="item.key"
>{{ item.value }}</a-tag
> -->
</span>
<a-tag v-if="paperName != ''" closable color="processing" @close="delTag">
<span style="font-size:14px;line-height: 33px;">删除考试</span>
</a-tag>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="btnbox">
<a-form-item has-feedback label="考试时间" name="choosedTime">
@@ -721,9 +715,13 @@ export default {
scoringModel: formState.scoringModel,
showAnalysis: formState.showAnalysis,
showAnswers: formState.showAnswers,
examinationTestId: state.id,
examinationTestName: state.testName,
examinationTestId: state.paperId,
examinationTestName: state.paperName,
};
if(!(state.paperId >0)){
message.destroy();
return message.error("请选择考试");
}
if (props.edit) {
// 编辑任务
updateExamination(obj)
@@ -732,6 +730,7 @@ export default {
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`编辑失败`);
});
} else {
@@ -742,6 +741,7 @@ export default {
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`创建失败`);
});
}
@@ -852,6 +852,7 @@ export default {
state.id = value.id;
state.testName = value.testName;
};
return {
formState,
afterVisibleChange,
@@ -876,6 +877,7 @@ export default {
chooseTest,
closeTag,
getData,
...toRefs(state),
};
},

144
src/components/drawers/ProjCheckPower.vue
View File

@@ -118,6 +118,7 @@
columnWidth: 20,
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
preserveSelectedRowKeys: true,
}"
/>
<div class="pa">
@@ -316,6 +317,7 @@
columnWidth: 30,
selectedRowKeys: selectedRowKeys2,
onChange: onSelectChange2,
preserveSelectedRowKeys: true,
}"
/>
<div class="pa" style="margin-top: 20px">
@@ -598,6 +600,14 @@ export default {
type: Number,
default: null,
},
classify: {
type: String,
default: "",
},
selectProjectId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const store = useStore();
@@ -792,9 +802,35 @@ export default {
deleteAll();
// console.log("expandedKeys", state.expandedKeys);
state.expandedKeys = [];
state.tabledata = [];
//快速选人
state.currentPage = 1;
state.tableDataTotal = 0;
state.nameSearch = ""; //搜索名称
//受众
state.currentPage2 = 1;
state.tableDataTotal2 = 0;
state.audienceName = "";
state.currentPage1 = 1;
state.tableDataTotal1 = 0;
state.selectedKeys = [];
state.selectOrgId = null; //选中的组织id
state.selectOrgName = null; //选中的组织名称
state.searchOrgName = null;
state.isSearchOrg = false;
state.treeData2 = [];
getAudienceInfo();
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
if (bool) {
optionAuthPerm();
}
};
//获取组织树
state.treeData = computed(() => {
@@ -866,12 +902,13 @@ export default {
//分页获取学员
const changePagination = (page) => {
state.currentPage = page;
console.log("1111111");
console.log("1111111", state.selectedRowKeys, state.choosepeople);
getMember(state.selectOrgId);
};
//搜索学员
const handleSearchStu = () => {
deleteDepSelect();
state.currentPage = 1;
state.currentPage2 = 1;
console.log("22222");
getMember();
@@ -891,10 +928,20 @@ export default {
};
//快速选人 选中的数组
const onSelectChange = (selectedRowKeys, item) => {
// console.log("selectedRowKeys changed: ", selectedRowKeys,item);
state.selectedRowKeys.push(selectedRowKeys[selectedRowKeys.length - 1]);
state.choosepeople.unshift(item[item.length - 1]);
console.log("selectedRowKeys changed: ", selectedRowKeys, item);
state.selectedRowKeys = selectedRowKeys;
state.choosepeople = item.reverse();
selectedsHeight();
// if (selectedRowKeys.length > 0 && item.length > 0) {
// state.selectedRowKeys.push(selectedRowKeys[selectedRowKeys.length - 1]);
// state.choosepeople.unshift(item[item.length - 1]);
// // console.log(
// // "selectedRowKeys changed22222: ",
// // state.selectedRowKeys,
// // state.choosepeople
// // );
// }
};
//单个删除选中的人
const deleteChoosePeople = (item) => {
@@ -920,7 +967,7 @@ export default {
resize.listenTo(
document.getElementById("ProjCheckship").querySelector("#selecteds"),
function (ele) {
console.log("ele", ele.offsetHeight);
console.log("ele", ele.clientHeight, ele.offsetHeight);
if (ele.offsetHeight > 160 && !state.showHidden) {
state.showMore = true;
document
@@ -1047,7 +1094,7 @@ export default {
}
}
// console.log("选中的部门2", state.selectedKeys1, state.chooseorganization);
console.log("选中的部门2", state.selectedKeys1, state.chooseorganization);
};
//点击确认添加-判断是否显示确定弹窗
const addOrgModal = () => {
@@ -1070,19 +1117,19 @@ export default {
state.showOrgModal = false;
};
//单个删除选中的人
//单个删除选中的组织
const deleteChoosePeople1 = (item) => {
console.log("item", item);
console.log("item", item, state.chooseorganization);
let arr = state.chooseorganization;
for (let i = 0; i < arr.length; i++) {
if (arr[i].key === item.key) {
if (arr[i].id === item.id) {
arr.splice(i, 1);
}
}
state.chooseorganization = arr;
let array = state.selectedKeys1;
for (let i = 0; i < array.length; i++) {
if (array[i] === item.key) {
if (array[i] === item.id) {
array.splice(i, 1);
}
}
@@ -1193,8 +1240,10 @@ export default {
//受众关联 选中的数组
const onSelectChange2 = (selectedRowKeys, item) => {
// console.log("selectedRowKeys changed: ", selectedRowKeys, item);
state.selectedRowKeys2.push(selectedRowKeys[selectedRowKeys.length - 1]);
state.relationpeople.unshift(item[item.length - 1]);
state.selectedRowKeys2 = selectedRowKeys;
state.relationpeople = item.reverse();
// state.selectedRowKeys2.push(selectedRowKeys[selectedRowKeys.length - 1]);
// state.relationpeople.unshift(item[item.length - 1]);
selectedsHeight2();
};
@@ -1331,6 +1380,73 @@ export default {
ctx.emit("update:addAuthList", state.selectAllArr);
closeDrawer();
};
//获取授权 坐回显
const optionAuthPerm = () => {
let obj = {
keyWord: "",
type:
props.classify === "learnPath"
? 1
: props.classify === "project"
? 2
: props.classify === "course"
? 3
: null,
tag: props.authClassify === 1 ? 3 : props.authClassify === 2 ? 4 : "",
opt: 1,
refId: props.selectProjectId,
pageNo: 0,
pageSize: 0,
deptList: [],
groupList: [],
studentList: [],
};
console.log("获取权限名单obj", obj);
api
.optionAuthPerm(obj)
.then((res) => {
// console.log("获取权限名单成功", res);
if (res.data.code === 200) {
let studentArr = res.data.data.studentList;
let selectedRowKeys = [];
let choosepeople = [];
for (let i = 0; i < studentArr.length; i++) {
selectedRowKeys.push(studentArr[i].id);
choosepeople.push(studentArr[i]);
}
//快速选人
state.selectedRowKeys = selectedRowKeys;
state.choosepeople = choosepeople;
let deptArr = res.data.data.deptList;
let selectedKeys1 = [];
let chooseorganization = [];
for (let i = 0; i < deptArr.length; i++) {
selectedKeys1.push(deptArr[i].id);
chooseorganization.push(deptArr[i]);
}
//组织
state.selectedKeys1 = selectedKeys1;
state.chooseorganization = chooseorganization;
state.chooseorganization1 = chooseorganization;
let groupArr = res.data.data.groupList;
let selectedRowKeys2 = [];
let relationpeople = [];
for (let i = 0; i < groupArr.length; i++) {
selectedRowKeys2.push(groupArr[i].id);
relationpeople.push(groupArr[i]);
}
//受众
state.selectedRowKeys2 = selectedRowKeys2;
state.relationpeople = relationpeople;
console.log("获取权限名单成功", res);
}
})
.catch((err) => {
console.log("获取权限名单失败", err);
});
};
return {
...toRefs(state),
@@ -1374,6 +1490,7 @@ export default {
resetOrg,
submitAuth,
optionAuthPerm,
};
},
};
@@ -1904,7 +2021,9 @@ export default {
margin-right: 32px;
margin-left: 32px;
min-height: 100px;
// height: 170px;
// overflow: hidden;
flex-shrink: 0;
.chose {
// width: 64px;
padding-left: 10px;
@@ -1920,6 +2039,7 @@ export default {
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
flex-shrink: 0;
.ch {
position: absolute;
width: 18px;

15
src/components/drawers/ProjPowerList.vue
View File

@@ -133,6 +133,7 @@
<script>
import { toRefs, reactive } from "vue";
import * as api from "../../api/index1";
import { message } from "ant-design-vue";
export default {
name: "ProjPowerList",
props: {
@@ -172,6 +173,7 @@ export default {
// },
],
cancelAuthInfo: null, //取消授权id
cancelAuthState: null, //取消授权种类
});
const closeDrawer = () => {
@@ -199,6 +201,7 @@ export default {
name: item.name,
};
state.cancelAuthInfo = obj;
state.cancelAuthState = item.state;
};
const closeCancelModal = () => {
state.cancelModal = false;
@@ -364,7 +367,14 @@ export default {
: props.classify === "course"
? 3
: null,
tag: 1,
tag:
state.cancelAuthState === "归属权"
? 2
: state.cancelAuthState === "查看权"
? 3
: state.cancelAuthState === "管理权"
? 4
: null,
opt: 4,
refId: props.selectProjectId,
pageNo: 1,
@@ -373,7 +383,7 @@ export default {
groupList: [],
studentList: [state.cancelAuthInfo],
};
console.log("取消权限名单obj", obj);
console.log("取消权限名单obj", obj, state.cancelAuthState);
api
.optionAuthPerm(obj)
.then((res) => {
@@ -381,6 +391,7 @@ export default {
if (res.data.code === 200) {
// console.log("取消授权成功", res.data.data);
optionAuthPerm();
message.success("取消授权成功");
closeCancelModal();
}
})

61
src/components/drawers/ProjectOwn.vue
View File

@@ -28,13 +28,13 @@
<div class="nameinp">
<div class="namee">姓名：</div>
<a-input
v-model:value="name"
v-model:value="nameSearch"
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
</div>
<div class="btns">
<div class="btn1">
<div class="btn1" @click="handleSearchStu">
<div class="img1">
<img
src="../../assets/images/courseManage/search0.png"
@@ -42,7 +42,7 @@
</div>
<div class="wz">搜索</div>
</div>
<div class="btn2">
<div class="btn2" @click="resetStu">
<div class="img2">
<img
src="../../assets/images/courseManage/reset1.png"
@@ -242,7 +242,7 @@ export default {
valueSelect: null, //树形选择
valueSelectboe2: null, //boe树形选择
name: "",
nameSearch: "",
nameadd: "",
nameaddd: "",
com: "",
@@ -317,6 +317,18 @@ export default {
ctx.emit("update:ProjOwnervisible", false);
state.openKeys = [];
state.isDisabled = true;
state.nameSearch = "";
state.tabledata = [];
state.currentPage = 1;
state.selectedKeys = [];
state.valueSelectboe = null;
state.choosepeople = []; //选中的组织名称
state.selectDepartment = null; //选中部门名称
state.showMore = false; //是否显示快速选人的查看更多
state.showHidden = false; //是否显示收回
state.selectedRowKeys = []; //表格选中的key
state.selectPeopleArr = []; //表格选中的人
};
const afterVisibleChange = (bool) => {
@@ -336,16 +348,22 @@ export default {
});
//获取选中部门的人员信息
const getPeoples = () => {
if (!state.nameSearch && !state.selectedKeys[0]) {
state.tableDataTotal = 0;
return false;
}
// console.log("org", org);
let obj = {
org: state.selectedKeys[0],
pageNo: state.currentPage,
pageSize: state.pageSize,
keyWord: state.nameSearch,
org: state.nameSearch ? null : state.selectedKeys[0],
};
if (!state.selectedKeys[0]) {
state.tableDataTotal = 0;
return;
}
// console.log("obj", obj);
// if (!state.selectedKeys[0]) {
// state.tableDataTotal = 0;
// return;
// }
console.log("obj", obj);
api
.getMemberInfo(obj)
.then((res) => {
@@ -373,7 +391,26 @@ export default {
console.log("获取学员失败", err);
});
};
//搜索学员
const handleSearchStu = () => {
// deleteDepSelect();
state.currentPage = 1;
console.log("22222");
getPeoples();
};
//重置
const resetStu = () => {
state.nameSearch = "";
state.currentPage = 1;
state.tableDataTotal = 0;
state.tabledata = [];
};
// //清空选择部门信息
// const deleteDepSelect = () => {
// state.selectedKeys = null;
// state.selectOrgId = null;
// state.selectOrgName = null;
// };
//分页
const changePagination = () => {
getPeoples();
@@ -610,6 +647,8 @@ export default {
changeOwnership,
addAuth,
removeClick,
handleSearchStu,
resetStu,
};
},
};

17
src/components/drawers/SelFacet.vue
View File

@@ -29,6 +29,7 @@
/>
</div>
</div>
<!--
<div class="mii_ipt">
<div class="ipt_name">课程状态：</div>
<div class="select fitems">
@@ -44,6 +45,7 @@
</a-select>
</div>
</div>
-->
</div>
<div class="mi_btns">
<div class="btn btn1" @click="search">
@@ -134,7 +136,7 @@
</template>
<script>
//import { ApiFilled } from "@ant-design/icons-vue";
import {reactive, toRefs, ref, computed} from "vue";
import {reactive, toRefs, computed} from "vue";
// import { planList } from "../../api/indexTaskadd";
// import {detail} from "../../api/indexCourse";
import {list} from "../../api/indexTaskadd";
@@ -279,7 +281,7 @@ export default {
//获取面授课列表
const getClassList = (obj) => {
let objn = obj || {
auditStatus: state.auditStatus,
auditStatus:2,
name: state.name,
pageNo: state.currentPage,
pageSize: state.pageSize
@@ -314,7 +316,7 @@ export default {
});
state.classTableData = array;
};
/**
const options1 = ref([
{
value: 0,
@@ -328,11 +330,8 @@ export default {
value: 2,
label: "已审核",
},
{
value: -1,
label: "审核未通过",
},
]);
]);*/
const handleChange = (value, option) => {
console.log("改变了", value, option);
console.log(state.valueContent);
@@ -359,7 +358,7 @@ export default {
// showDrawerSelFacet,
afterVisibleChange,
closeDrawer,
options1,
columns1,
getClassData,
handleChange,

143
src/views/courselibrary/CoursewareManage.vue
View File

@@ -167,10 +167,10 @@
:style="{ display: hideshow ? 'block' : 'none' }"
>
<span style="color: #999ba3">
1、课程名称统一不加书名号。<br/>
1、课程名称统一不加书名号。<br />
2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先
看到的是课程内容主题。<br/>
看到的是课程内容主题。<br />
3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用
版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。
</span>
@@ -351,10 +351,10 @@
:style="{ display: hideshow ? 'block' : 'none' }"
>
<span style="color: #999ba3">
1、课程名称统一不加书名号。<br/>
1、课程名称统一不加书名号。<br />
2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先
看到的是课程内容主题。<br/>
看到的是课程内容主题。<br />
3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用
版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。
</span>
@@ -531,9 +531,10 @@
</div>
<div class="item_inp">
<div class="i1_input">
<ProjectManager v-model:value="member.value"
v-model:name="member.name"></ProjectManager>
<ProjectManager
v-model:value="member.value"
v-model:name="member.name"
></ProjectManager>
</div>
</div>
</div>
@@ -664,9 +665,7 @@
<div class="btnText">取消</div>
</div>
<div class="btn btn6" v-if="isEdit == 0" @click="handlePush">
<div class="btnText">
确定
</div>
<div class="btnText">确定</div>
</div>
<div class="btn btn6" v-if="isEdit == 1">
<div class="btnText">已保存</div>
@@ -776,7 +775,7 @@
</template>
<a>
授权
<down-outlined/>
<down-outlined />
</a>
</a-dropdown>
<a
@@ -874,7 +873,7 @@
</template>
<a>
授权
<down-outlined/>
<down-outlined />
</a>
</a-dropdown>
</span>
@@ -991,7 +990,7 @@
</template>
<a>
授权
<down-outlined/>
<down-outlined />
</a>
</a-dropdown>
<span>
@@ -1120,7 +1119,7 @@
</template>
<a>
授权
<down-outlined/>
<down-outlined />
</a>
</a-dropdown>
<a
@@ -1228,7 +1227,7 @@
</template>
<a>
授权
<down-outlined/>
<down-outlined />
</a>
</a-dropdown>
<a
@@ -1656,7 +1655,7 @@
</template>
<a>
更多
<down-outlined/>
<down-outlined />
</a>
</a-dropdown>
</span>
@@ -1777,8 +1776,10 @@
<span style="margin-right: 3px">授课教师</span>
</div>
<div class="b_input">
<ProjectManager v-model:value="member.value"
v-model:name="member.name"></ProjectManager>
<ProjectManager
v-model:value="member.value"
v-model:name="member.name"
></ProjectManager>
</div>
</div>
<div class="cstm_items">
@@ -2376,8 +2377,7 @@
:value="1"
@click="clear_jyradioV1"
>结业
</a-radio
>
</a-radio>
</div>
<div class="ol_checkbox">
<a-radio
@@ -2385,8 +2385,7 @@
:value="2"
@click="clear_jyradioV1"
>不结业
</a-radio
>
</a-radio>
</div>
</div>
</a-radio-group>
@@ -2474,13 +2473,13 @@
class="del-icons"
:style="{ display: del_hs ? 'block' : 'none' }"
>
<img src="@/assets/images/coursewareManage/notice.png" alt=""/>
<img src="@/assets/images/coursewareManage/notice.png" alt="" />
</div>
<div
class="del-icons"
:style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"
>
<img src="@/assets/images/coursewareManage/QR.png" alt=""/>
<img src="@/assets/images/coursewareManage/QR.png" alt="" />
</div>
<span>提示</span>
<div class="close_exit" @click="delete_exit1"></div>
@@ -2519,7 +2518,7 @@
<!-- <StuAdd v-model:Stuvisible="Stuvisible" @sure="handlePostSure" /> -->
<!-- 添加学员抽屉 -->
<proj-check-ship
v-model:ProjCheckvisible="Stuvisible"
v-model:ProjCheckvisible="viewpowervisible"
:selectProjectId="offcourseId"
v-model:addAuthList="addStudentList"
:authClassify="authClassify"
@@ -2545,13 +2544,13 @@
classify="course"
/>
<!-- 查看权抽屉 -->
<proj-check-ship
<!-- <proj-check-ship
v-model:ProjCheckvisible="viewpowervisible"
:selectProjectId="selectCourseId"
v-model:addAuthList="addAuthList"
:authClassify="authClassify"
classify="course"
/>
/> -->
<!-- 管理权抽屉 -->
<proj-check-ship
v-model:ProjCheckvisible="viewpowervisible"
@@ -2563,7 +2562,7 @@
</div>
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="保存中..."/>
<a-spin :spinning="addLoading" tip="保存中..." />
</div>
</template>
<script>
@@ -2577,7 +2576,7 @@ import {
onBeforeUnmount,
watch,
} from "vue";
import {message} from "ant-design-vue";
import { message } from "ant-design-vue";
// import StuAdd from "../../components/drawers/StuAdd";
// import OwnPower from "../../components/drawers/OwnPower.vue";
// import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
@@ -2611,12 +2610,12 @@ import {
getdateToDate,
} from "../../utils/utils";
// import { toDate } from "../../api/method.js";
import {fileUp} from "../../api/indexEval";
import { fileUp } from "../../api/indexEval";
import dayjs from "dayjs";
import * as api1 from "../../api/index1";
import "@wangeditor/editor/dist/css/style.css";
import {Editor, Toolbar} from "@wangeditor/editor-for-vue";
import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
import ProjectManager from "@/components/project/ProjectManager";
//列表表格
@@ -2627,7 +2626,7 @@ const columns1 = [
dataIndex: "num",
key: "num",
align: "center",
customRender: ({index}) => {
customRender: ({ index }) => {
return index + 1;
},
},
@@ -2638,7 +2637,7 @@ const columns1 = [
key: "name",
ellipsis: true,
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2648,7 +2647,7 @@ const columns1 = [
dataIndex: "contentTxt",
key: "1",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2658,7 +2657,7 @@ const columns1 = [
dataIndex: "courseform",
key: "2",
align: "center",
customRender: ({record}) => {
customRender: ({ record }) => {
switch (String(record.courseform)) {
case "1":
return "线上";
@@ -2674,7 +2673,7 @@ const columns1 = [
key: "3",
align: "center",
ellipsis: true,
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2684,7 +2683,7 @@ const columns1 = [
dataIndex: "stunum",
key: "4",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "0";
},
},
@@ -2694,7 +2693,7 @@ const columns1 = [
dataIndex: "grade",
key: "5",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "0";
},
},
@@ -2704,7 +2703,7 @@ const columns1 = [
dataIndex: "status",
key: "6",
align: "center",
customRender: ({record}) => {
customRender: ({ record }) => {
switch (String(record.status)) {
case "0":
return "未提交";
@@ -2723,7 +2722,7 @@ const columns1 = [
dataIndex: "ynpub",
key: "7",
align: "center",
customRender: ({record}) => {
customRender: ({ record }) => {
switch (String(record.ynpub)) {
case "0":
return "未发布";
@@ -2738,7 +2737,7 @@ const columns1 = [
dataIndex: "creator",
key: "8",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2748,7 +2747,7 @@ const columns1 = [
dataIndex: "createtime",
key: "9",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? getdateToTime(text * 1000) : "-";
},
},
@@ -2758,7 +2757,7 @@ const columns1 = [
dataIndex: "pubtime",
key: "10",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? getdateToTime(text * 1000) : "-";
},
},
@@ -2768,7 +2767,7 @@ const columns1 = [
key: "either",
dataIndex: "kkty",
align: "center",
customRender: ({record}) => {
customRender: ({ record }) => {
switch (String(record.kkty)) {
case "0":
return "停用";
@@ -2864,7 +2863,7 @@ const columns6 = [
key: "num",
width: "8%",
align: "center",
customRender: ({index}) => {
customRender: ({ index }) => {
//{ text, record, index, column }
return index + 1;
},
@@ -2875,7 +2874,7 @@ const columns6 = [
key: "organization",
width: "10%",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2885,7 +2884,7 @@ const columns6 = [
key: "saddress",
width: "10%",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2895,7 +2894,7 @@ const columns6 = [
key: "starttime",
width: "18%",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? getdateToTime(text * 1000) : "-";
},
},
@@ -2905,7 +2904,7 @@ const columns6 = [
key: "createtime",
width: "18%",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? getdateToTime(text * 1000) : "-";
},
},
@@ -2925,7 +2924,7 @@ const columns7 = [
dataIndex: "num",
key: "num",
align: "center",
customRender: ({index}) => {
customRender: ({ index }) => {
//{ text, record, index, column }
return index + 1;
},
@@ -2935,7 +2934,7 @@ const columns7 = [
width: 200,
dataIndex: "name",
key: "name",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2945,7 +2944,7 @@ const columns7 = [
dataIndex: "number",
key: "1",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2955,7 +2954,7 @@ const columns7 = [
dataIndex: "department",
key: "2",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2965,7 +2964,7 @@ const columns7 = [
dataIndex: "postion",
key: "3",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2975,7 +2974,7 @@ const columns7 = [
dataIndex: "band",
key: "4",
align: "center",
customRender: ({text}) => {
customRender: ({ text }) => {
return text ? text : "-";
},
},
@@ -2985,7 +2984,7 @@ const columns7 = [
dataIndex: "status",
key: "5",
align: "center",
customRender: ({record}) => {
customRender: ({ record }) => {
switch (String(record.source)) {
case "0":
return "待审核";
@@ -3002,7 +3001,7 @@ const columns7 = [
dataIndex: "join",
key: "6",
align: "center",
customRender: ({record}) => {
customRender: ({ record }) => {
switch (String(record.source)) {
case "1":
return "手动加入";
@@ -3017,7 +3016,7 @@ const columns7 = [
dataIndex: "signstatus",
key: "7",
align: "center",
customRender: ({record}) => {
customRender: ({ record }) => {
switch (String(record.source)) {
case "0":
return "未签到";
@@ -3034,7 +3033,7 @@ const columns7 = [
dataIndex: "evastatus",
key: "8",
align: "center",
customRender: ({record}) => {
customRender: ({ record }) => {
switch (String(record.source)) {
case "0":
return "未评估";
@@ -3096,7 +3095,7 @@ export default defineComponent({
teacher: null,
selectedRowKeys7: [],
isEdit: 0,
member: {name: '', value: ''},
member: { name: "", value: "" },
//列表表格
tableData1: [
// {
@@ -3339,7 +3338,7 @@ export default defineComponent({
});
const showStuAdd = () => {
state.Stuvisible = true;
state.viewpowervisible = true;
};
// 富文本 sssssssssssssss
@@ -3354,7 +3353,7 @@ export default defineComponent({
// }, 1500);
});
const toolbarConfig = {};
const editorConfig = {placeholder: "请输入内容..."};
const editorConfig = { placeholder: "请输入内容..." };
// 组件销毁时，也及时销毁编辑器
onBeforeUnmount(() => {
const editor = editorRef.value;
@@ -3499,7 +3498,7 @@ export default defineComponent({
endTime: endTime,
beginTime: startTime,
});
const {rows, total} = res.data.data;
const { rows, total } = res.data.data;
state.tableDataTotal1 = total;
const datas = traverseArr(
rows,
@@ -3778,7 +3777,7 @@ export default defineComponent({
// console.log("获取学员信息", obj);
let res = await studentList(obj);
// console.log("获取学员列表", res);
const {rows, total} = res.data.data;
const { rows, total } = res.data.data;
state.tableDataTotal3 = total;
rows.forEach((item, index) => {
rows[index] = {
@@ -3878,7 +3877,7 @@ export default defineComponent({
console.log("获取开课", obj);
let res = await planList(obj);
console.log("开课res", res);
const {rows, total} = res.data.data;
const { rows, total } = res.data.data;
state.tableDataTotal222 = total;
const datas = traverseArr(
rows,
@@ -4090,7 +4089,7 @@ export default defineComponent({
};
const createkk = () => {
state.offcoursePlanId = null;
state.member = {}
state.member = {};
state.cstm_hs = true;
};
const handleCancelStu = () => {
@@ -4198,7 +4197,7 @@ export default defineComponent({
state.xjkkradioV1 = "";
}
*/
state.member = {value: item.teacherId, name: item.teacher};
state.member = { value: item.teacherId, name: item.teacher };
state.cstm_hs = true;
state.kk_eidt = true;
@@ -4533,7 +4532,7 @@ export default defineComponent({
.catch((err) => {
console.log("获取授课教师失败", err);
});
const {rows, total} = item1;
const { rows, total } = item1;
state.tableDataTotalTea1 = total;
state.tableDataTotalTea2 = total;
let newArr = [];
@@ -4591,7 +4590,7 @@ export default defineComponent({
state.teacher = item.teacher;
state.teacherId = item.teacherId;
state.qdms_inputV6 = item.intro;
state.member = {value: item.teacherId, name: item.teacher};
state.member = { value: item.teacherId, name: item.teacher };
if (item.attach == "") {
state.imgList = [];
@@ -4599,10 +4598,10 @@ export default defineComponent({
if (item.attach.indexOf(",")) {
const arr = item.attach.split(",");
arr.forEach((item) => {
state.imgList.push({img: item});
state.imgList.push({ img: item });
});
} else {
state.imgList = [{img: item.attach}];
state.imgList = [{ img: item.attach }];
}
}
@@ -4786,7 +4785,7 @@ export default defineComponent({
}).then((res) => {
console.log(res);
if (res.data.code === 200) {
state.Stuvisible = false;
state.viewpowervisible = false;
getTableDate2();
}
});

16
src/views/learningpath/LearningPath.vue
View File

@@ -589,20 +589,20 @@
/>
<!-- 查看权抽屉 -->
<proj-check-ship
v-model:ProjCheckvisible="Queryvisible"
:selectProjectId="selectPathId"
v-model:ProjCheckvisible="showCheck"
v-model:selectProjectId="selectPathId"
v-model:addAuthList="addAuthList"
:authClassify="authClassify"
v-model:authClassify="authClassify"
classify="learnPath"
/>
<!-- 管理权抽屉 -->
<proj-check-ship
<!-- <proj-check-ship
v-model:ProjCheckvisible="Managevisible"
:selectProjectId="selectPathId"
v-model:addAuthList="addAuthList"
:authClassify="authClassify"
classify="learnPath"
/>
/> -->
<!-- 创建路径loading -->
<!-- 更多背景图 v-model:visible="learnBgMore" -->
@@ -733,6 +733,7 @@ export default {
PLvisible: false, //授权名单抽屉
Queryvisible: false, //查看权抽屉
Managevisible: false, //管理权抽屉
showCheck: false,
value1: "",
value2: "",
@@ -991,12 +992,12 @@ export default {
const showQuery = (id) => {
state.authClassify = 1;
state.selectPathId = id;
state.Queryvisible = true;
state.showCheck = true;
};
const showManage = (id) => {
state.authClassify = 2;
state.selectPathId = id;
state.Managevisible = true;
state.showCheck = true;
};
const getTableDate = (tableData) => {
let data = tableData;
@@ -1713,6 +1714,7 @@ export default {
});
}
);
return {
...toRefs(state),
selectProjectName,

27
src/views/learningpath/LevelAdd.vue
View File

@@ -98,7 +98,7 @@
<div class="taskmain">快速创建项目详情</div>
</div>
<div class="second">
<router-link :to="{ path: '/leveladddetail' }">
<div @click="totask">
<div
class="taskbox"
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
@@ -117,10 +117,10 @@
</div>
<div class="centermain">快速添加任务/关卡</div>
</div>
</router-link>
</div>
<div
class="taskbox"
@click="showAddStu"
@click="tostudent"
style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
>
<div class="leftt">
@@ -460,7 +460,7 @@
</div>
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">{{ item.beginTime }}</div>
<div class="timetext">{{ item.startTime!==null?item.startTime[0]+'-'+ item.startTime[1]+'-'+item.startTime[2]:''}}</div>
</div>
<div class="progress">
<div class="progresstext">
@@ -773,7 +773,7 @@
</div>
<div class="btnbox" style="margin: 20px">
<a-upload
v-if="(docChecked==true)"
v-if="docChecked == true"
v-model:file-list="fileList"
name="file"
action="/manageApi/file/upload"
@@ -790,7 +790,11 @@
alt=""
/>
</a-upload>
<div v-if="(docChecked==true)" class="btnbox" style="margin: 20px">
<div
v-if="docChecked == true"
class="btnbox"
style="margin: 20px"
>
<span style="color: #999999">
支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
</span>
@@ -2115,6 +2119,15 @@ export default {
});
}
);
const totask = () => {
state.activeKey = "2";
};
const tostudent = () => {
state.activeKey = "3";
getStudent();
// state.activeKey1 = "8";
};
return {
...toRefs(state),
...toRefs(levelList),
@@ -2166,6 +2179,8 @@ export default {
setconfig,
deFile,
deleteStu,
totask,
tostudent,
};
},
};

415
src/views/projectcenter/ProjectManage.vue
View File

File diff suppressed because it is too large Load Diff

2
src/views/projectcenter/TaskPage.vue
View File

@@ -429,7 +429,7 @@
</div>
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">{{item.createTime?toDate(Number(item.createTime),"Y-M-D"):'---'}}</div>
<div class="timetext">{{item.startTime!==null?item.startTime[0]+'-'+ item.startTime[1]+'-'+item.startTime[2]:''}}</div>
</div>
<div class="progress">
<div class="progresstext">

1
vue.config.js
View File

@@ -15,7 +15,6 @@ module.exports = defineConfig({
proxy: {
"/manageApi": {
target:"http://111.231.196.214:30001/",
// target: "http://localhost:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
changeOrigin: true, //表示是否改变原域名
// secure: false,
// ws: false, //表示WebSocket协议