diff --git a/src/api/dataReport/bluetoothReport.js b/src/api/dataReport/bluetoothReport.js
new file mode 100644
index 0000000..b67c0cb
--- /dev/null
+++ b/src/api/dataReport/bluetoothReport.js
@@ -0,0 +1,23 @@
+import request from '@/utils/request';
+
+// 蓝牙上报
+export function bluetoothList(data) {
+ return request({
+ url:
+ '/bluetooth/list?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize,
+ method: 'post',
+ data
+ });
+}
+export function bluetoothInfo(params) {
+ return request({
+ url: '/bluetooth/info',
+ params
+ });
+}
+export function bluetoothExport(params) {
+ return request({
+ url: '/bluetooth/export',
+ params
+ });
+}
diff --git a/src/views/dataReport/bluetoothReport/detail.vue b/src/views/dataReport/bluetoothReport/detail.vue
new file mode 100644
index 0000000..89ad282
--- /dev/null
+++ b/src/views/dataReport/bluetoothReport/detail.vue
@@ -0,0 +1,384 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 重置
+
+
+
+
+ 报表导出
+
+
+
+
+
+
+
+
+ {{ value }}:{{ key }}
+
+
+ {{ value }}:{{ key }}
+
+
+ {{ props.row.bleBatteryFaultInfo }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.isFactory == 0 ? '否' : '是' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.cellAnalog[index] }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (scope.row.historicalFault.tempList[index] - 2731) / 10 }}°C
+
+
+
+
+ {{ scope.row.historicalFault.cellVoltageList[index] }}mV
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataReport/bluetoothReport/index.vue b/src/views/dataReport/bluetoothReport/index.vue
new file mode 100644
index 0000000..b5a0af3
--- /dev/null
+++ b/src/views/dataReport/bluetoothReport/index.vue
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备数据
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataReport/deviceData/index.vue b/src/views/dataReport/deviceData/index.vue
new file mode 100644
index 0000000..b6fba0b
--- /dev/null
+++ b/src/views/dataReport/deviceData/index.vue
@@ -0,0 +1,102 @@
+
+
+
+ 报表导出
+
+
+
+
+
+
+
+
+
+ {{
+ getDeviceTypeLabel(scope.row.deviceType)
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workOrderManage/orderHistory/detail.vue b/src/views/workOrderManage/orderHistory/detail.vue
index 79d2831..f023e2c 100644
--- a/src/views/workOrderManage/orderHistory/detail.vue
+++ b/src/views/workOrderManage/orderHistory/detail.vue
@@ -71,7 +71,11 @@
>
- {{ scope.row.workInfo.proName + scope.row.workInfo.cityName + scope.row.workInfo.disName }}
+ {{
+ scope.row.workInfo.proName +
+ scope.row.workInfo.cityName +
+ scope.row.workInfo.disName
+ }}
-
+
{{ scope.row.workInfo.warningLevel | toChinaNum }}级
@@ -173,11 +173,20 @@ export default {
this.loading = false;
});
},
+ /** 导出按钮操作 */
exportExcel() {
- exportExcelTxt({ id: this.id }).then(({ code, msg }) => {
- if (code !== 200) return this.$message.error(msg);
- this.download(msg);
- });
+ const id = this.id;
+ this.$confirm('是否确认导出所有用户数据项?', '警告', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(function() {
+ return exportExcelTxt({ id });
+ })
+ .then(response => {
+ this.download(response.msg);
+ });
}
},
created() {