Просмотр исходного кода

Merge branch 'manage-cicle' into jenkins

liushengqiang 2 лет назад
Родитель
Сommit
d1386349c1
2 измененных файлов с 10 добавлено и 8 удалено
  1. 7 4
      src/views/subject-echarts/index.module.less
  2. 3 4
      src/views/subject-echarts/index.tsx

+ 7 - 4
src/views/subject-echarts/index.module.less

@@ -49,6 +49,8 @@
             padding: 0 4px;
             margin: 0 3px;
             line-height: 18px;
+            width: 40px;
+            text-align: center;
         }
     }
 }
@@ -57,7 +59,7 @@
     align-items: center;
     justify-content: center;
     padding: 10px;
-    font-size: 10px;
+    font-size: 12px;
     .headLabel{
         margin: 0 6px;
         display: flex;
@@ -94,7 +96,7 @@
             display: flex;
             justify-content: flex-end;
             align-items: center;
-            font-weight: bold;
+            font-weight: 400;
             font-size: 22px;
             color: #333;
             margin-bottom: 3px;
@@ -120,7 +122,7 @@
         padding: 0 10px;
         border-left: 1px solid;
         border-right: 1px solid;
-        border-image: linear-gradient(to bottom, #EAEAEA, #979797, #EAEAEA) 1;
+        border-image: linear-gradient(to bottom, #EAEAEA, #d0d0d0, #EAEAEA) 1;
     }
 }
 
@@ -144,11 +146,12 @@
 
         .subjectName {
             width: 54px;
-            font-size: 14px;
+            font-size: 13px;
             font-weight: 600;
             color: #333;
             line-height: 18px;
             margin-bottom: 3px;
+            white-space: nowrap;
         }
 
         .subjectType {

+ 3 - 4
src/views/subject-echarts/index.tsx

@@ -101,7 +101,7 @@ export default defineComponent({
           }
         },
         grid: {
-          left: 5,
+          left: 8,
           top: 5,
           right: 5,
           bottom: 5,
@@ -231,7 +231,7 @@ export default defineComponent({
           noMemberNum: Math.floor(Math.random() * 1000),
           noPassNum: Math.floor(Math.random() * 1000),
           passNum: Math.floor(Math.random() * 1000),
-          practiceRate: parseFloat((Math.random() * 100).toFixed(2))
+          practiceRate: Math.ceil(Math.random() * 100)
         },
         practiceThisWeeks: new Array(Math.ceil(Math.random() * 9)).fill(1).map((n, i) => {
           return {
@@ -252,7 +252,7 @@ export default defineComponent({
       handleInit({ content: resulst })
     }
     onMounted(() => {
-      // handleMock()
+      handleMock()
       listenerMessage('setAccomanyEcharts', handleInit)
       postMessage({
         api: 'setAccomanyEcharts'
@@ -278,7 +278,6 @@ export default defineComponent({
           <div class={styles.head}>
             <div
               class={styles.headLeft}
-              onClick={() => handleMock()}
             >
               <img class={styles.icon} src={iconEnsemble} />
               <div>总体情况</div>