3 Commits

Author SHA1 Message Date
sjl
59489aaafa 微调 2026-01-30 15:01:19 +08:00
guanj
5d0421dd40 Merge branch 'master' of http://192.168.1.22:3000/Web/admin-sjzx 2026-01-29 14:10:32 +08:00
guanj
6d7ef7cf5d 修改终端型号 2026-01-29 14:10:18 +08:00
6 changed files with 18 additions and 10 deletions

View File

@@ -17,6 +17,7 @@ const config = useConfig()
// import { nextTick } from 'process' // import { nextTick } from 'process'
const emit = defineEmits(['triggerPoint', 'group', 'echartClick']) const emit = defineEmits(['triggerPoint', 'group', 'echartClick'])
color[0] = config.layout.elementUiPrimary[0] color[0] = config.layout.elementUiPrimary[0]
const chartRef = ref<HTMLDivElement>() const chartRef = ref<HTMLDivElement>()
const props = defineProps(['options', 'isInterVal', 'pieInterVal']) const props = defineProps(['options', 'isInterVal', 'pieInterVal'])

View File

@@ -79,7 +79,7 @@ const init = async () => {
// 设置消息接收回调 // 设置消息接收回调
mqttClient.onMessage((topic, message) => { mqttClient.onMessage((topic, message) => {
const msg = JSON.parse(message.toString()) const msg = JSON.parse(message.toString())
console.log('🚀 ~ init ~ msg:', msg) // console.log('🚀 ~ init ~ msg:', msg)
if (msg.deptList.includes(adminInfo.$state.deptId)) { if (msg.deptList.includes(adminInfo.$state.deptId)) {
drawer.value = true drawer.value = true
isLoading.value = true isLoading.value = true

View File

@@ -100,10 +100,10 @@ const tableStore = new TableStore({
} }
}, },
{ field: 'areaName', title: '区域',minWidth: 100 }, { field: 'areaName', title: '区域',minWidth: 100 },
{ field: 'gdName', title: '地级区' ,minWidth: 100}, { field: 'gdName', title: '供电公司' ,minWidth: 100},
{ {
field: 'bdName', field: 'bdName',
title: '供电公司', title: '场站',
minWidth: 100 minWidth: 100
}, },
{ field: 'objName', title: '对象名称' , minWidth: 240}, { field: 'objName', title: '对象名称' , minWidth: 240},

View File

@@ -145,10 +145,10 @@ const tableStore = new TableStore({
} }
}, },
{ field: 'areaName', title: '区域', minWidth: 100 }, { field: 'areaName', title: '区域', minWidth: 100 },
{ field: 'gdName', title: '地级区', minWidth: 100 }, { field: 'gdName', title: '供电公司', minWidth: 100 },
{ {
field: 'bdName', field: 'bdName',
title: '供电公司', title: '场站',
minWidth: 100 minWidth: 100
}, },
{ field: 'manufacturer', title: '厂家', minWidth: 100 }, { field: 'manufacturer', title: '厂家', minWidth: 100 },

View File

@@ -30,6 +30,7 @@ import { ref, onMounted, provide, nextTick } from 'vue'
import { mainHeight } from '@/utils/layout' import { mainHeight } from '@/utils/layout'
import { useDictData } from '@/stores/dictData' import { useDictData } from '@/stores/dictData'
import MyEchart from '@/components/echarts/MyEchart.vue' import MyEchart from '@/components/echarts/MyEchart.vue'
const dictData = useDictData() const dictData = useDictData()
const tableRef = ref() const tableRef = ref()
const options = ref({}) const options = ref({})
@@ -88,6 +89,7 @@ const tableStore = new TableStore({
text: '暂降原因统计', text: '暂降原因统计',
top: '20' top: '20'
}, },
legend: { legend: {
type: 'scroll', type: 'scroll',
orient: 'vertical', orient: 'vertical',

View File

@@ -82,7 +82,8 @@ const tableStore: any = new TableStore({
{ field: 'updateBy', title: '修改人' }, { field: 'updateBy', title: '修改人' },
{ field: 'updateTime', title: '修改时间' }, { field: 'updateTime', title: '修改时间' },
{ {
title: '操作',fixed: 'right', title: '操作',
fixed: 'right',
width: '220', width: '220',
render: 'buttons', render: 'buttons',
buttons: [ buttons: [
@@ -147,9 +148,13 @@ const okRun = () => {
}) })
} }
onMounted(() => { onMounted(() => {
getIcdList().then(res => { getIcdList()
options.value = res.data .then(res => {
}) options.value = res.data
tableStore.index() tableStore.index()
})
.catch(err => {
tableStore.index()
})
}) })
</script> </script>