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

Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

Browse Source
This commit is contained in:
zhangyc
2022-12-08 17:14:19 +08:00
parent d74443e12b 2749baf7c6
commit 89ff5d6752
15 changed files with 229 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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-08 08:48:26
* @LastEditTime: 2022-12-08 15:47:05
* @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -56,7 +56,7 @@ http.interceptors.response.use(
return response;
} else {
if (code === 1000) {
window.open("https://u-pre.boe.com/web/", '_self');
// window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self');
}
console.log("api %o", msg);

BIN
src/assets/images/coursewareManage/docpic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/assets/images/coursewareManage/pdfpic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/assets/images/coursewareManage/pngpic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/assets/images/coursewareManage/pptpic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/assets/images/coursewareManage/xlspic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/assets/images/coursewareManage/zippic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

2
src/components/TwoDimensionalCode.vue
View File

@@ -7,7 +7,7 @@
:closable="closableQR"
wrapClassName="codeModal"
style="margin-top: 400px"
:zIndex="999"
:zIndex="9999"
@cancel="qr_exit"
>
<div id="qrcode" class="QR">

2
src/components/drawers/AddEval.vue
View File

@@ -214,7 +214,7 @@ export default {
await addTempTask({
courseId: Number(value.evaluationId),
name: value.evaluationName,
projectTemplateId: props.projectTemplateId,
projectTemplateId: Number(localStorage.getItem("projectTemplateId")),
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 10,

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

@@ -1626,8 +1626,16 @@
<a
@click="
() => {
QR_hs = true;
ftsQR_hs = true;
//QR_hs = true;
//ftsQR_hs = true;
codevisible = true;
codeIndex = 0;
codeType = 0;
codeInfo = {
title: '面授课签到',
name: record.name,
url: codeUrl,
};
}
"
>
@@ -1675,8 +1683,16 @@
<a-menu-item
@click="
() => {
QR_hs = true;
vipftQR_hs = true;
//QR_hs = true;
//vipftQR_hs = true;
codevisible = true;
codeIndex = 1;
codeType = 1;
codeInfo = {
title: '面授课二维码',
name: record.name,
url: codeUrl,
};
}
"
>
@@ -2626,6 +2642,15 @@
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="" />
</div>
<!-- 二维码弹窗 -->
<two-dimensional-code
v-model:codevisible="codevisible"
:codeInfo="codeInfo"
:index="codeIndex"
:type="codeType === 1 ? '课程二维码' : '签到二维码'"
/>
<!-- 二维码弹窗 -->
</template>
<script>
import {
@@ -2687,7 +2712,8 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
import SeeModal from "./components/seeModal.vue";
import CourseModal from "./courseModal.vue";
import * as moment from "moment";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import { codeUrl } from "../../api/method";
//列表表格
const columns1 = [
{
@@ -3203,6 +3229,7 @@ export default defineComponent({
// return attrs.vnodes;
// },
addOnlineCourse,
TwoDimensionalCode,
},
setup() {
const CourseModalRef = ref(null);
@@ -3471,6 +3498,9 @@ export default defineComponent({
assessmentId: null,
assessmentName: "",
assessmentVisible: false,
codevisible: false, //二维码弹窗
codeInfo: null, //二维码内容
codeUrl: codeUrl,
});
const showStuAdd = (record) => {
@@ -3977,7 +4007,7 @@ export default defineComponent({
};
// console.log("获取学员信息", obj);
let res = await studentList(obj);
// console.log("获取学员列表", res);
console.log("获取学员列表", res);
const { rows, total, pageNo } = res.data.data;
state.tableDataTotal3 = total;
@@ -4102,6 +4132,7 @@ export default defineComponent({
address: "address",
starttime: "beginTime",
createtime: "createTime",
createName: "createName",
},
true
);
@@ -4109,6 +4140,7 @@ export default defineComponent({
itm.pageNo = pageNo;
});
state.tableData6 = datas;
console.log("state.tableData6", state.tableData6);
};
const options1 = ref([
@@ -4194,7 +4226,13 @@ export default defineComponent({
message.destroy();
return message.warning("请输入必填项");
}
console.log(" state.valueE1", state.valueE1,!state.bs_hs && state.valueE1 == 2,state.bs_hs,state.valueE1 == 2);
console.log(
" state.valueE1",
state.valueE1,
!state.bs_hs && state.valueE1 == 2,
state.bs_hs,
state.valueE1 == 2
);
if (state.bs_hs && state.valueE1 == 2) {
state.of_hs = false;
// state.ft_hs = true;
@@ -4841,8 +4879,6 @@ export default defineComponent({
};
//编辑面授课
const handleEdit = async (itm, type) => {
console.log(45555);
console.log(itm);
if (type === "1") {

18
src/views/courselibrary/components/seeModal.vue
View File

@@ -160,7 +160,23 @@
:key="index"
>
<div class="file_img">
<img :src="item.img" />
<img v-if="(item.indexOf('jpg')!==-1 ||item.indexOf('jpeg')!==-1 ||item.indexOf('png')!==-1 )" src="@/assets/images/coursewareManage/pngpic.png" />
<div v-else>
<img v-if="(item.indexOf('doc')!==-1)" src="@/assets/images/coursewareManage/docpic.png" />
<div v-else>
<img v-if="(item.indexOf('xls')!==-1)" src="@/assets/images/coursewareManage/xlspic.png" />
<div v-else>
<img v-if="(item.indexOf('ppt')!==-1)" src="@/assets/images/coursewareManage/pptpic.png" />
<div v-else>
<img v-if="(item.indexOf('pdf')!==-1)" src="@/assets/images/coursewareManage/pdfpic.png" />
<div v-else>
<img v-if="(item.indexOf('zip')!==-1)" src="@/assets/images/coursewareManage/zippic.png" />
<img v-else src="@/assets/images/coursewareManage/docpic.png" />
</div>
</div>
</div>
</div>
</div>
</div>
<div class="file_detail">
<div class="file_name">

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

@@ -1448,7 +1448,7 @@ export default {
addAuthList: [],
codevisible: false, //二维码是否显示
codeInfo: null, //二维码标题
codeInfo: null, //二维码内容
});
const levelList = reactive({

3
src/views/projectcenter/LibraryAdd.vue
View File

@@ -964,7 +964,10 @@ export default defineComponent({
console.log("data=====", data);
for (let i in data) {
console.log("what ------ > ", i, data);
if(data[i].taskList.length!==0){
state.taskSyllabus.push({ text: data[i].name?data[i].name:'无阶段任务', children: [] });
}
for (let j in data[i].taskList) {
state.taskSyllabus[i].children.push({
course: checkType(data[i].taskList[j].type),

57
src/views/projectcenter/ProjectAdd.vue
View File

@@ -84,7 +84,12 @@
allowClear
></a-select>
<img
style="width:100px;height:100px;margin-top:20px;border-radius: 8px"
style="
width: 100px;
height: 100px;
margin-top: 20px;
border-radius: 8px;
"
v-if="projectInfo.picUrl"
:src="projectInfo.picUrl"
alt="avatar"
@@ -300,7 +305,7 @@ import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManagerNew";
import ProjectLevel from "@/components/project/ProjectLevel";
import { changeOwnership, scrollLoad } from "@/api/method";
import { storage } from "../../api/storage";
export default {
name: "projectAdd",
components: {
@@ -329,16 +334,19 @@ export default {
},
classifyList5: [],
courseSyncFlag: false,
picUrlName:'请选择封面图'
picUrlName: "请选择封面图",
});
// 封面图选择
const handleChangeSelect = (value) => {
console.log(value)
state.projectInfo.picUrl= value
}
console.log(value);
state.projectInfo.picUrl = value;
};
onMounted(() => {
state.projectPic = store.state.projectPic.map((e) => ({value: e.dictValue, label: e.dictName}));
state.projectPic = store.state.projectPic.map((e) => ({
value: e.dictValue,
label: e.dictName,
}));
state.viewDetail = routers.query.viewDetail;
getProjectInfo();
getTemplate();
@@ -363,13 +371,16 @@ export default {
.then((res) => {
state.projectInfo = res.data.data.projectInfo;
console.log(res)
let picurl = res.data.data.projectInfo.picUrl
let dates = store.state.projectPic.map((e) => ({value: e.dictValue, label: e.dictName}));
console.log(dates,picurl)
console.log(res);
let picurl = res.data.data.projectInfo.picUrl;
let dates = store.state.projectPic.map((e) => ({
value: e.dictValue,
label: e.dictName,
}));
console.log(dates, picurl);
for (let i = 0; i < dates.length; i++) {
if (dates[i].value == picurl) {
state.picUrlName = dates[i].label
state.picUrlName = dates[i].label;
}
}
@@ -466,19 +477,23 @@ export default {
state.projectInfo.type = 3;
state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
api.createProject(state.projectInfo).then((res) => {
state.projectInfo.projectId || changeOwnership(
"project",
res.data.data.projectId,
[{id: res.data.data.createId, name: res.data.data.createName}]
);
state.projectInfo.projectId ||
changeOwnership("project", res.data.data.projectId, [
{ id: res.data.data.createId, name: res.data.data.createName },
]);
message.destroy();
message.success("编辑成功");
router.back();
message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
// router.back();
router.push({
path: "/taskpage",
query: { projectId: res.data.data.projectId },
});
storage.set("projectId", res.data.data.projectId);
});
};
function managerChange(e, l, d) {
state.projectInfo.sourceBelongId = d
state.projectInfo.sourceBelongId = d;
}
return {
@@ -490,7 +505,7 @@ export default {
createProject,
backPage,
templateScroll,
handleChangeSelect
handleChangeSelect,
};
},
};

11
src/views/projectcenter/temTask.vue
View File

@@ -1407,9 +1407,18 @@ export default {
state.level = [];
// state.tableData = array[0]
// 当无阶段任务出现时 显示当前数据
if(array[0].taskList.length!==0){
getTableData(array[0].taskList)
}
}else{
state.level = array;
let datearr = []
for(let i=0;i<array.length;i++){
if(array[i].id!==0&&array[i].taskList.length!==0){
datearr.push(array[i])
}
}
state.level = datearr;
}
};