diff --git a/src/views/govern/analyze/APF/index.vue b/src/views/govern/analyze/APF/index.vue
index 155a613..9e8e256 100644
--- a/src/views/govern/analyze/APF/index.vue
+++ b/src/views/govern/analyze/APF/index.vue
@@ -107,9 +107,14 @@ const nodeClick = async (e: anyObj) => {
if (zblist.value.length === 0) {
await init()
}
- let getDevCapacityRes = await getDevCapacity(formInline.devId)
- devCapacity.value = getDevCapacityRes.data
- search()
+ getDevCapacity(formInline.devId).then(res => {
+ devCapacity.value = res.data
+ search()
+ }).catch(() => {
+ loading.value = false
+
+ })
+
}
}
const search = () => {
diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue
index 474c816..199b714 100644
--- a/src/views/govern/device/planData/index.vue
+++ b/src/views/govern/device/planData/index.vue
@@ -20,15 +20,13 @@
测试项信息
-
+
-
+
+
+
{{ item.itemName }}
@@ -101,19 +99,10 @@
-
-
+
+
@@ -121,30 +110,17 @@
-
-
+
+
-
+
@@ -411,24 +387,33 @@ const init = () => {
tooltip: {
trigger: 'axis',
axisPointer: {
- type: 'shadow'
- },
- formatter: function (params: any) {
- var res = params[0].name + '
'
- for (var i = 0, l = params.length; i < l; i++) {
- params[i].unit =
- echartsData.value.options.yAxis[
- echartsData.value.options.series[params[i].seriesIndex].yAxisIndex
- ]?.name
- res +=
- params[i].seriesName +
- ' ' +
- `` +
- `${params[i].value} ${params[i].unit}
`
+ type: 'cross',
+ crossStyle: {
+ color: '#999'
}
- return res
}
},
+ // tooltip: {
+ // trigger: 'axis',
+ // axisPointer: {
+ // type: 'shadow'
+ // },
+ // formatter: function (params: any) {
+ // var res = params[0].name + '
'
+ // for (var i = 0, l = params.length; i < l; i++) {
+ // params[i].unit =
+ // echartsData.value.options.yAxis[
+ // echartsData.value.options.series[params[i].seriesIndex].yAxisIndex
+ // ]?.name
+ // res +=
+ // params[i].seriesName +
+ // ' ' +
+ // `` +
+ // `${params[i].value} ${params[i].unit}
`
+ // }
+ // return res
+ // }
+ // },
legend: {
//legend使用iconfont图标
data: [],
@@ -443,13 +428,13 @@ const init = () => {
width: 400,
height: 50
},
- grid: {
- left: historyDataList.value.length != 0 ? '5%' : '1%',
- right: '5%',
- bottom: '10%',
- top: '8%',
- containLabel: true
- },
+ // grid: {
+ // left: historyDataList.value.length != 0 ? '5%' : '1%',
+ // right: '5%',
+ // bottom: '10%',
+ // top: '8%',
+ // containLabel: true
+ // },
xAxis: [
{
type: 'category',
@@ -527,7 +512,7 @@ const init = () => {
axisLine: {
show: true,
lineStyle: {
- color: colorList[index + 1]
+ // color: colorList[index + 1]
}
},
nameTextStyle: {
@@ -834,8 +819,10 @@ onMounted(() => {
}
}
}
+
.history_title {
width: 100%;
+
p {
height: 32px;
line-height: 32px;
@@ -853,13 +840,16 @@ onMounted(() => {
min-height: 130px !important;
}
}
+
.history_header {
display: flex;
+
// flex-wrap: wrap;
#history_select {
width: 95%;
display: flex;
justify-content: flex-start;
+
// overflow-x: auto;
// height: 45px;
// padding-top: 18px;
@@ -870,6 +860,7 @@ onMounted(() => {
display: flex;
align-items: center;
}
+
.el-select {
margin-right: 10px;
}