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

This commit is contained in:
yuping
2022-12-26 19:16:05 +08:00
2 changed files with 40 additions and 32 deletions

View File

@@ -76,13 +76,13 @@
</div>
</div>
</div>
<div class="mbl_items" v-if="detail.sceneId">
<div class="mbl_items" v-if="detail.sceneContent">
<div class="item_nam">
<span style="margin-right: 14px">场景</span>
</div>
<div class="item_inp">
<div class="select i7_input">
{{ filterSenceTxt(detail.sceneId) }}
{{ detail.sceneContent }}
</div>
</div>
</div>
@@ -123,10 +123,10 @@
<div class="i12_box1" style="position: relative" v-for="(item, index) in detail.attach" :key="index">
<div class="file_img">
<img v-if="
item.indexOf('jpg') !== -1 ||
item.indexOf('jpeg') !== -1 ||
item.indexOf('png') !== -1
" src="@/assets/images/coursewareManage/pngpic.png" />
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>
@@ -160,13 +160,13 @@
left: 72px;
">
{{
item.indexOf("-") !== -1
? item.slice(
item.lastIndexOf("/") + 1,
item.lastIndexOf("-")
) + item.slice(item.lastIndexOf("."))
: item
}}
item.indexOf("-") !== -1
? item.slice(
item.lastIndexOf("/") + 1,
item.lastIndexOf("-")
) + item.slice(item.lastIndexOf("."))
: item
}}
</span>
</div>

View File

@@ -154,10 +154,10 @@
<!-- />-->
<a-tree-select style="width: 440px" placeholder="请选择内容分类" :treeDefaultExpandAll="true"
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
" @change="changeTreeSelectValue" v-model:value="fen_lei" :tree-data="options2222">
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
" @change="changeTreeSelectValue" v-model:value="fen_lei" :tree-data="options2222">
</a-tree-select>
</div>
</div>
@@ -192,26 +192,34 @@
</div>
</div>
</div>
<!--
<div class="mbl_items">
<div class="item_nam">
<span style="margin-right: 14px">场景</span>
</div>
<div class="item_inp">
<div class="select i7_input">
<a-select :getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
" v-model:value="chang_jin" dropdownClassName="dropdown-style" style="width: 440px" placeholder="请选择"
:options="options3" allowClear showSearch />
<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">
<a-select :getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
" v-model:value="chang_jin" dropdownClassName="dropdown-style" style="width: 440px" placeholder="请选择"
:options="options3" allowClear showSearch />
</div>
</div> -->
</div>
-->
<div class="mbl_items">
<div class="item_nam">
<span style="margin-right: 14px">内容标签</span>
@@ -359,7 +367,7 @@ export default defineComponent({
fen_lei: null,
fen_lei1: null,
feng_mian_1: null,
chang_jin: null,
chang_jin: "",
tags_val_single: "",
tags_val: [],
qdms_inputV6: "",
@@ -564,7 +572,7 @@ export default defineComponent({
state.fen_lei = null;
state.fen_lei1 = null;
state.feng_mian_1 = null;
state.chang_jin = null;
state.chang_jin = "";
state.tags_val_single = "";
state.tags_val = [];
state.qdms_inputV6 = "";
@@ -751,7 +759,7 @@ export default defineComponent({
targetUser: state.qdms_inputV2,
meaning: state.qdms_inputV3,
categoryId: state.fen_lei,
sceneId: state.chang_jin,
sceneContent: state.chang_jin,
tips: state.tags_val ? state.tags_val.join(",") : null,
teacherId: state.member.value,
teacher: state.member.name,
@@ -841,7 +849,7 @@ export default defineComponent({
state.qdms_inputV3 = item.meaning;
state.fen_lei = 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.qdms_inputV6 = item.intro;
state.member = { value: item.teacherId, name: item.teacher };