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

This commit is contained in:
yuping
2023-02-13 19:18:08 +08:00
2 changed files with 19 additions and 15 deletions

View File

@@ -136,6 +136,7 @@ export default {
state.checked = true; state.checked = true;
state.radioSelect = 1; state.radioSelect = 1;
ctx.emit("update:unlockModeVisible", false); ctx.emit("update:unlockModeVisible", false);
ctx.emit("closeUnlockModal", false)
}; };

View File

@@ -171,14 +171,14 @@
<a-select-option :value="2">闯关模式</a-select-option> <a-select-option :value="2">闯关模式</a-select-option>
<a-select-option :value="3">闯关模式</a-select-option> <a-select-option :value="3">闯关模式</a-select-option>
</a-select> </a-select>
<a-button type="primary" size="large" style="border-radius: 8px;" <a-button type="primary" size="large" style="border-radius: 8px;margin-left: 24px;"
@click="showModeVisible">切换模式</a-button> @click="showModeVisible">切换模式</a-button>
<!-- <div class="bottonbox" @click="showModeVisible"> <!-- <div class="bottonbox" @click="showModeVisible">
<div class="btnText">切换模式</div> <div class="btnText">切换模式</div>
</div> --> </div> -->
<!-- </div> --> <!-- </div> -->
<unlock-mode ref="unlockModeModal" v-model:unlockModeVisible="unlockModeVisible" <unlock-mode ref="unlockModeModal" v-model:unlockModeVisible="unlockModeVisible"
:objData="routerInfo" @saveUnlock="saveUnlock" /> :objData="routerInfo" @saveUnlock="saveUnlock" @closeUnlockModal="closeUnlockModal" />
</div> </div>
<div class="line"></div> <div class="line"></div>
<router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }"> <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
@@ -477,23 +477,20 @@
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #4f5156; color: #4f5156;
line-height: 36px; line-height: 36px;" class="tableRow">
" class="tableRow">
<div style=" <div style="
width: 87px; width: 87px;
text-align: center; text-align: center;
margin-left: 46px; margin-left: 46px;
position: relative; position: relative;">
">
<div class="racona"> <div class="racona">
<div class="img" style=" <div class="img" style="
cursor: pointer; cursor: pointer;
margin-top: 2px; margin-top: 2px;
margin-right: 9px; margin-right: 9px;
position: absolute; position: absolute;
left: -25px; left: -25px;"></div>
"></div> <a-checkbox :id="element.routerTaskId" v-model:checked="element.checked" @change="changeRow">
<a-checkbox :id="element.id" v-model:checked="element.checked" @change="changeRow">
</a-checkbox> </a-checkbox>
<div style="margin-top: 2px; margin-left: 8px"> <div style="margin-top: 2px; margin-left: 8px">
{{ element.lei }} {{ element.lei }}
@@ -548,8 +545,8 @@
<span style=" <span style="
color: #4ea6ff; color: #4ea6ff;
margin-right: 25px; margin-right: 25px;
cursor: pointer; cursor: pointer;"
" @click=" @click="
decideType( decideType(
element.lei, element.lei,
element.courseId, element.courseId,
@@ -558,7 +555,7 @@
"> ">
编辑 编辑
</span> </span>
<span style="color: #4ea6ff; cursor: pointer" @click="showDeleteModal(element.id)"> <span style="color: #4ea6ff; cursor: pointer" @click="showDeleteModal(element.routerTaskId)">
删除 删除
</span> </span>
</div> </div>
@@ -611,7 +608,7 @@
<a-select-option :value="2">闯关模式</a-select-option> <a-select-option :value="2">闯关模式</a-select-option>
<a-select-option :value="3">闯关模式</a-select-option> <a-select-option :value="3">闯关模式</a-select-option>
</a-select> </a-select>
<a-button type="primary" size="large" style="border-radius: 8px;" <a-button type="primary" size="large" style="border-radius: 8px;margin-left: 24px;"
@click="showModeVisible">切换模式</a-button> @click="showModeVisible">切换模式</a-button>
<!-- <div class="bottonbox" @click="showModeVisible"> <!-- <div class="bottonbox" @click="showModeVisible">
@@ -619,7 +616,7 @@
</div> --> </div> -->
<!-- </div> --> <!-- </div> -->
<unlock-mode ref="unlockModeModal" :unlockModeVisible="unlockModeVisible" <unlock-mode ref="unlockModeModal" :unlockModeVisible="unlockModeVisible"
:objData="routerInfo" @saveUnlock="saveUnlock" /> :objData="routerInfo" @saveUnlock="saveUnlock" @closeUnlockModal="closeUnlockModal"/>
</div> </div>
<div class="line"></div> <div class="line"></div>
<router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }"> <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
@@ -1032,6 +1029,11 @@ export default {
state.updateChapterID = null; state.updateChapterID = null;
}; };
// 关闭模式弹框
const closeUnlockModal = () => {
state.unlockModeVisible = false;
}
const saveUnlock = (num) => { const saveUnlock = (num) => {
state.routerInfo.unlockMode = num state.routerInfo.unlockMode = num
editRoutered(state.routerInfo).then(res=>{ editRoutered(state.routerInfo).then(res=>{
@@ -1885,7 +1887,8 @@ export default {
closedeleteAll, closedeleteAll,
subdeleteAll, subdeleteAll,
saveUnlock saveUnlock,
closeUnlockModal
}; };
}, },
}; };