Browse Source

fix修改的内容

huoyi 1 week ago
parent
commit
a59ce031fb

+ 4 - 4
src/pages/attendance/components/AddAttendancePersonnelModal.vue

@@ -63,14 +63,14 @@
63 63
         </view>
64 64
         <view class="title-cell" v-if="!searchViewShow">
65 65
           <view class="title-text" style="display: flex; align-items: center;">{{ notkezhang ? '选择通道' : '选择区域' }}
66
-            <view v-if="!userInfo.roles.includes('banzuzhang')">
66
+            <view v-if="!userInfo.roles.includes('xiaozuzhang')">
67 67
               <SelectArea :notkezhang="notkezhang" @selected="selectedArea">
68 68
                 <u-icon name="plus-circle" color="#2A70D1" size="25" />
69 69
               </SelectArea>
70 70
             </view>
71 71
           </view>
72 72
           <view class="">
73
-            <uniDataPicker v-if="userInfo.roles.includes('banzuzhang')" :localdata="channelList"
73
+            <uniDataPicker v-if="userInfo.roles.includes('xiaozuzhang')" :localdata="channelList"
74 74
               :popup-title="notkezhang ? '请选择上岗通道' : '请选择上岗区域'" v-model="channelOrRegional"
75 75
               @change="onLocationChange" />
76 76
 
