许静 5 年之前
父節點
當前提交
feda216414

+ 1
- 1
src/pages/indexEcharts/components/NewUsers.jsx 查看文件

@@ -92,7 +92,7 @@ const NewUsers = (props) => {
92 92
     <>
93 93
       <div>
94 94
         <div >
95
-          <p onClick={()=>router.push('/indexEcharts/newUsers')}><span style={{borderBottom:'1px solid #f02d40',fontSize:'0.12rem',fontWeight:'600'}}>新增用户</span> <span style={{fontSize:'0.09rem',color:'#888',marginLeft:'0.06rem'}}>最近七天</span></p>
95
+          <p onClick={()=>router.push('/indexEcharts/newUsers')}><span style={{borderBottom:'1px solid #f02d40',fontSize:'0.12rem',fontWeight:'600'}}>新增用户</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
96 96
        </div>
97 97
         <EChart options={options} style={piestyles} onClick={()=>router.push('/indexEcharts/newUsers')} />
98 98
       </div>

+ 1
- 1
src/pages/indexEcharts/components/UserBehavior.jsx 查看文件

@@ -121,7 +121,7 @@ const UserBehavior = (props) => {
121 121
         {/* onSuccess={(e) => onTabledatas(e)} */}
122 122
         <p onClick={() => router.push('/indexEcharts/userBehavior')}>
123 123
           <span style={{ borderBottom: '1px solid #f02d40', color: '#333', fontSize: '0.12rem', fontWeight: '600' }}>用户行为</span>
124
-          {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}></span>}
124
+          {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
125 125
         </p>
126 126
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
127 127
           {!props.BuildSelectHide && <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>}

+ 1
- 3
src/pages/indexEcharts/components/UserConversion.jsx 查看文件

@@ -19,11 +19,11 @@ const UserSource = props => {
19 19
   }, [])
20 20
 
21 21
  function UserConversionRate(params) {
22
+   
22 23
       request({
23 24
         ...apis.indexEcharts.userConversion,
24 25
         params,
25 26
       }).then(data => {
26
-        // console.log("data: ", data)
27 27
         setDataset(data, params.conversion)
28 28
       })
29 29
   }
@@ -72,8 +72,6 @@ const UserSource = props => {
72 72
       name: '转化率',
73 73
       radius: ['34%', '52%'],
74 74
       data: theCurrent,
75
-      // data:[ { name: '授权手机', value: 6 },
76
-      // { name: '其余', value: 5 },]
77 75
     },
78 76
   }
79 77
 

+ 1
- 1
src/pages/indexEcharts/components/UserSource.jsx 查看文件

@@ -103,7 +103,7 @@ const UserSource = (props) => {
103 103
   return (
104 104
     <>
105 105
       <div>
106
-      <p onClick={()=>router.push('/indexEcharts/userSource')}><span style={{borderBottom:'1px solid #f02d40',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> <span style={{fontSize:'0.09rem',color:'#888',marginLeft:'0.06rem'}}>最近七天</span></p>
106
+      <p onClick={()=>router.push('/indexEcharts/userSource')}><span style={{borderBottom:'1px solid #f02d40',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
107 107
 
108 108
         <EChart onClick={() => router.push('/indexEcharts/userSource')} options={baroptions} style={barstyle} />
109 109
 

+ 1
- 1
src/pages/indexEcharts/newUsers.jsx 查看文件

@@ -102,7 +102,7 @@ const header = props => {
102 102
         搜索
103 103
           </Button>
104 104
       <div>
105
-        <NewUsers endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
105
+        <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
106 106
         {/* */}
107 107
       </div>
108 108
     </div>

+ 4
- 4
src/pages/indexEcharts/userBehavior.jsx 查看文件

@@ -103,7 +103,7 @@ const header = props => {
103 103
       padding: '32PX 28px',
104 104
       boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
105 105
       borderRadius: '12px',
106
-      minHeight: '1000vh'
106
+      minHeight: '60vh'
107 107
     }}>
108 108
     <div>
109 109
     <Radio.Group buttonStyle="solid" defaultValue="a">
@@ -126,17 +126,17 @@ const header = props => {
126 126
      
127 127
       <div style={{ display: 'flex', margin: '24px 0' }}>
128 128
       <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
129
-        <Select placeholder="所有事件组" style={{ width: '14%',minWidth:'160px',marginRight:'2%' }} onChange={handleChange}>
129
+        <Select placeholder="所有事件组" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
130 130
           <Option value="jack">Jack</Option>
131 131
           <Option value="lucy">Lucy</Option>
132 132
           <Option value="Yiminghe">yiminghe</Option>
133 133
         </Select>
134
-        <Select placeholder="请选择事件" style={{ width: '14%',minWidth:'160px',marginRight:'2%' }} onChange={handleChange}>
134
+        <Select placeholder="请选择事件" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
135 135
           <Option value="jack">Jack</Option>
136 136
           <Option value="lucy">Lucy</Option>
137 137
           <Option value="Yiminghe">yiminghe</Option>
138 138
         </Select>
139
-        <Select placeholder="请选择属性" style={{ width: '14%',minWidth:'160px' }} onChange={handleChange}>
139
+        <Select placeholder="请选择属性" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
140 140
           <Option value="jack">Jack</Option>
141 141
           <Option value="lucy">Lucy</Option>
142 142
           <Option value="Yiminghe">yiminghe</Option>

+ 2
- 5
src/pages/indexEcharts/userSource.jsx 查看文件

@@ -146,7 +146,6 @@ const header = props => {
146 146
 
147 147
 
148 148
 
149
-
150 149
   return (<>
151 150
     <div style={{
152 151
       backgroundColor: '#fff',
@@ -178,16 +177,14 @@ const header = props => {
178 177
           <div style={{
179 178
             width: '1060px',
180 179
             height: '560px',
181
-
182 180
             paddingTop: '40px',
183 181
             marginRight: ' 40px',
184 182
           }}>
185
-            <UserSource endDate={endDate} startDate={startDate} onSuccess={(e) => onTabledatas(e)}></UserSource>
183
+            <UserSource BuildSelectHide={true} endDate={endDate} startDate={startDate} onSuccess={(e) => onTabledatas(e)}></UserSource>
186 184
           </div>
187 185
           <div style={{
188 186
             width: '509px',
189 187
             height: '600px',
190
-
191 188
             paddingTop: '40px',
192 189
 
193 190
           }}>
@@ -199,7 +196,7 @@ const header = props => {
199 196
           <Option value='registered'>注册用户</Option>
200 197
         </Select>
201 198
 
202
-        <Table dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
199
+        <Table style={{marginTop:'20px'}} dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
203 200
       </div>
204 201
     </div>
205 202
   </>