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

需求变更整改

Browse Source
This commit is contained in:
guanj
2025-07-15 16:31:06 +08:00
parent 96518a4c9d
commit aa323c0d9c
50 changed files with 582 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/govern/device/control/analysisList/index.vue
View File

@@ -58,8 +58,8 @@ const tableStore: any = new TableStore({
}
},
{ field: 'successCount', title: '成功解析数', minWidth: 150 },
{ field: 'startTime', title: '导入开始时间', minWidth: 170 },
{ field: 'endTime', title: '导入结束时间', minWidth: 170 },
{ field: 'startTime', title: '导入开始时间', minWidth: 170, sortable: true },
{ field: 'endTime', title: '导入结束时间', minWidth: 170 , sortable: true},
{
title: '解析状态',
field: 'status',

6
src/views/govern/device/control/analysisList/popup.vue
View File

@@ -42,9 +42,9 @@ const tableStore: any = new TableStore({
}
},
{ field: 'name', title: '文件名称', minWidth: 170 },
{ field: 'createTime', title: '导入时间', minWidth: 170 },
{ field: 'allCount', title: '数据总数(条)', minWidth: 170 },
{ field: 'realCount', title: '已入库总数(条)', minWidth: 170 },
{ field: 'createTime', title: '导入时间', minWidth: 170 , sortable: true},
{ field: 'allCount', title: '数据总数(条)', minWidth: 170 , sortable: true},
{ field: 'realCount', title: '已入库总数(条)', minWidth: 170, sortable: true },
{
title: '解析状态',
field: 'state',

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

@@ -270,7 +270,7 @@ const init = () => {
}
}
if ((echartsData.value.legend = ['A相', 'B相', 'C相'])) {
echartsData.value.color = ['#FFCC00', '#009900', '#CC0000']
echartsData.value.color = ['#DAA520', '#2E8B57', '#A52a2a']
}
} else {

4
src/views/govern/device/control/index.vue
View File

@@ -208,7 +208,7 @@
</el-button>
<el-button
type="primary"
v-if="dataSet.indexOf('_moduleData') != -1"
v-if="dataSet.indexOf('_moduleData') != -1 && moduleFlag"
:icon="Refresh"
@click="refreshTheState"
>
@@ -582,6 +582,7 @@ const tableLoading = ref(false)
const getGroupLoading = ref(false)
const deviceData = ref<any>(null)
const dataSet = ref('')
const moduleFlag = ref(false)
const testItemRecordsRef = ref()
const moduleDataRef = ref()
const nearRealTimeDataRef = ref()
@@ -1284,6 +1285,7 @@ const handleClick = async (tab?: any) => {
tableLoading.value = false
setTimeout(() => {
//targetType
res.data.length > 0 ? (moduleFlag.value = true) : (moduleFlag.value = false)
moduleDataRef.value?.setData(res.data)
}, 500)
setTimeout(() => {

17
src/views/govern/device/control/moduleData.vue
View File

@@ -4,7 +4,7 @@
<div class="container">
<div class="tabs-container">
<!-- 左侧标签头 -->
<div class="tab-list" :style="titleHeight" style="overflow-y: auto">
<div class="tab-list" :style="titleHeight" style="overflow-y: auto" v-loading="loadingLeft">
<button
v-for="(item, index) in list"
:key="index"
@@ -71,6 +71,7 @@ import { yMethod } from '@/utils/echartMethod'
import { k } from 'vite/dist/node/types.d-aGj9QkWt'
const list: any = ref([])
const loading = ref(false)
const loadingLeft = ref(false)
const height = ref(mainHeight(290))
const titleHeight = ref(mainHeight(302))
const echartHeight = ref(mainHeight(342))
@@ -129,7 +130,7 @@ const setData = (data: any) => {
}
],
itemStyle: {
color: '#FFB74D' // 图例标记颜色与数据标记一致
color: '#ccc' // 图例标记颜色与数据标记一致
}
},
toolbox: {
@@ -229,8 +230,8 @@ const setData = (data: any) => {
name: k.stateDesc,
coord: [k.time, k.stateDesc == '离线' ? 0.03 : k.stateDesc == '运行' ? 1 : 0.5],
itemStyle: {
color: '#FFB74D', // 亮黄色填充
borderColor: '#FFB74D', // 边框颜色
color: k.stateDesc == '离线' ? "#f56c6c" : k.stateDesc == '运行' ? '#67c23a' : '#e6a23c', //'#FFB74D', // 亮黄色填充
borderColor: k.stateDesc == '离线' ? "#f56c6c" : k.stateDesc == '运行' ? '#67c23a' : '#e6a23c',//'#FFB74D', // 边框颜色
borderWidth: 1 // 边框宽度
}
}))
@@ -269,7 +270,7 @@ const setData = (data: any) => {
min: loadMin,
max: loadMax
},
color: ['#FFCC00', '#009900', '#CC0000'],
color: ['#DAA520', '#2E8B57', '#A52a2a'],
options: {
series: [
{
@@ -333,7 +334,7 @@ const setData = (data: any) => {
min: modOuMin,
max: modOuMax
},
color: ['#FFCC00', '#009900', '#CC0000'],
color: ['#DAA520', '#2E8B57', '#A52a2a'],
options: {
series: [
{
@@ -373,7 +374,7 @@ const setData = (data: any) => {
echarts.connect('group')
}
const getModule = async (id: string) => {
loading.value = true
loadingLeft.value = true
await getModuleState({ id: id }).then(res => {
res.data.forEach((item: any) => {
list.value.forEach((k: any) => {
@@ -385,7 +386,7 @@ const getModule = async (id: string) => {
ElMessage.success('刷新成功')
})
loading.value = false
loadingLeft.value = false
}
const changeTab = (e: any) => {
echartList.value = list.value[e]

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

@@ -210,7 +210,7 @@ const tableStore = new TableStore({
return row.cellValue === 'MQTT' ? 'MQTT' : row.cellValue === 'cloud' ? 'CLD' : row.cellValue
}
},
{ title: '录入时间', field: 'createTime' },
{ title: '录入时间', field: 'createTime', sortable: true },
{ title: '网络设备ID', field: 'ndid' },
{
title: '状态',

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

@@ -40,7 +40,7 @@ const tableStore: any = new TableStore({
return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
}
},
{ field: 'startTime', title: '发生时刻', minWidth: 170 },
{ field: 'startTime', title: '发生时刻', minWidth: 170, sortable: true },
{ field: 'showName', title: '事件描述', minWidth: 170 },
{
field: 'phaseType',
@@ -58,7 +58,7 @@ const tableStore: any = new TableStore({
formatter: (row: any) => {
row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
return row.cellValue
}
}, sortable: true
},
{
field: 'featureAmplitude',

12
src/views/govern/device/control/tabs/realtime.vue
View File

@@ -273,21 +273,21 @@ const initRadioCharts = () => {
value: 0,
name: 'A相',
itemStyle: {
color: '#FFCC00'
color: '#DAA520'
}
},
{
value: 0,
name: 'B相',
itemStyle: {
color: '#009900'
color: '#2E8B57'
}
},
{
value: 0,
name: 'C相',
itemStyle: {
color: '#CC0000'
color: '#A52a2a'
}
}
]
@@ -373,21 +373,21 @@ const initRadioCharts = () => {
value: 0,
name: 'A相',
itemStyle: {
color: '#FFCC00'
color: '#DAA520'
}
},
{
value: 0,
name: 'B相',
itemStyle: {
color: '#009900'
color: '#2E8B57'
}
},
{
value: 0,
name: 'C相',
itemStyle: {
color: '#CC0000'
color: '#A52a2a'
}
}
]

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

@@ -341,7 +341,7 @@ const init = async () => {
return str
}
},
color: ['#FFCC00', '#009900', '#CC0000', ...color],
color: ['#DAA520', '#2E8B57', '#A52a2a', ...color],
xAxis: {
type: 'time',
axisLabel: {
@@ -461,7 +461,7 @@ const init = async () => {
: kk[0].anotherName,
type: 'line',
smooth: true,
color: colorName == 'A' ? '#FFCC00' : colorName == 'B' ? '#009900' : colorName == 'C' ? '#CC0000' : '',
color: colorName == 'A' ? '#DAA520' : colorName == 'B' ? '#2E8B57' : colorName == 'C' ? '#A52a2a' : '',
symbol: 'none',
data: seriesList,
lineStyle: lineStyle[lineS],