From 4b90690fc6715504b9df5f9e4d76a7aea849ed7d Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期日, 28 八月 2022 23:14:50 +0800 Subject: [PATCH] 添加排查标记. 修正饼图提示 --- src/views/manageCenter/index.vue | 6 ++++++ src/views/dataView/index.vue | 3 ++- src/views/hashrate/CameraManage/CameraInfo/index.vue | 2 +- src/views/search/components/CardItem.vue | 14 +++++++++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/views/dataView/index.vue b/src/views/dataView/index.vue index 82ed1c1..537a877 100644 --- a/src/views/dataView/index.vue +++ b/src/views/dataView/index.vue @@ -331,7 +331,8 @@ }, pieChartOption: { tooltip: { - trigger: "item" + trigger: "item", + formatter: "{b} {d}%" //鍙鐧惧垎姣� }, legend: { top: "70%", diff --git a/src/views/hashrate/CameraManage/CameraInfo/index.vue b/src/views/hashrate/CameraManage/CameraInfo/index.vue index 65c9bee..f592318 100644 --- a/src/views/hashrate/CameraManage/CameraInfo/index.vue +++ b/src/views/hashrate/CameraManage/CameraInfo/index.vue @@ -5,7 +5,7 @@ <el-form class="addForm" ref="addForm" :model="form" :rules="rules" label-width="88px" label-position="left"> <div class="row"> - <el-form-item label="RTSP鍦板潃" prop="rtsp"> + <el-form-item label="璁惧ID" prop="rtsp"> <el-input v-model="form.rtsp" placeholder="rtsp://" :disabled="isDisabled" size="small"></el-input> </el-form-item> diff --git a/src/views/manageCenter/index.vue b/src/views/manageCenter/index.vue index c8914db..18530c7 100644 --- a/src/views/manageCenter/index.vue +++ b/src/views/manageCenter/index.vue @@ -444,6 +444,10 @@ "rgb(255, 124, 31)", "rgb(165, 96, 255)" ], + tooltip: { + trigger: "item", + formatter: "{b} {d}%" //鍙鐧惧垎姣� + }, series: [ { name: "Nightingale Chart", @@ -456,7 +460,9 @@ }, label: { show: false + //formatter: '{b} : {c} ({d}%)' //甯﹀綋鍓嶅浘渚嬪悕 + 鐧惧垎姣� }, + data: [] } ] diff --git a/src/views/search/components/CardItem.vue b/src/views/search/components/CardItem.vue index 773fe4e..ffee081 100644 --- a/src/views/search/components/CardItem.vue +++ b/src/views/search/components/CardItem.vue @@ -313,6 +313,18 @@ <i class="iconfont iconshoucang2" @click="dialogVisible = true"></i> </el-tooltip> --> </div> + <el-tooltip content="宸叉帓鏌�" placement="top" popper-class="atooltip" v-show="data.warningFlag == 4"> + <i class="el-icon-view"></i> + </el-tooltip> + <el-tooltip content="璇姤" placement="top" popper-class="atooltip" v-show="data.warningFlag == 1"> + <i class="el-icon-circle-close"></i> + </el-tooltip> + <el-tooltip content="宸叉暣鏀�" placement="top" popper-class="atooltip" v-show="data.warningFlag == 2"> + <i class="el-icon-circle-check"></i> + </el-tooltip> + <el-tooltip content="鏈暣鏀�" placement="top" popper-class="atooltip" v-show="data.warningFlag == 3"> + <i class="el-icon-remove-outline"></i> + </el-tooltip> </div> </div> @@ -943,7 +955,7 @@ position: absolute; bottom: 0px; i { - color: #3d68e1; + color: #000; font-size: 20px !important; padding-right: 10px; cursor: pointer; -- Gitblit v1.8.0