瀏覽代碼

Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

魏超 5 年之前
父節點
當前提交
2701618390
共有 2 個文件被更改,包括 12 次插入1 次删除
  1. 11
    0
      src/pages/Monitor.jsx
  2. 1
    1
      src/pages/statistical/consultant/table.jsx

+ 11
- 0
src/pages/Monitor.jsx 查看文件

@@ -31,6 +31,7 @@ const Monitor = props => {
31 31
 
32 32
   function getBuildingReports() {
33 33
     request({ ...apis.system.taBuildingReports, }).then((data) => {
34
+      console.log(data,"22222222222222222")
34 35
       setCheckData((data.records || []).map((x) => x.reportCode))
35 36
     })
36 37
   }
@@ -58,6 +59,16 @@ const Monitor = props => {
58 59
             <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount || '0'}</span>
59 60
           </div>
60 61
         }
62
+        {checkData.includes('total_number_of_visit_users') &&
63
+          <div style={{
64
+            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
65
+            boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
66
+            borderRadius: '12px', width: '32%', marginRight: '2%'
67
+          }}>
68
+            <span style={{ fontSize: '24px', color: '#fff' }}>今日访问次数 </span>
69
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectVisitCount || '0'}</span>
70
+          </div>
71
+        }
61 72
         {checkData.includes('number_of_new_users') &&
62 73
           <div onClick={() => router.push('/statistical/newUsers')} style={{
63 74
             textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',

+ 1
- 1
src/pages/statistical/consultant/table.jsx 查看文件

@@ -138,7 +138,7 @@ function record(props) {
138 138
                         dataIndex: 'reportDate',
139 139
                         key: 'reportDate',
140 140
                         align: 'center',
141
-                        render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span>}</>,
141
+                        render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
142 142
                     },
143 143
                 ]
144 144
     const columns = basicColunms.concat(lastColum)