diff --git a/src/views/modules/sys/app-menu-add-or-update.vue b/src/views/modules/sys/app-menu-add-or-update.vue
index c6ef776..6f540fc 100644
--- a/src/views/modules/sys/app-menu-add-or-update.vue
+++ b/src/views/modules/sys/app-menu-add-or-update.vue
@@ -24,6 +24,16 @@
           :placeholder="$t('menu.name')"
         ></el-input>
       </el-form-item>
+      <el-form-item label="所属类别"
+                    prop="category">
+        <el-select v-model="dataForm.category" placeholder="请选择">
+          <el-option v-for="item in appMenuCategory"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item prop="menuCode" :label="$t('menu.menuCode')">
         <el-input
           v-model="dataForm.menuCode"
@@ -222,6 +232,7 @@ export default {
         name: '',
         pid: '0',
         parentName: '',
+        category: '',
         url: '',
         sort: 0,
         icon: '',
@@ -232,7 +243,8 @@ export default {
         numFlag: '0'
       },
       uploadUrl: '',
-      loading: false
+      loading: false,
+      appMenuCategory: []
     }
   },
   computed: {
@@ -278,6 +290,15 @@ export default {
           }
         })
       })
+      this.getListFromDict()
+    },
+    getListFromDict () {
+      this.$http.get(`/sys/dict/listSimple/app_menu_category`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.appMenuCategory = res.data
+      }).catch(() => { })
     },
     // 获取菜单列表
     getMenuList () {
diff --git a/src/views/modules/sys/app-menu.vue b/src/views/modules/sys/app-menu.vue
index bf3bed7..0e0a62f 100644
--- a/src/views/modules/sys/app-menu.vue
+++ b/src/views/modules/sys/app-menu.vue
@@ -21,12 +21,7 @@
         border
         style="width: 100%;"
       >
-        <table-tree-column
-          prop="name"
-          :label="$t('menu.name')"
-          header-align="center"
-          width="150"
-        ></table-tree-column>
+        <table-tree-column prop="name" :label="$t('menu.name')" header-align="center" width="150" ></table-tree-column>
         <el-table-column
           prop="icon"
           label="菜单图标"
@@ -58,6 +53,13 @@
           header-align="center"
           align="center"
         ></el-table-column>
+        <el-table-column
+          prop="category"
+          label="所属类别"
+          header-align="center"
+          :formatter="showCategoryFormatter"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="numFlag"
           label="显示数字"
@@ -127,6 +129,15 @@ export default {
       } else {
         return '未知'
       }
+    },
+    showCategoryFormatter: function (row, column) {
+      if (row.category === 'work') {
+        return '工作端'
+      } else if (row.category === 'analysis') {
+        return '数据端'
+      } else {
+        return '未知'
+      }
     }
   }
 }
diff --git a/src/views/modules/sys/appmenutemplate-add-or-update.vue b/src/views/modules/sys/appmenutemplate-add-or-update.vue
index 6e9080a..dd969e5 100644
--- a/src/views/modules/sys/appmenutemplate-add-or-update.vue
+++ b/src/views/modules/sys/appmenutemplate-add-or-update.vue
@@ -18,6 +18,16 @@
           placeholder="模板名称"
         ></el-input>
       </el-form-item>
+      <el-form-item label="所属类别"
+                    prop="category">
+        <el-select v-model="dataForm.category" placeholder="请选择">
+          <el-option v-for="item in appMenuCategory"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="模板编码" prop="templateCode">
         <el-input
           v-model="dataForm.templateCode"
@@ -72,9 +82,9 @@ export default {
         className: '',
         spareClassName: '',
         columnAmount: 0,
-        createdTime: '',
-        updatedTime: ''
-      }
+        category: ''
+      },
+      appMenuCategory: []
     }
   },
   computed: {
@@ -115,37 +125,9 @@ export default {
             trigger: 'blur'
           }
         ],
-        revision: [
-          {
-            required: false,
-            message: this.$t('validate.required'),
-            trigger: 'blur'
-          }
-        ],
-        createdBy: [
-          {
-            required: false,
-            message: this.$t('validate.required'),
-            trigger: 'blur'
-          }
-        ],
-        createdTime: [
+        category: [
           {
-            required: false,
-            message: this.$t('validate.required'),
-            trigger: 'blur'
-          }
-        ],
-        updatedBy: [
-          {
-            required: false,
-            message: this.$t('validate.required'),
-            trigger: 'blur'
-          }
-        ],
-        updatedTime: [
-          {
-            required: false,
+            required: true,
             message: this.$t('validate.required'),
             trigger: 'blur'
           }
@@ -162,6 +144,15 @@ export default {
           this.getInfo()
         }
       })
