huoyi 4 mesi fa
parent
commit
82c25faa15

+ 25 - 0
public/index.html

@@ -0,0 +1,25 @@
1
+<!DOCTYPE html>
2
+<html lang="zh-CN">
3
+
4
+    <head>
5
+        <meta charset="utf-8">
6
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
7
+        <title>
8
+            <%= htmlWebpackPlugin.options.title %>
9
+        </title>
10
+        <script>
11
+            var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
12
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
13
+        </script>
14
+        <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
15
+    </head>
16
+
17
+    <body>
18
+        <noscript>
19
+            <strong>Please enable JavaScript to continue.</strong>
20
+        </noscript>
21
+        <div id="app"></div>
22
+        <!-- built files will be auto injected -->
23
+    </body>
24
+
25
+</html>

+ 9 - 0
src/api/system/user.js

@@ -100,3 +100,12 @@ export function getAppListByRoleId(roleId) {
100 100
     method: 'get',
101 101
   })
102 102
 }
103
+
104
+//查询移动端全部应用列表
105
+export function getAppList(params) {
106
+  return request({
107
+    url: '/system/app/listBy',
108
+    method: 'get',
109
+    params: params
110
+  })
111
+}

+ 10 - 12
src/pages/eikonStatistics/components/standard-execution.vue

