Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

examples/components/headerNav.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="headerNav">
+  <div class="headerNav navBg">
     <div style="position: relative">
       <ai-icon type="logo" :icon="'iconcunwei'"/>
       <ai-icon type="logo" :icon="'iconcunwei'" class="textShadow"/>
@@ -78,7 +78,6 @@ export default {
   display: flex;
   align-items: center;
   width: 100%;
-  background-image: url("../assets/nav_bg.png");
   background-repeat: no-repeat;
   background-size: 100% 48px;
   position: fixed;

project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue

@@ -111,9 +111,8 @@
             <div class="time-select" :class="departType == index ? 'active' : ''" v-for="(item, index) in dateTypeList" :key="index" @click="changeDepartType(index)">{{item}}</div>
           </div>
         </div>
-        <div id="departBarChart">
+        <div id="departBarChart" v-if="isDepartData"></div>
-          <ai-empty v-if="!isDepartData"></ai-empty>
+        <ai-empty v-if="!isDepartData"></ai-empty>
-        </div>
       </div>
 
       <ai-dialog :visible.sync="dialogDate" title="选择时间" width="500px" customFooter>
@@ -385,10 +384,9 @@
             axisPointer: {
               type: 'shadow'
             },
-            formatter: function(data) {
+            formatter: (data) => {
               var index = data[0].dataIndex
-              let name = `<ai-open-data type="departmentName" openid="${this.departBarData[index].deptId}" class="name"></ai-open-data><br/>宣发任务数：${this.departBarData[index].taskCount}`
+              return `<ww-open-data type="departmentName" openid="${this.departBarData[index].deptId}"></ww-open-data><br/>宣发任务数：${data[0].value}`
-              return name
             }
           },
           dataZoom: [