Browse Source

update-2022-09-27

1. 调整首页 部分文字显示及图表数据计算错误
2. 微调首页navbar部分图标及文字
moccus 2 years ago
parent
commit
fe31558241

+ 2 - 2
exam-06173-vue/src/layout/components/Navbar.vue

@@ -13,7 +13,7 @@
         <el-tooltip content="字体大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
-        <div class="right-menu-item" style="cursor:pointer;position: relative;" @mouseenter="funMouseIn" @mouseleave="funMouseOut">
+        <div class="right-menu-item" style="cursor:pointer;position: relative;padding-top:2px;" @mouseenter="funMouseIn" @mouseleave="funMouseOut">
           <i class="el-icon-mobile" style="font-size: 20px;font-weight: bold;"></i>
           <transition name="el-fade-in">
             <div class="download-mn" v-show="downloadShow">
@@ -23,7 +23,7 @@
               </div>
               <div class="download-mn-it">
                 <img src="./../../assets/web/outer.png" alt="">
-                <div>外人员考培系统app(Android)</div>
+                <div>外人员考培系统app(Android)</div>
               </div>
             </div>
           </transition>

+ 5 - 4
exam-06173-vue/src/views/dashboard/index.vue

@@ -266,7 +266,7 @@ export default {
           title: {
             showTitle: true,
             text: `${
-              tabActive === "bm" ? "部门培训课时排行" : "职工培训课时排行top20"
+              tabActive === "bm" ? "部门培训课程排行" : "职工培训时长排行top20"
             }`,
             subtext: "可滚轮缩放、左右拖动查看",
             x: "center",
@@ -281,6 +281,7 @@ export default {
           },
           yAxis: {
             type: "value",
+            minInterval: 1,
           },
           tooltip: {
             show: true,
@@ -289,7 +290,7 @@ export default {
               let str = "";
               data.forEach((ele) => {
                 let circle = `<span style="display:inline-block;margin-right:5px;border-radius:50%;width:10px;height:10px;left:5px;background-color:${ele.color}"></span>`;
-                str += circle + `${ele.name}: ${ele.value}分钟 <br />`;
+                str += circle + `${ele.name} : ${ele.value}${tabActive === 'bm' ? '' : '分钟'} <br />`;
               });
               return str;
             },
@@ -332,7 +333,7 @@ export default {
 
         res.data.forEach((ele) => {
           xAxisData.push(tabActive === "bm" ? ele.deptName : ele.realName);
-          pxSeriesData.push(ele.total);
+          pxSeriesData.push(ele.total > 0 ? (ele.passed / ele.total) * 100 : 0);
         });
 
         option = {
@@ -361,7 +362,7 @@ export default {
               let str = "";
               data.forEach((ele) => {
                 let circle = `<span style="display:inline-block;margin-right:5px;border-radius:50%;width:10px;height:10px;left:5px;background-color:${ele.color}"></span>`;
-                str += circle + `${ele.name}: ${ele.value}% <br />`;
+                str += circle + `${ele.name} : ${ele.value}% <br />`;
               });
               return str;
             },