diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue new file mode 100644 index 0000000..50cab39 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue new file mode 100644 index 0000000..50cab39 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue index 7c357fb..a003dfa 100644 --- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue @@ -68,6 +68,10 @@ diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue new file mode 100644 index 0000000..50cab39 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue index 7c357fb..a003dfa 100644 --- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue @@ -68,6 +68,10 @@ diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue new file mode 100644 index 0000000..50cab39 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue index 7c357fb..a003dfa 100644 --- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue @@ -68,6 +68,10 @@ diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue new file mode 100644 index 0000000..50cab39 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue index 7c357fb..a003dfa 100644 --- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue @@ -68,6 +68,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue index f028216..113710f 100644 --- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue +++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue @@ -48,4 +48,8 @@ box-sizing: border-box; } } + +::v-deep(.el-loading-mask) { + background-color: rgba($color: #0b0b0f, $alpha: 95%); +} diff --git a/public/image/other/one-icon.png b/public/image/other/one-icon.png new file mode 100644 index 0000000..fa8d096 --- /dev/null +++ b/public/image/other/one-icon.png Binary files differ diff --git a/public/image/other/one.png b/public/image/other/one.png new file mode 100644 index 0000000..c50238b --- /dev/null +++ b/public/image/other/one.png Binary files differ diff --git a/public/image/other/other-icon.png b/public/image/other/other-icon.png new file mode 100644 index 0000000..9dfbbff --- /dev/null +++ b/public/image/other/other-icon.png Binary files differ diff --git a/public/image/other/other.png b/public/image/other/other.png new file mode 100644 index 0000000..b0c2c7c --- /dev/null +++ b/public/image/other/other.png Binary files differ diff --git a/public/image/other/three-icon.png b/public/image/other/three-icon.png new file mode 100644 index 0000000..2c324b1 --- /dev/null +++ b/public/image/other/three-icon.png Binary files differ diff --git a/public/image/other/three.png b/public/image/other/three.png new file mode 100644 index 0000000..48c5628 --- /dev/null +++ b/public/image/other/three.png Binary files differ diff --git a/public/image/other/two-icon.png b/public/image/other/two-icon.png new file mode 100644 index 0000000..97e6eeb --- /dev/null +++ b/public/image/other/two-icon.png Binary files differ diff --git a/public/image/other/two.png b/public/image/other/two.png new file mode 100644 index 0000000..7454e16 --- /dev/null +++ b/public/image/other/two.png Binary files differ diff --git a/public/image/spread.gif b/public/image/spread.gif new file mode 100644 index 0000000..bad5c84 --- /dev/null +++ b/public/image/spread.gif Binary files differ diff --git a/src/api/home/alarm/history.ts b/src/api/home/alarm/history.ts index 5634f7c..379ecce 100644 --- a/src/api/home/alarm/history.ts +++ b/src/api/home/alarm/history.ts @@ -25,8 +25,10 @@ export function exportHistoryAlarm(data: any) { return request({ url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index e4052fe..5441843 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -116,5 +116,6 @@ return request({ url: '/template/download?filename=device_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/ledger/pipeline.ts b/src/api/home/ledger/pipeline.ts index 0e30515..2cfa488 100644 --- a/src/api/home/ledger/pipeline.ts +++ b/src/api/home/ledger/pipeline.ts @@ -44,7 +44,9 @@ return request({ url: '/system/busPipeline/batchExport', method: 'get', - data, + params: { + ...data, + }, responseType: 'blob', }) } @@ -53,5 +55,6 @@ return request({ url: '/template/download?filename=pipe_info_template.xlsx', method: 'get', + responseType: 'blob', }) } diff --git a/src/api/home/operation/alarm.ts b/src/api/home/operation/alarm.ts index c82febf..06d216f 100644 --- a/src/api/home/operation/alarm.ts +++ b/src/api/home/operation/alarm.ts @@ -49,9 +49,11 @@ } export function exportDeviceAlarm(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/history.ts b/src/api/home/operation/history.ts index 3db1a66..df38564 100644 --- a/src/api/home/operation/history.ts +++ b/src/api/home/operation/history.ts @@ -22,9 +22,11 @@ } export function exportDeviceHistory(data: any) { return request({ - url: '/system/alarmRecords/batchExportHistory', - method: 'post', - data, + url: '/maintenance/alarmRecords/batchExportDeviceAlarmHistoryList', + method: 'get', + params: { + ...data, + }, responseType: 'blob', }) } diff --git a/src/api/home/operation/manufacturer.ts b/src/api/home/operation/manufacturer.ts index 6fc8e28..765857e 100644 --- a/src/api/home/operation/manufacturer.ts +++ b/src/api/home/operation/manufacturer.ts @@ -15,7 +15,7 @@ export function exportOperationList(data: any) { return request({ url: '/device/busRepairLog/batchExport', - method: 'post', + method: 'get', params: { ...data, }, diff --git a/src/assets/Digital.ttf b/src/assets/Digital.ttf new file mode 100644 index 0000000..233c1cb --- /dev/null +++ b/src/assets/Digital.ttf Binary files differ diff --git "a/src/assets/images/dashboard/\350\255\246\346\212\245.png" "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" new file mode 100644 index 0000000..ad99a90 --- /dev/null +++ "b/src/assets/images/dashboard/\350\255\246\346\212\245.png" Binary files differ diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 544d6a4..7ee9d06 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -21,6 +21,10 @@ type: Boolean, default: false, }, + border: { + type: Boolean, + default: true, + }, // 查询条件，此处主要需要分页的条件 query: { type: Object, @@ -319,7 +323,7 @@
-
+
关闭声音
+ + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue new file mode 100644 index 0000000..50cab39 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue index 7c357fb..a003dfa 100644 --- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue @@ -68,6 +68,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue index f028216..113710f 100644 --- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue +++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue @@ -48,4 +48,8 @@ box-sizing: border-box; } } + +::v-deep(.el-loading-mask) { + background-color: rgba($color: #0b0b0f, $alpha: 95%); +} diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue index 54bafd0..410e728 100644 --- a/src/views/home/dashboard/fullScreen.vue +++ b/src/views/home/dashboard/fullScreen.vue @@ -5,6 +5,7 @@ --> + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue new file mode 100644 index 0000000..50cab39 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue index 7c357fb..a003dfa 100644 --- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue @@ -68,6 +68,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue index f028216..113710f 100644 --- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue +++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue @@ -48,4 +48,8 @@ box-sizing: border-box; } } + +::v-deep(.el-loading-mask) { + background-color: rgba($color: #0b0b0f, $alpha: 95%); +} diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue index 54bafd0..410e728 100644 --- a/src/views/home/dashboard/fullScreen.vue +++ b/src/views/home/dashboard/fullScreen.vue @@ -5,6 +5,7 @@ --> + + + + diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index be21841..f746f40 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -1583,7 +1583,7 @@ left: 400px; /* background: rgb(68 66 66 / 80%); */ background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; @@ -1618,7 +1618,7 @@ right: 400px; background-color: rgba($color: #0B0B0F, $alpha: 0.8); - border: 2px solid #249eff; + border: 1px solid #249eff; color: #fff; padding: 10px; diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue new file mode 100644 index 0000000..a6dc07b --- /dev/null +++ b/src/views/home/dashboard/components/eventMap.vue @@ -0,0 +1,385 @@ + + + + + + +.show-count { + position: absolute; + z-index: 9; + left: 400px; + top: 100px; + width: 240px; +} + +.show-change { + position: absolute; + top: 100px; + right: 400px; + z-index: 9; + // background-color: #ddd; + + .change { + padding: 10px 20px; + text-align: center; + background: url("@/assets/fullscren/data-bg.png") no-repeat center center / cover; + border: 1px solid #249eff; + color: #fff; + + &:hover { + cursor: pointer; + } + } +} + +.left-container { + position: absolute; + z-index: 9; + top: 100px; + left: 15px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.right-container { + position: absolute; + z-index: 9; + top: 100px; + right: 15px; + // background-color: #0b0b0f; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); +} + +.amap-legend1 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + left: 400px; + /* background: rgb(68 66 66 / 80%); */ + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 16px; + line-height: 16px; + + &:hover { + cursor: pointer; + } + } + } +} + +.amap-legend2 { + /* background: url("@/assets/images/dashboard/legend.png") no-repeat center center / cover; */ + position: absolute; + z-index: 9; + bottom: 10px; + right: 400px; + background-color: rgba($color: #0B0B0F, $alpha: 0.8); + + border: 2px solid #249eff; + color: #fff; + padding: 10px; + + .legend-item { + display: flex; + margin: 5px; + flex-wrap: wrap; + color: #a7ceec; + + // .icon { + // height: 20px; + // width: 20px; + // border-radius: 50%; + // opacity: 0.8; + // } + img { + height: 16px; + width: 16px; + } + + .value { + margin-left: 5px; + height: 20px; + line-height: 20px; + + &:hover { + cursor: pointer; + } + } + } +} + + + diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts index ffe032d..ee2cf8a 100644 --- a/src/views/home/dashboard/components/imgData.ts +++ b/src/views/home/dashboard/components/imgData.ts @@ -21,4 +21,5 @@ shaobing: new URL('@/assets/images/dashboard/shaobing.png', import.meta.url), yuntai: new URL('@/assets/images/dashboard/yuntai.png', import.meta.url), ranqi: new URL('@/assets/images/dashboard/ranqi.png', import.meta.url), + alarm: new URL('@/assets/images/spread.gif', import.meta.url), } diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue new file mode 100644 index 0000000..1e7a305 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue index 28759cf..f28f557 100644 --- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue @@ -117,6 +117,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue new file mode 100644 index 0000000..50cab39 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue index 7c357fb..a003dfa 100644 --- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue @@ -68,6 +68,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue index f028216..113710f 100644 --- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue +++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue @@ -48,4 +48,8 @@ box-sizing: border-box; } } + +::v-deep(.el-loading-mask) { + background-color: rgba($color: #0b0b0f, $alpha: 95%); +} diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue index 54bafd0..410e728 100644 --- a/src/views/home/dashboard/fullScreen.vue +++ b/src/views/home/dashboard/fullScreen.vue @@ -5,6 +5,7 @@ --> diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue new file mode 100644 index 0000000..50cab39 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue index 7c357fb..a003dfa 100644 --- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue @@ -68,6 +68,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue index f028216..113710f 100644 --- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue +++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue @@ -48,4 +48,8 @@ box-sizing: border-box; } } + +::v-deep(.el-loading-mask) { + background-color: rgba($color: #0b0b0f, $alpha: 95%); +} diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue index 54bafd0..410e728 100644 --- a/src/views/home/dashboard/fullScreen.vue +++ b/src/views/home/dashboard/fullScreen.vue @@ -5,6 +5,7 @@ --> diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue index e472adf..81c3a90 100644 --- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue +++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue @@ -42,6 +42,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue new file mode 100644 index 0000000..50cab39 --- /dev/null +++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue index 7c357fb..a003dfa 100644 --- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue +++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue @@ -68,6 +68,10 @@ diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue index f028216..113710f 100644 --- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue +++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue @@ -48,4 +48,8 @@ box-sizing: border-box; } } + +::v-deep(.el-loading-mask) { + background-color: rgba($color: #0b0b0f, $alpha: 95%); +} diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue index 54bafd0..410e728 100644 --- a/src/views/home/dashboard/fullScreen.vue +++ b/src/views/home/dashboard/fullScreen.vue @@ -5,6 +5,7 @@ -->