Merge branch 'pre-release' into 'release'

Pre release

See merge request !36

src/App.vue

@@ -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);
 		});

src/components/student/CommonStudent.vue

@@ -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,

src/views/learningpath/LevelAddDetail.vue

@@ -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)"

src/views/projectcenter/TaskAdd.vue

@@ -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>

src/views/projectcenter/temTask.vue

@@ -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)"