diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..994e48f 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -43,7 +43,7 @@
- 导出记录
+ 导出记录
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..994e48f 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -43,7 +43,7 @@
- 导出记录
+ 导出记录
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index e052117..7fd3e22 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -1,6 +1,6 @@
-
+
@@ -174,10 +174,14 @@
}
},
fetchDevice() {
+ debugger
this.loading = true
+ debugger
this.devices = []
+ debugger
// 获取液位可选列表
getDeviceSimpleList('2', '0').then(response => {
+ debugger
this.loading = false
this.devices = [...this.device, ...response.data]
// 获取开挖可选列表
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..994e48f 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -43,7 +43,7 @@
- 导出记录
+ 导出记录
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index e052117..7fd3e22 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -1,6 +1,6 @@
-
+
@@ -174,10 +174,14 @@
}
},
fetchDevice() {
+ debugger
this.loading = true
+ debugger
this.devices = []
+ debugger
// 获取液位可选列表
getDeviceSimpleList('2', '0').then(response => {
+ debugger
this.loading = false
this.devices = [...this.device, ...response.data]
// 获取开挖可选列表
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index eafa3c8..cdb29d6 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -37,7 +37,7 @@
- 导出记录
+ 导出记录
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..994e48f 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -43,7 +43,7 @@
- 导出记录
+ 导出记录
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index e052117..7fd3e22 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -1,6 +1,6 @@
-
+
@@ -174,10 +174,14 @@
}
},
fetchDevice() {
+ debugger
this.loading = true
+ debugger
this.devices = []
+ debugger
// 获取液位可选列表
getDeviceSimpleList('2', '0').then(response => {
+ debugger
this.loading = false
this.devices = [...this.device, ...response.data]
// 获取开挖可选列表
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index eafa3c8..cdb29d6 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -37,7 +37,7 @@
- 导出记录
+ 导出记录
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 34092a5..bc713a1 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -31,8 +31,18 @@
name: 'DeviceCountByDept',
data() {
this.extend = {
+ xAxis: {
+ axisLabel: {
+ rotate: 30,
+ margin: 30,
+ textStyle: {
+ align: 'center'
+ }
+ }
+ },
series: {
- label: { show: true, position: 'top' }
+ label: { show: true, position: 'top' },
+ barMaxWidth: 35 // 最大柱宽度
}
}
this.grid = {
@@ -48,7 +58,7 @@
barWidth: 15,
labelMap: {
'deptName': '权属单位',
- 'deviceCount': '设备数量'
+ 'deviceCount': '设备数量(个)'
},
dimension: ['deptName'],
metrics: ['deviceCount']
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..994e48f 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -43,7 +43,7 @@
- 导出记录
+ 导出记录
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index e052117..7fd3e22 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -1,6 +1,6 @@
-
+
@@ -174,10 +174,14 @@
}
},
fetchDevice() {
+ debugger
this.loading = true
+ debugger
this.devices = []
+ debugger
// 获取液位可选列表
getDeviceSimpleList('2', '0').then(response => {
+ debugger
this.loading = false
this.devices = [...this.device, ...response.data]
// 获取开挖可选列表
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index eafa3c8..cdb29d6 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -37,7 +37,7 @@
- 导出记录
+ 导出记录
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 34092a5..bc713a1 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -31,8 +31,18 @@
name: 'DeviceCountByDept',
data() {
this.extend = {
+ xAxis: {
+ axisLabel: {
+ rotate: 30,
+ margin: 30,
+ textStyle: {
+ align: 'center'
+ }
+ }
+ },
series: {
- label: { show: true, position: 'top' }
+ label: { show: true, position: 'top' },
+ barMaxWidth: 35 // 最大柱宽度
}
}
this.grid = {
@@ -48,7 +58,7 @@
barWidth: 15,
labelMap: {
'deptName': '权属单位',
- 'deviceCount': '设备数量'
+ 'deviceCount': '设备数量(个)'
},
dimension: ['deptName'],
metrics: ['deviceCount']
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 13a1f67..0724edc 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -16,7 +16,7 @@
-
+
- 导出记录
+ 导出记录
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index e052117..7fd3e22 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -1,6 +1,6 @@
-
+
@@ -174,10 +174,14 @@
}
},
fetchDevice() {
+ debugger
this.loading = true
+ debugger
this.devices = []
+ debugger
// 获取液位可选列表
getDeviceSimpleList('2', '0').then(response => {
+ debugger
this.loading = false
this.devices = [...this.device, ...response.data]
// 获取开挖可选列表
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index eafa3c8..cdb29d6 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -37,7 +37,7 @@
- 导出记录
+ 导出记录
-
+
{{ scope.row[column.value] }}
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 34092a5..bc713a1 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -31,8 +31,18 @@
name: 'DeviceCountByDept',
data() {
this.extend = {
+ xAxis: {
+ axisLabel: {
+ rotate: 30,
+ margin: 30,
+ textStyle: {
+ align: 'center'
+ }
+ }
+ },
series: {
- label: { show: true, position: 'top' }
+ label: { show: true, position: 'top' },
+ barMaxWidth: 35 // 最大柱宽度
}
}
this.grid = {
@@ -48,7 +58,7 @@
barWidth: 15,
labelMap: {
'deptName': '权属单位',
- 'deviceCount': '设备数量'
+ 'deviceCount': '设备数量(个)'
},
dimension: ['deptName'],
metrics: ['deviceCount']
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 13a1f67..0724edc 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -16,7 +16,7 @@
-
+
- 导出记录
+ 导出记录