Web/admin-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改测试bug

Browse Source
This commit is contained in:
GGJ
2024-12-11 16:33:23 +08:00
parent 26c971f3b0
commit fb462e3936
10 changed files with 58 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/govern/device/control/detail.vue
View File

@@ -179,7 +179,7 @@ const init = () => {
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0
},

37
src/views/govern/device/control/tabs/components/harmonicSpectrum.vue
View File

@@ -4,33 +4,18 @@
<div class="harmonic_select" v-if="!loading">
<el-form :model="searchForm" id="history_select">
<el-form-item label="稳态指标">
<el-select
multiple
collapse-tags
collapse-tags-tooltip
v-model="searchForm.index"
placeholder="请选择统计指标"
:multiple-limit="3"
value-key="id"
>
<el-option
v-for="(item, index) in indexOptions"
:label="item.name"
:key="index"
:value="item"
></el-option>
<el-select multiple collapse-tags collapse-tags-tooltip v-model="searchForm.index"
placeholder="请选择统计指标" :multiple-limit="3" value-key="id">
<el-option v-for="(item, index) in indexOptions" :label="item.name" :key="index"
:value="item"></el-option>
</el-select>
</el-form-item>
<!-- <el-button type="primary" :loading="loading" @click="init">查询</el-button> -->
</el-form>
</div>
<div class="harmonic_body">
<div
class="harmonic_body_charts"
:style="{ height: height }"
v-for="(item, index) in searchForm.index"
:key="index"
>
<div class="harmonic_body_charts" :style="{ height: height }" v-for="(item, index) in searchForm.index"
:key="index">
<MyEchart :ref="setChildRef(index)" :options="item.echartsData" :isInterVal="true"></MyEchart>
</div>
</div>
@@ -286,8 +271,8 @@ const init = () => {
searchForm.value.index.map((item: any, index: any) => {
item?.children.map((vv: any, vvs: any) => {
if (mqttMessage.value[vv.name] !=undefined) {
if (mqttMessage.value[vv.name] != undefined) {
item.data.push({
// time: mqttMessage.value.dataTime,
value: mqttMessage.value[vv.name],
@@ -305,7 +290,7 @@ const init = () => {
xAixsTimeList.value.push(mqttMessage.value.dataTime.split(" ")[1])
searchForm.value.index.map((item: any, index: any) => {
//循环渲染图表
const refName = setChildRef(index)
childRefs[refName] = ref(null) // 初始化ref
@@ -334,7 +319,7 @@ const init = () => {
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0
},
xAxis: {
@@ -386,7 +371,7 @@ const init = () => {
loading.value = false
}
onMounted(() => {})
onMounted(() => { })
defineExpose({ resetData, setHarmonicSpectrumData })
</script>
<style lang="scss" scoped>

2
src/views/govern/device/control/tabs/trend.vue
View File

@@ -277,7 +277,7 @@ const init = async () => {
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0,
formatter(params: any) {
const xname = params[0].value[0]

22
src/views/govern/device/planData/index.vue
View File

@@ -34,9 +34,9 @@
</span>
</template>
<el-descriptions size="small" width="180" :column="4" border>
<el-descriptions-item label="测试项名称" width="160">
<!-- <el-descriptions-item label="测试项名称" width="160">
{{ item.itemName }}
</el-descriptions-item>
</el-descriptions-item> -->
<el-descriptions-item label="测量间隔" width="160">
{{ item.statisticalInterval }}分钟
</el-descriptions-item>
@@ -205,7 +205,7 @@ const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
const volConTypeList = dictData.getBasicData('Dev_Connect')
//值类型
const pageHeight = mainHeight(20)
const EcharHeight = ref(mainHeight(483))
const EcharHeight = ref(mainHeight(451))
const loading = ref(false)
const searchForm: any = ref({})
const typeOptions = [
@@ -554,7 +554,7 @@ const init = (flag: boolean) => {
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0,
formatter(params: any) {
const xname = params[0].value[0]
@@ -564,7 +564,7 @@ const init = (flag: boolean) => {
if (el.value[3] == 'dashed') {
for (let i = 0; i < 3; i++) {
marker+= `<span style="display:inline-block;border: 2px ${el.color} solid;margin-right:5px;width:10px;height:0px;background-color:#ffffff00;"></span>`
marker += `<span style="display:inline-block;border: 2px ${el.color} solid;margin-right:5px;width:10px;height:0px;background-color:#ffffff00;"></span>`
}
} else {
marker = `<span style="display:inline-block;border: 2px ${el.color} ${el.value[3]};margin-right:5px;width:40px;height:0px;background-color:#ffffff00;"></span>`
@@ -889,13 +889,13 @@ const selectChange = (e: boolean) => {
if (activeColName.value == '0') {
if (flag.value) {
EcharHeight.value = mainHeight(527)
EcharHeight.value = mainHeight(495)
} else {
EcharHeight.value = mainHeight(483)
EcharHeight.value = mainHeight(451)
}
} else {
if (flag.value) {
EcharHeight.value = mainHeight(357)
EcharHeight.value = mainHeight(355)
} else {
EcharHeight.value = mainHeight(315)
}
@@ -905,13 +905,13 @@ const selectChange = (e: boolean) => {
const handleChange = () => {
if (activeColName.value == '0') {
if (flag.value) {
EcharHeight.value = mainHeight(527)
EcharHeight.value = mainHeight(495)
} else {
EcharHeight.value = mainHeight(483)
EcharHeight.value = mainHeight(451)
}
} else {
if (flag.value) {
EcharHeight.value = mainHeight(357)
EcharHeight.value = mainHeight(355)
} else {
EcharHeight.value = mainHeight(315)
}