zlisen 3 年前
父节点
当前提交
31d29c1f6f

+ 12
- 12
config/routes.js 查看文件

613
                 path: '/statistics/dataReport',
613
                 path: '/statistics/dataReport',
614
                 name: '数据报表',
614
                 name: '数据报表',
615
                 component: './statistics/dataReport',
615
                 component: './statistics/dataReport',
616
-                menuCode: '/building/list',
616
+                menuCode: '/statistics/dataRepor',
617
               },
617
               },
618
               {
618
               {
619
                 path: '/statistics/dataReport/newAdd',
619
                 path: '/statistics/dataReport/newAdd',
620
                 name: '新增用户',
620
                 name: '新增用户',
621
                 hideInMenu: true,
621
                 hideInMenu: true,
622
                 component: './statistics/dataReport/newAdd',
622
                 component: './statistics/dataReport/newAdd',
623
-                menuCode: '/building/list',
623
+                menuCode: '/statistics/dataRepor',
624
               },
624
               },
625
               {
625
               {
626
                 path: '/statistics/activity',
626
                 path: '/statistics/activity',
627
                 name: '活动统计',
627
                 name: '活动统计',
628
                 component: './statistics/activity',
628
                 component: './statistics/activity',
629
-                menuCode: '/building/list',
629
+                menuCode: '/statistics/activity',
630
               },
630
               },
631
               {
631
               {
632
                 path: '/statistics/activity/sharePersonNum',
632
                 path: '/statistics/activity/sharePersonNum',
633
                 name: '分享人数',
633
                 name: '分享人数',
634
                 hideInMenu: true,
634
                 hideInMenu: true,
635
                 component: './statistics/activity/sharePersonNum',
635
                 component: './statistics/activity/sharePersonNum',
636
-                menuCode: '/building/list',
636
+                menuCode: '/statistics/activity',
637
               },
637
               },
638
               {
638
               {
639
                 path: '/statistics/activity/shareNum',
639
                 path: '/statistics/activity/shareNum',
640
                 name: '分享次数',
640
                 name: '分享次数',
641
                 hideInMenu: true,
641
                 hideInMenu: true,
642
                 component: './statistics/activity/shareNum',
642
                 component: './statistics/activity/shareNum',
643
-                menuCode: '/building/list',
643
+                menuCode: '/statistics/activity',
644
               },
644
               },
645
               {
645
               {
646
                 path: '/statistics/activity/visitPersonNum',
646
                 path: '/statistics/activity/visitPersonNum',
647
                 name: '访问人数',
647
                 name: '访问人数',
648
                 hideInMenu: true,
648
                 hideInMenu: true,
649
                 component: './statistics/activity/visitPersonNum',
649
                 component: './statistics/activity/visitPersonNum',
650
-                menuCode: '/building/list',
650
+                menuCode: '/statistics/activity',
651
               },
651
               },
652
               {
652
               {
653
                 path: '/statistics/activity/visitNum',
653
                 path: '/statistics/activity/visitNum',
654
                 name: '访问次数',
654
                 name: '访问次数',
655
                 hideInMenu: true,
655
                 hideInMenu: true,
656
                 component: './statistics/activity/visitNum',
656
                 component: './statistics/activity/visitNum',
657
-                menuCode: '/building/list',
657
+                menuCode: '/statistics/activity',
658
               },
658
               },
659
               {
659
               {
660
                 path: '/statistics/activity/addRegistNum',
660
                 path: '/statistics/activity/addRegistNum',
661
                 name: '新增注册用户',
661
                 name: '新增注册用户',
662
                 hideInMenu: true,
662
                 hideInMenu: true,
663
                 component: './statistics/activity/addRegistNum',
663
                 component: './statistics/activity/addRegistNum',
664
-                menuCode: '/building/list',
664
+                menuCode: '/statistics/activity',
665
               },
665
               },
666
               {
666
               {
667
                 path: '/statistics/activity/detail',
667
                 path: '/statistics/activity/detail',
668
                 name: '查看',
668
                 name: '查看',
669
                 hideInMenu: true,
669
                 hideInMenu: true,
670
                 component: './statistics/activity/detail',
670
                 component: './statistics/activity/detail',
671
-                menuCode: '/building/list',
671
+                menuCode: '/statistics/activity',
672
               },
672
               },
673
               
673
               
674
               {
674
               {
675
                 path: '/statistics/building',
675
                 path: '/statistics/building',
676
                 name: '项目统计',
676
                 name: '项目统计',
677
                 component: './statistics/building',
677
                 component: './statistics/building',
678
-                menuCode: '/building/list',
678
+                menuCode: '/statistics/building',
679
               },
679
               },
