Showing
1 changed file
with
57 additions
and
15 deletions
... | ... | @@ -58,10 +58,10 @@ |
58 | 58 | <div> {{ !isAdmin(role) ? `产品数` : '产品数' }}</div> |
59 | 59 | </div> |
60 | 60 | </div> |
61 | - <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5"> | |
61 | + <div v-if="!isAdmin(role)" class="pt-4" style="border-top: 2px solid #f0f2f5"> | |
62 | 62 | 今日新增 {{ toThousands(growCardList?.productInfo?.todayAdd) }}</div |
63 | 63 | > |
64 | - <div v-else class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5"> | |
64 | + <div v-else class="pt-4" style="border-top: 2px solid #f0f2f5"> | |
65 | 65 | 今日新增 {{ toThousands(growCardList?.productInfo?.todayAdd) }}</div |
66 | 66 | > |
67 | 67 | </Card> |
... | ... | @@ -92,7 +92,7 @@ |
92 | 92 | <div> 设备数 </div> |
93 | 93 | </div> |
94 | 94 | </div> |
95 | - <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5"> | |
95 | + <div class="pt-4" style="border-top: 2px solid #f0f2f5"> | |
96 | 96 | 今日新增 {{ toThousands(growCardList?.deviceInfo?.todayAdd) }} |
97 | 97 | </div> |
98 | 98 | </Card> |
... | ... | @@ -143,10 +143,10 @@ |
143 | 143 | <div> {{ !isAdmin(role) ? `告警数` : '租户总量' }}</div> |
144 | 144 | </div> |
145 | 145 | </div> |
146 | - <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5"> | |
146 | + <div v-if="!isAdmin(role)" class="pt-4" style="border-top: 2px solid #f0f2f5"> | |
147 | 147 | 今日新增 {{ toThousands(growCardList?.alarmInfo?.todayAdd) }}</div |
148 | 148 | > |
149 | - <div v-else class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5"> | |
149 | + <div v-else class="pt-4" style="border-top: 2px solid #f0f2f5"> | |
150 | 150 | 今日新增 {{ toThousands(growCardList?.tenantInfo?.todayAdd) }}</div |
151 | 151 | > |
152 | 152 | </Card> |
... | ... | @@ -167,8 +167,8 @@ |
167 | 167 | style="font-size: 1.625rem; color: #333; font-weight: bold" |
168 | 168 | > |
169 | 169 | <CountTo |
170 | - v-if="growCardList?.messageInfo?.todayMessageAdd" | |
171 | - :end-val="growCardList.messageInfo.todayMessageAdd" | |
170 | + v-if="growCardList?.messageInfo?.messageCount" | |
171 | + :end-val="growCardList.messageInfo.messageCount" | |
172 | 172 | /> |
173 | 173 | <CountTo v-else :end-val="0" /> |
174 | 174 | </div> |
... | ... | @@ -185,7 +185,44 @@ |
185 | 185 | !isAdmin(role) |
186 | 186 | ? `今日消息数:${ |
187 | 187 | growCardList?.messageInfo?.todayMessageAdd |
188 | - } 近30日新增 ${toThousands(growCardList?.messageInfo?.messageCount)}` | |
188 | + } 今日消息点数 ${toThousands( | |
189 | + growCardList?.messageInfo?.todayDataPointsAdd | |
190 | + )}` | |
191 | + : `客户总量:${growCardList?.customerInfo?.sumCount} 今日新增 ${toThousands( | |
192 | + growCardList?.customerInfo?.todayAdd | |
193 | + )}` | |
194 | + }} | |
195 | + </template> | |
196 | + <img | |
197 | + v-if="isAdmin(role)" | |
198 | + src="/src/assets/images/tip.png" | |
199 | + style="width: 1.125rem; height: 1.125rem" | |
200 | + /> | |
201 | + </Tooltip> | |
202 | + </div> | |
203 | + <div> {{ !isAdmin(role) ? `消息数` : '客户总量' }}</div> | |
204 | + </div> | |
205 | + <div class="flex-auto" v-if="!isAdmin(role)"> | |
206 | + <div class="flex justify-between" style="align-items: center"> | |
207 | + <div | |
208 | + v-if="!isAdmin(role)" | |
209 | + style="font-size: 1.625rem; color: #333; font-weight: bold" | |
210 | + > | |
211 | + <CountTo | |
212 | + v-if="growCardList?.messageInfo?.dataPointsCount" | |
213 | + :end-val="growCardList.messageInfo.dataPointsCount" | |
214 | + /> | |
215 | + <CountTo v-else :end-val="0" /> | |
216 | + </div> | |
217 | + <Tooltip> | |
218 | + <template #title> | |
219 | + {{ | |
220 | + !isAdmin(role) | |
221 | + ? `今日消息数:${ | |
222 | + growCardList?.messageInfo?.todayMessageAdd | |
223 | + } 今日消息点数 ${toThousands( | |
224 | + growCardList?.messageInfo?.todayDataPointsAdd | |
225 | + )}` | |
189 | 226 | : `客户总量:${growCardList?.customerInfo?.sumCount} 今日新增 ${toThousands( |
190 | 227 | growCardList?.customerInfo?.todayAdd |
191 | 228 | )}` |
... | ... | @@ -194,15 +231,20 @@ |
194 | 231 | <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" /> |
195 | 232 | </Tooltip> |
196 | 233 | </div> |
197 | - <div> {{ !isAdmin(role) ? `今日消息数` : '客户总量' }}</div> | |
234 | + <div> {{ !isAdmin(role) ? `消息点数` : '' }}</div> | |
198 | 235 | </div> |
199 | 236 | </div> |
200 | - <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5"> | |
201 | - 近30日新增 {{ toThousands(growCardList?.messageInfo?.messageCount) }}</div | |
202 | - > | |
203 | - <div v-else class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5"> | |
204 | - 近30日新增 {{ toThousands(growCardList?.customerInfo?.todayAdd) }}</div | |
205 | - > | |
237 | + <div class="flex justify-between" style="border-top: 2px solid #f0f2f5"> | |
238 | + <div v-if="!isAdmin(role)" class="pt-4"> | |
239 | + 今日消息数 {{ toThousands(growCardList?.messageInfo?.todayMessageAdd) }}</div | |
240 | + > | |
241 | + <div v-if="!isAdmin(role)" class="pt-4"> | |
242 | + 今日消息点数 {{ toThousands(growCardList?.messageInfo?.todayDataPointsAdd) }}</div | |
243 | + > | |
244 | + <div v-else class="pt-4"> | |
245 | + 近30日新增 {{ toThousands(growCardList?.customerInfo?.todayAdd) }}</div | |
246 | + > | |
247 | + </div> | |
206 | 248 | </Card> |
207 | 249 | </div> |
208 | 250 | <!-- 首页饼图 --> | ... | ... |