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

# Conflicts:
#	src/components/drawers/project/ProjectOnlineManage.vue

src/App.vue

@@ -34,7 +34,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 const store = useStore();
 const isLogin = ref(false);
 
-console.log("版本2.4.2------------");
+console.log("版本2.4.3------------");
 
 
 

src/components/drawers/AddTest.vue

@@ -110,7 +110,7 @@
               <span style="margin-right: 3px">及格线：</span>
             </div>
             <div class="btnbox">
-              <a-input :disabled="taskIndex >= 0  && isEdit" v-model:value="formData.passLine" type="number"
+              <a-input-number min="0" :disabled="taskIndex >= 0  && isEdit" v-model:value="formData.passLine"
                 style="width: 400px; height: 40px; border-radius: 8px" />
 
               <span style="color: #999999; margin-left: 8px">分</span>
@@ -425,6 +425,9 @@ defineExpose({ openDrawer })
 }
 
 .addtestDrawer {
+  .ant-input-number-input-wrap > .ant-input-number-input {
+    height: 40px !important;
+  }
   .drawerMain {
     .header {
       height: 73px;

src/components/drawers/project/ProjectOnlineManage.vue

@@ -338,6 +338,7 @@ export default {
             return (
               <div class="racona">
                 {text.record.finishStatus==1?<a
+                  style={{color:text.record.finishStatus == 1 ?"":"#666"}}
                   onClick={()=>{
                     console.log('iyiy', text.record)
                     showassess(text.record);

src/components/drawers/router/RouterCommonManage.vue

@@ -345,6 +345,7 @@ export default {
             return (
               <div class="racona">
                 <a
+                  style={{color:text.record.finishStatus == 1 ?"":"#666"}}
                   onClick={()=>{
                     console.log('iyiy', text.record)
                     showassess(text.record);

src/views/learningpath/LevelAddDetail.vue

@@ -335,7 +335,10 @@
       <div class="btnbox">
         <a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
         <a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
-        <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
+        <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
+          <!-- @click="cancelStorage" -->
+          <a-button class="btn btn1" :loading="cancleLoading">取消</a-button>
+        </router-link>
       </div>
     </div>
     <div>

src/views/projectcenter/TaskAdd.vue

@@ -289,7 +289,10 @@
       <div class="btnbox">
         <a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
         <a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
-        <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
+        <router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId } }">
+          <!-- @click="cancelStorage" -->
+          <a-button class="btn btn1" :loading="cancleLoading">取消</a-button>
+        </router-link>
       </div>
     </div>
     <div>