刘洋 2 years ago
parent
commit
740a215908

+ 1 - 0
src/components/shared/ScoringPanel.vue

@@ -21,6 +21,7 @@
           :active="activeIndex === index"
           :modal="dialogMode"
           :toggle-modal="props.toggleModal && index === questionList.length - 1"
+          :show-confirm-btn="index == questionList.length - 1"
           :question="question"
           :large="props.large"
           :allow-submit="allowSubmit"

+ 2 - 0
src/components/shared/ScoringPanelItem.vue

@@ -42,6 +42,7 @@
             />
           </div>
           <el-button
+            v-if="!!props.showConfirmBtn"
             :disabled="!props.allowSubmit"
             size="small"
             type="primary"
@@ -116,6 +117,7 @@ const props = withDefaults(
     question: QuestionInfo
     large?: boolean
     allowSubmit: boolean
+    showConfirmBtn?: boolean
   }>(),
   { modal: false, toggleModal: true, score: void 0, scoreValidFail: false, large: true }
 )

+ 4 - 2
src/modules/admin-subject/edit-main-question/index.vue

@@ -347,7 +347,9 @@ const items = computed<EpFormItem[]>(() => [
 
 if (isEdit) {
   getMainQuestionInfo({ subjectCode: props.subjectCode, mainNumber: +props.mainNumber }).then((result) => {
-    result.remarkNumber = (result.remarkNumber || 0) / 60
+    if (result.remarkType === 'TIME') {
+      result.remarkNumber = (result.remarkNumber || 0) / 60
+    }
     Object.assign(model, omit(result, 'examId'))
     // levelRangValues.value = result.levelRange.slice(0)
     levelRangValues.value = result.levelRange.slice(0).map((item) => {
@@ -377,7 +379,7 @@ const onSubmit = async () => {
     if (valid) {
       const data = Object.assign(
         { ...model, levelRange: model.levelRange || [], category: model.category || void 0 },
-        { remarkNumber: (model.remarkNumber || 0) * 60 }
+        { remarkNumber: model.remarkType === 'TIME' ? (model.remarkNumber || 0) * 60 : model.remarkNumber }
       )
       await (isEdit ? editMainQuestion(data) : addMainQuestion(data))
       ElMessage.success('保存成功')

+ 0 - 1
src/modules/bootstrap/login/index.vue

@@ -122,7 +122,6 @@ function loginSuccess(loginInfo: ExtractApiResponse<'userLogin'>) {
   mainStore.getUserMarkConfig()
 
   mainLayoutStore.getRenderMenuList().then((renderMenus: any) => {
-    console.log('renderMenus::::::', renderMenus)
     let path = '/analysis'
     let find = renderMenus.find((item: any) => item.index === 'analysis')
     if (find && (find.children || []).find((v: any) => v.index === 'analysis-monitoring')) {