diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts new file mode 100644 index 0000000..31ed06c --- /dev/null +++ b/src/api/laboratory/overView.ts @@ -0,0 +1,13 @@ +/** + * 运行总览 + */ +import request from '../requestLab' +const prefix = 'overview' + +// 列表查询 +export function getOverviewAlarmDetail() { + return request({ + url: `${prefix}/alarmCount`, + method: 'get', + }) +} diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts new file mode 100644 index 0000000..31ed06c --- /dev/null +++ b/src/api/laboratory/overView.ts @@ -0,0 +1,13 @@ +/** + * 运行总览 + */ +import request from '../requestLab' +const prefix = 'overview' + +// 列表查询 +export function getOverviewAlarmDetail() { + return request({ + url: `${prefix}/alarmCount`, + method: 'get', + }) +} diff --git a/src/assets/icons/icon-overView-message.svg b/src/assets/icons/icon-overView-message.svg new file mode 100644 index 0000000..9f46cde --- /dev/null +++ b/src/assets/icons/icon-overView-message.svg @@ -0,0 +1 @@ + diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts new file mode 100644 index 0000000..31ed06c --- /dev/null +++ b/src/api/laboratory/overView.ts @@ -0,0 +1,13 @@ +/** + * 运行总览 + */ +import request from '../requestLab' +const prefix = 'overview' + +// 列表查询 +export function getOverviewAlarmDetail() { + return request({ + url: `${prefix}/alarmCount`, + method: 'get', + }) +} diff --git a/src/assets/icons/icon-overView-message.svg b/src/assets/icons/icon-overView-message.svg new file mode 100644 index 0000000..9f46cde --- /dev/null +++ b/src/assets/icons/icon-overView-message.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-radio.svg b/src/assets/icons/icon-radio.svg new file mode 100644 index 0000000..abb3c78 --- /dev/null +++ b/src/assets/icons/icon-radio.svg @@ -0,0 +1 @@ + diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts new file mode 100644 index 0000000..31ed06c --- /dev/null +++ b/src/api/laboratory/overView.ts @@ -0,0 +1,13 @@ +/** + * 运行总览 + */ +import request from '../requestLab' +const prefix = 'overview' + +// 列表查询 +export function getOverviewAlarmDetail() { + return request({ + url: `${prefix}/alarmCount`, + method: 'get', + }) +} diff --git a/src/assets/icons/icon-overView-message.svg b/src/assets/icons/icon-overView-message.svg new file mode 100644 index 0000000..9f46cde --- /dev/null +++ b/src/assets/icons/icon-overView-message.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-radio.svg b/src/assets/icons/icon-radio.svg new file mode 100644 index 0000000..abb3c78 --- /dev/null +++ b/src/assets/icons/icon-radio.svg @@ -0,0 +1 @@ + diff --git a/src/assets/images/lab.png b/src/assets/images/lab.png new file mode 100644 index 0000000..fab238c --- /dev/null +++ b/src/assets/images/lab.png Binary files differ diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts new file mode 100644 index 0000000..31ed06c --- /dev/null +++ b/src/api/laboratory/overView.ts @@ -0,0 +1,13 @@ +/** + * 运行总览 + */ +import request from '../requestLab' +const prefix = 'overview' + +// 列表查询 +export function getOverviewAlarmDetail() { + return request({ + url: `${prefix}/alarmCount`, + method: 'get', + }) +} diff --git a/src/assets/icons/icon-overView-message.svg b/src/assets/icons/icon-overView-message.svg new file mode 100644 index 0000000..9f46cde --- /dev/null +++ b/src/assets/icons/icon-overView-message.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-radio.svg b/src/assets/icons/icon-radio.svg new file mode 100644 index 0000000..abb3c78 --- /dev/null +++ b/src/assets/icons/icon-radio.svg @@ -0,0 +1 @@ + diff --git a/src/assets/images/lab.png b/src/assets/images/lab.png new file mode 100644 index 0000000..fab238c --- /dev/null +++ b/src/assets/images/lab.png Binary files differ diff --git a/src/main.ts b/src/main.ts index d300cf5..2479d4c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -11,6 +11,7 @@ import request from '@/api/index' import request1 from '@/api/request' import request2 from '@/api/requestLab' +import requestLab from '@/api/requestLab' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -51,6 +52,7 @@ request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 request2.defaults.baseURL = result.data.baseUrlAccount // 设置默认请求网址 + requestLab.defaults.baseURL = result.data.baseUrlLaboratory // 设置默认请求网址 app.mount('#app') ElMessage.success('获取默认配置成功') // 版本号 diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts new file mode 100644 index 0000000..31ed06c --- /dev/null +++ b/src/api/laboratory/overView.ts @@ -0,0 +1,13 @@ +/** + * 运行总览 + */ +import request from '../requestLab' +const prefix = 'overview' + +// 列表查询 +export function getOverviewAlarmDetail() { + return request({ + url: `${prefix}/alarmCount`, + method: 'get', + }) +} diff --git a/src/assets/icons/icon-overView-message.svg b/src/assets/icons/icon-overView-message.svg new file mode 100644 index 0000000..9f46cde --- /dev/null +++ b/src/assets/icons/icon-overView-message.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-radio.svg b/src/assets/icons/icon-radio.svg new file mode 100644 index 0000000..abb3c78 --- /dev/null +++ b/src/assets/icons/icon-radio.svg @@ -0,0 +1 @@ + diff --git a/src/assets/images/lab.png b/src/assets/images/lab.png new file mode 100644 index 0000000..fab238c --- /dev/null +++ b/src/assets/images/lab.png Binary files differ diff --git a/src/main.ts b/src/main.ts index d300cf5..2479d4c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -11,6 +11,7 @@ import request from '@/api/index' import request1 from '@/api/request' import request2 from '@/api/requestLab' +import requestLab from '@/api/requestLab' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -51,6 +52,7 @@ request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 request2.defaults.baseURL = result.data.baseUrlAccount // 设置默认请求网址 + requestLab.defaults.baseURL = result.data.baseUrlLaboratory // 设置默认请求网址 app.mount('#app') ElMessage.success('获取默认配置成功') // 版本号 diff --git a/src/views/laboratory/overview/components/message.vue b/src/views/laboratory/overview/components/message.vue new file mode 100644 index 0000000..b75184b --- /dev/null +++ b/src/views/laboratory/overview/components/message.vue @@ -0,0 +1,94 @@ + + + + + + + + + + + 报警总数{{ form.alarmTotal }} + + + {{ form.confirmedCount }} + + + + {{ form.confirmedCount }} + + + + {{ form.canceledCount }} + + + + + + + + + + + + + + diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts new file mode 100644 index 0000000..31ed06c --- /dev/null +++ b/src/api/laboratory/overView.ts @@ -0,0 +1,13 @@ +/** + * 运行总览 + */ +import request from '../requestLab' +const prefix = 'overview' + +// 列表查询 +export function getOverviewAlarmDetail() { + return request({ + url: `${prefix}/alarmCount`, + method: 'get', + }) +} diff --git a/src/assets/icons/icon-overView-message.svg b/src/assets/icons/icon-overView-message.svg new file mode 100644 index 0000000..9f46cde --- /dev/null +++ b/src/assets/icons/icon-overView-message.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-radio.svg b/src/assets/icons/icon-radio.svg new file mode 100644 index 0000000..abb3c78 --- /dev/null +++ b/src/assets/icons/icon-radio.svg @@ -0,0 +1 @@ + diff --git a/src/assets/images/lab.png b/src/assets/images/lab.png new file mode 100644 index 0000000..fab238c --- /dev/null +++ b/src/assets/images/lab.png Binary files differ diff --git a/src/main.ts b/src/main.ts index d300cf5..2479d4c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -11,6 +11,7 @@ import request from '@/api/index' import request1 from '@/api/request' import request2 from '@/api/requestLab' +import requestLab from '@/api/requestLab' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -51,6 +52,7 @@ request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 request2.defaults.baseURL = result.data.baseUrlAccount // 设置默认请求网址 + requestLab.defaults.baseURL = result.data.baseUrlLaboratory // 设置默认请求网址 app.mount('#app') ElMessage.success('获取默认配置成功') // 版本号 diff --git a/src/views/laboratory/overview/components/message.vue b/src/views/laboratory/overview/components/message.vue new file mode 100644 index 0000000..b75184b --- /dev/null +++ b/src/views/laboratory/overview/components/message.vue @@ -0,0 +1,94 @@ + + + + + + + + + + + 报警总数{{ form.alarmTotal }} + + + {{ form.confirmedCount }} + + + + {{ form.confirmedCount }} + + + + {{ form.canceledCount }} + + + + + + + + + + + + + + diff --git a/src/views/laboratory/overview/index.vue b/src/views/laboratory/overview/index.vue index 6de9817..30a6d4f 100644 --- a/src/views/laboratory/overview/index.vue +++ b/src/views/laboratory/overview/index.vue @@ -1,3 +1,241 @@ + + + - 实验室 + + + + + + + + + {{ item.name }} + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + + + + + + + 确认报警 + + + 取消报警 + + + + + + + diff --git a/src/api/laboratory/overView.ts b/src/api/laboratory/overView.ts new file mode 100644 index 0000000..31ed06c --- /dev/null +++ b/src/api/laboratory/overView.ts @@ -0,0 +1,13 @@ +/** + * 运行总览 + */ +import request from '../requestLab' +const prefix = 'overview' + +// 列表查询 +export function getOverviewAlarmDetail() { + return request({ + url: `${prefix}/alarmCount`, + method: 'get', + }) +} diff --git a/src/assets/icons/icon-overView-message.svg b/src/assets/icons/icon-overView-message.svg new file mode 100644 index 0000000..9f46cde --- /dev/null +++ b/src/assets/icons/icon-overView-message.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-radio.svg b/src/assets/icons/icon-radio.svg new file mode 100644 index 0000000..abb3c78 --- /dev/null +++ b/src/assets/icons/icon-radio.svg @@ -0,0 +1 @@ + diff --git a/src/assets/images/lab.png b/src/assets/images/lab.png new file mode 100644 index 0000000..fab238c --- /dev/null +++ b/src/assets/images/lab.png Binary files differ diff --git a/src/main.ts b/src/main.ts index d300cf5..2479d4c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -11,6 +11,7 @@ import request from '@/api/index' import request1 from '@/api/request' import request2 from '@/api/requestLab' +import requestLab from '@/api/requestLab' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -51,6 +52,7 @@ request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 request2.defaults.baseURL = result.data.baseUrlAccount // 设置默认请求网址 + requestLab.defaults.baseURL = result.data.baseUrlLaboratory // 设置默认请求网址 app.mount('#app') ElMessage.success('获取默认配置成功') // 版本号 diff --git a/src/views/laboratory/overview/components/message.vue b/src/views/laboratory/overview/components/message.vue new file mode 100644 index 0000000..b75184b --- /dev/null +++ b/src/views/laboratory/overview/components/message.vue @@ -0,0 +1,94 @@ + + + + + + + + + + + 报警总数{{ form.alarmTotal }} + + + {{ form.confirmedCount }} + + + + {{ form.confirmedCount }} + + + + {{ form.canceledCount }} + + + + + + + + + + + + + + diff --git a/src/views/laboratory/overview/index.vue b/src/views/laboratory/overview/index.vue index 6de9817..30a6d4f 100644 --- a/src/views/laboratory/overview/index.vue +++ b/src/views/laboratory/overview/index.vue @@ -1,3 +1,241 @@ + + + - 实验室 + + + + + + + + + {{ item.name }} + + + + + + + + {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }} + + + + + + + + 确认报警 + + + 取消报警 + + + + + + + diff --git a/src/views/laboratory/overview/overview-interface.ts b/src/views/laboratory/overview/overview-interface.ts new file mode 100644 index 0000000..24aba47 --- /dev/null +++ b/src/views/laboratory/overview/overview-interface.ts @@ -0,0 +1,21 @@ +// 表格 +export interface ITableList { + alarmLevel: string // 报警等级 + alarmStatus: string // 报警状态(字典code) + alarmStatusName: string // 报警状态(字典value) + alarmTime: string // 报警时间 + alarmValue: string // 报警数值 + createTime: string // 创建时间 + deptId: string // 负责部门id + deptName: string // 负责部门 + deviceId: string // 设备表id + deviceName: string // 设备名称 + deviceNo: string // 设备编号 + eventName: string // 事件名称 + id: string // 主键id + locationId: string // 安装地点id + locationName: string // 安装地点 + updateTime: string // 更新时间 + userId: string // 负责人id + userName: string // 负责人 +}