瀏覽代碼

修改样式

lex 2 年之前
父節點
當前提交
872b03eda7

+ 5 - 4
public/project/css/initiation.css

@@ -72,7 +72,7 @@ span {
 }
 
 .van-form {
-  margin-top: 164px;
+  /* margin-top: 164px; */
   background: linear-gradient(180deg, rgba(255, 239, 216, 0) 0%, #ffdab0 100%);
   overflow: hidden;
 }
@@ -91,14 +91,15 @@ span {
 
 .title {
   text-shadow: 0px 2px 3px rgba(255, 96, 0, 0.5);
-  position: absolute;
   font-size: 26px;
   line-height: 37px;
   color: #ffffff;
-  top: 0;
-  left: 24px;
+  /* top: 0; */
+  /* left: 24px; */
   width: 57%;
+  padding-left: 24px;
   height: 154px;
+  margin-bottom: 10px;
   display: flex;
   justify-content: center;
   align-items: center;

+ 6 - 4
public/project/css/preRegister.css

@@ -72,7 +72,7 @@ span {
 }
 
 .van-form {
-  margin-top: 164px;
+  /* margin-top: 164px; */
   background: linear-gradient(180deg, rgba(238, 225, 255, 0) 0%, #EEE1FF 100%);
   overflow: hidden;
 }
@@ -91,14 +91,16 @@ span {
 
 .title {
   text-shadow: 0px 2px 3px #704CA7;
-  position: absolute;
+  /* position: absolute; */
   font-size: 26px;
   line-height: 37px;
   color: #ffffff;
-  top: 0;
-  left: 24px;
+  /* top: 0; */
+  /* left: 24px; */
   width: 57%;
+  padding-left: 24px;
   height: 154px;
+  margin-bottom: 10px;
   display: flex;
   justify-content: center;
   align-items: center;

+ 1 - 1
public/project/initiation.html

@@ -240,7 +240,7 @@
           </template>
         </van-field>
         <van-field label="所学乐器" v-if="stu.hasLearningExperience==1" name="learningSubjectName"
-          v-model="stu.learningSubjectName" placeholder="(非必填)请选择所学乐器"></van-field>
+          v-model="stu.learningSubjectName" placeholder="(非必填)请输入所学乐器"></van-field>
         <van-field label="是否报名参加管乐团家长会了解相关情况" name="joinParentMeeting"
           :rules="[{ required: true, message: '请选择是否报名参加管乐团家长会了解相关情况' }]">
           <template #input>

+ 8 - 8
src/school/mass-message/create-message.tsx

@@ -93,12 +93,12 @@ export default defineComponent({
         const tempName = file.name || ''
         const fileName = '/i-m/' + (tempName && tempName.replace(/ /gi, '_'))
         const key = new Date().getTime() + fileName
-        showLoadingToast({
-          message: '加载中...',
-          forbidClick: true,
-          loadingType: 'spinner',
-          duration: 0
-        })
+        // showLoadingToast({
+        //   message: '加载中...',
+        //   forbidClick: true,
+        //   loadingType: 'spinner',
+        //   duration: 0
+        // })
         const res = await request.post(signUrl, {
           hideLoading: true,
           data: {
@@ -134,14 +134,14 @@ export default defineComponent({
         })
         // console.log(getOssUploadUrl(state.bucket) + key)
         const uploadUrl = getOssUploadUrl(forms.bucket) + key
-        closeToast()
+        // closeToast()
 
         // state.fileList.push({ url: uploadUrl })
         files.url = uploadUrl
         files.status = 'done'
       } catch (error) {
         files.status = 'failed'
-        closeToast()
+        // closeToast()
         console.log(error, 'uploadFile')
       }
     }

+ 6 - 1
src/views/unit-test/model/answer-list/index.tsx

@@ -38,6 +38,7 @@ export default defineComponent({
   },
   emits: ['select'],
   setup(props, { emit }) {
+    console.log(props.lookType, 'lookType')
     /**
      * @description 检查用户是否答对
      * @returns Boolean
@@ -85,7 +86,11 @@ export default defineComponent({
                     props.lookType === 'RESULT' &&
                       (formatUserResult(item.id) ? styles.yes : styles.no),
                     props.lookType === 'CLICK' && index === props.index && styles.answered,
-                    item.showAnalysis ? (item.analysis.userResult ? styles.yes : styles.no) : ''
+                    props.lookType !== 'CLICK' && item.showAnalysis
+                      ? item.analysis.userResult
+                        ? styles.yes
+                        : styles.no
+                      : ''
                   ]}
                 >
                   {index + 1}

+ 1 - 1
src/views/unit-test/model/drag-question/index.tsx

@@ -108,7 +108,7 @@ export default defineComponent({
     // 修改题目逻辑
     const onSelectAnswer = (item: any) => {
       // 判断是否已经选中了
-      if (item.checked) return
+      if (item.checked || props.readOnly) return
       const result: any = []
       state.options.forEach((option: any, index: any) => {
         // console.log(option, '------')

+ 4 - 2
src/views/unit-test/model/play-question/index.tsx

@@ -67,7 +67,7 @@ export default defineComponent({
   },
   emits: ['update:value'],
   setup(props, { emit }) {
-    console.log(props)
+    console.log(props, 'props')
     const state = reactive({
       list: [] as any,
       score: 0
@@ -239,7 +239,9 @@ export default defineComponent({
               <div class={['van-hairline--top', styles.unitScoreNum]}>
                 <div class={styles.score}>{state.score}</div>
                 <div class={styles.scoreTitle}>评测分数</div>
-                <div class={styles.scoreTips}>多次评测取完整评测的最高分数</div>
+                {!props.showScore && (
+                  <div class={styles.scoreTips}>多次评测取完整评测的最高分数</div>
+                )}
               </div>
             )}
           </div>

+ 1 - 1
src/views/unit-test/practice-mode/index.tsx

@@ -277,7 +277,7 @@ export default defineComponent({
     // 下一个考点
     const onConfirmResult = () => {
       const knowledgelist = state.knowledgelist || []
-      console.log('🚀 ~ file: index.tsx:246 ~ onConfirmResult ~ knowledgelist', knowledgelist)
+      // console.log('🚀 ~ file: index.tsx:246 ~ onConfirmResult ~ knowledgelist', knowledgelist)
       // 当前正在考试的节点
       const knownleIndex = knowledgelist.findIndex((item: any) => item.id === state.id)
       console.log('🚀 ~ file: index.tsx:249 ~ onConfirmResult ~ knownleIndex', knownleIndex)

+ 4 - 4
src/views/unit-test/unit-detail/index.tsx

@@ -52,10 +52,11 @@ export default defineComponent({
         temp.forEach((item: any) => {
           item.userAnswer = formatUserAnswers(item, studentAnswerJson)
           item.showAnalysis = true
+          item.showScore = true
           item.analysis = {
             message: item.answerAnalysis,
             topic: true, // 是否显示结果
-            showScore: true,
+
             userResult: formatUserResult(item.id) // 用户答题对错
           }
         })
@@ -106,9 +107,9 @@ export default defineComponent({
           item.userAnswer = formatTeacherAnswer(rightAnswers)
           item.showAnalysis = true
           item.showRate = true
+          item.showScore = false
           item.analysis = {
             message: item.answerAnalysis,
-            showScore: false,
             topic: false // 是否显示结果
           }
         })
@@ -124,7 +125,6 @@ export default defineComponent({
      * @description 初始化正确答案
      */
     const formatTeacherAnswer = (answers: any) => {
-      console.log(answers)
       const result: any = []
       answers.forEach((answer: any) => {
         // rightAnswerFlag 说明是正确的
@@ -199,7 +199,7 @@ export default defineComponent({
             size = 0
           }
           const rect = useRect(currentItemDom)
-          console.log('🚀 ~ setTimeout ~ currentItemDom', currentItemDom)
+          // console.log('🚀 ~ setTimeout ~ currentItemDom', currentItemDom)
           console.log('🚀 ~ setTimeout ~ rect', rect, state.currentIndex)
 
           state.swipeHeight = rect.height