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

# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
This commit is contained in:
yuping
2023-02-13 16:36:53 +08:00
6 changed files with 1250 additions and 1047 deletions

View File

@@ -800,7 +800,7 @@ export default {
state.searchOrgName = null;
state.isSearchOrg = false;
state.treeData2 = [];
getAudienceInfo();
// getAudienceInfo();
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
@@ -1164,23 +1164,23 @@ export default {
});
}
};
getAudienceInfo();
// getAudienceInfo();
//分页获取受众
const changePagination1 = (page) => {
// console.log(page);
state.currentPage2 = page;
getAudienceInfo();
// getAudienceInfo();
};
//搜索受众
const searchAudienceInfo = () => {
state.currentPage2 = 1;
getAudienceInfo();
// getAudienceInfo();
};
//重置受众
const resetAudienceInfo = () => {
state.currentPage2 = 1;
state.audienceName = "";
getAudienceInfo();
// getAudienceInfo();
};
//受众关联 选中的数组
const onSelectChange2 = (selectedRowKeys, item) => {

View File

@@ -305,34 +305,90 @@
<!-- 查看面授课弹框 end -->
<!-- 确定新建面授课弹窗 -->
<!-- 表格 -->
<div style="padding:10px 35px">
<div style="padding: 10px 35px">
<a-table
:header-cell-style="{'text-align':'center'}"
:header-cell-style="{ 'text-align': 'center' }"
style="border: 1px solid #f2f6fe"
:columns="columns1"
:data-source="tableData1"
:loading="tableLoading"
:pagination="false"
:scroll="{x:'max-content'}"
:scroll="{ x: 'max-content' }"
>
<template #bodyCell="{ record, column }">
<template v-if="column.key === 'operation'">
<a-space>
<a-button v-if="(record.status===0 || record.status===-1 || !record.kkty) && checkPer(record.permissions)" @click="() => handleEdit(record, String(record.courseform))" type="link">编辑</a-button>
<a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleStart(record, String(record.courseform))" type="link">开课</a-button>
<a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleLook(record, String(record.courseform))" type="link">查看</a-button>
<a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleGuan22(record, String(record.courseform))" type="link">管理</a-button>
<a-button
v-if="
(record.status === 0 ||
record.status === -1 ||
!record.kkty) &&
checkPer(record.permissions)
"
@click="() => handleEdit(record, String(record.courseform))"
type="link"
>编辑</a-button
>
<a-button
v-if="record.status === 2 && checkPer(record.permissions)"
@click="() => handleStart(record, String(record.courseform))"
type="link"
>开课</a-button
>
<a-button
v-if="record.status === 2 && checkPer(record.permissions)"
@click="() => handleLook(record, String(record.courseform))"
type="link"
>查看</a-button
>
<a-button
v-if="record.status === 2 && checkPer(record.permissions)"
@click="() => handleGuan22(record, String(record.courseform))"
type="link"
>管理</a-button
>
<DropDown v-if="checkPer(record.permissions)" value="授权">
<OwnerTableModelStudent :types="[10,11,12]" :id="record.offcourseId">权限名单</OwnerTableModelStudent>
<CommonStudent :type="10" :id="record.offcourseId" title="查看权">查看权</CommonStudent>
<CommonStudent :type="11" :id="record.offcourseId" title="管理权">管理权</CommonStudent>
<OwnerTableModelStudent :types="[10, 11, 12]" :id="record.id"
>权限名单</OwnerTableModelStudent
>
<CommonStudent :type="10" :id="record.id" title="查看权"
>查看权</CommonStudent
>
<CommonStudent :type="11" :id="record.id" title="管理权"
>管理权</CommonStudent
>
</DropDown>
<DropDown v-if="checkPer(record.permissions)" value="更多">
<a-button @click="() => handleCopy(record, String(record.courseform))" type="link">复制</a-button>
<a-button @click="() => handleRejectExit(record, String(record.courseform))" type="link">撤回</a-button>
<a-button v-if="record.status===2 && record.kkty" @click="() => handleStop(record, String(record.courseform))" type="link">停用</a-button>
<a-button v-if="record.status===2 && !record.kkty" @click="() => handleOpen(record, String(record.courseform))" type="link">启用</a-button>
<a-button @click="() => handleDelete(record, String(record.courseform))" type="link" danger>删除</a-button>
<a-button
@click="() => handleCopy(record, String(record.courseform))"
type="link"
>复制</a-button
>
<a-button
@click="
() => handleRejectExit(record, String(record.courseform))
"
type="link"
>撤回</a-button
>
<a-button
v-if="record.status === 2 && record.kkty"
@click="() => handleStop(record, String(record.courseform))"
type="link"
>停用</a-button
>
<a-button
v-if="record.status === 2 && !record.kkty"
@click="() => handleOpen(record, String(record.courseform))"
type="link"
>启用</a-button
>
<a-button
@click="() => handleDelete(record, String(record.courseform))"
type="link"
danger
>删除</a-button
>
</DropDown>
</a-space>
</template>
@@ -2123,7 +2179,7 @@ export default defineComponent({
const store = useStore();
const state = reactive({
tableLoading:false,
tableLoading: false,
//新加
stuColumns: [
{
@@ -2896,7 +2952,7 @@ export default defineComponent({
// 渲染列表1操作
const getTableDate = async () => {
state.tableLoading = true
state.tableLoading = true;
console.log("我是点击搜索的数据", state.sysTypeId);
// let datas = state.tableData1;
let startTime = "";
@@ -2958,7 +3014,8 @@ export default defineComponent({
findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
});
state.tableData1 = datas;
state.tableLoading = false
console.log("state.tableData1", state.tableData1);
state.tableLoading = false;
};
function findClassFullName(list, classify, name = "") {
@@ -3619,7 +3676,7 @@ export default defineComponent({
let type = t.concat(p);
const postData = {
offcourseId: state.offcourseId,
id: state.offcoursePlanId, //开课ID,不传代表新增
offcoursePlanId: state.offcoursePlanId, //开课ID,不传代表新增
address: state.xjkkinputV2,
applyFlag: state.checked1 ? 1 : 0,
attach: state.attach,
@@ -3685,9 +3742,12 @@ export default defineComponent({
}
);
}
console.log("res");
console.log("获取面授课详情", item);
state.xjkkinputV2 = item.address;
state.checked1 = item.applyFlag === 1;
state.checked1 = item.applyFlag === 1 ? true : false;
let arrss = item.attach.split(",");
let str = "";
for (let i = 0; i < arrss.length; i++) {
@@ -3708,9 +3768,9 @@ export default defineComponent({
(state.comLeave =
item.completeType.split(",")[1] == "1" ? true : false),
(state.checked4 = item.evalFlag === 1 ? true : false);
state.assessmentId =item.evaluateId || '';
state.EditTestId = item.testId || '';
state.EditWorkId = item.homeWorkId || ''
state.assessmentId = String(item.evaluateId);
state.EditTestId = String(item.testId);
state.EditWorkId = String(item.homeWorkId);
state.xjkkinputV1 = item.name;
if (item.signFlag === 1) {
//是否允许未报名的签到:1是0否
@@ -3953,13 +4013,15 @@ export default defineComponent({
if (state.copy_hs) {
console.log(2222222);
if (state.offcourseId && state.offcoursePlanId) {
copyCoursePlan({offcoursePlanId:state.offcoursePlanId}).then(() => {
copyCoursePlan({ offcoursePlanId: state.offcoursePlanId }).then(
() => {
message.destroy();
message.success("复制成功");
getTableDate3();
delete_exit1();
rest();
});
}
);
} else if (state.offcourseId) {
console.log(87887);
// 拿数据
@@ -4119,7 +4181,7 @@ export default defineComponent({
if (type === "1") {
return;
}
// console.log(itm)
console.log("编辑面授课信息", itm, type);
state.offcourseId = itm.id;
const item = await detail({
@@ -4128,8 +4190,6 @@ export default defineComponent({
if (res.data.code === 200) return res.data.data;
});
state.statusJuJue = Number(item.auditStatus) === -1 ? 1 : 0;
if (Number(item.auditStatus) === 2 && Number(item.status) === 1) {
@@ -4270,7 +4330,8 @@ export default defineComponent({
});
};
const handleStart = (item, type) => {
console.log(item);
console.log("点击开课item", item);
// console.log(item);
if (type === "1") {
return;
}
@@ -4368,6 +4429,7 @@ export default defineComponent({
// 管理开课
const handleGuan22 = (item) => {
console.log("点击管理信息", item);
if (String(item.courseform) === "1") {
return;
}
@@ -4610,7 +4672,9 @@ export default defineComponent({
name: record.name ? record.name : "",
url:
type == 1
? window.location.protocol + process.env.VUE_APP_COURSE_STUDY + record.offcourseId
? window.location.protocol +
process.env.VUE_APP_COURSE_STUDY +
record.offcourseId
: process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${
record.offcoursePlanId

View File

@@ -1,15 +1,30 @@
<!-- 确定新建面授课弹窗 -->
<template>
<a-modal v-model:visible="ft_hs" title="Title" :footer="null" :closable="false"
wrapClassName="modalStyle facteachModal" width="80%" @cancel="visibleClose" @ok="handlePush">
<a-modal
v-model:visible="ft_hs"
title="Title"
:footer="null"
:closable="false"
wrapClassName="modalStyle facteachModal"
width="80%"
@cancel="visibleClose"
@ok="handlePush"
>
<div class="modalHeader">
<div class="headerLeft">
<img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/basicinfo/add.png" />
<img
style="width: 17px; height: 18px; margin-right: 8px"
src="@/assets/images/basicinfo/add.png"
/>
<span v-if="ft_eidt" class="headerLeftText">编辑面授课</span>
<span v-else class="headerLeftText">新建面授课</span>
</div>
<div style="margin-right: 57px; cursor: pointer">
<img @click="noEditClose" style="width: 22px; height: 22px" src="@/assets/images/basicinfo/close22.png" />
<img
@click="noEditClose"
style="width: 22px; height: 22px"
src="@/assets/images/basicinfo/close22.png"
/>
</div>
</div>
<div class="modalMain">
@@ -26,14 +41,25 @@
<div class="mbl_items">
<div class="item_nam">
<div class="asterisk_icon">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt="asterisk"
/>
</div>
<span style="margin-right: 14px">课程名称</span>
</div>
<div class="item_inp">
<div class="i1_input">
<NameInput ref="inputRef" placeholder="请输入课程名称" v-model:value="qdms_inputV1"
v-model:validate="validate" :maxlength="20" show-count :type="2" :id="offcourseId"></NameInput>
<NameInput
ref="inputRef"
placeholder="请输入课程名称"
v-model:value="qdms_inputV1"
v-model:validate="validate"
:maxlength="20"
show-count
:type="2"
:id="offcourseId"
></NameInput>
<!-- <a-input-->
<!-- v-model:value="qdms_inputV1"-->
<!-- maxlength="90"-->
@@ -53,17 +79,30 @@
<div class="i2_left">
<span style="color: #999ba3">课程命名规则</span>
</div>
<div class="i2_right" @click="hideShow" style="cursor: pointer">
<div class="b_zk" :style="{ display: hideshow ? 'block' : 'none' }">
<div
class="i2_right"
@click="hideShow"
style="cursor: pointer"
>
<div
class="b_zk"
:style="{ display: hideshow ? 'block' : 'none' }"
>
<span style="color: #4ea6ff">收起</span>
</div>
<div class="b_sq" :style="{ display: hideshow ? 'none' : 'block' }">
<div
class="b_sq"
:style="{ display: hideshow ? 'none' : 'block' }"
>
<span style="color: #4ea6ff">展开</span>
</div>
<div class="b_icon"></div>
</div>
</div>
<div class="i2_detail" :style="{ display: hideshow ? 'block' : 'none' }">
<div
class="i2_detail"
:style="{ display: hideshow ? 'block' : 'none' }"
>
<span style="color: #999ba3">
1课程名称统一不加书名号<br />
2项目名称属地等信息如需体现在课程名称中请放在课程名称信息
@@ -75,17 +114,38 @@
</div>
</div>
<div class="mbl_items2">
<div class="item_nam" style="margin-top: 8px;">
<div class="item_nam" style="margin-top: 8px">
<div class="asterisk_icon">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 14px">封面图</span>
</div>
<div class="item_inp">
<div style="width:440px;height:70px;display: flex;justify-content: flex-start;align-items: center;">
<img v-for="(item, index) in optionsUrl" :key="index" class="choiceoptionurl"
:style="item.value == feng_mian_1 ? 'border:3px solid rgb(78, 166, 255);' : ''" :src="item.value"
:alt="item.name" @click="choicePic(item.value)" />
<div
style="
width: 440px;
height: 70px;
display: flex;
justify-content: flex-start;
align-items: center;
"
>
<img
v-for="(item, index) in optionsUrl"
:key="index"
class="choiceoptionurl"
:style="
item.value == feng_mian_1
? 'border:3px solid rgb(78, 166, 255);'
: ''
"
:src="item.value"
:alt="item.name"
@click="choicePic(item.value)"
/>
</div>
<!-- <a-select
:getPopupContainer="
@@ -101,8 +161,13 @@
allowClear
showSearch
/> -->
<img class="i_upload_img" v-if="feng_mian_1" :src="feng_mian_1"
style="width:220px;height:120px;border-radius: 8px;" alt="avatar" />
<img
class="i_upload_img"
v-if="feng_mian_1"
:src="feng_mian_1"
style="width: 220px; height: 120px; border-radius: 8px"
alt="avatar"
/>
<div class="i_bottom">
<span style="color: #999ba3">
高宽比为16:9 (:800*450) png或jpg图片
@@ -113,14 +178,22 @@
<div class="mbl_items">
<div class="item_nam">
<div class="asterisk_icon">
<img style="width: 10px; height: 10px" src="@/assets/images/coursewareManage/asterisk.png" alt="" />
<img
style="width: 10px; height: 10px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 14px">目标人群</span>
</div>
<div class="item_inp">
<div class="i1_input">
<a-input v-model:value="qdms_inputV2" maxlength="50"
style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入目标人群" />
<a-input
v-model:value="qdms_inputV2"
maxlength="50"
style="width: 440px; height: 40px; border-radius: 8px"
placeholder="请输入目标人群"
/>
<div class="inp_num">
<span style="color: #c7cbd2">
{{ qdms_inputV2.length }}/50
@@ -132,49 +205,68 @@
<div class="mbl_items">
<div class="item_nam">
<div class="asterisk_icon">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt="asterisk"
/>
</div>
<span style="margin-right: 14px">内容分类</span>
</div>
<div class="item_inp">
<div class="select i6_input">
<a-tree-select style="width: 440px" placeholder="请选择内容分类" :treeDefaultExpandAll="true"
:getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
<a-tree-select
style="width: 440px"
placeholder="请选择内容分类"
:treeDefaultExpandAll="true"
:getPopupContainer="
(triggerNode) => triggerNode.parentNode || document.body
"
v-model:value="fen_lei"
:tree-data="sysTypeOptions"
:fieldNames="{
children: 'children',
label: 'name',
value: 'code',
}">
}"
>
</a-tree-select>
</div>
</div>
</div>
<div v-if="fen_lei" class="mbl_items">
<div class="item_nam">
<div class="asterisk_icon">
</div>
<div class="asterisk_icon"></div>
<span style="margin-right: 14px"> </span>
</div>
<div class="item_inp">
<div class="select i6_input">
<div style="width:440px;height:26px;font-size: 14px;color: rgb(153, 155, 163);">
<div
style="
width: 440px;
height: 26px;
font-size: 14px;
color: rgb(153, 155, 163);
"
>
所属层级{{ fen_lei1 }}
</div>
</div>
</div>
</div>
<div class="mbl_items">
<div class="item_nam" style="margin-bottom:110px;">
<div class="item_nam" style="margin-bottom: 110px">
<span style="margin-right: 14px">课程价值</span>
</div>
<div class="item_inp">
<div class="i1_input">
<a-textarea v-model:value="qdms_inputV3" maxlength="200"
style="width: 440px; height: 140px; border-radius: 8px" placeholder="请输入课程价值" />
<div class="inp_num" style="top:110px;">
<span style="color: #c7cbd2;">
<a-textarea
v-model:value="qdms_inputV3"
maxlength="200"
style="width: 440px; height: 140px; border-radius: 8px"
placeholder="请输入课程价值"
/>
<div class="inp_num" style="top: 110px">
<span style="color: #c7cbd2">
{{ qdms_inputV3.length }}/200
</span>
</div>
@@ -188,8 +280,12 @@
</div>
<div class="item_inp">
<div class="i1_input">
<a-input v-model:value="chang_jin" maxlength="50"
style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入场景" />
<a-input
v-model:value="chang_jin"
maxlength="50"
style="width: 440px; height: 40px; border-radius: 8px"
placeholder="请输入场景"
/>
<div class="inp_num">
<span style="color: #c7cbd2">
{{ chang_jin.length }}/50
@@ -214,10 +310,19 @@
<span style="margin-right: 14px">内容标签</span>
</div>
<div class="item_inp">
<a-input v-model:value="tags_val_single" style="width: 440px; height: 40px; border-radius: 8px"
placeholder="请输入内容标签按回车键添加内容标签,可添加多个内容标签。" @pressEnter="handleTagChange" />
<a-input
v-model:value="tags_val_single"
style="width: 440px; height: 40px; border-radius: 8px"
placeholder="请输入内容标签按回车键添加内容标签,可添加多个内容标签。"
@pressEnter="handleTagChange"
/>
<div class="tag-content">
<a-tag v-for="(item, index) in tags_val" :key="index" closable @close="handleTagClose(item)">
<a-tag
v-for="(item, index) in tags_val"
:key="index"
closable
@close="handleTagClose(item)"
>
{{ item }}
</a-tag>
</div>
@@ -225,9 +330,7 @@
</div>
</div>
<div class="mb_right">
<!--
<div class="mbl_items">
<div class="item_nam" style="margin-top:5px;">
@@ -246,16 +349,23 @@
-->
<div class="mbl_items2">
<div class="item_nam" style="margin-top: 8px;">
<div class="item_nam" style="margin-top: 8px">
<div class="asterisk_icon">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt="asterisk"
/>
</div>
<span style="margin-right: 14px">课程简介</span>
</div>
<div class="item_inp">
<div class="i10_textarea">
<a-textarea v-model:value="qdms_inputV6" maxlength="150"
style="width: 440px; height: 100px; border-radius: 8px" placeholder="请输入" />
<a-textarea
v-model:value="qdms_inputV6"
maxlength="150"
style="width: 440px; height: 100px; border-radius: 8px"
placeholder="请输入"
/>
<div class="inp_num">
<span style="color: #c7cbd2">
{{ qdms_inputV6.length }}/150
@@ -265,7 +375,7 @@
</div>
</div>
<div class="mbl_items">
<div class="item_nam" style="margin-top: 8px;">
<div class="item_nam" style="margin-top: 8px">
<span style="margin-right: 10px">附件</span>
</div>
<div class="item_inp">
@@ -273,8 +383,6 @@
</div>
</div>
</div>
</div>
<div class="m_footer">
<div class="fotnam">
@@ -282,10 +390,19 @@
</div>
<div v-if="ft_hs" class="fotarea">
<div style="border: 1px solid #ccc">
<Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig"
:mode="mode" />
<Editor style="height: 250px; overflow-y: hidden" v-model="valueHtml" :defaultConfig="editorConfig"
:mode="mode" @onCreated="handleCreated" />
<Toolbar
style="border-bottom: 1px solid #ccc"
:editor="editorRef"
:defaultConfig="toolbarConfig"
:mode="mode"
/>
<Editor
style="height: 250px; overflow-y: hidden"
v-model="valueHtml"
:defaultConfig="editorConfig"
:mode="mode"
@onCreated="handleCreated"
/>
</div>
</div>
</div>
@@ -315,7 +432,9 @@ import {
defineComponent,
ref,
shallowRef,
onUnmounted, computed, watch,
onUnmounted,
computed,
watch,
} from "vue";
import { validateName } from "@/api/index1";
import { message } from "ant-design-vue";
@@ -327,7 +446,7 @@ import NameInput from "@/components/project/NameInput";
import FJUpload from "@/components/common/FJUpload";
import * as moment from "moment";
import * as api2 from "../../api/indexAudit";
import {useStore} from "vuex";
import { useStore } from "vuex";
export default defineComponent({
components: {
@@ -375,32 +494,49 @@ export default defineComponent({
const sysTypeOptions = computed(() => store.state.content_type);
const optionsUrl = computed(() => store.state.course_pic);
watch(()=>state.fen_lei,()=>{
state.fen_lei1 = findClassFullName(sysTypeOptions.value)
})
watch(
() => state.fen_lei,
() => {
state.fen_lei1 = findClassFullName(sysTypeOptions.value);
}
);
function findClassFullName(list,name=''){
return list && list.length && list.map(e=>{
return state.fen_lei === e.code ? name?name+'-'+e.name:e.name : findClassFullName(e.children,name?name+'-'+e.name:e.name)
}).filter(name=>name).join('')
function findClassFullName(list, name = "") {
return (
list &&
list.length &&
list
.map((e) => {
return state.fen_lei === e.code
? name
? name + "-" + e.name
: e.name
: findClassFullName(
e.children,
name ? name + "-" + e.name : e.name
);
})
.filter((name) => name)
.join("")
);
}
// 删除文件返回参数
const changevalue = (e) => {
let arr = state.attach.split(',')
let newarr = []
let arr = state.attach.split(",");
let newarr = [];
for (let i = 0; i < arr.length; i++) {
if (i !== e) {
newarr.push(arr[i])
newarr.push(arr[i]);
}
}
if (newarr.length == 0) {
state.attach = "";
} else {
state.attach = newarr.toString()
}
console.log('changevalue', e, newarr, state.attach)
state.attach = newarr.toString();
}
console.log("changevalue", e, newarr, state.attach);
};
const visibleOpen = (offcourseId, name) => {
state.offcourseId = offcourseId;
@@ -428,7 +564,7 @@ export default defineComponent({
state.ft_hs = false;
ft_exit();
emit("noEdit");
}
};
expose({
visibleOpen,
@@ -515,7 +651,7 @@ export default defineComponent({
// 点击图片选择图片
const choicePic = (value) => {
state.feng_mian_1 = value;
}
};
//获取分类、场景、封面图、-----------字典配置-------------------------------
const options2 = ref([]);
@@ -554,7 +690,11 @@ export default defineComponent({
files = files.slice(0, files.length - 1);
console.log("filesfiles", files);
const offName = await validateName({ name: state.qdms_inputV1, type: 2, id: state.offcourseId }).then(res => {
const offName = await validateName({
name: state.qdms_inputV1,
type: 2,
id: state.offcourseId,
}).then((res) => {
return res.data.data == 1;
});
if (offName) {
@@ -610,12 +750,9 @@ export default defineComponent({
visibleClose();
}
} else if (res.data.code === -1) {
message.destroy();
message.success("无此操作权限");
visibleClose();
}
});
};
@@ -651,7 +788,9 @@ export default defineComponent({
});
if (res.rows && res.rows.length > 0) {
let i = res.rows.length;
state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
state.auditDescription = res.rows[i - 1].description
? res.rows[i - 1].description
: "-";
}
}
@@ -661,17 +800,19 @@ export default defineComponent({
state.qdms_inputV3 = item.meaning;
// state.fen_lei = item.categoryId;
state.fen_lei = item.sysTypeId;
state.chang_jin = String(item.sceneContent ? item.sceneContent : '');
state.chang_jin = String(item.sceneContent ? item.sceneContent : "");
state.tags_val = item.tips ? item.tips.split(",") : [];
state.qdms_inputV6 = item.intro;
state.member = { value: item.teacherId, name: item.teacher };
valueHtml.value = item.outline;
let arrss = item.attach.split(',')
let str = ''
let arrss = item.attach.split(",");
let str = "";
for (let i = 0; i < arrss.length; i++) {
i == arrss.length - 1 ? str += arrss[i].slice(arrss[i].lastIndexOf('/') + 1) : str += arrss[i].slice(arrss[i].lastIndexOf('/') + 1) + ','
i == arrss.length - 1
? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
: (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
}
console.log(str)
console.log(str);
state.attach = str;
};
@@ -962,15 +1103,14 @@ export default defineComponent({
left: 395px;
bottom: 10px;
}
}
}
.fujian{
.fujian {
display: none;
}
.mbl_items12 {
width: 440px;
margin-right:56px;
margin-right: 56px;
.i12_box1 {
display: flex;

View File

@@ -408,9 +408,7 @@
height: 68px;
display: flex;
align-items: center;
justify-content: space-between;
"
>
justify-content: space-between;">
<div class="headerLeft" style="margin-left: 32px">
<span style="width: 15px; height: 15px"
><img src="../../assets/images/taskpage/pub.png"
@@ -1230,7 +1228,7 @@ export default {
message.destroy();
message.success("创建成功");
state.lpLoading = false;
router.push( {path: "/leveladd",query:{routerId: id }})
router.push( {path: "/leveladd",query:{routerId: id.data.data }})
})
};

View File

@@ -1969,7 +1969,7 @@ export default {
routerId: state.routerId,
};
api
.getStudent(obj)
.getStuPage(obj)
.then((res) => {
console.log("获取学员列表", res);
let data = res.data.data.rows || null;

View File

@@ -181,7 +181,7 @@
:objData="routerInfo" @saveUnlock="saveUnlock" />
</div>
<div class="line"></div>
<router-link to="/leveladd">
<router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
<div style="display: flex">
<img class="img2" style="margin-right: 22px" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div>
@@ -622,7 +622,7 @@
:objData="routerInfo" @saveUnlock="saveUnlock" />
</div>
<div class="line"></div>
<router-link to="/leveladd">
<router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
<div style="display: flex">
<img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div>
@@ -857,7 +857,7 @@ import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
import * as api from "../../api/indexLevel";
import { GetRouterDetail, changeChapterSort, changeTasklistSort, releaseRouter, cancelRouterTask } from "../../api/indexTask";
import { message, Modal } from "ant-design-vue";
import { storage } from "../../api/storage";
// import { storage } from "../../api/storage";
import { deleteStudyTask } from "../../api/indexStudy";
import draggable from "vuedraggable";
import { editTask } from "../../api/indexTaskadd";
@@ -891,9 +891,7 @@ export default {
const route = useRoute();
const unlockModeModal = ref()
const state = reactive({
routerId: storage.get("routerId")
? JSON.parse(storage.get("routerId"))
: route.query.routerId,
routerId: route.query.routerId,
routerDetail: null,
level: [
// {
@@ -1775,6 +1773,7 @@ export default {
setTimeout(() => {
router.push({
path: "/leveladd",
query:{ routerId: state.routerId }
});
}, 3000);
}
@@ -1796,6 +1795,7 @@ export default {
setTimeout(() => {
router.push({
path: "/leveladd",
query:{ routerId: state.routerId }
});
}, 5000)
}
@@ -1817,6 +1817,7 @@ export default {
} else {
router.push({
path: "/leveladd",
query:{ routerId: state.routerId }
});
}