zc

src/views/components/centerNotice.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="centerNotice" :class="allShow?'all-max-box':''">
     <div class="centerNotice-page" id="centerNotice-page">
-      <img class="null-max-img" v-if="!noticeList[1]" src="@/assets/ZDimages/1695@1x.png">
+      <img class="null-max-img" v-if="!noticeList[0]" src="@/assets/ZDimages/1695@1x.png">
       <div class="content-box" id="scrollTextBox" v-if="pageType === '0'" v-html="content"></div>
       <vue-office-pdf
         id="scrollPdfBox"
@@ -201,7 +201,9 @@
         clearInterval(this.noticeTextInterval);
         clearInterval(this.noticeImgInterval);
         this.$set(this,'pageType',null);
-        if(this.noticeList[this.noticeIndex+1]){
+        console.log('1');
+        if(this.noticeList[this.noticeIndex]){
+          console.log('2');
           this.initialize(this.noticeList[this.noticeIndex])
           this.$set(this,'noticeIndex',this.noticeIndex+1);
         }else{

src/views/components/personnelEntryRecord.vue

@@ -5,11 +5,11 @@
     <div class="top-num-max-big-box">
       <div class="left-num-box">
         <p>安全准入</p>
-        <p>{{todayTotal}}</p>
+        <p>{{totalNumber}}</p>
       </div>
       <div class="right-num-box">
         <p>今日进入</p>
-        <p>{{totalNumber}}</p>
+        <p>{{todayTotal}}</p>
       </div>
     </div>
     <div class="bottom-list-max-big-box">

src/views/components/scientificResearchProject.vue

@@ -69,6 +69,7 @@
         clearInterval(this.eChartsTimerData)
         dashboardsResearchProjects().then(res => {
           this.$set(this,'eChartsCarouselIndex',0);
+          const getFirstSix = (str) => str.slice(0, 6);
           //柱状图
           let maxList = []
           let list = []
@@ -77,12 +78,14 @@
               maxList.push(JSON.parse(JSON.stringify(list)))
               list = []
               list.push({
-                name: res.data.collages[i].type,
+                // name: res.data.collages[i].type,
+                name: getFirstSix(res.data.collages[i].type),
                 value: res.data.collages[i].count
               })
             } else {
               list.push({
-                name: res.data.collages[i].type,
+                // name: res.data.collages[i].type,
+                name: getFirstSix(res.data.collages[i].type),
                 value: res.data.collages[i].count
               })
             }