From fd4a4f4513419baa9af45c8176a511450f096fc4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 11 十一月 2021 19:13:30 +0800
Subject: [PATCH] 2021-11-11
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 3c47e00..2112bc2 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -21,6 +21,7 @@
const PrintButton = asyncComponent(() => import('@/tabviews/zshare/actionList/printbutton'))
const BarCode = asyncElementComponent(() => import('@/components/barcode'))
const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
+const MkProgress = asyncElementComponent(() => import('@/components/mkProgress'))
const Video = asyncComponent(() => import('@/components/video'))
const PicRadio = {
'4:3': '75%', '3:2': '66.67%', '16:9': '56.25%', '2:1': '50%', '3:1': '33.33%', '4:1': '25%',
@@ -414,13 +415,6 @@
val = val / card.maxValue * 100
val = parseInt(val * 100) / 100
- let _val = val
- if (val > 100) {
- _val = '100%'
- } else {
- _val = `${val}%`
- }
-
if (card.marks) {
let _color = this.getColor(card.marks)
color = _color ? _color : color
@@ -429,13 +423,7 @@
return (
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
- <div className="ant-mk-slider">
- <div className="ant-mk-slider-rail"></div>
- <div className="ant-mk-slider-track" style={{width: _val, backgroundColor: color}}></div>
- <Tooltip title={`${val}%`}>
- <div className="ant-mk-slider-handle" style={{left: _val, borderColor: color}}></div>
- </Tooltip>
- </div>
+ <MkProgress value={val} config={card} color={color}/>
</div>
</Col>
)
--
Gitblit v1.8.0