@@ -209,13 +209,13 @@ export default {
209 209
   watch: {
210 210
     show(newValue) {
211 211
       if (newValue) {
212
-        if (this.userInfo.roles.includes('kezhang')) {
212
+        if (this.userInfo.roles.includes('banzuzhang')) {
213 213
           this.getQueryLastTime()
214 214
         }
215 215
         this.currentTime = formatTime(new Date())
216 216
 
217 217
         if (this.notkezhang) {
218
-          if (this.userInfo.roles.includes('banzuzhang')) {
218
+          if (this.userInfo.roles.includes('xiaozuzhang')) {
219 219
             memberList({
220 220
               attendanceTeamId: this.userInfo.teamsId,
221 221
               attendanceDate: moment().format('YYYY-MM-DD')

+ 2 - 2
src/pages/attendance/components/MaintainAreaOrMemberModal.vue

@@ -152,8 +152,8 @@ export default {
152 152
     },
153 153
     computed: {
154 154
         notkezhang() {
155
-            // console.log(!this.userInfo.roles || !this.userInfo.roles.includes('kezhang'), "!this.userInfo.roles || !this.userInfo.roles.includes('kezhang')")
156
-            return !this.userInfo.roles || !this.userInfo.roles.includes('kezhang')
155
+            // console.log(!this.userInfo.roles || !this.userInfo.roles.includes('banzuzhang'), "!this.userInfo.roles || !this.userInfo.roles.includes('banzuzhang')")
156
+            return !this.userInfo.roles || !this.userInfo.roles.includes('banzuzhang')
157 157
         },
158 158
     },
159 159
     mounted() {

+ 5 - 5
src/pages/attendance/components/WorkingGroup.vue

@@ -49,13 +49,13 @@
49 49
           </view>
50 50
         </view>
51 51
       </view>
52
-      <!-- {{ selectedMember.length === 0 }}{{ !userInfo.roles.includes('kezhang') }}{{ !attendanceInfo.checkInTime }} -->
52
+      <!-- {{ selectedMember.length === 0 }}{{ !userInfo.roles.includes('banzuzhang') }}{{ !attendanceInfo.checkInTime }} -->
53 53
       <!-- :disabled="!attendanceInfo.checkInTime || checkOutStatus" -->
54 54
       <AddAttendancePersonnelModal v-if="index === 0" :disabled="checkOutStatus" :notkezhang="notkezhang"
55 55
         :userInfo="userInfo" @updateRecord="invokerGetPostRecordList" :selectedMember="selectedMember" :attendanceInfo="attendanceInfo">
56 56
         <!-- :class="{ disabled: !attendanceInfo.checkInTime }"   没有选人不可以上通道 -->
57 57
         <view v-if="authority" class="custom-btn" @click="openModal"
58
-          :class="{ disabled: selectedMember.length === 0 && !userInfo.roles.includes('kezhang') || (!attendanceInfo.checkInTime || (attendanceInfo.checkInTime && attendanceInfo.checkOutTime)) }">
58
+          :class="{ disabled: selectedMember.length === 0 && !userInfo.roles.includes('banzuzhang') || (!attendanceInfo.checkInTime || (attendanceInfo.checkInTime && attendanceInfo.checkOutTime)) }">
59 59
           {{ checkOutStatus ? '下通道' : '上通道' }}
60 60
         </view>
61 61
       </AddAttendancePersonnelModal>
@@ -118,12 +118,12 @@ export default {
118 118
   },
119 119
   computed: {
120 120
     notkezhang() {
121
-      return !this.userInfo.roles || !this.userInfo.roles.includes('kezhang')
121
+      return !this.userInfo.roles || !this.userInfo.roles.includes('banzuzhang')
122 122
     },
123 123
     authority() { // 上通道权限
124 124
       return this.userInfo.roles && (
125
-        this.userInfo.roles.includes('kezhang') ||
126
-        this.userInfo.roles.includes('banzuzhang')
125
+        this.userInfo.roles.includes('banzuzhang') ||
126
+        this.userInfo.roles.includes('xiaozuzhang')
127 127
       )
128 128
     }
129 129
   },

+ 1 - 1
src/pages/attendance/index.vue

@@ -59,7 +59,7 @@ export default {
59 59
       }
60 60
     },
61 61
     showMaintain() {
62
-      return this.userInfo.roles.includes('banzuzhang')
62
+      return this.userInfo.roles.includes('xiaozuzhang')
63 63
     }
64 64
   },
65 65
   data() {

+ 3 - 3
src/pages/attendanceStatistics/index.vue

@@ -2,7 +2,7 @@
2 2
     <home-container :customStyle="{ background: 'none' }">
3 3
         <view class="container">
4 4
             <!-- 顶部tabs -->
5
-            <h-tabs v-if="roles.includes('kezhang')" v-model="currentTab" :tabs="tabList" value-key="type"
5
+            <h-tabs v-if="roles.includes('banzuzhang')" v-model="currentTab" :tabs="tabList" value-key="type"
6 6
                 label-key="title" @change="handleTabChange" />
7 7
 
8 8
             <!-- 通道开放情况 -->
@@ -111,7 +111,7 @@ export default {
111 111
     mounted() {
112 112
         this.fetchData("1");
113 113
 
114
-        if (!this.roles.includes('kezhang')) {
114
+        if (!this.roles.includes('banzuzhang')) {
115 115
             this.currentTab = 'all'
116 116
         }
117 117
     },
@@ -176,7 +176,7 @@ export default {
176 176
             let openRate = 0;
177 177
             let openData = 0;
178 178
             let closeData = 0;
179
-            if (this.roles.includes('kezhang') && this.currentTab == 'my') {
179
+            if (this.roles.includes('banzuzhang') && this.currentTab == 'my') {
180 180
 
181 181
                 openData = this.terminlDetail.reduce((item, cur) => {
182 182
                     return item + cur.onDutyChannelCount;

+ 1 - 1
src/pages/checklist/index.vue

@@ -164,7 +164,7 @@ export default {
164 164
         },
165 165
         notkezhang() {
166 166
             let roles = this.$store.state.user.roles
167
-            return !roles || !roles.includes('kezhang')
167
+            return !roles || !roles.includes('banzuzhang')
168 168
         },
169 169
         roles() {
170 170
             return this.$store.state.user.roles

+ 4 - 4
src/pages/eikonStatistics/components/topInfo.vue

@@ -34,7 +34,7 @@
34 34
                     <!-- 搜索框 -->
35 35
                     <view class="search-section">
36 36
                         <uni-easyinput v-model="searchKeyword"
37
-                            :placeholder="userRoles.includes('banzuzhang') ? '请输入姓名搜索' : '请输入部门名称、姓名搜索'"
37
+                            :placeholder="userRoles.includes('xiaozuzhang') ? '请输入姓名搜索' : '请输入部门名称、姓名搜索'"
38 38
                             :clearable="true" />
39 39
                     </view>
40 40
 
@@ -220,13 +220,13 @@ export default {
220 220
             if (this.userRoles.includes('test')) {
221 221
                 params.deptId = this.userInfo.stationId
222 222
             }
223
-            if (this.userRoles.includes('jingli')) {
223
+            if (this.userRoles.includes('bumenjingli')) {
224 224
                 params.deptId = this.userInfo.brigadeId
225 225
             }
226
-            if (this.userRoles.includes('kezhang')) {
226
+            if (this.userRoles.includes('banzuzhang')) {
227 227
                 params.deptId = this.userInfo.departmentId
228 228
             }
229
-            if (this.userRoles.includes('banzuzhang')) {
229
+            if (this.userRoles.includes('xiaozuzhang')) {
230 230
                 params.deptId = this.userInfo.teamsId
231 231
             }
232 232
             let res = await getDeptUserTree(params)

+ 3 - 3
src/pages/eikonStatistics/index.vue

@@ -131,7 +131,7 @@ export default {
131 131
       return this.oldLevel && this.oldLevelId
132 132
     },
133 133
     hasTabs() {
134
-      return this.userRoles.includes('SecurityCheck') || this.userRoles.includes('banzuzhang')
134
+      return this.userRoles.includes('SecurityCheck') || this.userRoles.includes('xiaozuzhang')
135 135
     }
136 136
   },
137 137
   async onLoad() {
@@ -147,9 +147,9 @@ export default {
147 147
     //根据不同的登录角色,赋予初始级别
148 148
     async setInitialLevel() {
149 149
       let isZhanZhang = this.userRoles && this.userRoles.includes('test')
150
-      let isKeZhang = this.userRoles && this.userRoles.includes('kezhang')
150
+      let isKeZhang = this.userRoles && this.userRoles.includes('banzuzhang')
151 151
       let isZhiJian = this.userRoles && this.userRoles.includes('zhijianke')
152
-      let isJingLi = this.userRoles && this.userRoles.includes('jingli')
152
+      let isJingLi = this.userRoles && this.userRoles.includes('bumenjingli')
153 153
       let level = isKeZhang ? 'department' : isJingLi ? 'brigade' : 'station';
154 154
       let levelId = isKeZhang ? this.userInfo.departmentId : isJingLi ? this.userInfo.brigadeId : this.userInfo.stationId;
155 155
       if (isKeZhang || isZhanZhang || isZhiJian || isJingLi) {

+ 1 - 1
src/pages/groupProfile/index.vue

@@ -342,7 +342,7 @@ export default {
342 342
         },
343 343
         isBanzuzhang() {
344 344
             const roles = this.getUserRoles()
345
-            return roles.includes('banzuzhang')
345
+            return roles.includes('xiaozuzhang')
346 346
         },
347 347
         chooseDept() {
348 348
             

+ 3 - 3
src/pages/home-new/components/total-detail.vue

@@ -9,7 +9,7 @@
9 9
             </div>
10 10
             <div class="item-links">
11 11
                 <div class="item-link"
12
-                    v-if="!role.includes('SecurityCheck') && !(role.includes('banzuzhang') && selectedRole == 'individual')"
12
+                    v-if="!role.includes('SecurityCheck') && !(role.includes('xiaozuzhang') && selectedRole == 'individual')"
13 13
                     @click="handleLinkClick('/pages/capabilityComparison/index')">能力对比</div>
14 14
             </div>
15 15
         </div>
@@ -132,14 +132,14 @@ export default {
132 132
                         type: 'USER'
133 133
                     }
134 134
                 }
135
-                if (roles.includes('banzuzhang')) {
135
+                if (roles.includes('xiaozuzhang')) {
136 136
                     obj = {
137 137
                         id: userInfo.teamsId,
138 138
                         name: userInfo.teamsName,
139 139
                         type: 'DEPT'
140 140
                     }
141 141
                 }
142
-                if (roles.includes('kezhang')) {
142
+                if (roles.includes('banzuzhang')) {
143 143
                     obj = {
144 144
                         id: userInfo.departmentId,
145 145
                         name: userInfo.departmentName,

+ 16 - 16
src/pages/home-new/index.vue

@@ -26,7 +26,7 @@
26 26
             </div>
27 27
 
28 28
             <!-- 角色切换组件(班组长显示) -->
29
-            <SelectTag v-if="role.includes('banzuzhang')" :tags="roleTags" :selected-value="selectedRole"
29
+            <SelectTag v-if="role.includes('xiaozuzhang')" :tags="roleTags" :selected-value="selectedRole"
30 30
                 @change="handleRoleChange" class="role-selector" />
31 31
         </div>
32 32
 
@@ -193,14 +193,14 @@ export default {
193 193
         },
194 194
         // 是否为班组视图:角色是班组长或者selectedRole为team
195 195
         isTeamView() {
196
-            return this.role.includes('banzuzhang') ? this.selectedRole === 'team' : this.role.includes('banzuzhang')
196
+            return this.role.includes('xiaozuzhang') ? this.selectedRole === 'team' : this.role.includes('xiaozuzhang')
197 197
         },
198 198
         // 是否为个人视图:selectedRole为individual或者角色是SecurityCheck
199 199
         isIndividualView() {
200
-            return this.role.includes('banzuzhang') ? this.selectedRole === 'individual' : this.role.includes('SecurityCheck')
200
+            return this.role.includes('xiaozuzhang') ? this.selectedRole === 'individual' : this.role.includes('SecurityCheck')
201 201
         },
202 202
         isBrigade() {
203
-            return this.role.includes('jingli') || this.role.includes('xingzheng')
203
+            return this.role.includes('bumenjingli') || this.role.includes('xingzheng')
204 204
         },
205 205
         // 是否为站长或质检科角色
206 206
         isZhanZhang() {
@@ -294,12 +294,12 @@ export default {
294 294
         attendanceItems() {
295 295
             let res = {};
296 296
 
297
-            if (this.role.includes('kezhang') || this.isZhanZhang || this.isBrigade) {
297
+            if (this.role.includes('banzuzhang') || this.isZhanZhang || this.isBrigade) {
298 298
                 // 班组长选择班组视图
299 299
                 if (this.isZhanZhang) {
300 300
                     res = this.attendanceStats.stationLeaderStats
301 301
                 }
302
-                if (this.role.includes('kezhang')) {
302
+                if (this.role.includes('banzuzhang')) {
303 303
                     res = this.attendanceStats.sectionLeaderStats
304 304
                 }
305 305
                 if (this.isBrigade) {
@@ -343,7 +343,7 @@ export default {
343 343
                 const { securityCheckerData } = this.seizeData;
344 344
                 const { pendingCount } = securityCheckerData || {};
345 345
                 return pendingCount;
346
-            } else if (this.role.includes('kezhang')) {
346
+            } else if (this.role.includes('banzuzhang')) {
347 347
                 const { sectionMasterData } = this.seizeData;
348 348
                 const { pendingCount } = sectionMasterData || {};
349 349
                 // 科长、SecurityCheck角色:显示班组、科级和站级排名
@@ -732,7 +732,7 @@ export default {
732 732
                 const { startDate, endDate } = this.calculateDateRange(this.selectedTimeRange);
733 733
                 params.startDate = startDate;
734 734
                 params.endDate = endDate;
735
-                if (!this.isZhanZhang && !this.role.includes('kezhang')) {
735
+                if (!this.isZhanZhang && !this.role.includes('banzuzhang')) {
736 736
                     params.dataSource = this.selectedRole;
737 737
                 }
738 738
 
@@ -1006,7 +1006,7 @@ export default {
1006 1006
                 return '本人';
1007 1007
             } else if (this.isTeamView) {
1008 1008
                 return '班组';
1009
-            } else if (this.role.includes('kezhang')) {
1009
+            } else if (this.role.includes('banzuzhang')) {
1010 1010
                 return '主管';
1011 1011
             } else if (this.isZhanZhang) {
1012 1012
                 return '全站';
@@ -1035,7 +1035,7 @@ export default {
1035 1035
                     { label: '大队平均', value: ((brigadePassRate || 0) * 100).toFixed(2), isImage: false, color: brigadePassRate < personalPassRate ? '#00AE41' : '#F96060' },
1036 1036
                     { label: '站平均', value: ((stationPassRate || 0) * 100).toFixed(2), isImage: false, color: stationPassRate < teamPassRate ? '#00AE41' : '#F96060' }
1037 1037
                 ];
1038
-            } else if (this.role.includes('kezhang')) {
1038
+            } else if (this.role.includes('banzuzhang')) {
1039 1039
                 // kezhang角色:主管、站平均、前三名班组(isImage: true)
1040 1040
                 return [
1041 1041
                     { label: '主管', value: ((departmentPassRate || 0) * 100).toFixed(2), isImage: false },
@@ -1088,7 +1088,7 @@ export default {
1088 1088
                     { label: '大队平均', value: (brigadeAvgAccuracy || 0), isImage: false, color: brigadeAvgAccuracy < teamAvgAccuracy ? '#00AE41' : '#F96060' },
1089 1089
                     { label: '站平均', value: (siteAvgAccuracy || 0), isImage: false, color: siteAvgAccuracy < teamAvgAccuracy ? '#00AE41' : '#F96060' }
1090 1090
                 ];
1091
-            } else if (this.role.includes('kezhang')) {
1091
+            } else if (this.role.includes('banzuzhang')) {
1092 1092
                 // kezhang角色:主管、站平均、前三名班组(isImage: true)
1093 1093
                 return [
1094 1094
                     { label: '主管', value: (deptAvgAccuracy || 0), isImage: false, },
@@ -1148,7 +1148,7 @@ export default {
1148 1148
                     { label: '大队平均', value: brigadeAverage || 0, isImage: false, color: brigadeAverage < teamAverage ? '#00AE41' : '#F96060' },
1149 1149
                     { label: '站平均', value: (stationAverage && stationAverage.toFixed(2)) || 0, isImage: false, color: stationAverage < teamAverage ? '#00AE41' : '#F96060' }
1150 1150
                 ];
1151
-            } else if (this.role.includes('kezhang')) {
1151
+            } else if (this.role.includes('banzuzhang')) {
1152 1152
                 // kezhang角色:从securityCheckerData解构
1153 1153
                 const { sectionMasterData } = this.seizeData;
1154 1154
                 const { brigadeAverage, departmentAverage, stationAverage } = sectionMasterData || {}
@@ -1221,7 +1221,7 @@ export default {
1221 1221
                     { label: '大队排名', current: brigadeRanking || 0, total: brigadeTotal || 0, percentage: brigadeTotal ? ((brigadeRanking || 0) / brigadeTotal) * 100 : 0 },
1222 1222
                     { label: '站级排名', current: stationRanking || 0, total: stationTotal || 0, percentage: stationTotal ? ((stationRanking || 0) / stationTotal) * 100 : 0, type: 'station' }
1223 1223
                 ];
1224
-            } else if (this.role.includes('kezhang')) {
1224
+            } else if (this.role.includes('banzuzhang')) {
1225 1225
                 return [
1226 1226
                     { label: '大队排名', current: brigadeRanking || 0, total: brigadeTotal || 0, percentage: brigadeTotal ? ((brigadeRanking || 0) / brigadeTotal) * 100 : 0 },
1227 1227
                     { label: '站级排名', current: stationRanking || 0, total: stationTotal || 0, percentage: stationTotal ? ((stationRanking || 0) / stationTotal) * 100 : 0, type: 'station' }
@@ -1255,7 +1255,7 @@ export default {
1255 1255
                     { label: '大队排名', current: deptRanking?.rank || 0, total: deptRanking?.total || 0, percentage: deptRanking?.total ? ((deptRanking.rank || 0) / deptRanking.total) * 100 : 0 },
1256 1256
                     { label: '站级排名', current: siteRanking?.rank || 0, total: siteRanking?.total || 0, percentage: siteRanking?.total ? ((siteRanking.rank || 0) / siteRanking.total) * 100 : 0, type: 'station' }
1257 1257
                 ];
1258
-            } else if (this.role.includes('kezhang')) {
1258
+            } else if (this.role.includes('banzuzhang')) {
1259 1259
                 const { deptInSiteRanking, deptInBrigadeRanking } = this.accuracyStatistics;
1260 1260
                 return [
1261 1261
                     { label: '大队排名', current: deptInBrigadeRanking?.rank || 0, total: deptInBrigadeRanking?.total || 0, percentage: deptInBrigadeRanking?.total ? ((deptInBrigadeRanking.rank || 0) / deptInBrigadeRanking.total) * 100 : 0 },
@@ -1292,7 +1292,7 @@ export default {
1292 1292
                     { label: '大队排名', current: brigadeRanking?.currentRank || 0, total: brigadeRanking?.totalItems || 0, percentage: brigadeRanking?.totalItems ? ((brigadeRanking.currentRank || 0) / brigadeRanking.totalItems) * 100 : 0 },
1293 1293
                     { label: '站级排名', current: stationRanking?.currentRank || 0, total: stationRanking?.totalItems || 0, percentage: stationRanking?.totalItems ? ((stationRanking.currentRank || 0) / stationRanking.totalItems) * 100 : 0, type: 'station' }
1294 1294
                 ];
1295
-            } else if (this.role.includes('kezhang')) {
1295
+            } else if (this.role.includes('banzuzhang')) {
1296 1296
                 const { sectionMasterData } = this.seizeData;
1297 1297
                 const { stationRanking, departmentRanking, brigadeRanking } = sectionMasterData || {};
1298 1298
                 // 科长、SecurityCheck角色:显示班组、科级和站级排名
@@ -1439,7 +1439,7 @@ export default {
1439 1439
                 }
1440 1440
 
1441 1441
                 // 调用接口获取今日上岗科长列表
1442
-                selectUserListByRoleKey(["kezhang"]).then(res => {
1442
+                selectUserListByRoleKey(["banzuzhang"]).then(res => {
1443 1443
                     if (res.code === 200 && res.data && res.data.length > 0) {
1444 1444
                         this.subTitleText = res.data && res.data.map(user => user.nickName).join('、');
1445 1445
                         resolve(res.data);