diff --git a/back/src/router/index.js b/back/src/router/index.js
index 08f69ea5..299a5852 100644
--- a/back/src/router/index.js
+++ b/back/src/router/index.js
@@ -105,6 +105,7 @@ router.beforeEach((to, from, next) => {
       return next({ name: 'login' })
     }
     window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
+    debugger
     fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
     next({ ...to, replace: true })
   }).catch(() => {
@@ -137,6 +138,7 @@ function fnCurrentRouteIsPageRoute (route, pageRoutes = []) {
  */
 function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
   var temp = []
+  debugger
   for (var i = 0; i < menuList.length; i++) {
     if (menuList[i].children && menuList[i].children.length >= 1) {
       temp = temp.concat(menuList[i].children)
@@ -187,6 +189,7 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
     },
     { path: '*', redirect: { name: '404' } }
   ])
+  console.log('查询路由', routes)
   window.SITE_CONFIG.dynamicMenuRoutes = routes
   window.SITE_CONFIG.dynamicMenuRoutesHasAdded = true
 }
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 704e4c78..b517f017 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -27,7 +27,7 @@
         <el-form-item>
           <span>日期：</span>
           <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
         <!--审核状态-->
@@ -43,7 +43,8 @@
 
         <!--部门-->
         <el-form-item>
-          <span>部门名称：</span>
+          <span v-if="this.departmentId === 1 || this.departmentId === 3">上架部门：</span>
+          <span v-else>申请部门：</span>
           <el-select
             v-model="abilityDepartment"
             placeholder="请选择部门"
@@ -51,7 +52,7 @@
             clearable
           >
             <el-option label="全部" value=""></el-option>
-            <el-option v-for="item in departmentSelects" :key="item.label" v-bind="item"></el-option>
+            <el-option v-for="item in departmentSelects" :key="item.label" :label="item.label" :value="item.value" v-bind="item"></el-option>
           </el-select>
         </el-form-item>
 
@@ -155,7 +156,7 @@
             </el-table-column>
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
             </el-table-column>
-            <el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2'>
+            <el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
             </el-table-column>
             <el-table-column prop="zj" label="总计" min-width="100%">
             </el-table-column>
@@ -462,6 +463,7 @@ export default {
       this.$http
         .get('/census/center/selectDeptDetailTypeCountList/', {
           params: {
+            type: this.abilityType,
             page: page || 1,
             limit: 5,
             approveStatus: this.status,
@@ -527,6 +529,7 @@ export default {
       this.$http
         .get('/census/center/selectApplyDeptDetailTypeCountList', {
           params: {
+            type: this.abilityType,
             page: page || 1,
             limit: this.pageSize,
             approveStatus: this.status,
@@ -702,6 +705,7 @@ export default {
             limit: 5,
             // page: page || 1,
             approveStatus: '',
+            type: '',
             deptId: '',
             params: '',
             startDate: ''
@@ -881,8 +885,8 @@ export default {
     // 点击查询按钮查询数据
     getDataList () {
       if (this.value1 && this.value1.length > 0) {
-        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss')
-        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss')
+        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
+        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
       } else {
         this.startDate = ''
         this.endDate = ''
diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue
index 8c8118c9..40398630 100644
--- a/back/src/views/modules/myAgent/CompetencyApplication.vue
+++ b/back/src/views/modules/myAgent/CompetencyApplication.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-08-23 10:37:29
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-19 11:10:50
  * @Description: 能力申请
 -->
 <template>
@@ -168,7 +168,7 @@ export default {
   created () {
     bus.$off('competencyApplicationInit')
     bus.$on('competencyApplicationInit', () => {
-      this.getDataList();
+      this.getDataList()
       bus.$emit('updateTaskNum')
     })
   }
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 153a38ef..6ba8a0dd 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-10-20 17:18:58
+ * @LastEditTime: 2022-10-21 09:31:25
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
diff --git a/front/package.json b/front/package.json
index 95d426a4..6456938f 100644
--- a/front/package.json
+++ b/front/package.json
@@ -60,6 +60,7 @@
     "body-parser": "^1.20.0",
     "chalk": "^4.1.1",
     "chokidar": "^3.5.2",
+    "compression-webpack-plugin": "^6.1.1",
     "crypto-js": "^4.1.1",
     "eslint": "^7.32.0",
     "eslint-plugin-prettier": "^4.2.1",
diff --git a/front/public/index.html b/front/public/index.html
index 10035c44..35f655e3 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-25 11:18:05
+ * @LastEditTime: 2022-10-19 17:44:14
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -102,4 +102,4 @@
     <!-- built files will be auto injected -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/front/src/views/capabilityCloud/components/Infrastructure.vue b/front/src/views/capabilityCloud/components/Infrastructure.vue
index 2741e9b5..08cf1b86 100644
--- a/front/src/views/capabilityCloud/components/Infrastructure.vue
+++ b/front/src/views/capabilityCloud/components/Infrastructure.vue
@@ -75,15 +75,10 @@ const params = {
   pageSize: 10,
 }
 infrastructureInfo().then((res) => {
-  console.log('基础设施==================>', res.data.data)
+  console.log('基础设施======云图============>', res.data.data)
   myDataList.value.forEach((val) => {
     const obj = res.data.data.filter((item) => item.type === val.title)[0]
     if (obj) {
-      if (obj.type == '视频资源数量') {
-        if (uavAndIndividualSoldier.num) {
-          obj.amount = obj.amount - 0 + uavAndIndividualSoldier.num
-        }
-      }
       val.snum = obj.amount
     }
   })
diff --git a/front/vue.config.js b/front/vue.config.js
index 34ebe1d2..7a72ae44 100644
--- a/front/vue.config.js
+++ b/front/vue.config.js
@@ -18,7 +18,19 @@ const {
   donation,
 } = require('./src/config')
 const { webpackBarName, webpackBanner, donationConsole } = require('vab-config')
-
+const CompressionWebpackPlugin = require('compression-webpack-plugin')
+const productionGzipExtensions = [
+  'js',
+  'css',
+  'html',
+  'svg',
+  'json',
+  'txt',
+  'ico',
+]
+// 是否开启gzip压缩
+const isPro = process.env.NODE_ENV === 'production'
+// const isPro = false
 if (donation) donationConsole()
 const { version, author } = require('./package.json')
 const Webpack = require('webpack')
@@ -92,7 +104,6 @@ module.exports = {
   chainWebpack(config) {
     config.resolve.symlinks(true)
     config.module.rule('svg').exclude.add(resolve('src/icon/remixIcon')).end()
-
     config.module
       .rule('remixIcon')
       .test(/\.svg$/)
@@ -110,21 +121,21 @@ module.exports = {
     config.when(process.env.NODE_ENV !== 'development', (config) => {
       config.performance.set('hints', false)
       config.devtool('none')
-      config.optimization.splitChunks({
-        chunks: 'all',
-        cacheGroups: {
-          libs: {
-            name: 'vue-admin-beautiful-libs',
-            test: /[\\/]node_modules[\\/]/,
-            priority: 10,
-            chunks: 'initial',
-          },
-        },
-      })
-      config
-        .plugin('banner')
-        .use(Webpack.BannerPlugin, [`${webpackBanner}${time}`])
-        .end()
+      // config.optimization.splitChunks({
+      //   chunks: 'all',
+      //   cacheGroups: {
+      //     libs: {
+      //       name: 'vue-admin-beautiful-libs',
+      //       test: /[\\/]node_modules[\\/]/,
+      //       priority: 10,
+      //       chunks: 'initial',
+      //     },
+      //   },
+      // })
+      // config
+      //   .plugin('banner')
+      //   .use(Webpack.BannerPlugin, [`${webpackBanner}${time}`])
+      //   .end()
       config.module
         .rule('images')
         .use('image-webpack-loader')
@@ -134,7 +145,19 @@ module.exports = {
         })
         .end()
     })
-
+    if (isPro) {
+      // 生产环境下使用gzip 压缩
+      config.plugin('compressionPlugin').use(
+        new CompressionWebpackPlugin({
+          // filename: '[path].gz[query]',
+          algorithm: 'gzip',
+          test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
+          threshold: 10240, // 只有大小大于该值的资源会被处理 10240
+          minRatio: 0.8, // 只有压缩率小于这个值的资源才会被处理
+          deleteOriginalAssets: false, // 删除原文件
+        })
+      )
+    }
     if (build7z) {
       config.when(process.env.NODE_ENV === 'production', (config) => {
         config