刘洋 2 年之前
父节点
当前提交
cea117b0b8

二进制
src/assets/images/link.png


+ 29 - 25
src/assets/styles/app.scss

@@ -7,7 +7,7 @@
 }
 
 .dou-yu {
-  font-family: 'DouYu'
+  font-family: 'DouYu';
 }
 
 html {
@@ -28,7 +28,8 @@ hr {
 }
 
 body {
-  font-family:'microsoft yahei', HanSan, system-ui, —apple-system, Segoe UI, Rototo, Emoji, Helvetica, Arial, sans-serif;
+  font-family: 'microsoft yahei', HanSan, system-ui, —apple-system, Segoe UI, Rototo, Emoji, Helvetica, Arial,
+    sans-serif;
   height: 100%;
   background-color: $BaseBgColor;
   font-size: $BaseFont;
@@ -36,7 +37,8 @@ body {
 }
 
 input {
-  font-family:'microsoft yahei', HanSan, system-ui, —apple-system, Segoe UI, Rototo, Emoji, Helvetica, Arial, sans-serif;
+  font-family: 'microsoft yahei', HanSan, system-ui, —apple-system, Segoe UI, Rototo, Emoji, Helvetica, Arial,
+    sans-serif;
 }
 
 * {
@@ -104,6 +106,9 @@ a {
   background-color: transparent;
   color: $color--primary;
   font-size: inherit;
+  padding-left: 14px;
+  background: url(../images/link.png) 0 2px no-repeat;
+  background-size: 12px 12px;
 }
 
 #app {
@@ -111,36 +116,35 @@ a {
   min-width: 1240px;
 }
 
-
 img {
   // pointer-events: none
 }
 .splitpanes.default-theme .splitpanes__pane {
   background-color: #fff !important;
 }
-.mark-container{
-  .next-button{
-    z-index:5;
+.mark-container {
+  .next-button {
+    z-index: 5;
   }
-  .mark-score{
+  .mark-score {
     z-index: 5;
-    color:red;
-    font-size:50px;
-    left:30px;
-    top:20px;
+    color: red;
+    font-size: 50px;
+    left: 30px;
+    top: 20px;
   }
 }
-.table-view{
-  transition:all .3s;
-  &.collapse{
-    width:0 !important;
-    padding:0 !important;
-    overflow:hidden;
+.table-view {
+  transition: all 0.3s;
+  &.collapse {
+    width: 0 !important;
+    padding: 0 !important;
+    overflow: hidden;
   }
-  .detail-info-table-header{
-    .detail-info-label{
-      padding-left:5px;
-      padding-right:5px;
+  .detail-info-table-header {
+    .detail-info-label {
+      padding-left: 5px;
+      padding-right: 5px;
     }
   }
   // .detail-info-table-header{
@@ -152,6 +156,6 @@ img {
   //   }
   // }
 }
-span.preview{
-  z-index:1;
-}
+span.preview {
+  z-index: 1;
+}

+ 1 - 1
src/components/shared/SendBackMark.vue

@@ -126,7 +126,7 @@ const onSendBack = async () => {
     }
     // }
     visible.value = false
-    ElMessage.success('操作成功')
+    // ElMessage.success('操作成功')
     emits('rejected')
   } catch (error) {
     console.error(error)

+ 6 - 2
src/components/shared/StandardDialog.vue

@@ -14,7 +14,7 @@
         </template>
       </base-form>
       <iframe
-        v-if="iframeSrc"
+        v-if="showIframe"
         style="width: 100%; height: calc(100% - 60px); prevent-events: pointer"
         :src="iframeSrc"
       ></iframe>
@@ -38,6 +38,7 @@ const { subjectList, mainQuestionList, dataModel, changeModelValue, onOptionInit
   'subject',
   'question',
 ])
+const showIframe = ref(false)
 const formModel = reactive<any>({
   mainNumber: dataModel.question,
   subjectCode: dataModel.subject,
@@ -90,8 +91,11 @@ const iframeSrc = computed(() => {
     : ''
 })
 const onSearch = () => {
+  showIframe.value = false
   // fetchStandard({ subjectCode: mainStore?.myUserInfo?.subjectCode, mainNumber: mainStore?.myUserInfo?.mainNumber })
-  fetchStandard({ subjectCode: formModel.subjectCode, mainNumber: formModel.mainNumber })
+  fetchStandard({ subjectCode: formModel.subjectCode, mainNumber: formModel.mainNumber }).then(() => {
+    showIframe.value = true
+  })
 }
 onOptionInit(onSearch)
 </script>

+ 4 - 2
src/layout/main/LeftMenu.vue

@@ -87,10 +87,12 @@ const onHandle = () => {
   :deep(.el-menu) {
     background-color: #333;
     .el-menu-item {
-      color: #999;
-      &.is-active,
+      // color: #999;
+      color: #666;
+      // &.is-active,
       .router-link-active {
         color: #fff;
+        background: $color--primary;
       }
     }
   }

+ 8 - 2
src/layout/main/MenuItem.vue

@@ -128,6 +128,9 @@ const checkActive = () => {
   }
   ::v-deep(.el-sub-menu__title) {
     margin-bottom: $SmallGapSpace;
+    .router-link-active.router-link-exact-active {
+      background: $color--primary;
+    }
   }
   &.main-layout-sub-menu {
     margin-bottom: $ExtraSmallGapSpace;
@@ -137,7 +140,8 @@ const checkActive = () => {
   }
   .main-layout-sub-menu-title {
     // color: $LayoutLeftSubMenuColor;
-    color: #fff;
+    // color: #fff;
+    color: #666;
     .menu-label {
       margin-left: $ExtraSmallGapSpace;
     }
@@ -158,6 +162,8 @@ const checkActive = () => {
 
   .menu-item {
     color: inherit;
+    padding-left: 10px;
+    border-radius: $LayoutLeftMenuRadius;
   }
 
   &.is-collapse {
@@ -185,7 +191,7 @@ const checkActive = () => {
     &.active-index {
       > .main-layout-sub-menu-title,
       > .el-sub-menu__title > .main-layout-sub-menu-title {
-        background: $color--primary;
+        // background: $color--primary;
         border-radius: $LayoutLeftMenuRadius;
         color: $color--white;
       }

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

@@ -154,6 +154,7 @@ const onSendBack = () => {
 const onRejected = () => {
   // checkNext()
   onSearch()
+  ElMessage.success('打回成功')
 }
 
 type OperationClick = MarkHeaderInstance['onClick']