瀏覽代碼

fix: 给分板不显示

chenhao 2 年之前
父節點
當前提交
4eba790b30

+ 10 - 5
src/components/shared/ScoringPanel.vue

@@ -49,8 +49,9 @@ const props = withDefaults(
     /** 分值 */
     score: (number | string)[]
     mainNumber?: number | null
+    id?: number | null
   }>(),
-  { modal: false, toggleModal: true, score: () => [], mainNumber: null }
+  { modal: false, toggleModal: true, score: () => [], mainNumber: null, id: null }
 )
 
 const emits = defineEmits(['submit', 'update:score', 'update:visible'])
@@ -93,14 +94,19 @@ const activeIndex = ref<number>(0)
 
 const { fetch: getQuestionStruct, reset: resetQuestionStruct, result: questionStruct } = useFetch('getQuestionStruct')
 
+watch(
+  () => props.id,
+  () => {
+    modalVisible.value = !!props.id
+    scoreValues.value = []
+  }
+)
+
 watch(
   () => props.mainNumber,
   () => {
     /** reset scores */
     scoreValues.value = []
-    /** auto show */
-    modalVisible.value = !!props.mainNumber
-    console.log('setModalVisible', modalVisible.value)
     if (props.mainNumber) {
       resetQuestionStruct()
       getQuestionStruct({ mainNumber: props.mainNumber })
@@ -140,7 +146,6 @@ const onToggleClick = () => {
   dialogMode.value = props.toggleModal ? !dialogMode.value : dialogMode.value
   if (!props.toggleModal) {
     modalVisible.value = false
-    console.log('onCloseSet', modalVisible.value)
   }
 }
 </script>

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

@@ -87,14 +87,12 @@ const questionInfo = ref<ExtractApiResponse<'getQuestionStruct'>>()
 const onSubmit = (data: ExtractApiResponse<'getQuestionStruct'>) => {
   questionInfo.value = data
   modalVisible.value = false
-  console.log('onsubmitSet', modalVisible.value)
   submitModalVisible.value = true
 }
 
 /** 取消提交 */
 const onCancelSubmit = () => {
   modalVisible.value = true
-  console.log('onCancelSubmit', modalVisible.value)
   submitModalVisible.value = false
 }
 

+ 1 - 1
src/modules/admin-exam/edit-exam/index.vue

@@ -99,7 +99,7 @@ async function onSubmit() {
       },
     })
   } catch (error) {
-    console.log(error)
+    console.error(error)
   }
 }
 

+ 1 - 1
src/modules/admin-user/bulk-add-user/index.vue

@@ -210,7 +210,7 @@ async function onSubmit() {
     })
     back()
   } catch (error) {
-    console.log(error)
+    console.error(error)
   }
 }
 

+ 1 - 1
src/modules/admin-user/edit-user/index.vue

@@ -186,7 +186,7 @@ async function onSubmit() {
     })
     back()
   } catch (error) {
-    console.log(error)
+    console.error(error)
   }
 }
 

+ 1 - 0
src/modules/analysis/group-monitoring-detail/index.vue

@@ -53,6 +53,7 @@
           <svg-icon name="preview"></svg-icon>
         </span>
         <scoring-panel-with-confirm-vue
+          :id="current?.taskId"
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
           :main-number="current?.mainNumber"

+ 1 - 0
src/modules/analysis/view-marked-detail/index.vue

@@ -59,6 +59,7 @@
   </div>
   <image-preview v-model="previewModalVisible" :url="current?.filePath"></image-preview>
   <scoring-panel-with-confirm
+    :id="current?.taskId"
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
     :main-number="current?.mainNumber"

+ 1 - 1
src/modules/bootstrap/init-name/index.vue

@@ -55,7 +55,7 @@ async function onSubmit() {
     mainStore.getMyUserInfo()
     replace({ name: mainStore.loginInfo?.role === 'MARKER' ? 'MarkingMark' : 'AnalysisMonitoring' })
   } catch (error) {
-    console.log(error)
+    console.error(error)
   }
 }
 </script>

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

@@ -82,7 +82,7 @@ async function onSubmit() {
     const loginResult = await login(loginModel)
     loginSuccess(loginResult)
   } catch (error) {
-    console.log(error)
+    console.error(error)
   }
 }
 

+ 1 - 0
src/modules/marking/arbitration/index.vue

