Эх сурвалжийг харах

feat: 超级管理员默认跳转到用户管理界面

chenhao 2 жил өмнө
parent
commit
83e02d5b15

+ 1 - 1
src/components/common/ContentEditAble.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script setup lang="ts" name="ContentEditAble">
-import { defineProps, ref, onMounted, withDefaults, watch } from 'vue'
+import { ref, onMounted, withDefaults, watch } from 'vue'
 import useVModel from '@/hooks/useVModel'
 
 const props = withDefaults(

+ 20 - 9
src/components/shared/message/MessageSend.vue

@@ -30,7 +30,7 @@
         </div>
         <div class="flex-1 p-base overflow-hidden">
           <div class="full-h radius-base scroll-y-auto message-info-content">
-            <content-edit-able v-model="messageContent" class="full-h"></content-edit-able>
+            <content-edit-able v-model="messageContent" class="full-h" @click="onContentClick"></content-edit-able>
           </div>
         </div>
         <div class="p-base flex items-center justify-end">
@@ -145,9 +145,15 @@ const onCheckChange = () => {
   checkedUsers.value = (treeRef?.value?.getCheckedNodes(true) as MarkerItem[]) || []
 }
 
-const onPreviewImage = (path: string) => {
-  previewPath.value = path
-  previewModalVisible.value = true
+const onContentClick = (e: Event) => {
+  const target = e.target as HTMLButtonElement
+  console.log([target])
+  const data = target.getAttribute('data')
+  console.log(data)
+  const path = target.getAttribute('data-path')
+  if (path) {
+    console.log(path)
+  }
 }
 
 /** 发送当前试卷 */
@@ -155,11 +161,16 @@ const sendCurrentPaper = () => {
   const ImgLink = defineComponent({
     render() {
       return (
-        <div class="inline" contenteditable={false}>
-          <span class="pointer" type="primary" link onClick={() => onPreviewImage('xxxxx')}>
-            当前试卷
-          </span>
-        </div>
+        <ElButton
+          style={{ textAlign: 'left' }}
+          class="pointer inline-block full-w"
+          contenteditable={false}
+          type="primary"
+          data={'xxxxx'}
+          link
+        >
+          当前试卷
+        </ElButton>
       )
     },
   })

+ 1 - 1
src/modules/bootstrap/check-exam/index.vue

@@ -70,7 +70,7 @@ async function joinOrCreateExam(isCreate: boolean) {
       ElMessage.error(`请选择一个考试批次`)
     }
     mainStore.getMyUserInfo()
-    replace({ name: 'AnalysisMonitoring' })
+    replace({ name: 'UserManage' })
   }
 }
 </script>

+ 7 - 3
src/modules/monitor/training-monitoring/index.vue

@@ -9,9 +9,13 @@
     </div>
     <div class="flex-1 p-base">
       <div class="radius-base p-base fill-blank">
-        <div v-show="hasSelected" class="flex items m-b-base">
-          <el-button size="small" type="primary" @click="onAssessPass(true)">考核通过</el-button>
-          <el-button size="small" type="primary" plain @click="onAssessPass(false)">考核不通过</el-button>
+        <div class="flex items m-b-base">
+          <el-button size="small" :disabled="!hasSelected" type="primary" @click="onAssessPass(true)">
+            考核通过
+          </el-button>
+          <el-button size="small" :disabled="!hasSelected" type="primary" plain @click="onAssessPass(false)">
+            考核不通过
+          </el-button>
           <!-- <el-button size="small" type="primary" custom-1 @click="viewPaper(false)">查看试卷</el-button> -->
         </div>
         <base-table