修改台账树

This commit is contained in:
guanj
2026-06-17 09:23:35 +08:00
parent d9dfd804c5
commit 2330b50147
25 changed files with 853 additions and 476 deletions

View File

@@ -22,26 +22,6 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="治理类型" class="top">
<el-select v-model.trim="form.governType" filterable placeholder="请选择治理类型" clearable>
<el-option label="暂态" value="event"></el-option>
<el-option label="稳态" value="harmonic"></el-option>
</el-select>
</el-form-item>
<el-form-item label="敏感用户" class="top">
<div style="display: flex;">
<el-select v-model.trim="form.monitorUser" style="width: 230px;" filterable placeholder="请选择敏感用户"
clearable>
<el-option v-for="option in userList" :key="option.id" :label="option.name"
:value="option.id"></el-option>
</el-select>
<el-button type="primary" icon="el-icon-Plus" class="ml10" @click="addMonitorUser" />
</div>
</el-form-item>
<el-form-item label="治理方法" class="top">
<el-input maxlength="32" show-word-limit v-model="form.governMethod" autocomplete="off" clearable
placeholder="例: 250A APF 或 100kVar SVG"></el-input>
</el-form-item>
<el-form-item label="通讯协议" prop="devAccessMethod" class="top">
<el-select v-model.trim="form.devAccessMethod" placeholder="请选择通讯协议" clearable disabled>
<el-option label="MQTT" value="MQTT"></el-option>
@@ -75,9 +55,9 @@ import {
portableDeviceRegister,
} from '@/api/cs-system-boot/device'
import { useRouter } from 'vue-router'
const router = useRouter() // 路由对象
const router = useRouter()
const props = defineProps<{
userList: any[]
engineeringList: any[]
devTypeOptions: any[]
devTypeOptions2: any
@@ -154,9 +134,6 @@ function getDefaultForm() {
associatedProject: '',
association: [] as any[],
sort: 0,
monitorUser: '',
governType: '',
governMethod: '',
id: undefined as string | number | undefined,
}
}
@@ -177,9 +154,6 @@ const buildSubmitPayload = () => {
associatedEngineering: normalizeFormValue(association[0]),
associatedProject: normalizeFormValue(association[1]),
sort: form.sort ?? 0,
monitorUser: normalizeFormValue(form.monitorUser),
governType: normalizeFormValue(form.governType),
governMethod: normalizeFormValue(form.governMethod),
}
}
@@ -253,12 +227,6 @@ const resetForm = () => {
visible.value = false
}
const addMonitorUser = () => {
sessionStorage.setItem('factoryNeedRefreshUserList', '1')
router.push({
name: 'govern/sensitiveLoadMange/index',
})
}
const addProject = () => {
sessionStorage.setItem('factoryNeedRefreshEngineeringList', '1')
router.push({

View File

@@ -90,7 +90,7 @@
</TableHeader>
<Table ref="tableRef" :checkbox-config="checkboxConfig" :key="tableKey" @sort-change="handleSortChange"></Table>
<FactoryForm ref="factoryFormRef" :user-list="userList" :engineering-list="engineeringList"
<FactoryForm ref="factoryFormRef" :engineering-list="engineeringList"
:dev-type-options="devTypeOptions" :dev-type-options2="devTypeOptions2" :dev-model-options="devModelOptions"
:dev-model-options2="devModelOptions2" @success="onFormSuccess" />
@@ -131,12 +131,10 @@ import html2canvas from 'html2canvas'
import { fullUrl } from '@/utils/common'
import JSZip from 'jszip'
import { saveAs } from 'file-saver'
import { getList } from '@/api/cs-harmonic-boot/recruitment'
defineOptions({
name: 'govern/manage/factory'
})
const userList: any = ref([])
const showQrCode = ref(false)
const devTypeOptions: any = ref([])
const devTypeOptions2: any = ref([])
@@ -255,30 +253,6 @@ const tableStore = new TableStore({
},
minWidth: 120
},
{
title: '治理类型',
field: 'governType',
minWidth: 100,
formatter: row => {
return row.cellValue === 'event' ? '暂态' : row.cellValue === 'harmonic' ? '稳态' : (row.cellValue || '/')
}
},
{
title: '治理方法',
field: 'governMethod',
minWidth: 100,
formatter: row => {
return row.cellValue || '/'
}
},
{
title: '敏感用户',
field: 'monitorUser',
minWidth: 120,
formatter: row => {
return userList.value.find((item: any) => item.id == row.cellValue)?.name || '/'
}
},
{
title: '通讯协议',
field: 'devAccessMethod',
@@ -829,15 +803,6 @@ const onFormSuccess = () => {
tableStore.onTableAction('search', {})
}
const getUserList = () => {
return getList({
pageNum: 1,
pageSize: 2000
}).then(res => {
userList.value = res.data.records
})
}
const getEngineeringList = () => {
return engineeringProject().then(res => {
engineeringList.value = res.data.filter(item => {
@@ -849,26 +814,19 @@ const getEngineeringList = () => {
})
}
// 页面被 keep-alive 缓存后,从敏感用户/工程页返回时刷新下拉列表
// 页面被 keep-alive 缓存后,从工程页返回时刷新下拉列表
onActivated(() => {
// if (sessionStorage.getItem('factoryNeedRefreshUserList')) {
// sessionStorage.removeItem('factoryNeedRefreshUserList')
getUserList()
// }
// if (sessionStorage.getItem('factoryNeedRefreshEngineeringList')) {
// sessionStorage.removeItem('factoryNeedRefreshEngineeringList')
if (sessionStorage.getItem('factoryNeedRefreshEngineeringList')) {
sessionStorage.removeItem('factoryNeedRefreshEngineeringList')
getEngineeringList()
// }
}
})
provide('tableStore', tableStore)
onMounted(() => {
queryTheDictionary()
// getUserList()
// getEngineeringList()
getEngineeringList()
setTimeout(() => { }, 100)
})

View File

@@ -81,15 +81,15 @@ const tableStore = new TableStore({
// }
},
{
title: '设备型号',
field: 'devType',
width: 130,
formatter: row => {
return devModelOptions.value.filter((item: any) => item.value == row.cellValue)[0]?.label
}
},
{ title: 'Mac地址', field: 'mac', width: 140 },
// {
// title: '设备型号',
// field: 'devType',
// width: 130,
// formatter: row => {
// return devModelOptions.value.filter((item: any) => item.value == row.cellValue)[0]?.label
// }
// },
// { title: 'Mac地址', field: 'mac', width: 140 },
// {
// title: '流程阶段',
// field: 'process',