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

3
.gitignore vendored
View File

@@ -11,14 +11,15 @@ node_modules
dist dist
dist-ssr dist-ssr
*.local *.local
# Editor directories and files # Editor directories and files
.vscode/* .vscode/*
!.vscode/extensions.json !.vscode/extensions.json
.idea .idea
.DS_Store .DS_Store
*.suo *.suo
*.zip*
*.ntvs* *.ntvs*
*.njsproj *.njsproj
*.sln *.sln
*.sw? *.sw?
pnpm-lock.yaml

1
package.json
View File

@@ -36,6 +36,7 @@
"pinia": "^2.1.7", "pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1", "pinia-plugin-persistedstate": "^3.2.1",
"screenfull": "^6.0.2", "screenfull": "^6.0.2",
"socket.io-client": "^4.0.0",
"splitpanes": "3.1.5", "splitpanes": "3.1.5",
"use-element-plus-theme": "^0.0.5", "use-element-plus-theme": "^0.0.5",
"vue": "^3.3.11", "vue": "^3.3.11",

2
src/components/echarts/MyEchart.vue
View File

@@ -66,7 +66,7 @@ const initChart = () => {
opacity: 0.35, opacity: 0.35,
fontSize: 14 fontSize: 14
}, },
backgroundColor: 'rgba(0,0,0,0.35)', backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0, borderWidth: 0,
confine: true, confine: true,
...(props.options?.tooltip || null) ...(props.options?.tooltip || null)

5
src/components/echarts/MyEchartMap.vue
View File

@@ -23,7 +23,7 @@ const fetchConfig = async (name: string) => {
// fetchConfig() // fetchConfig()
const emit = defineEmits(['getRegionByRegion', 'eliminate']) const emit = defineEmits(['getRegionByRegion', 'eliminate'])
onMounted(() => {}) onMounted(() => { })
const GetEchar = async (name: string) => { const GetEchar = async (name: string) => {
let chartDom = document.getElementById('chartMap') let chartDom = document.getElementById('chartMap')
@@ -53,7 +53,7 @@ const GetEchar = async (name: string) => {
opacity: 0.35, opacity: 0.35,
fontSize: 14 fontSize: 14
}, },
backgroundColor: 'rgba(0,0,0,0.35)', backgroundColor: 'rgba(0,0,0,0.55)',
...(props.options.tooltip || null) ...(props.options.tooltip || null)
}, },
@@ -206,6 +206,7 @@ watch(
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.iconfont { .iconfont {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;

6
src/components/echarts/rmsboxi.vue
View File

@@ -218,7 +218,7 @@ export default {
' 发生时刻：' + ' 发生时刻：' +
this.boxoList.startTime + this.boxoList.startTime +
' 暂降(骤升)幅值：' + ' 暂降(骤升)幅值：' +
(this.boxoList.featureAmplitude ) + (this.boxoList.featureAmplitude) +
'% 持续时间：' + '% 持续时间：' +
(this.boxoList.persistTime ? this.boxoList.persistTime.toFixed(2) : '-') + (this.boxoList.persistTime ? this.boxoList.persistTime.toFixed(2) : '-') +
's' 's'
@@ -907,7 +907,7 @@ export default {
opacity: 0.35, opacity: 0.35,
fontSize: 14, fontSize: 14,
}, },
backgroundColor: "rgba(0,0,0,0.35)", backgroundColor: "rgba(0,0,0,0.55)",
borderWidth: 0, borderWidth: 0,
}, },
title: { title: {
@@ -1338,7 +1338,7 @@ export default {
opacity: 0.35, opacity: 0.35,
fontSize: 14, fontSize: 14,
}, },
backgroundColor: "rgba(0,0,0,0.35)", backgroundColor: "rgba(0,0,0,0.55)",
borderWidth: 0, borderWidth: 0,
}, },
title: { title: {

4
src/components/echarts/shushiboxi.vue
View File

@@ -577,7 +577,7 @@ export default {
opacity: 0.35, opacity: 0.35,
fontSize: 14 fontSize: 14
}, },
backgroundColor: 'rgba(0,0,0,0.35)', backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0, borderWidth: 0,
}, },
@@ -941,7 +941,7 @@ export default {
opacity: 0.35, opacity: 0.35,
fontSize: 14 fontSize: 14
}, },
backgroundColor: 'rgba(0,0,0,0.35)', backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0 borderWidth: 0
}, },
title: { title: {

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

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

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

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

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

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