hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 19:36: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-26 19:16:05 +08:00
parent 8b7c4aabaf f3ecc9043d
commit daa48a3bb1
2 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,13 +76,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="mbl_items" v-if="detail.sceneId"> <div class="mbl_items" v-if="detail.sceneContent">
<div class="item_nam"> <div class="item_nam">
<span style="margin-right: 14px">场景：</span> <span style="margin-right: 14px">场景：</span>
</div> </div>
<div class="item_inp"> <div class="item_inp">
<div class="select i7_input"> <div class="select i7_input">
{{ filterSenceTxt(detail.sceneId) }} {{ detail.sceneContent }}
</div> </div>
</div> </div>
</div> </div>

24
src/views/courselibrary/courseModal.vue
View File

@@ -193,12 +193,22 @@
</div> </div>
</div> </div>
<!--
<div class="mbl_items"> <div class="mbl_items">
<div class="item_nam"> <div class="item_nam">
<span style="margin-right: 14px">场景</span> <span style="margin-right: 14px">场景</span>
</div> </div>
<div class="item_inp"> <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="请输入场景" />
<div class="inp_num">
<span style="color: #c7cbd2">
{{ chang_jin.length }}/50
</span>
</div>
</div>
</div>
<!-- <div class="item_inp">
<div class="select i7_input"> <div class="select i7_input">
<a-select :getPopupContainer=" <a-select :getPopupContainer="
(triggerNode) => { (triggerNode) => {
@@ -207,10 +217,8 @@
" v-model:value="chang_jin" dropdownClassName="dropdown-style" style="width: 440px" placeholder="请选择" " v-model:value="chang_jin" dropdownClassName="dropdown-style" style="width: 440px" placeholder="请选择"
:options="options3" allowClear showSearch /> :options="options3" allowClear showSearch />
</div> </div>
</div> -->
</div> </div>
</div>
-->
<div class="mbl_items"> <div class="mbl_items">
<div class="item_nam"> <div class="item_nam">
@@ -359,7 +367,7 @@ export default defineComponent({
fen_lei: null, fen_lei: null,
fen_lei1: null, fen_lei1: null,
feng_mian_1: null, feng_mian_1: null,
chang_jin: null, chang_jin: "",
tags_val_single: "", tags_val_single: "",
tags_val: [], tags_val: [],
qdms_inputV6: "", qdms_inputV6: "",
@@ -564,7 +572,7 @@ export default defineComponent({
state.fen_lei = null; state.fen_lei = null;
state.fen_lei1 = null; state.fen_lei1 = null;
state.feng_mian_1 = null; state.feng_mian_1 = null;
state.chang_jin = null; state.chang_jin = "";
state.tags_val_single = ""; state.tags_val_single = "";
state.tags_val = []; state.tags_val = [];
state.qdms_inputV6 = ""; state.qdms_inputV6 = "";
@@ -751,7 +759,7 @@ export default defineComponent({
targetUser: state.qdms_inputV2, targetUser: state.qdms_inputV2,
meaning: state.qdms_inputV3, meaning: state.qdms_inputV3,
categoryId: state.fen_lei, categoryId: state.fen_lei,
sceneId: state.chang_jin, sceneContent: state.chang_jin,
tips: state.tags_val ? state.tags_val.join(",") : null, tips: state.tags_val ? state.tags_val.join(",") : null,
teacherId: state.member.value, teacherId: state.member.value,
teacher: state.member.name, teacher: state.member.name,
@@ -841,7 +849,7 @@ export default defineComponent({
state.qdms_inputV3 = item.meaning; state.qdms_inputV3 = item.meaning;
state.fen_lei = String(item.categoryId); state.fen_lei = String(item.categoryId);
state.fen_lei1 = changeTreeSelectValue(String(item.categoryId)); state.fen_lei1 = changeTreeSelectValue(String(item.categoryId));
state.chang_jin = String(item.sceneId); state.chang_jin = String(item.sceneContent ? item.sceneContent : '');
state.tags_val = item.tips ? item.tips.split(",") : []; state.tags_val = item.tips ? item.tips.split(",") : [];
state.qdms_inputV6 = item.intro; state.qdms_inputV6 = item.intro;
state.member = { value: item.teacherId, name: item.teacher }; state.member = { value: item.teacherId, name: item.teacher };