xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

Browse Source
This commit is contained in:
fks-yangshouda
2024-08-21 08:37:52 +08:00
parent 173ad8bdb4 def744926f
commit 878d02680d
2 changed files with 68 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hx-ai-intelligent/src/api/planToAdd.ts
View File

@@ -1,5 +1,7 @@
import { BASE_URL } from './index';
export enum planToAddApi {
getActivatedPlanTree = '/carbon-smart/deviceCtrlPlan/getActivatedPlanTree', //计划树
getActivatedPlanListByTree = '/carbon-smart/deviceCtrlPlan/getActivatedPlanListByTree', //计划列表
updPlan = '/carbon-smart/deviceCtrlPlan/updateActivatedPlan', //修改计划
getActivatedPlanTree = `${BASE_URL}/api/deviceCtrlPlan/getActivatedPlanTree`, //计划树
getActivatedPlanListByTree = `${BASE_URL}/api/deviceCtrlPlan/getActivatedPlanListByTree`, //计划列表
updPlan = `${BASE_URL}/api/deviceCtrlPlan/updateActivatedPlan`, //修改计划
}

94
hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue
View File

@@ -190,28 +190,17 @@
type: 'shadow',
},
formatter: function (params: any) {
let res =
params[0].axisValue +
'<br/>' +
params[0].marker +
' ' +
params[0].seriesName +
' : ' +
params[0].data +
'<br/>' +
params[1].marker +
' ' +
params[1].seriesName +
' : ' +
params[1].data +
'<br/>' +
params[2].marker +
' ' +
params[2].seriesName +
' : ' +
params[2].data +
'<br/>';
return res;
console.log(params, '错误');
if (params.length > 0) {
let res = params[0].axisValue + '<br/>';
params.forEach((item: any) => {
if (item.seriesName !== '总数') {
res = res + item.marker + ' ' + item.seriesName + ' : ' + item.data + '<br/>';
}
});
return res;
}
return '';
},
},
grid: {
@@ -284,15 +273,26 @@
],
//滑块样式
dataZoom: [
{
type: 'inside',
start: 0,
end: 100,
},
{
type: 'slider',
// backgroundColor: 'yellow',
// fillerColor: 'yellow',
fillerColor: new echarts.graphic.LinearGradient(
0,
0,
1,
0,
[
{
offset: 0,
color: 'rgba(97, 134, 255, 1)',
},
{
offset: 1,
color: 'rgba(36, 186, 255, 1)',
},
],
false,
),
height: 12, // 设置slider的高度为15
start: 0,
end: 100,
@@ -304,9 +304,41 @@
handleSize: '140%', // 放大按钮
// borderColor: 'none',
handleStyle: {
// color: 'red',
// shadowBlur: 6,
// shadowColor: 'yellow',
color: new echarts.graphic.LinearGradient(
0,
0,
1,
0,
[
{
offset: 0,
color: 'rgba(97, 134, 255, 1)',
},
{
offset: 1,
color: 'rgba(36, 186, 255, 1)',
},
],
false,
),
borderWidth: 4,
borderColor: new echarts.graphic.LinearGradient(
0,
0,
0,
1,
[
{
offset: 0,
color: 'rgba(255, 255, 255, 1)',
},
{
offset: 1,
color: 'rgba(204, 238, 255, 1)',
},
],
false,
),
shadowOffsetX: 0, // 阴影偏移x轴多少
shadowOffsetY: 0, // 阴影偏移y轴多少
},