mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-20 08:16:46 +08:00
Merge branch 'pre-release' into 'release'
Pre release See merge request !36
This commit is contained in:
@@ -44,7 +44,7 @@ export default defineComponent({
|
||||
const store = useStore();
|
||||
const isLogin = ref(false);
|
||||
// console.log("router", router.getRoutes(), route);
|
||||
console.log("版本1.09------------");
|
||||
console.log("版本1.2.8------------");
|
||||
const routes = computed(() => {
|
||||
return router.getRoutes().filter((e) => e.meta?.isLink);
|
||||
});
|
||||
|
||||
@@ -707,6 +707,7 @@ function handleStageOk() {
|
||||
stageVisible.value = false;
|
||||
visiable.value = false;
|
||||
emit("finash", false);
|
||||
nameSearch.value.keyword = "";
|
||||
saveStu({
|
||||
targetId: props.id,
|
||||
type: props.type,
|
||||
|
||||
@@ -701,6 +701,7 @@
|
||||
<div class="opa">
|
||||
<div class="opacation">
|
||||
<span
|
||||
v-if="element.type!==5"
|
||||
style="
|
||||
color: #4ea6ff;
|
||||
margin-right: 25px;
|
||||
@@ -716,6 +717,14 @@
|
||||
>
|
||||
编辑
|
||||
</span>
|
||||
<span
|
||||
v-else
|
||||
style="
|
||||
color: #4ea6ff;
|
||||
margin-right: 55px;
|
||||
cursor: pointer;
|
||||
">
|
||||
</span>
|
||||
<span
|
||||
style="color: #4ea6ff; cursor: pointer"
|
||||
@click="showDeleteModal(element.id)"
|
||||
|
||||
@@ -506,7 +506,7 @@
|
||||
">
|
||||
<div class="opa">
|
||||
<div class="opacation">
|
||||
<span style="
|
||||
<span v-if="element.type!==5" style="
|
||||
color: #4ea6ff;
|
||||
margin-right: 25px;
|
||||
cursor: pointer;
|
||||
@@ -519,6 +519,14 @@
|
||||
">
|
||||
编辑
|
||||
</span>
|
||||
<span
|
||||
v-else
|
||||
style="
|
||||
color: #4ea6ff;
|
||||
margin-right: 55px;
|
||||
cursor: pointer;
|
||||
">
|
||||
</span>
|
||||
<span style="color: #4ea6ff; cursor: pointer" @click="showDelete(element.id)">
|
||||
删除
|
||||
</span>
|
||||
|
||||
@@ -660,6 +660,7 @@
|
||||
<div class="opa">
|
||||
<div class="opacation">
|
||||
<span
|
||||
v-if="element.type!==5"
|
||||
style="
|
||||
color: #4ea6ff;
|
||||
margin-right: 25px;
|
||||
@@ -675,6 +676,14 @@
|
||||
>
|
||||
编辑
|
||||
</span>
|
||||
<span
|
||||
v-else
|
||||
style="
|
||||
color: #4ea6ff;
|
||||
margin-right: 55px;
|
||||
cursor: pointer;
|
||||
">
|
||||
</span>
|
||||
<span
|
||||
style="color: #4ea6ff; cursor: pointer"
|
||||
@click="showDelete(element.id)"
|
||||
|
||||
Reference in New Issue
Block a user