@@ -19,6 +19,7 @@
           <img :src="dataUrl" alt="" class="paper-img" :style="{ 'background-color': frontColor }" />
         </div>
         <scoring-panel-with-confirm
+          :id="currentArbitration?.taskId"
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
           :main-number="currentArbitration?.mainNumber"

+ 1 - 0
src/modules/marking/inquiry-result/index.vue

@@ -56,6 +56,7 @@
   <image-preview v-model="previewModalVisible" :url="current?.filePath"></image-preview>
   <mark-history-list :id="currentViewHistory?.taskId" v-model="visibleHistory"></mark-history-list>
   <scoring-panel-with-confirm
+    :id="current?.taskId"
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
     :main-number="current?.mainNumber"

+ 1 - 8
src/modules/marking/mark/index.vue

@@ -27,6 +27,7 @@
       </div>
     </div>
     <scoring-panel-with-confirm
+      :id="currentTask?.taskId"
       v-model:visible="scoringPanelVisible"
       v-model:score="modelScore"
       :main-number="currentTask?.mainNumber"
@@ -178,14 +179,6 @@ watch(taskPool, () => {
 /** 给分板 */
 const scoringPanelVisible = ref<boolean>(true)
 
-watch(
-  scoringPanelVisible,
-  () => {
-    console.log(scoringPanelVisible.value)
-  },
-  { immediate: true }
-)
-
 /** 回评弹窗 */
 const remarkModalVisible = ref<boolean>(false)
 

+ 2 - 1
src/modules/marking/problem/index.vue

@@ -21,6 +21,7 @@
           <img :src="dataUrl" alt="" class="paper-img" :style="{ 'background-color': frontColor }" />
         </div>
         <scoring-panel-with-confirm
+          :id="currentProblem?.taskId"
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
           :main-number="currentProblem?.mainNumber"
@@ -102,7 +103,7 @@ const {
 } = useMarkHeader()
 
 /** 给分板 */
-const scoringPanelVisible = ref<boolean>(true)
+const scoringPanelVisible = ref<boolean>(false)
 
 /** 图片预览 */
 const previewModalVisible = ref<boolean>(false)

+ 1 - 0
src/modules/marking/repeat/index.vue

@@ -21,6 +21,7 @@
           <img :src="dataUrl" alt="" class="paper-img" :style="{ 'background-color': frontColor }" />
         </div>
         <scoring-panel-with-confirm
+          :id="currentReMarkPaper?.taskId"
           v-model:visible="scoringPanelVisible"
           v-model:score="modelScore"
           :main-number="currentReMarkPaper?.mainNumber"

+ 1 - 0
src/modules/monitor/system-check/index.vue

@@ -53,6 +53,7 @@
   </div>
   <image-preview v-model="previewModalVisible" :url="currentSystemCheckPaper?.filePath"></image-preview>
   <scoring-panel-with-confirm
+    :id="currentSystemCheckPaper?.taskId"
     v-model:visible="scoringPanelVisible"
     v-model:score="modelScore"
     modal

+ 1 - 0
src/modules/quality/self-check-detail/index.vue

@@ -45,6 +45,7 @@
     </div>
   </div>
   <scoring-panel-with-confirm
+    :id="current?.taskId"
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
     :main-number="current?.mainNumber"

+ 1 - 0
src/modules/quality/subjective-check/index.vue

@@ -58,6 +58,7 @@
     </div>
   </div>
   <scoring-panel-with-confirm
+    :id="currentSubjectiveCheck?.taskId"
     v-model:visible="editScoreVisible"
     v-model:score="modelScore"
     :main-number="currentSubjectiveCheck?.mainNumber"

+ 0 - 12
src/store/layout.ts

@@ -25,18 +25,6 @@ export function getMenuRotes() {
 
   const tempRoutes = router.getRoutes()
 
-  /** 给后端配置权限的菜单路由 */
-  // console.log(
-  //   tempRoutes
-  //     .filter((route) => !route.path.startsWith('/example') && route.meta.menu)
-  //     .map((_) => ({
-  //       menuId: _.meta.menuId,
-  //       name: _.name,
-  //       path: _.path,
-  //       label: _.meta.label,
-  //     }))
-  // )
-
   const routesMap = tempRoutes
     .map((_, i) => _.meta?.menuId + '-' + i)
     .filter((_) => !_.startsWith('undefined'))