+      this.getListFromDict()
+    },
+    getListFromDict () {
+      this.$http.get(`/sys/dict/listSimple/app_menu_category`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.appMenuCategory = res.data
+      }).catch(() => { })
     },
     // 获取信息
     getInfo () {
diff --git a/src/views/modules/sys/appmenutemplate.vue b/src/views/modules/sys/appmenutemplate.vue
index 064a746..ecdf1a5 100644
--- a/src/views/modules/sys/appmenutemplate.vue
+++ b/src/views/modules/sys/appmenutemplate.vue
@@ -52,6 +52,13 @@
           header-align="center"
           align="center"
         ></el-table-column>
+        <el-table-column
+          prop="category"
+          label="所属类别"
+          header-align="center"
+          :formatter="showCategoryFormatter"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="templateCode"
           label="模板编码"
@@ -150,6 +157,15 @@ export default {
         : row.state === '0'
           ? '未知'
           : '否'
+    },
+    showCategoryFormatter: function (row, column) {
+      if (row.category === 'work') {
+        return '工作端'
+      } else if (row.category === 'analysis') {
+        return '数据端'
+      } else {
+        return '未知'
+      }
     }
   }
 }
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index d503eab..64aa8e5 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -86,7 +86,7 @@
                      ref="whistleDeptListTree"
                      accordion
                      show-checkbox
-                     check-strictly=true>
+                     :check-strictly="true">
             </el-tree>
           </el-form-item>
         </el-col>
@@ -124,7 +124,7 @@ export default {
       appMenuList: [],
       categoryList: [],
       roleTypeList: [],
-      analysisMenuList:[],
+      analysisMenuList: [],
       dataForm: {
         id: '',
         name: '',
@@ -166,9 +166,9 @@ export default {
           this.getMenuList(),
           this.getDeptList(),
           this.getAppMenuList(),
-          this.getCategoryList(),
-          this.getWhistleDeptList(),
-          this.getAnalysisMenuList()
+          this.getCategoryList()
+          // this.getWhistleDeptList()
+          // this.getAnalysisMenuList()
         ]).then(() => {
           if (this.dataForm.id) {
             this.getInfo()
@@ -192,24 +192,27 @@ export default {
           return this.$message.error(res.msg)
         }
         this.deptList = res.data
-      }).catch(() => { })
-    },
-    // 获取吹哨部门列表
-    getWhistleDeptList () {
-      return this.$http.get('/sys/dept/list').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
+        // 吹哨部门列表与全部部门列表相同
         this.whistleDeptList = res.data
       }).catch(() => { })
     },
+    // 获取吹哨部门列表
+    // getWhistleDeptList () {
+    //   return this.$http.get('/sys/dept/list').then(({ data: res }) => {
+    //     if (res.code !== 0) {
+    //       return this.$message.error(res.msg)
+    //     }
+    //     this.whistleDeptList = res.data
+    //   }).catch(() => { })
+    // },
     // 获取App菜单列表
     getAppMenuList () {
-      return this.$http.get('/sys/appmenu/select').then(({ data: res }) => {
+      return this.$http.get('/sys/appmenu/v2/select').then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.appMenuList = res.data
+        this.appMenuList = res.data.workMenu
+        this.analysisMenuList = res.data.analysisMenu
       }).catch(() => { })
     },
     // 获取项目处理类型授权
@@ -221,14 +224,14 @@ export default {
         this.categoryList = res.data
       }).catch(() => { })
     },
-    getAnalysisMenuList () {
-      return this.$http.get('/sys/analysismenu/select').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.analysisMenuList = res.data
-      }).catch(() => { })
-    },
+    // getAnalysisMenuList () {
+    //   return this.$http.get('/sys/analysismenu/select').then(({ data: res }) => {
+    //     if (res.code !== 0) {
+    //       return this.$message.error(res.msg)
+    //     }
+    //     this.analysisMenuList = res.data
+    //   }).catch(() => { })
+    // },
     // 获取信息
     getInfo () {
       this.$http.get(`/sys/role/${this.dataForm.id}`).then(({ data: res }) => {
@@ -271,7 +274,7 @@ export default {
           ...this.$refs.analysisMenuListTree.getHalfCheckedKeys()
         ]
         this.dataForm.whistleDeptIdList = this.$refs.whistleDeptListTree.getCheckedKeys()
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/role', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/role/v2', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }