center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2022-04-18 11:01:52 +08:00
commit 7241e26013
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/io/dataease/listener/util/CacheUtils.java
View File

@ -26,8 +26,8 @@ public class CacheUtils {
public static Object get(String cacheName, Object key) { public static Object get(String cacheName, Object key) {
if (getCacheManager() instanceof RedisCacheManager) { if (getCacheManager() instanceof RedisCacheManager) {
org.springframework.cache.Cache cache = getCacheManager().getCache(cacheName); org.springframework.cache.Cache cache = getCacheManager().getCache(cacheName);
if (null == cache) return null; if (null == cache || null == cache.get(key)) return null;
return cache.get(key); return cache.get(key).get();
} }
Element element = cache(cacheName).get(key); Element element = cache(cacheName).get(key);
if (null == element) return null; if (null == element) return null;
@ -36,9 +36,12 @@ public class CacheUtils {
public static void put(String cacheName, Object key, Object value, Integer ttl, Integer tti) { public static void put(String cacheName, Object key, Object value, Integer ttl, Integer tti) {
if (getCacheManager() instanceof RedisCacheManager) { if (getCacheManager() instanceof RedisCacheManager) {
RedisTemplate redisTemplate = (RedisTemplate) CommonBeanFactory.getBean("redisTemplate"); /*RedisTemplate redisTemplate = (RedisTemplate) CommonBeanFactory.getBean("redisTemplate");
ValueOperations valueOperations = redisTemplate.opsForValue(); ValueOperations valueOperations = redisTemplate.opsForValue();
valueOperations.set(cacheName + "::" + key , value ); valueOperations.set(cacheName + "::" + key , value );*/
org.springframework.cache.Cache cache = getCacheManager().getCache(cacheName);
if (null == cache) return;
cache.put(key, value);
return; return;
} }
Element e = new Element(key, value); Element e = new Element(key, value);

2
frontend/src/views/chart/chart/gauge/gauge.js
View File

@ -62,7 +62,7 @@ export function baseGaugeOption(chart_option, chart) {
const per = parseFloat(chart.data.series[0].data[0]) / parseFloat(chart_option.series[0].max) const per = parseFloat(chart.data.series[0].data[0]) / parseFloat(chart_option.series[0].max)
for (let i = 0; i < arr.length; i++) { for (let i = 0; i < arr.length; i++) {
const ele = arr[i] const ele = arr[i]
const p = parseInt(ele) / 100 const p = parseFloat(ele) / 100
range.push([p, hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)]) range.push([p, hexColorToRGBA(customAttr.color.colors[i % customAttr.color.colors.length], customAttr.color.alpha)])
if (!flag && per <= p) { if (!flag && per <= p) {
flag = true flag = true

2
frontend/src/views/chart/chart/gauge/gauge_antv.js
View File

@ -48,7 +48,7 @@ export function baseGaugeOptionAntV(plot, container, chart, action) {
const arr = threshold.gaugeThreshold.split(',') const arr = threshold.gaugeThreshold.split(',')
for (let i = 0; i < arr.length; i++) { for (let i = 0; i < arr.length; i++) {
const ele = arr[i] const ele = arr[i]
const p = parseInt(ele) / 100 const p = parseFloat(ele) / 100
range.push(p) range.push(p)
if (!flag && per <= p) { if (!flag && per <= p) {
flag = true flag = true

4
frontend/src/views/chart/components/senior/Threshold.vue
View File

@ -9,7 +9,7 @@
<span>,100</span> <span>,100</span>
<el-tooltip class="item" effect="dark" placement="bottom"> <el-tooltip class="item" effect="dark" placement="bottom">
<div slot="content"> <div slot="content">
阈值设置，决定仪表盘区间颜色，为空则不开启阈值，范围(0-100)，仅限整数，且逐级递增 阈值设置，决定仪表盘区间颜色，为空则不开启阈值，范围(0-100)，逐级递增
<br> <br>
例如：输入 30,70；表示：分为3段，分别为[0,30],(30,70],(70,100] 例如：输入 30,70；表示：分为3段，分别为[0,30],(30,70],(70,100]
</div> </div>
@ -129,7 +129,7 @@ export default {
const arr = this.thresholdForm.gaugeThreshold.split(',') const arr = this.thresholdForm.gaugeThreshold.split(',')
for (let i = 0; i < arr.length; i++) { for (let i = 0; i < arr.length; i++) {
const ele = arr[i] const ele = arr[i]
if (ele.indexOf('.') > -1 || parseInt(ele).toString() === 'NaN' || parseInt(ele) < 1 || parseInt(ele) > 99) { if (parseFloat(ele).toString() === 'NaN' || parseFloat(ele) < 1 || parseFloat(ele) > 99) {
this.$message({ this.$message({
message: this.$t('chart.gauge_threshold_format_error'), message: this.$t('chart.gauge_threshold_format_error'),
type: 'error', type: 'error',