diff --git a/src/components/cockpit/monitoringPointList/index.vue b/src/components/cockpit/monitoringPointList/index.vue index 1d002ad..8b11b69 100644 --- a/src/components/cockpit/monitoringPointList/index.vue +++ b/src/components/cockpit/monitoringPointList/index.vue @@ -62,7 +62,7 @@ import OverLimitDetails from '@/components/cockpit/monitoringPointList/component import TableHeader from '@/components/table/header/index.vue' import { uploadReport, getReportUrl } from '@/api/harmonic-boot/cockpit/cockpit' import { getTime } from '@/utils/formatTime' - +import { useDictData } from '@/stores/dictData' const prop = defineProps({ w: { type: [String, Number] }, h: { type: [String, Number] }, @@ -72,7 +72,8 @@ const prop = defineProps({ timeValue: { type: Object }, interval: { type: Number } }) - +const dictData = useDictData() +const monitorObjList = dictData.getBasicData('Line_Position') const headerHeight = ref(57) const TableHeaderRef = ref() @@ -122,19 +123,19 @@ const tableStore: any = new TableStore({ }, { title: '监测点名称', - field: 'lineName', + field: 'name', minWidth: '120', render: 'customTemplate', customTemplate: (row: any) => { - return `${row.lineName}` + return `${row.name}` } }, { - title: '监测类型', + title: '监测位置', field: 'position', minWidth: '80', formatter: (row: any) => { - return row.cellValue || '/' + return monitorObjList.filter(item => item.id == row.cellValue)[0]?.name || '/' } }, // { @@ -153,21 +154,19 @@ const tableStore: any = new TableStore({ width: 100, custom: { - 停运: 'danger', - 退运: 'danger', - 运行: 'success', - 中断: 'warning', - 检修: 'warning', - 调试: 'warning', + 0: 'success', + 1: 'warning', + 2: 'danger', + 3: 'warning', + 4: 'danger', null: 'info' }, replaceValue: { - 运行: '运行', - 退运: '退运', - 停运: '停运', - 中断: '中断', - 检修: '检修', - 调试: '调试', + 0: '运行', + 1: '检修', + 2: '停运', + 3: '调试', + 4: '退运', null: '/' } }, @@ -183,7 +182,10 @@ const tableStore: any = new TableStore({ { title: '电压等级', field: 'volGrade', - minWidth: '80' + minWidth: '80', + formatter: (row: any) => { + return row.cellValue || '/' + } }, { title: '是否治理', @@ -311,7 +313,7 @@ const setTime = () => { // 点击行 const cellClickEvent = ({ row, column }: any) => { - if (column.field == 'lineName') { + if (column.field == 'name') { OverLimitDetailsRef.value.open( row, tableStore.table.params.searchBeginTime || prop.timeValue?.[0], diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue index 76dc920..29c9f0f 100644 --- a/src/views/govern/cloudDeviceEntry/index.vue +++ b/src/views/govern/cloudDeviceEntry/index.vue @@ -165,7 +165,8 @@ prop="engineeringParam.name" :rules="{ required: true, message: '请输入工程名称', trigger: 'blur' }" > - - - - - - - - - -
- : -
- : - - - - - { currentGdName.value = '' } -const area = () => { +const area = async () => { nodeAllList() .then(res => { affiliatiedFrontArr.value = res.data @@ -2839,12 +2857,6 @@ const area = () => { getListByIds().then(res => { userList.value = res.data }) - getDicDataByTypeCode({ dictTypeCode: 'M_Obj_Types' }).then(res => { - monitorObjList.value = res.data - }) - getDicDataByTypeCode({ dictTypeCode: 'Line_Position' }).then(res => { - linePosition.value = res.data - }) } onMounted(() => { @@ -2906,7 +2918,7 @@ area() .el-form-item { width: 30%; - margin-bottom: 15px; + margin-bottom: 15px !important; .el-select { width: 100%; diff --git a/src/views/govern/mxgraph/graphList/components/popup.vue b/src/views/govern/mxgraph/graphList/components/popup.vue index 7c50e52..9680a91 100644 --- a/src/views/govern/mxgraph/graphList/components/popup.vue +++ b/src/views/govern/mxgraph/graphList/components/popup.vue @@ -41,15 +41,7 @@ /> - + @@ -78,7 +70,7 @@ import { deviceTree, add, audit, getztProjectTree } from '@/api/cs-harmonic-boot import { ElMessage, ElMessageBox } from 'element-plus' import { useAdminInfo } from '@/stores/adminInfo' const adminInfo = useAdminInfo() -const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager')|| item.includes('root')) +const hasAdmin = adminInfo.roleCode.some(item => item.includes('operation_manager') || item.includes('root')) const title = ref('') const formRef = ref() const Engineering = ref([]) @@ -95,7 +87,7 @@ const form: any = reactive({ name: '', projectIds: [], scope: 1, - orderBy: '100', + orderBy: 100, remark: '' }) const rules = { @@ -117,11 +109,13 @@ const addFn = () => { } ) } else { - audit({ ...form, projectIds: form.scope == 1 ? ['WIRELESS_PROJECT_ID'] : form.projectIds }).then((res: any) => { - ElMessage.success('修改项目成功!') - dialogVisible.value = false - emit('submit') - }) + audit({ ...form, projectIds: form.scope == 1 ? ['WIRELESS_PROJECT_ID'] : form.projectIds }).then( + (res: any) => { + ElMessage.success('修改项目成功!') + dialogVisible.value = false + emit('submit') + } + ) } } }) @@ -201,13 +195,14 @@ const open = ref((row: any) => { if (row.title == '新增项目') { form.name = '' form.projectIds = [] - form.orderBy = '100' + form.orderBy = 100 form.remark = '' } else { for (let key in form) { form[key] = row.row[key] || '' } form.id = row.row.id + form.orderBy = row.row.orderBy - 0 } }) const removeData = arr => {