几个新bug修复

components/bussiness/charts/chart-pie-title.vue

@@ -103,7 +103,7 @@ export default {
 
         legend: {
           type: "scroll",
-          type: "plain", // 普通图例
+          // type: "plain", // 普通图例
           orient: "vertical",
           itemWidth: 9,
           itemHeight: 9,

components/bussiness/ranking-item.vue

@@ -13,7 +13,7 @@
         </div>
         <div class="ratio">
           <span class="desc-1">{{(item.certRate * 100).toFixed(1)}}%</span>
-          <span class="desc-2">完成比例</span>
+          <span class="desc-2">{{certFlag ? '获证比例' : '完成比例'}}</span>
         </div>
       </li>
     </ul>

pages/index.vue

@@ -25,12 +25,12 @@
         <ChartColumnStack v-if="projectInfo.certFlag"  :certFlag="projectInfo.certFlag" :echartsData="echartsData"></ChartColumnStack>
         <CommonSplitLine></CommonSplitLine>
         <CommonTitle title="项目情况排名"></CommonTitle>
-        <RankingList :certFlag="projectInfo.certFlag" :rankList="(allData && allData.studyRank)"></RankingList>
-        <ShowAll v-show="allData && allData.studyRank && allData.studyRank.length > 5" @action="gotoPage('/rankedu', true)"></ShowAll>
+        <RankingList :certFlag="projectInfo.certFlag" :rankList="studyRankList.slice(0, 5)"></RankingList>
+        <ShowAll v-show="studyRankList.length > 5" @action="gotoPage('/rankedu', true)"></ShowAll>
         <CommonSplitLine></CommonSplitLine>
         <CommonTitleWithWhat @tipsClick="tipsRankingItemClick" title="完成天数排名"></CommonTitleWithWhat>
-        <RankingItemDays :rankList="(allData && allData.costRank)"></RankingItemDays>
-        <ShowAll v-show="allData && allData.costRank && allData.costRank.length > 5" @action="gotoPage('/rankdays')"></ShowAll>
+        <RankingItemDays :rankList="costRankList.slice(0, 5)"></RankingItemDays>
+        <ShowAll v-show="costRankList.length > 5" @action="gotoPage('/rankdays')"></ShowAll>
       </div>
       <div v-show="isSingleOrg">
         <CommonTitle title="培训机构情况"></CommonTitle>
@@ -218,9 +218,11 @@ export default {
         }
       ],
       allData: {},
+      studyRankList: [],
+      costRankList: [],
       projectId: "",
       token:
-        "A5021C99F35540B7A3102004018E1A56" ||
+        "0CFC560350E4499A902C4B02C2683ADE" ||
         "A220943B006347799F277CC524EBB662" ||
         "B10441890E2940499621C76667675B2D" ||
         // "17B31C94D44947829097A953BC7C2732" ||
@@ -317,11 +319,7 @@ export default {
       } else {
         return value
       }
-    },
-    // convert: function (value, unitName = '分钟') {
-    //   if(!value) return 0 + unitName;
-    //   return Math.ceil(value / 60) + unitName
-    // },
+    }
   },
   computed: {
     ...mapGetters({
@@ -420,6 +418,8 @@ export default {
       await getGeneralPersonal(params).then(res => {
         if (res.code === "000000") {
           this.allData = res.data;
+          this.studyRankList = this.allData.studyRank || [];
+          this.costRankList = this.allData.costRank || [];
           if (params.pageCfg.type === 1) {
             this.orgDoctorTabData.certUserList = res.data.personData;
           } else if (params.pageCfg.type === 2) {
@@ -436,6 +436,8 @@ export default {
       await getGeneralData(queryData).then(res => {
         if (res.code === "000000") {
           this.allData = res.data;
+          this.studyRankList = this.allData.studyRank || []
+          this.costRankList = this.allData.costRank || [];
           this.echartsData = res.data.eduData;
         }
       });
@@ -533,8 +535,9 @@ export default {
       this.setAreaDegree(selData.areaDegree);
       // orgConfirm
       if(selData.townName || selData.countyName || selData.cityName || selData.provinceName) {
-        this.areaName = selData.townName || selData.countyName || selData.cityName || selData.provinceName
+        this.areaName = this.shortName(selData.townName || selData.countyName || selData.cityName || selData.provinceName, 6)
       }
+      // this.shortName()
       console.log(selData)
       // this. = hospitalNames[0] || this.orgName
       // this.getGeneralData(this.queryGDParams);
@@ -564,7 +567,7 @@ export default {
         this.getGeneralData(this.queryGDParams);
       }
       this.isShowOrg = false;
-      this.orgName = hospitalNames[0] || '全部机构'
+      this.orgName = this.shortName(hospitalNames[0] || '全部机构', 6);
       this.getGeneralExam(this.queryGDParams);
       this.getUserAnalysis(this.queryGDParams);
       this.getGeneralCourse(this.queryGDParams);
@@ -654,6 +657,13 @@ export default {
     clickTips() {
       this.isShowTips = false
     },
+    shortName: function (value, length = 15, append = '...') {
+      if (value && value.length > length) {
+        return value.substring(0, length) + append
+      } else {
+        return value
+      }
+    },
     // 映射Store中的Actions
     ...mapActions({
       setProjectId: "setProjectId",

pages/rankedu.vue

@@ -37,12 +37,22 @@ export default {
           type: 1
         }
       },
+      // dropdownList: [{
+      //   desc: '按获证比例排名',
+      //   type: 1
+      // },{
+      //   desc: '按获证人数排名',
+      //   type: 2
+      // },{
+      //   desc: '按参与人数排名',
+      //   type: 3
+      // }],      
       dropdownList: [{
-        desc: '按获证比例排名',
-        type: 1
-      },{
         desc: '按获证人数排名',
         type: 2
+      },{
+        desc: '按获证比例排名',
+        type: 1
       },{
         desc: '按参与人数排名',
         type: 3
@@ -66,12 +76,22 @@ export default {
         this.queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || [];
         this.certFlag = cQuery.certFlag;
         if(!this.certFlag) {
+          // this.dropdownList = [{
+          //   desc: '按完成比例排名',
+          //   type: 1
+          // },{
+          //   desc: '按完成人数排名',
+          //   type: 2
+          // },{
+          //   desc: '按参与人数排名',
+          //   type: 3
+          // }]          
           this.dropdownList = [{
-            desc: '按完成比例排名',
-            type: 1
-          },{
             desc: '按完成人数排名',
             type: 2
+          },{
+            desc: '按完成比例排名',
+            type: 1
           },{
             desc: '按参与人数排名',
             type: 3