Merge branch 'startLogin' into dev

src/views/attend-class/model/train-type/index.tsx

@@ -135,14 +135,15 @@ export default defineComponent({
           )}
         </div>
         <div class={styles['train-content']}>
+
           <NImage src={props.item.coverImg} previewDisabled objectFit="cover" />
           {props.isDisabled && !props.isCLassWork ? (
             <div class={styles.disPreview}>
               <NProgress
                 percentage={
-                  (Number(props.item.trainingTimes) /
+                  props.item.trainingType === 'EVALUATION' ? (Number(props.item.trainingTimes) /
                     Number(props.item.allTimes)) *
-                  100
+                    100 : ((Number(props.item.trainingTimes) / 60) / Number(props.item.allTimes) * 100)
                 }
                 offset-degree={180}
                 type="circle"
@@ -153,6 +154,7 @@ export default defineComponent({
                     : '#44B3FF'
                 }
                 style="width: 120px; margin: 0  0 10px;">
+
                 <div class={styles.BProgress}>
                   {props.item.trainingType === 'EVALUATION' ? (
                     <h4>
@@ -164,7 +166,7 @@ export default defineComponent({
                     <h4>
 
                       {props.item.trainingTimes
-                        ? parseInt((props.item.trainingTimes / 60)+'')
+                        ? parseInt((props.item.trainingTimes / 60) + '')
                         : 0}
                       <span>分钟</span>
                     </h4>

src/views/classList/modals/restStudentBox.tsx

@@ -80,6 +80,8 @@ export default defineComponent({
           targetClass.id = classList.value[0].key;
         }
 
+
+
         const tarRes = await getCLassStudentList(targetClass.id);
         targetStudentList.value = tarRes.data.rows.map((item: any) => {
           return {
@@ -228,6 +230,10 @@ export default defineComponent({
     };
 
     const submitStudent = async () => {
+      if(classList.value.length <2){
+        message.error('当前只有一个班级,无法调整')
+        return
+      }
       if (submitList.value < 1) {
         emit('close');
         return;
@@ -313,7 +319,7 @@ export default defineComponent({
             </div>
             <div class={styles.studentRight}>
               <div class={styles.listTop}>
-                <NDropdown
+                {targetClass.id?      <NDropdown
                   key="111"
                   v-model:value={targetClass.id}
                   options={classList.value}
@@ -328,7 +334,8 @@ export default defineComponent({
                       src={smallArrow}
                       previewDisabled></NImage>
                   </div>
-                </NDropdown>
+                </NDropdown>:null}
+
               </div>
               <div class={styles.listCore}>
                 <NRow class={styles.chioseCheckAllBox}>

src/views/login/components/codeLogin.tsx

@@ -182,7 +182,7 @@ export default defineComponent({
                       class={styles.sendMsg}
                       disabled={isDisabledCode.value}
                       onClick={() => sendMessage()}>
-                      {isDisabledCode.value ? starTimer.value : codeName}
+                      {isDisabledCode.value ? starTimer.value+'S' : codeName}
                     </NButton>
                   )
                 }}