diff --git a/src/views/device/deviceConfig.vue b/src/views/device/deviceConfig.vue
index bb488ab..3ad9639 100644
--- a/src/views/device/deviceConfig.vue
+++ b/src/views/device/deviceConfig.vue
@@ -54,7 +54,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination style="margin-top: 20px; text-align: center" :current-page="queryInfo.page" :total="total" :page-size="queryInfo.size" :pager-count="7" :page-sizes="[3, 5, 10]" layout="prev, pager, next, jumper,->,sizes,total" @current-change="getStartUpList" @size-change="handleSizeChange" />
+        <el-pagination style="margin-top: 20px;" background :current-page="queryInfo.page" :total="total" :page-size="queryInfo.size" :pager-count="7" :page-sizes="[3, 5, 10]" layout="prev, pager, next, jumper,->,sizes,total" @current-change="getStartUpList" @size-change="handleSizeChange" />
 
       </el-col>
     </el-row>
@@ -216,7 +216,7 @@ export default {
         device_name: '',
         is_state: '',
         page: 1,
-        size: 3
+        size: 10
       },
       total: 0,
       // 开关机列表的数据
@@ -324,9 +324,6 @@ export default {
       if (row.open_weekly) {
         this.selectOpenWeekly = row.open_weekly.split(',')
       }
-      // console.log(this.form.open_weekly)
-      // console.log(typeof this.form.open_weekly)
-      // console.log(this.selectOpenWeekly)
       this.form.close_weekly = row.close_weekly
       if (row.close_weekly) {
         this.selectCloseweekly = row.close_weekly.split(',')
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 1410e2b..f8168c5 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -64,7 +64,7 @@
         </el-table>
       </el-col>
     </el-row>
-    <el-pagination style="margin-top: 20px; text-align: center" :current-page="queryInfo.page" :total="total" :page-size="queryInfo.size" :pager-count="7" :page-sizes="[3, 5, 10]" layout="prev, pager, next, jumper,->,sizes,total" @current-change="getDevice" @size-change="handleSizeChange" />
+    <el-pagination style="margin-top: 20px;" background :current-page="queryInfo.page" :total="total" :page-size="queryInfo.size" :pager-count="7" :page-sizes="[3, 5, 10]" layout="prev, pager, next, jumper,->,sizes,total" @current-change="getDevice" @size-change="handleSizeChange" />
     <!-- 编辑设备 -->
     <div class="layer">
       <el-dialog :title="dialogTitle" :close-on-click-modal="false" :show-close="false" :visible.sync="addFromVisible" width="576px">
@@ -158,7 +158,7 @@ export default {
         device_name: '',
         is_state: '',
         page: 1,
-        size: 3
+        size: 10
       },
       total: 0,
       // device_id:'',
diff --git a/src/views/materialContent/index.vue b/src/views/materialContent/index.vue
index 259635f..8ba7b67 100644
--- a/src/views/materialContent/index.vue
+++ b/src/views/materialContent/index.vue
@@ -5,17 +5,17 @@
         <el-tab-pane label="全部" name="0" />
         <el-tab-pane name="1">
           <span slot="label">
-            图片<i class="emrgencyCount">1</i>
+            图片<i class="emrgencyCount">{{ imgNum }}</i>
           </span>
         </el-tab-pane>
         <el-tab-pane name="2">
           <span slot="label">
-            视频<i class="emrgencyCount">1</i>
+            视频<i class="emrgencyCount">{{ videoNum }}</i>
           </span>
         </el-tab-pane>
         <el-tab-pane name="3">
           <span slot="label">
-            音频<i class="emrgencyCount">1</i>
+            音频<i class="emrgencyCount">{{ audioNum }}</i>
           </span>
         </el-tab-pane>
       </el-tabs>
@@ -37,9 +37,19 @@ export default {
     return {
       activeIndex: 0 || '0',
       isMultiSelected: false,
-      mulitText: '多选'
+      mulitText: '多选',
+      audioNum: 0,
+      imgNum: 0,
+      videoNum: 0
     }
   },
+  mounted: function() {
+    setTimeout(() => {
+      this.audioNum = this.$refs.MaterialList.audioNum
+      this.imgNum = this.$refs.MaterialList.imgNum
+      this.videoNum = this.$refs.MaterialList.videoNum
+    }, 1000)
+  },
   methods: {
     handleClick(tab) {
       this.activeIndex = tab.index
@@ -82,4 +92,7 @@ export default {
   position: relative;
   padding: 6px 0 20px 0;
 }
+.emrgencyCount{
+  padding: 0 4px;
+}
 </style>
diff --git a/src/views/materialContent/materialList/index.vue b/src/views/materialContent/materialList/index.vue
index 018454d..ca4977a 100644
--- a/src/views/materialContent/materialList/index.vue
+++ b/src/views/materialContent/materialList/index.vue
@@ -10,8 +10,8 @@
       <!-- 上传 / 创建文件夹 -->
       <div class="material_item cont_upload">
         <Upload ref="uploadMaterial" :is-theme="isTheme" @saveMaterial="saveMaterial" />
-        <el-button v-if="!isToFolder" class="mkdir_btn" round type="primary" @click="handleMkdir(0)">创建文件夹</el-button>
-        <el-button v-else class="return_btn" round type="primary"><a href="/content">返回</a></el-button>
+        <el-button v-if="!isToFolder && tabType == null" class="mkdir_btn" round type="primary" @click="handleMkdir(0)">创建文件夹</el-button>
+        <el-button v-if="isToFolder" class="return_btn" round type="primary"><a href="/content">返回</a></el-button>
       </div>
       <!-- 文件夹list -->
       <div v-for="(item,index) in materialFolders" :key="item.id" :class="['material_item', 'folder', { 'item_multi': folderChecked == index }]" @click.stop="editFolder(item,index)" @dblclick="floderDbClick(item,index)">
@@ -162,7 +162,10 @@ export default {
       uploadListData: [ // 上传列表
       ],
       folderListChecked: -1,
-      tabType: null
+      tabType: null,
+      audioNum: 0,
+      imgNum: 0,
+      videoNum: 0
     }
   },
   computed: {
@@ -178,7 +181,6 @@ export default {
       }
     },
     activeIndex(newName, oldName) {
-      // console.log(newName)
       this.tabIndex = newName
     },
     '$route.query.folderTag'(Val) {
@@ -186,7 +188,7 @@ export default {
     }
   },
   created() {
-    console.log(localStorage.getItem('materialTabIndex'))
+    // console.log(localStorage.getItem('materialTabIndex'))
   },
   mounted: function() {
     console.log(this.$route.query.folderTag)
@@ -228,6 +230,9 @@ export default {
         }
         this.materialFolders = res.data.materialFolders
         this.materialList = res.data.pageThemeVO
+        this.audioNum = res.data.audioNum
+        this.imgNum = res.data.imgNum
+        this.videoNum = res.data.videoNum
         // 创建文件夹获取data
         this.thisFoldId = res.data.thisFoldId
       })
diff --git a/src/views/publishContent/historyList/index.vue b/src/views/publishContent/historyList/index.vue
index 20127c2..21a6a67 100644
--- a/src/views/publishContent/historyList/index.vue
+++ b/src/views/publishContent/historyList/index.vue
@@ -2,7 +2,6 @@
   <div class="list_warp">
     <el-row :gutter="15">
       <el-col>
-        <!--  v-loading="crud.loading" -->
         <el-table ref="table" :data="publishHistoryList" :header-cell-style="{ background: '#3a8aeb', color: '#fff' }" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" />
           <el-table-column label="发布名称" align="center" prop="relaase_name" />
@@ -48,7 +47,8 @@
             </template>
           </el-table-column>
         </el-table>
-        <!--分页组件-->
+        <!-- 分页器 -->
+        <el-pagination style="margin-top: 20px;" background :current-page="page" :total="total" :page-size="size" :pager-count="5" :page-sizes="[3, 5, 10]" layout="prev, pager, next, jumper,->,sizes,total" @current-change="getPublishHistory" @size-change="handleSizeChange" />
       </el-col>
     </el-row>
   </div>
@@ -67,21 +67,14 @@ export default {
 
   data() {
     return {
-      form: {
-
-      },
-      queryInfo: {
-        release_name: '',
-        orga_id: '133221333123111',
-        page: 1,
-        size: 3
-      },
-      // 发布历史列表
-      publishHistoryList: [],
+      orga_id: '133221333123111',
+      page: 1,
+      size: 10,
       // 总条数
       total: 0,
+      // 发布历史列表
+      publishHistoryList: [],
       selectedList: []
-
     }
   },
   mounted() {
@@ -89,8 +82,14 @@ export default {
   },
   methods: {
     // 获取发布历史列表
-    getPublishHistory() {
-      const params = this.queryInfo
+    getPublishHistory(pager = 1) {
+      this.page = pager
+      const params = {
+        release_name: '',
+        orga_id: this.orga_id,
+        page: this.page,
+        size: this.size
+      }
       reqPublishHistory(params).then(res => {
         if (res.code == 200) {
           this.publishHistoryList = res.data.content
@@ -119,6 +118,12 @@ export default {
         this.clearBtnDisabled = true
       }
       console.log(val)
+    },
+    // 每条显示数据改变时的事件
+    handleSizeChange(size) {
+      // 整理参数
+      this.size = size
+      this.getPublishHistory()
     }
   }
 }
diff --git a/src/views/publishContent/urgentMessage/index.vue b/src/views/publishContent/urgentMessage/index.vue
index 2839590..ab7f27d 100644
--- a/src/views/publishContent/urgentMessage/index.vue
+++ b/src/views/publishContent/urgentMessage/index.vue
@@ -36,7 +36,7 @@
       </el-col>
     </el-row>
     <!-- 分页器 -->
-    <el-pagination style="margin-top: 20px; text-align: center" :current-page="queryInfo.page" :total="total" :page-size="queryInfo.size" :pager-count="5" :page-sizes="[3, 5, 10]" layout="prev, pager, next, jumper,->,sizes,total" @current-change="getUrgentMessage" @size-change="handleSizeChange" />
+    <el-pagination style="margin-top: 20px;" background :current-page="queryInfo.page" :total="total" :page-size="queryInfo.size" :pager-count="5" :page-sizes="[3, 5, 10]" layout="prev, pager, next, jumper,->,sizes,total" @current-change="getUrgentMessage" @size-change="handleSizeChange" />
 
     <!-- 编辑紧急通知 -->
     <div class="publish_layer">
@@ -178,7 +178,7 @@ export default {
         notice_name: '',
         orga_id: '133221333123111',
         page: 1,
-        size: 3
+        size: 10
       },
       total: 0,
       messageVisible: false,
@@ -293,13 +293,13 @@ export default {
             this.form.context_position_name = '底部'
           }
           // 判断速度
-          //   if(context_speed_name == 0){
-          //   this.form.context_speed_name='1s'
-          // }else if(this.form.context_speed==1){
-          //     this.form.context_speed_name='2s'
-          // }else{
-          //     this.form.context_speed_name='3s'
-          // }
+          if (this.form.context_speed_name == 0) {
+            this.form.context_speed_name = '1s'
+          } else if (this.form.context_speed == 1) {
+            this.form.context_speed_name = '2s'
+          } else {
+            this.form.context_speed_name = '3s'
+          }
           // 判断文字大小
           if (this.form.context_size == 0) {
             this.form.context_size_name = '16'
@@ -345,7 +345,7 @@ export default {
                   : '添加紧急通知成功'
               })
               this.messageVisible = false
-              this.getUrgentMessage(this.form.notice_id ? this.queryInfo : 1)
+              this.getUrgentMessage(this.queryInfo.page)
             }
           })
         }