fix修改的内容

src/pages.json

@@ -415,12 +415,6 @@
     "paddingBottom": "0px",
     "marginBottom": "0px",
     "list": [
-      // {
-      //   "pagePath": "pages/home-new/index",
-      //   "iconPath": "static/images/tabbar/home.png",
-      //   "selectedIconPath": "static/images/tabbar/home_.png",
-      //   "text": "首页"
-      // },
       {
         "pagePath": "pages/myToDoList/index",
         "iconPath": "/static/images/tabbar/message.png",
@@ -434,6 +428,12 @@
         "text": "AI问答"
       },
       {
+        "pagePath": "pages/home-new/index",
+        "iconPath": "static/images/tabbar/home.png",
+        "selectedIconPath": "static/images/tabbar/home_.png",
+        "text": "首页"
+      },
+      {
         "pagePath": "pages/work/index",
         "iconPath": "static/images/tabbar/work.png",
         "selectedIconPath": "static/images/tabbar/work_.png",

src/pages/login.vue

@@ -78,7 +78,7 @@ export default {
   onLoad() {
     //#ifdef H5
     if (getToken()) {
-      this.$tab.reLaunch('/pages/myToDoList/index')
+      this.$tab.reLaunch('/pages/home-new/index')
     }
     this.getStorage()
     //#endif
@@ -164,7 +164,7 @@ export default {
       this.$store.dispatch('GetInfo').then(res => {
         // 登录成功后调用showMessageTabRedDot更新消息tab红点状态
         showMessageTabRedDot()
-        this.$tab.reLaunch('/pages/myToDoList/index')
+        this.$tab.reLaunch('/pages/home-new/index')
       })
     }
   }

src/pages/seizeStatistics/index.vue

@@ -5,7 +5,7 @@
       <view class="filter-section">
         <view class="filter-row">
           <uni-data-picker
-            v-if="curUserRoles.includes('test') || curUserRoles.includes('jingli') || curUserRoles.includes('xingzheng')"
+            v-if="curUserRoles.includes('test') || curUserRoles.includes('bumenjingli') || curUserRoles.includes('xingzheng')"
             class="filter-select" :localdata="departments" :placeholder="'请选择'" @change="handleinspectDeptIdChange"
             :clear-icon="false" />
           <text v-if="dateRange.length > 0" class="days-count">共 {{ totalDays }} 天</text>
@@ -233,7 +233,7 @@ export default {
           { label: '按个人', value: 3 }
         ];
       }
-      if (this.getType == "MANAGER" || this.curUserRoles.includes('kezhang')) {
+      if (this.getType == "MANAGER" || this.curUserRoles.includes('banzuzhang')) {
         return [
           { label: '按班组', value: 2 },
           { label: '按个人', value: 3 }
@@ -315,7 +315,7 @@ export default {
       if (this.getType == "MANAGER") {
         dept = { inspectDepartmentId: this.formData.inspectDeptId }
       }
-      if (this.curUserRoles.includes('kezhang')) {
+      if (this.curUserRoles.includes('banzuzhang')) {
         const deptId = this.currentUser.userInfo.deptId;
         dept = { inspectDepartmentId: deptId }
       }
@@ -355,7 +355,7 @@ export default {
     },
     // 初始化数据
     async initData() {
-      if (this.curUserRoles.includes('kezhang')) {
+      if (this.curUserRoles.includes('banzuzhang')) {
         this.defaultActive = 2
       }
       // 使用data()中设置的默认今天日期，不再重置dateRange
@@ -379,7 +379,7 @@ export default {
         const deptId = this.currentUser.userInfo && this.currentUser.userInfo.deptId;
         const subDeptTree = await getDeptList({ parentId: deptId });
         // console.log(subDeptTree, "subDeptTree")
-        let firstOption = this.curUserRoles.includes('test') ? [{ value: null, deptType: null, text: '全站' }] : this.curUserRoles.includes('jingli') || this.curUserRoles.includes('xingzheng') ? [{ value: deptId, deptType: 'BRIGADE', text: '本队' }] : [];
+        let firstOption = this.curUserRoles.includes('test') ? [{ value: null, deptType: null, text: '全站' }] : this.curUserRoles.includes('bumenjingli') || this.curUserRoles.includes('xingzheng') ? [{ value: deptId, deptType: 'BRIGADE', text: '本队' }] : [];
         //如果是站长，则获取所有部门的大队，如果是经理或行政，则获取登陆角色部门下的主管
         let otherOption = this.curUserRoles.includes('test') ? buildBrigadeOptions(deptTree.data || [], true) : buildManagerOptions(subDeptTree.data, true);
         console.log(otherOption, "this.departments")

src/pages/seizedReported/index.vue

@@ -309,7 +309,7 @@ export default {
     },
     // 判断是否为kezhang角色
     isKezhang() {
-      return this.$store?.state?.user?.roles?.includes('kezhang')
+      return this.$store?.state?.user?.roles?.includes('banzuzhang')
     },
     // 将item_check_method_options转换为字符串数组供uni-combox使用
     checkMethodCandidates() {

src/pages/seizedReportedVoice/index.vue

@@ -1502,7 +1502,7 @@ export default {
           formData: payload,
           submitterId: this.currentUser.id,
           submitterName: this.currentUser.name,
-          submitterRole: this.currentUser.roles.includes('banzuzhang') ? 'SEIZURE_REPORT_LEADER' : this.currentUser.roles.includes('SecurityCheck') ? 'SEIZURE_REPORT_STAFF' : '',
+          submitterRole: this.currentUser.roles.includes('xiaozuzhang') ? 'SEIZURE_REPORT_LEADER' : this.currentUser.roles.includes('SecurityCheck') ? 'SEIZURE_REPORT_STAFF' : '',
         }
 
 

src/pages/teamProfile/index.vue

@@ -345,7 +345,7 @@ export default {
         //班组长
         // isManager() {
         //     const roles = this.getUserRoles()
-        //     return roles.includes('banzuzhang')
+        //     return roles.includes('xiaozuzhang')
         // },
         chooseDept() {
             if (this.isStationMaster() || this.isBrigade()) {

src/pages/workProfile/index.vue

@@ -4,7 +4,7 @@
         <view class="workProfileContainer">
             <!-- 下拉选择 -->
             <div class="filter-section" v-if="isSpecialUser || isJingLi">
-                <uni-data-select :class="{ 'filter-select': true, 'kezhang-style': isKeZhang }" v-model="selectedLevel"
+                <uni-data-select :class="{ 'filter-select': true, 'banzuzhang-style': isKeZhang }" v-model="selectedLevel"
                     :localdata="levelOptions" placeholder="请选择级别" :clear="false" @change="handleLevelChange"
                     :disabled="isKeZhang" />
             </div>
@@ -151,10 +151,10 @@ export default {
             return this.userRoles.includes('test')
         },
         isJingLi() {
-            return this.userRoles.includes('jingli')
+            return this.userRoles.includes('bumenjingli')
         },
         isKeZhang() {
-            return this.userRoles.includes('kezhang')
+            return this.userRoles.includes('banzuzhang')
         },
         curUserRoles() {
             return this.$store.state.user && this.$store.state.user.roles;
@@ -368,7 +368,7 @@ export default {
         }
     }
 
-    .kezhang-style {
+    .banzuzhang-style {
         ::v-deep .uni-stat-box {
             .uniui-bottom {
                 display: none !important;

src/utils/common.js

@@ -464,7 +464,7 @@ export function checkRolePermission(role, path) {
       '/pages/voiceSubmissionDraft/index'
     ],
     //班组长
-    banzuzhang: [
+    xiaozuzhang: [
       '/pages/attendance/index',
       `/pages/seizedReported/index?params=${encodeURIComponent(JSON.stringify({ type: 'add' }))}`,
       '/pages/daily-exam/task-list/index',
@@ -477,7 +477,7 @@ export function checkRolePermission(role, path) {
       '/pages/voiceSubmissionDraft/index'
     ],
     //站长
-    kezhang: [
+    banzuzhang: [
       '/pages/attendance/index',
       '/pages/attendanceStatistics/index',
       '/pages/inspectionChecklist/index',