Yansen 2 years ago
parent
commit
4a6a16cc15
2 changed files with 30 additions and 26 deletions
  1. 29
    25
      config/routes.js
  2. 1
    1
      src/pages/Machinery/OperationStatistics/components/MaJob.jsx

+ 29
- 25
config/routes.js View File

@@ -38,7 +38,7 @@ export default [
38 38
     name: '作业大屏',
39 39
     icon: 'DesktopOutlined',
40 40
     component: './MonitoringScreen2',
41
-    access: 'screen',
41
+    access: 'screen2',
42 42
   },
43 43
   {
44 44
     path: '/ContentManagementSystem',
@@ -144,26 +144,50 @@ export default [
144 144
         component: './Machinery/GIS/detail.jsx',
145 145
         hideInMenu: true,
146 146
       },
147
+    ],
148
+  },
149
+  {
150
+    path: '/iot',
151
+    name: 'IOT平台',
152
+    component: '../layouts/BasicLayout',
153
+    access: 'iot',
154
+    routes: [
147 155
       {
148
-        path: '/Machinery/JobList',
156
+        path: '/iot/JobList',
149 157
         name: '设备作业列表',
150 158
         component: './Machinery/JobList',
159
+        access: 'deviceJobList',
151 160
       },
152 161
       {
153
-        path: '/Machinery/OperationStatistics',
162
+        path: '/iot/OperationStatistics',
154 163
         name: '设备作业统计',
155 164
         component: './Machinery/OperationStatistics',
165
+        access: 'deviceJobStatis',
156 166
       },
157 167
       {
158
-        path: '/Machinery/OperationStatistics/Detail',
168
+        path: '/iot/OperationStatistics/Detail',
159 169
         name: '设备作业详情',
160 170
         component: './Machinery/OperationStatistics/Detail',
171
+        access: 'deviceJobDetail',
161 172
         hideInMenu: true,
162 173
       },
163 174
       {
164
-        path: '/Machinery/Sensing',
175
+        path: '/iot/Sensing',
165 176
         name: '传感设备列表',
166 177
         component: './Machinery/Sensing',
178
+        access: 'sensorList',
179
+      },
180
+      {
181
+        path: '/iot/Subsoiler',
182
+        name: '深松机',
183
+        component: './SystemManagement/Subsoiler',
184
+        access: 'shensong',
185
+      },
186
+      {
187
+        path: '/iot/Classification',
188
+        name: '外设分类',
189
+        component: './SystemManagement/Classification',
190
+        access: 'peripherals',
167 191
       },
168 192
     ],
169 193
   },
@@ -310,26 +334,6 @@ export default [
310 334
         access: 'setting',
311 335
         component: './SystemManagement/BasicParameters',
312 336
       },
313
-      {
314
-        path: '/SystemManagement/iot',
315
-        name: 'IOT平台',
316
-        access: 'setting',
317
-        component: '../layouts/BasicLayout',
318
-        routes: [
319
-          {
320
-            path: '/SystemManagement/iot/Subsoiler',
321
-            name: '深松机',
322
-            access: 'setting',
323
-            component: './SystemManagement/Subsoiler',
324
-          },
325
-          {
326
-            path: '/SystemManagement/iot/Classification',
327
-            name: '外设分类',
328
-            access: 'setting',
329
-            component: './SystemManagement/Classification',
330
-          },
331
-        ],
332
-      },
333 337
     ],
334 338
   },
335 339
 

+ 1
- 1
src/pages/Machinery/OperationStatistics/components/MaJob.jsx View File

@@ -58,7 +58,7 @@ export default (props) => {
58 58
 
59 59
   const queryData = (params) => {
60 60
     setLoading(true);
61
-    getDeviceJobByOrg({ ...params, startDate: '2022-01-01', endDate: '2099-12-31' })
61
+    getDeviceJobByOrg({ ...params, startDate: '2000-01-01', endDate: '2099-12-31' })
62 62
       .then((res) => {
63 63
         setLoading(false);
64 64
         const { list: dtList, totalArea } = res;