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-09-30 11:08:35 +08:00
parent 83af279826
commit 5befa69299
13 changed files with 70 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,6 +144,7 @@ const handlerYAxis = () => {
nameTextStyle: { nameTextStyle: {
color: '#000' color: '#000'
}, },
splitNumber:5,
minInterval: 1, minInterval: 1,
axisLine: { axisLine: {
show: true, show: true,

2
src/components/table/header/index.vue
View File

@@ -48,6 +48,7 @@ import { mainHeight } from '@/utils/layout'
import { useDictData } from '@/stores/dictData' import { useDictData } from '@/stores/dictData'
import { Search, RefreshLeft } from '@element-plus/icons-vue' import { Search, RefreshLeft } from '@element-plus/icons-vue'
import { defineProps } from 'vue' import { defineProps } from 'vue'
const emit = defineEmits(['selectChange',])
const tableStore = inject('tableStore') as TableStore const tableStore = inject('tableStore') as TableStore
const tableHeader = ref() const tableHeader = ref()
@@ -147,6 +148,7 @@ const computedSearchRow = () => {
const showSelect = ref(false) const showSelect = ref(false)
const showSelectChange = () => { const showSelectChange = () => {
showSelect.value = !showSelect.value showSelect.value = !showSelect.value
emit('selectChange', showSelect.value)
} }
const onComSearch = async () => { const onComSearch = async () => {
if (props.datePicker) { if (props.datePicker) {

6
src/styles/app.scss
View File

@@ -381,12 +381,14 @@ body,
height: 100%; height: 100%;
width: 100%; width: 100%;
background: #fff; background: #fff;
z-index: 2; z-index: 10;
} }
.bjs-powered-by { .bjs-powered-by {
display: none; display: none;
} }
.el-select__wrapper{
height: 32px !important;
}
@font-face { @font-face {
font-family: 'AlimamaFangYuanTiVF'; font-family: 'AlimamaFangYuanTiVF';
src: url('../assets/font/ali/AlimamaFangYuanTiVF-Thin.woff') format('woff'), src: url('../assets/font/ali/AlimamaFangYuanTiVF-Thin.woff') format('woff'),

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

@@ -119,7 +119,7 @@ const init = () => {
res.data.forEach((item: any[]) => { res.data.forEach((item: any[]) => {
arr.push(...item) arr.push(...item)
}) })
let [min, max, interval] = yMethod(arr.map((item: any) => item.statisticalData)) let [min, max] = yMethod(arr.map((item: any) => item.statisticalData.toFixed(2)))
echartsData.value = { echartsData.value = {
options: { options: {
grid: { grid: {
@@ -132,7 +132,7 @@ const init = () => {
series: res.data.map((item: any) => { series: res.data.map((item: any) => {
return { return {
data: item.map((item: any, i: any) => { data: item.map((item: any, i: any) => {
return [res.data[0][i].time, item.statisticalData] return [res.data[0][i].time, item.statisticalData.toFixed(2)]
}), }),
// data: [ // data: [
// [1584086222000, '573'], // [1584086222000, '573'],
@@ -189,7 +189,7 @@ const init = () => {
min: min, min: min,
max: max, max: max,
// interval:interval, // interval:interval,
splitNumber:5
// min: 134, // min: 134,
// max: 500, // max: 500,
// min: Math.ceil( // min: Math.ceil(

4
src/views/govern/device/control/supplementaryRecruitment/current.vue
View File

@@ -20,7 +20,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备型号"> <el-form-item label="设备型号">
<el-select v-model="tableStore.table.params.devModel" clearable placeholder="请选择设备型号"> <el-select v-model="tableStore.table.params.devModel" filterable clearable placeholder="请选择设备型号">
<el-option <el-option
v-for="item in devModelOptionsFilter" v-for="item in devModelOptionsFilter"
:key="item.value" :key="item.value"
@@ -94,7 +94,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备型号:" prop="devModel" class="top"> <el-form-item label="设备型号:" prop="devModel" class="top">
<el-select v-model="form.devModel" placeholder="请选择" clearable> <el-select v-model="form.devModel" filterable placeholder="请选择" clearable>
<el-option <el-option
v-for="item in formDevModelOptionsFilter" v-for="item in formDevModelOptionsFilter"
:key="item.value" :key="item.value"

4
src/views/govern/device/control/supplementaryRecruitment/history.vue
View File

@@ -20,7 +20,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备型号"> <el-form-item label="设备型号">
<el-select v-model="tableStore.table.params.devModel" clearable placeholder="请选择设备型号"> <el-select v-model="tableStore.table.params.devModel" filterable clearable placeholder="请选择设备型号">
<el-option <el-option
v-for="item in devModelOptionsFilter" v-for="item in devModelOptionsFilter"
:key="item.value" :key="item.value"
@@ -94,7 +94,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备型号:" prop="devModel" class="top"> <el-form-item label="设备型号:" prop="devModel" class="top">
<el-select v-model="form.devModel" placeholder="请选择" clearable> <el-select v-model="form.devModel" filterable placeholder="请选择" clearable>
<el-option <el-option
v-for="item in formDevModelOptionsFilter" v-for="item in formDevModelOptionsFilter"
:key="item.value" :key="item.value"

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

@@ -63,7 +63,7 @@ const tableStore: any = new TableStore({
title: '暂降幅值(%)', title: '暂降幅值(%)',
minWidth: 100, minWidth: 100,
formatter: (row: any) => { formatter: (row: any) => {
row.cellValue = row.cellValue ? row.cellValue : '/' row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
return row.cellValue return row.cellValue
} }
}, },

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

@@ -1,9 +1,10 @@
<template> <template>
<div> <div>
<div > <!-- 历史趋势数据 -->
<TableHeader :showSearch="false"> <div>
<TableHeader :showSearch="false" @selectChange="selectChange">
<template v-slot:select> <template v-slot:select>
<!-- <el-form :model="searchForm" class="history_select" id="history_select"> --> <!-- <el-form :model="searchForm" class="history_select" id="history_select"> -->
<el-form-item> <el-form-item>
<DatePicker ref="datePickerRef"></DatePicker> <DatePicker ref="datePickerRef"></DatePicker>
</el-form-item> </el-form-item>
@@ -25,15 +26,15 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
<!-- </el-form> --> <!-- </el-form> -->
</template> </template>
<template #operation> <template #operation>
<el-button type="primary" icon="el-icon-Search" @click="init()">查询</el-button> <el-button type="primary" icon="el-icon-Search" @click="init()">查询</el-button>
</template> </template>
</TableHeader> </TableHeader>
</div> </div>
<div class="history_chart" v-loading="loading"> <div class="history_chart" :style="pageHeight" v-loading="loading">
<MyEchart ref="historyChart" :options="echartsData" /> <MyEchart ref="historyChart" :options="echartsData" />
</div> </div>
</div> </div>
@@ -68,7 +69,7 @@ const voltageLevelList = dictData.getBasicData('Dev_Voltage')
const volConTypeList = dictData.getBasicData('Dev_Connect') const volConTypeList = dictData.getBasicData('Dev_Connect')
//值类型 //值类型
const pageHeight = mainHeight(20) const pageHeight = ref(mainHeight(290))
const loading = ref(true) const loading = ref(true)
const searchForm = ref({}) const searchForm = ref({})
const typeOptions = [ const typeOptions = [
@@ -231,27 +232,27 @@ const init = async () => {
// } // }
} }
}, },
tooltip: { // tooltip: {
trigger: 'axis', // trigger: 'axis',
axisPointer: { // // axisPointer: {
type: 'shadow' // // type: 'shadow'
}, // // },
formatter: function (params: any) { // // formatter: function (params: any) {
var res = params[0].name + '<br/>' // // var res = params[0].name + '<br/>'
for (var i = 0, l = params.length; i < l; i++) { // // for (var i = 0, l = params.length; i < l; i++) {
params[i].unit = // // params[i].unit =
echartsData.value.options.yAxis[ // // echartsData.value.options.yAxis[
echartsData.value.options.series[params[i].seriesIndex].yAxisIndex // // echartsData.value.options.series[params[i].seriesIndex].yAxisIndex
]?.name // // ]?.name
res += // // res +=
params[i].seriesName + // // params[i].seriesName +
' ' + // // ' ' +
`<div style="width:16px;height:16px;float:left;background:${params[i].color};border-radius:50%;margin:0 5px;margin:0 15px"></div>` + // // `<div style="width:16px;height:16px;float:left;background:${params[i].color};border-radius:50%;margin:0 5px;margin:0 15px"></div>` +
`<div style='float:right;min-width:120px;padding-left:20px;'>${params[i].value} ${params[i].unit}</div><br/>` // // `<div style='float:right;min-width:120px;padding-left:20px;'>${params[i].value} ${params[i].unit}</div><br/>`
} // // }
return res // // return res
} // // }
}, // },
legend: { legend: {
//legend使用iconfont图标 //legend使用iconfont图标
data: [], data: [],
@@ -433,6 +434,15 @@ const init = async () => {
} }
} }
} }
const selectChange = (flag: boolean) => {
console.log("🚀 ~ selectChange ~ flag:", flag)
if (flag) {
pageHeight.value = mainHeight(345)
} else {
pageHeight.value = mainHeight(290)
}
}
//导出 //导出
const historyChart = ref() const historyChart = ref()
// const chart: any = ref(null) // const chart: any = ref(null)
@@ -685,7 +695,7 @@ defineExpose({ getTrendRequest })
.history_chart { .history_chart {
width: 100%; width: 100%;
height: calc(100vh - 400px) !important;
// flex: 1; // flex: 1;
margin-top: 10px; margin-top: 10px;
} }

6
src/views/govern/manage/basic/popupDictionary.vue
View File

@@ -4,7 +4,7 @@
<div style="padding-left: 50px"> <div style="padding-left: 50px">
<el-divider content-position="center">基础数据</el-divider> <el-divider content-position="center">基础数据</el-divider>
</div> </div>
<el-form :inline="true" :model="form" label-width="140px" ref="formRef" :rules="rules"> <el-form :model="form" label-width="140px" ref="formRef" class="form-two" :rules="rules">
<el-form-item label="数据分类:" prop="dataType"> <el-form-item label="数据分类:" prop="dataType">
<el-select v-model="form.dataType" filterable clearable placeholder="请选择数据分类"> <el-select v-model="form.dataType" filterable clearable placeholder="请选择数据分类">
<el-option <el-option
@@ -41,7 +41,7 @@
<el-input v-model="form.type" autocomplete="off" placeholder="请输入基础数据类型"></el-input> <el-input v-model="form.type" autocomplete="off" placeholder="请输入基础数据类型"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="开始结束次数:" prop="harmStart"> <el-form-item label="开始结束次数:" prop="harmStart">
<el-slider v-model="form.harm" range show-stops :max="50" /> <el-slider v-model="form.harm" range show-stops :max="50" style="width: 95%"/>
</el-form-item> </el-form-item>
<el-form-item label="统计方法:" prop="statMethod"> <el-form-item label="统计方法:" prop="statMethod">
<el-select v-model="form.statMethod" multiple filterable clearable placeholder="请选择统计方法"> <el-select v-model="form.statMethod" multiple filterable clearable placeholder="请选择统计方法">
@@ -106,7 +106,7 @@
<div style="padding-left: 50px"> <div style="padding-left: 50px">
<el-divider content-position="center">拓展数据</el-divider> <el-divider content-position="center">拓展数据</el-divider>
</div> </div>
<el-form :inline="true" :model="form" label-width="140px" ref="formRef2" :rules="rules"> <el-form class="form-two" :model="form" label-width="140px" ref="formRef2" :rules="rules">
<el-form-item label="参数缺省值:" prop="defaultValue"> <el-form-item label="参数缺省值:" prop="defaultValue">
<el-input v-model="form.defaultValue" autocomplete="off" placeholder="请输入参数缺省值"></el-input> <el-input v-model="form.defaultValue" autocomplete="off" placeholder="请输入参数缺省值"></el-input>
</el-form-item> </el-form-item>

4
src/views/govern/manage/basic/popupVersion.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title"> <el-dialog class="cn-operate-dialog" width="800px" v-model="dialogVisible" :title="title">
<el-scrollbar> <el-scrollbar>
<el-form :inline="true" :model="form" label-width="120px" ref="formRef" :rules="rules"> <el-form class="form-two" :model="form" label-width="120px" ref="formRef" :rules="rules">
<el-form-item label="装置类型:" prop="type"> <el-form-item label="装置类型:" prop="type">
<el-select v-model="form.type" placeholder="请选择" @change="typeChange"> <el-select v-model="form.type" placeholder="请选择" @change="typeChange">
<el-option <el-option

8
src/views/govern/manage/factory.vue
View File

@@ -19,7 +19,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备型号"> <el-form-item label="设备型号">
<el-select v-model="tableStore.table.params.devModel" clearable placeholder="请选择设备型号"> <el-select v-model="tableStore.table.params.devModel" filterable clearable placeholder="请选择设备型号">
<el-option <el-option
v-for="item in devModelOptionsFilter" v-for="item in devModelOptionsFilter"
:key="item.value" :key="item.value"
@@ -70,8 +70,8 @@
draggable draggable
width="40%" width="40%"
> >
<el-form :model="form" label-width="120px" :rules="rules" ref="ruleFormRef"> <el-form :model="form" label-width="120px" :rules="rules" ref="ruleFormRef" class="form-two">
<el-form-item label="设备名称:" prop="name"> <el-form-item label="设备名称:" prop="name" >
<el-input <el-input
v-model="form.name" v-model="form.name"
autocomplete="off" autocomplete="off"
@@ -93,7 +93,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备型号:" prop="devModel" class="top"> <el-form-item label="设备型号:" prop="devModel" class="top">
<el-select v-model="form.devModel" placeholder="请选择" clearable> <el-select v-model="form.devModel" filterable placeholder="请选择" clearable>
<el-option <el-option
v-for="item in formDevModelOptionsFilter" v-for="item in formDevModelOptionsFilter"
:key="item.value" :key="item.value"

2
src/views/govern/terminal/deviceLedger/index.vue
View File

@@ -93,7 +93,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备型号:" prop="devModel" class="top"> <el-form-item label="设备型号:" prop="devModel" class="top">
<el-select v-model="form.devModel" placeholder="请选择" clearable> <el-select v-model="form.devModel" filterable placeholder="请选择" clearable>
<el-option <el-option
v-for="item in formDevModelOptionsFilter" v-for="item in formDevModelOptionsFilter"
:key="item.value" :key="item.value"

4
src/views/govern/terminal/deviceMonitor/index.vue
View File

@@ -19,7 +19,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备型号"> <el-form-item label="设备型号">
<el-select v-model="tableStore.table.params.devModel" clearable placeholder="请选择设备型号"> <el-select v-model="tableStore.table.params.devModel" filterable clearable placeholder="请选择设备型号">
<el-option <el-option
v-for="item in devModelOptionsFilter" v-for="item in devModelOptionsFilter"
:key="item.value" :key="item.value"
@@ -93,7 +93,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备型号:" prop="devModel" class="top"> <el-form-item label="设备型号:" prop="devModel" class="top">
<el-select v-model="form.devModel" placeholder="请选择" clearable> <el-select v-model="form.devModel" filterable placeholder="请选择" clearable>
<el-option <el-option
v-for="item in formDevModelOptionsFilter" v-for="item in formDevModelOptionsFilter"
:key="item.value" :key="item.value"