680
               {
680
               {
681
                 path: '/statistics/building/detail',
681
                 path: '/statistics/building/detail',
682
                 name: '项目统计',
682
                 name: '项目统计',
683
                 hideInMenu: true,
683
                 hideInMenu: true,
684
                 component: './statistics/building/detail',
684
                 component: './statistics/building/detail',
685
-                menuCode: '/building/list',
685
+                menuCode: '/statistics/building',
686
               },
686
               },
687
 
687
 
688
               {
688
               {
689
                 path: '/statistics/consultant',
689
                 path: '/statistics/consultant',
690
                 name: 'KPI',
690
                 name: 'KPI',
691
                 component: './statistics/consultant',
691
                 component: './statistics/consultant',
692
-                menuCode: '/building/list',
692
+                menuCode: '/statistics/consultant',
693
               },
693
               },
694
             ],
694
             ],
695
           },
695
           },

+ 3
- 6
src/pages/statistics/activity/compents/ContentTable.jsx 查看文件

235
 
235
 
236
   //排序
236
   //排序
237
   const handleTableChange = (pagination, filters, sorter) => {
237
   const handleTableChange = (pagination, filters, sorter) => {
238
-    console.log(pagination, filters, sorter);
239
-    // Desc  和asc
240
-    const sortType =
241
-      sorter.order == 'ascend' ? 'asc' : sorter.order == 'descend' ? 'Desc' : undefined;
238
+
242
     getTableList({
239
     getTableList({
243
       ...params,
240
       ...params,
244
       pageNum: pagination.current,
241
       pageNum: pagination.current,
245
       pageSize: pagination.pageSize,
242
       pageSize: pagination.pageSize,
246
-      sortType: sortType,
247
-      sortField: sorter.columnKey,
243
+      sort: sorter.order,
244
+      colKey: sorter.columnKey
248
     });
245
     });
249
   };
246
   };
250
 
247
 

+ 2
- 2
src/pages/statistics/activity/compents/OverviewDeatil.jsx 查看文件

182
 
182
 
