diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 83afc6d..939c795 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -68,8 +68,8 @@ { type: 'text', label: '点位编号', value: 'wellCode', placeholder: '未知' }, { type: 'text', label: '设备编号', value: 'devcode', placeholder: '未知' }, { type: 'text', label: '详细地址', value: 'position', placeholder: '未知' }, - { type: 'text', label: '告警类型', value: 'alarmTypeName', placeholder: '未知' }, - { type: 'text', label: '告警内容', value: 'alarmContentName', placeholder: '--' }, + // { type: 'text', label: '告警类型', value: 'alarmTypeName', placeholder: '未知' }, + // { type: 'text', label: '告警内容', value: 'alarmContentName', placeholder: '--' }, { type: 'text', label: '告警详情', value: 'alarmMessage', placeholder: '未知' }, { type: 'text', label: '工单状态', value: 'jobStatusName', placeholder: '未知' }, { type: 'timeline', label: '工单动态', value: '', placeholder: '暂无', span: 5 } diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 83afc6d..939c795 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -68,8 +68,8 @@ { type: 'text', label: '点位编号', value: 'wellCode', placeholder: '未知' }, { type: 'text', label: '设备编号', value: 'devcode', placeholder: '未知' }, { type: 'text', label: '详细地址', value: 'position', placeholder: '未知' }, - { type: 'text', label: '告警类型', value: 'alarmTypeName', placeholder: '未知' }, - { type: 'text', label: '告警内容', value: 'alarmContentName', placeholder: '--' }, + // { type: 'text', label: '告警类型', value: 'alarmTypeName', placeholder: '未知' }, + // { type: 'text', label: '告警内容', value: 'alarmContentName', placeholder: '--' }, { type: 'text', label: '告警详情', value: 'alarmMessage', placeholder: '未知' }, { type: 'text', label: '工单状态', value: 'jobStatusName', placeholder: '未知' }, { type: 'timeline', label: '工单动态', value: '', placeholder: '暂无', span: 5 } diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 825b4fb..0f6ed2c 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -200,6 +200,11 @@ class: 'warning' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '工单创建时间', value: 'createTime', width: 170, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 83afc6d..939c795 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -68,8 +68,8 @@ { type: 'text', label: '点位编号', value: 'wellCode', placeholder: '未知' }, { type: 'text', label: '设备编号', value: 'devcode', placeholder: '未知' }, { type: 'text', label: '详细地址', value: 'position', placeholder: '未知' }, - { type: 'text', label: '告警类型', value: 'alarmTypeName', placeholder: '未知' }, - { type: 'text', label: '告警内容', value: 'alarmContentName', placeholder: '--' }, + // { type: 'text', label: '告警类型', value: 'alarmTypeName', placeholder: '未知' }, + // { type: 'text', label: '告警内容', value: 'alarmContentName', placeholder: '--' }, { type: 'text', label: '告警详情', value: 'alarmMessage', placeholder: '未知' }, { type: 'text', label: '工单状态', value: 'jobStatusName', placeholder: '未知' }, { type: 'timeline', label: '工单动态', value: '', placeholder: '暂无', span: 5 } diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 825b4fb..0f6ed2c 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -200,6 +200,11 @@ class: 'warning' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '工单创建时间', value: 'createTime', width: 170, diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue index 808c9cd..14d72fd 100644 --- a/src/views/jobManage/listJobsOverTimeGet.vue +++ b/src/views/jobManage/listJobsOverTimeGet.vue @@ -162,6 +162,11 @@ class: 'warning' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '工单创建时间', value: 'createTime', width: 170, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 83afc6d..939c795 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -68,8 +68,8 @@ { type: 'text', label: '点位编号', value: 'wellCode', placeholder: '未知' }, { type: 'text', label: '设备编号', value: 'devcode', placeholder: '未知' }, { type: 'text', label: '详细地址', value: 'position', placeholder: '未知' }, - { type: 'text', label: '告警类型', value: 'alarmTypeName', placeholder: '未知' }, - { type: 'text', label: '告警内容', value: 'alarmContentName', placeholder: '--' }, + // { type: 'text', label: '告警类型', value: 'alarmTypeName', placeholder: '未知' }, + // { type: 'text', label: '告警内容', value: 'alarmContentName', placeholder: '--' }, { type: 'text', label: '告警详情', value: 'alarmMessage', placeholder: '未知' }, { type: 'text', label: '工单状态', value: 'jobStatusName', placeholder: '未知' }, { type: 'timeline', label: '工单动态', value: '', placeholder: '暂无', span: 5 } diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 825b4fb..0f6ed2c 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -200,6 +200,11 @@ class: 'warning' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '工单创建时间', value: 'createTime', width: 170, diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue index 808c9cd..14d72fd 100644 --- a/src/views/jobManage/listJobsOverTimeGet.vue +++ b/src/views/jobManage/listJobsOverTimeGet.vue @@ -162,6 +162,11 @@ class: 'warning' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '工单创建时间', value: 'createTime', width: 170, diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue index 9edf704..468b9cd 100644 --- a/src/views/jobManage/listJobsOverTimeHandle.vue +++ b/src/views/jobManage/listJobsOverTimeHandle.vue @@ -161,6 +161,11 @@ class: 'warning' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '工单创建时间', value: 'createTime', width: 170, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 83afc6d..939c795 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -68,8 +68,8 @@ { type: 'text', label: '点位编号', value: 'wellCode', placeholder: '未知' }, { type: 'text', label: '设备编号', value: 'devcode', placeholder: '未知' }, { type: 'text', label: '详细地址', value: 'position', placeholder: '未知' }, - { type: 'text', label: '告警类型', value: 'alarmTypeName', placeholder: '未知' }, - { type: 'text', label: '告警内容', value: 'alarmContentName', placeholder: '--' }, + // { type: 'text', label: '告警类型', value: 'alarmTypeName', placeholder: '未知' }, + // { type: 'text', label: '告警内容', value: 'alarmContentName', placeholder: '--' }, { type: 'text', label: '告警详情', value: 'alarmMessage', placeholder: '未知' }, { type: 'text', label: '工单状态', value: 'jobStatusName', placeholder: '未知' }, { type: 'timeline', label: '工单动态', value: '', placeholder: '暂无', span: 5 } diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 825b4fb..0f6ed2c 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -200,6 +200,11 @@ class: 'warning' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '工单创建时间', value: 'createTime', width: 170, diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue index 808c9cd..14d72fd 100644 --- a/src/views/jobManage/listJobsOverTimeGet.vue +++ b/src/views/jobManage/listJobsOverTimeGet.vue @@ -162,6 +162,11 @@ class: 'warning' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '工单创建时间', value: 'createTime', width: 170, diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue index 9edf704..468b9cd 100644 --- a/src/views/jobManage/listJobsOverTimeHandle.vue +++ b/src/views/jobManage/listJobsOverTimeHandle.vue @@ -161,6 +161,11 @@ class: 'warning' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '工单创建时间', value: 'createTime', width: 170, diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue index d842357..ff383c8 100644 --- a/src/views/systemConfig/alarmLevel/listLevel.vue +++ b/src/views/systemConfig/alarmLevel/listLevel.vue @@ -81,7 +81,7 @@ data() { return { selectedTenant: { - id: '1', + id: '', tenantName: '' }, tenantList: [], @@ -142,7 +142,6 @@ }, created() { this.fetchTenantList() - this.fetchData() }, methods: { // 点击切换项目 @@ -155,7 +154,10 @@ }, // 获取项目列表 fetchTenantList() { - getTenantList().then(response => { + const params = { + tenantName: '' + } + getTenantList(params).then(response => { this.tenantList = response.data if (this.tenantList.length > 0) { this.selectedTenant = this.tenantList[0]