@@ -335,8 +335,8 @@ export default {
335 335
           indicator: indicator,
336 336
           shape: 'polygon',
337 337
           splitNumber: 4,
338
-          radius: '55%',
339
-          center: ['50%', '55%'], // 缩小雷达图并居中,为label留出空间
338
+          radius: '50%',
339
+          center: ['50%', '60%'], // 缩小雷达图并居中,为label留出空间
340 340
           axisName: {
341 341
             color: '#666',
342 342
             fontSize: 12
@@ -449,13 +449,11 @@ export default {
449 449
           return {
450 450
             value: values,
451 451
             name: dept.deptName,
452
-            // areaStyle: {
453
-            //   show: false // 去掉面积遮盖
452
+           
453
+            // lineStyle: {
454
+            //   color: color.line,
455
+           
454 456
             // },
455
-            lineStyle: {
456
-              color: color.line,
457
-              width: 2
458
-            },
459 457
             // itemStyle: {
460 458
             //   color: color.line
461 459
             // },
@@ -464,7 +462,7 @@ export default {
464 462
               formatter: function (params) {
465 463
                 return params.value;
466 464
               },
467
-              color: color.line,
465
+              // color: color.line,
468 466
               fontSize: 10
469 467
             }
470 468
           };
@@ -531,8 +529,8 @@ export default {
531 529
           indicator: indicator,
532 530
           shape: 'polygon',
533 531
           splitNumber: 4,
534
-          radius: '55%',
535
-          center: ['50%', '55%'], // 缩小雷达图并居中,为label留出空间
532
+          radius: '50%',
533
+          center: ['50%', '60%'], // 缩小雷达图并居中,为label留出空间
536 534
           axisName: {
537 535
             color: '#666',
538 536
             fontSize: 12
@@ -773,7 +771,7 @@ export default {
773 771
 }
774 772
 
775 773
 .radar-chart {
776
-  height: 400rpx;
774
+  height: 550rpx;
777 775
   background: #fff;
778 776
   border-radius: 12rpx;
779 777
   margin-bottom: 20rpx;

+ 10 - 12
src/pages/home/index.vue

@@ -57,7 +57,7 @@ import Announcement from "@/pages/home/components/announcement.vue";
57 57
 import myToDo from "@/pages/home/components/myToDo.vue";
58 58
 import Task from "@/pages/home/components/task.vue";
59 59
 import Notice from "@/pages/home/components/notice.vue";
60
-import { getUserProfile,getAppListByRoleId } from "@/api/system/user";
60
+import { getUserProfile,getAppListByRoleId,getAppList } from "@/api/system/user";
61 61
 import { getAttendanceList } from "@/api/attendance/attendance"
62 62
 import { getUnreadCount } from "@/api/check/checkTask"
63 63
 import { checkRolePermission } from "@/utils/common.js";
@@ -174,18 +174,16 @@ export default {
174 174
       // }
175 175
     },
176 176
     async loadAppList(userInfo) {
177
-      const roleId = userInfo.roles && userInfo.roles.length ? userInfo.roles[0].roleId : null;
177
+      // const roleId = userInfo.roles && userInfo.roles.length ? userInfo.roles[0].roleId : null;
178 178
 
179 179
       try {
180
-        if (roleId) {
181
-          const res = await getAppListByRoleId(roleId);
180
+        // if (roleId) {
181
+          const res = await getAppList({homePage:1});
182 182
           if (res.code === 200) {
183
-            //全部应用
184
-            const sysAppList = res.sysAppList;
185
-            const checkedAppIdList = res.checkedAppIdList;
186
-            this.appList = sysAppList.filter(app => checkedAppIdList.includes(app.appId) && app.homePage == '1');
183
+  
184
+            this.appList = res.data;
187 185
           }
188
-        }
186
+        // }
189 187
       } catch (error) {
190 188
         console.error('获取应用列表失败:', error);
191 189
         this.appList = [];
@@ -265,7 +263,7 @@ img {
265 263
   display: flex;
266 264
   align-items: center;
267 265
   justify-content: space-between;
268
-  padding: 40rpx;
266
+  padding: 40rpx 70rpx;
269 267
   background: #FFFFFF;
270 268
   box-shadow: 0 8rpx 32rpx 0 rgba(0, 0, 0, 0.06);
271 269
   border-radius: 32rpx;
@@ -281,8 +279,8 @@ img {
281 279
 
282 280
     img {
283 281
       display: inline-block;
284
-      width: 120rpx;
285
-      height: 120rpx;
282
+      width: 88rpx;
283
+      height: 88rpx;
286 284
     }
287 285
     .text {
288 286
       margin-top: 10rpx;

+ 6 - 5
src/pages/inspectionStatistics/components/ProblemDiscovery.vue

@@ -740,8 +740,8 @@ export default {
740 740
           const option = {
741 741
             tooltip: {},
742 742
             grid: {
743
-              top: '10%',
744
-              bottom: '20%',
743
+              top: '0',
744
+              bottom: '25%',
745 745
               left: '10%',
746 746
               right: '10%'
747 747
             },
@@ -754,7 +754,8 @@ export default {
754 754
             },
755 755
             radar: {
756 756
               indicator: indicatorName.map(item => ({ name: item })),
757
-              radius: '60%'
757
+              radius: '50%',
758
+              center: ['50%', '40%'],
758 759
             },
759 760
             series: [
760 761
               {
@@ -953,10 +954,10 @@ export default {
953 954
     }
954 955
 
955 956
     .radarChart-container {
956
-      height: 500rpx;
957
+      height: 550rpx;
957 958
 
958 959
       .radar-chart {
959
-        height: 500rpx;
960
+        height: 550rpx;
960 961
       }
961 962
     }
962 963
 

+ 9 - 11
src/pages/work/index.vue

@@ -38,7 +38,7 @@
38 38
 <script>
39 39
 import HomeContainer from "@/components/HomeContainer.vue";
40 40
 import { checkRolePermission } from "@/utils/common.js";
41
-import { getUserProfile, getAppListByRoleId } from "@/api/system/user";
41
+import { getUserProfile, getAppListByRoleId,getAppList } from "@/api/system/user";
42 42
 
43 43
 export default {
44 44
   components: { HomeContainer },
@@ -68,18 +68,16 @@ export default {
68 68
       await this.loadAppList(data.data);
69 69
     },
70 70
     async loadAppList(userInfo) {
71
-      const roleId = userInfo.roles && userInfo.roles.length ? userInfo.roles[0].roleId : null;
71
+      // const roleId = userInfo.roles && userInfo.roles.length ? userInfo.roles[0].roleId : null;
72 72
 
73 73
       try {
74
-        if (roleId) {
75
-          const res = await getAppListByRoleId(roleId);
74
+        // if (roleId) {
75
+          const res = await getAppList({homePage:0});
76 76
           if (res.code === 200) {
77 77
             //全部应用
78
-            const sysAppList = res.sysAppList;
79
-            const checkedAppIdList = res.checkedAppIdList;
80
-            this.appList = sysAppList.filter(app => checkedAppIdList.includes(app.appId));
78
+            this.appList = res.data;
81 79
           }
82
-        }
80
+        // }
83 81
       } catch (error) {
84 82
         console.error('获取应用列表失败:', error);
85 83
         this.appList = [];
@@ -197,8 +195,8 @@ export default {
197 195
 
198 196
   img {
199 197
     display: inline-block;
200
-    width: 120rpx;
201
-    height: 120rpx;
198
+    width: 88rpx;
199
+    height: 88rpx;
202 200
   }
203 201
 
204 202
   &:active {
@@ -209,7 +207,7 @@ export default {
209 207
 
210 208
 .text {
211 209
   text-align: center;
212
-  font-size: 26rpx;
210
+  font-size: 25rpx;
213 211
   margin-top: 15rpx;
214 212
   color: #333;
215 213
 }

+ 12 - 17
src/store/modules/eikonLevel.js

@@ -194,12 +194,20 @@ const eikonLevel = {
194 194
       try {
195 195
         //总体概览
196 196
         const overviewRes = await getOverview(detailParams)
197
+        commit('SET_OVERVIEW_DATA', overviewRes.data)
197 198
         //资质能力
198 199
         const res = await getModuleMetrics({ ...detailParams, userTypeStr: state.currentLevel })
200
+        let result = res.data && res.data.moduleResults;
201
+        commit('SET_ALL_DATA', result)
202
+        commit('SET_SYSTEM_DATA', result && result.system || {})
203
+        commit('SET_ATTENDANCE_DATA', result && result.attendance || {})
204
+        commit('SET_ITEM_DATA', result && result.item || {})
199 205
         //巡检
200 206
         const portraitRes = await getPortrait(portraitParams)
207
+        commit('SET_PORTRAIT_DATA', portraitRes.data)
201 208
         //学习成长
202 209
         const growthPortraitRes = await getGrowthPortrait(growthParams)
210
+        commit('SET_GROWTH_PORTRAIT_DATA', growthPortraitRes.data)
203 211
         //测试
204 212
         let profileRes = {}
205 213
         if (getters.isKeZhang) {
@@ -209,7 +217,7 @@ const eikonLevel = {
209 217
         } else {
210 218
           profileRes = await getUserProfile(overviewParams)
211 219
         }
212
-
220
+        commit('SET_PROFILE_DATA', profileRes.data)
213 221
         //协同配合
214 222
         let collaborationRes = {}
215 223
         if (getters.isPersonal) {
@@ -217,8 +225,8 @@ const eikonLevel = {
217 225
         } else {
218 226
           collaborationRes = await getCollaborationProfile({ deptId: state.currentLevelId })
219 227
         }
228
+        commit('SET_COLLABORATION_DATA', collaborationRes.data)
220 229
         //能力画像-明细
221
-
222 230
         if (!getters.isPersonal) {
223 231
           const detailRes = await getDetailProfile(detailParams)
224 232
           commit('SET_DETAIL_DATA', detailRes.data)
@@ -234,20 +242,7 @@ const eikonLevel = {
234 242
           commit('SET_STATION_ATTENDANCE_DATA', attendanceStatisticsRes)
235 243
         }
236 244
 
237
-        commit('SET_COLLABORATION_DATA', collaborationRes.data)
238
-
239
-
240
-        commit('SET_OVERVIEW_DATA', overviewRes.data)
241
-        commit('SET_PROFILE_DATA', profileRes.data)
242
-        commit('SET_PORTRAIT_DATA', portraitRes.data)
243
-        commit('SET_GROWTH_PORTRAIT_DATA', growthPortraitRes.data)
244
-        let result = res.data && res.data.moduleResults;
245
-        commit('SET_ALL_DATA', result)
246
-        commit('SET_SYSTEM_DATA', result && result.system || {})
247
-        commit('SET_ATTENDANCE_DATA', result && result.attendance || {})
248
-        commit('SET_ITEM_DATA', result && result.item || {})
249
-
250
-        return result
245
+    
251 246
       } catch (error) {
252 247
         console.error('加载数据失败:', error);
253 248
         throw error
@@ -440,7 +435,7 @@ const eikonLevel = {
440 435
 
441 436
       // 根据级别获取对应的部门路径
442 437
       const path = await dispatch('getDepartmentPathById', levelId)
443
-    
438
+
444 439
       if (level === 'personal') {
445 440
         // 个人模式:去掉数组里的最后一个元素
446 441
         const personalPath = path.slice(0, -1)

File diff suppressed because it is too large
+ 385 - 988
yarn.lock