183
   return (
183
   return (
184
     <Card title="详细数据" headStyle={{ textAlign: 'left' }}>
184
     <Card title="详细数据" headStyle={{ textAlign: 'left' }}>
185
-      <div style={{ textAlign: 'right' }}>
185
+      {/* <div style={{ textAlign: 'right' }}>
186
         <Button type="primary" onClick={exportActivityStats}>
186
         <Button type="primary" onClick={exportActivityStats}>
187
           导出
187
           导出
188
         </Button>
188
         </Button>
189
-      </div>
189
+      </div> */}
190
 
190
 
191
       <Table
191
       <Table
192
         key="date"
192
         key="date"

+ 2
- 2
src/pages/statistics/activity/shareNum.jsx 查看文件

331
               重置
331
               重置
332
             </Button>
332
             </Button>
333
           </Form.Item>
333
           </Form.Item>
334
-          <AuthButton name="admin.statistical.activity.export" noRight={null}>
334
+          {/* <AuthButton name="admin.statistical.activity.export" noRight={null}>
335
             <Button
335
             <Button
336
               type="primary"
336
               type="primary"
337
               style={{ position: 'absolute', right: '27px', zIndex: 1 }}
337
               style={{ position: 'absolute', right: '27px', zIndex: 1 }}
339
             >
339
             >
340
               导出
340
               导出
341
             </Button>
341
             </Button>
342
-          </AuthButton>
342
+          </AuthButton> */}
343
         </Form>
343
         </Form>
344
         <div>
344
         <div>
345
           <Table
345
           <Table

+ 2
- 2
src/pages/statistics/activity/sharePersonNum.jsx 查看文件

325
             </Button>
325
             </Button>
326
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
326
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
327
           </Form.Item>
327
           </Form.Item>
328
-          <AuthButton name="admin.statistics.activity.export" noRight={null}>
328
+          {/* <AuthButton name="admin.statistics.activity.export" noRight={null}>
329
             <Button type="primary" style={{ float: 'right', zIndex: 1, marginTop: '24px' }} onClick={this.exportActivityStats}>
329
             <Button type="primary" style={{ float: 'right', zIndex: 1, marginTop: '24px' }} onClick={this.exportActivityStats}>
330
               导出
330
               导出
331
             </Button>
331
             </Button>
332
-          </AuthButton>
332
+          </AuthButton> */}
333
         </Form>
333
         </Form>
334
         <div>
334
         <div>
335
 
335
 

+ 2
- 2
src/pages/statistics/activity/visitNum.jsx 查看文件

335
               重置
335
               重置
336
             </Button>
336
             </Button>
337
           </Form.Item>
337
           </Form.Item>
338
-          <AuthButton name="admin.statistics.activity.export" noRight={null}>
338
+          {/* <AuthButton name="admin.statistics.activity.export" noRight={null}>
339
             <Button
339
             <Button
340
               type="primary"
340
               type="primary"
341
               style={{ float: 'right', margin: '20px 0', zIndex: 1 }}
341
               style={{ float: 'right', margin: '20px 0', zIndex: 1 }}
343
             >
343
             >
344
               导出
344
               导出
345
             </Button>
345
             </Button>
346
-          </AuthButton>
346
+          </AuthButton> */}
347
         </Form>
347
         </Form>
348
         <div>
348
         <div>
349
           <Table
349
           <Table

+ 2
- 2
src/pages/statistics/activity/visitPersonNum.jsx 查看文件

245
             </Button>
245
             </Button>
246
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
246
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
247
           </Form.Item>
247
           </Form.Item>
248
-          <AuthButton name="admin.statistics.activity.export" noRight={null}>
248
+          {/* <AuthButton name="admin.statistics.activity.export" noRight={null}>
249
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
249
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
250
               导出
250
               导出
251
             </Button>
251
             </Button>
252
-          </AuthButton>
252
+          </AuthButton> */}
253
         </Form>
253
         </Form>
254
         <div>
254
         <div>
255
 
255
 

+ 2
- 2
src/pages/statistics/building/detail/tableDetail.jsx 查看文件

91
       headStyle={{ textAlign: 'left' }}
91
       headStyle={{ textAlign: 'left' }}
92
 
92
 
93
     >
93
     >
94
-      <div style={{ marginBottom: '20px', textAlign: 'right' }}>
94
+      {/* <div style={{ marginBottom: '20px', textAlign: 'right' }}>
95
         <AuthButton name="admin.statistical.building.export" noRight={null}>
95
         <AuthButton name="admin.statistical.building.export" noRight={null}>
96
           <Button type="primary" onClick={exportBuildingStats}>
96
           <Button type="primary" onClick={exportBuildingStats}>
97
             导出
97
             导出
98
           </Button>
98
           </Button>
99
         </AuthButton>
99
         </AuthButton>
100
-      </div>
100
+      </div> */}
101
       <Table
101
       <Table
102
         dataSource={data?.records || []}
102
         dataSource={data?.records || []}
103
         columns={columns}
103
         columns={columns}

+ 10
- 6
src/pages/statistics/consultant/index.jsx 查看文件

201
   const handleChange = (pagination, filters, sorter) => {
201
   const handleChange = (pagination, filters, sorter) => {
202
     console.log(pagination, filters, sorter);
202
     console.log(pagination, filters, sorter);
203
     // Desc  和asc
203
     // Desc  和asc
204
-    const sortType =
205
-      sorter.order == 'ascend' ? 'asc' : sorter.order == 'descend' ? 'Desc' : undefined;
206
-    getTableList({
204
+    let sort = {};
205
+    if (sorter.order == 'ascend') {
206
+      sort.asc = sorter.columnKey;
207
+    } else if (sorter.order == 'descend') {
208
+      sort.desc = sorter.columnKey;
209
+    }
210
+
211
+    getList({
207
       buildingId: buildingValue,
212
       buildingId: buildingValue,
208
       startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
213
       startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
209
       endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
214
       endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
210
       pageNum: pagination.current,
215
       pageNum: pagination.current,
211
       pageSize: pagination.pageSize,
216
       pageSize: pagination.pageSize,
212
-      sortType: sortType,
213
-      sortField: sorter.columnKey,
217
+      ...sort,
214
     });
218
     });
215
   };
219
   };
216
 
220
 
288
         </AuthButton>
292
         </AuthButton>
289
       </div> */}
293
       </div> */}
290
       <Table
294
       <Table
291
-        rowKey={record => data.current * data.size + row++}
295
+        // rowKey={record => data?.current * data?.size + row++}
292
         style={{ marginTop: '30px' }}
296
         style={{ marginTop: '30px' }}
293
         dataSource={_list}
297
         dataSource={_list}
294
         // dataSource={data.records}
298
         // dataSource={data.records}

+ 2
- 2
src/pages/statistics/dataReport/components/IntentionalCustomers.jsx 查看文件

122
             ></BuildingSelect>
122
             ></BuildingSelect>
123
           </Col>
123
           </Col>
124
           <Col span={2} style={{ textAlign: 'right' }}>
124
           <Col span={2} style={{ textAlign: 'right' }}>
125
-            <Button type="primary" onClick={exportIntentionUsers}>
125
+            {/* <Button type="primary" onClick={exportIntentionUsers}>
126
               导出
126
               导出
127
-            </Button>
127
+            </Button> */}
128
           </Col>
128
           </Col>
129
         </Row>
129
         </Row>
130
         <Table
130
         <Table