diff --git a/ruoyi-ui/src/api/MonthlyEquipment/index.js b/ruoyi-ui/src/api/MonthlyEquipment/index.js
new file mode 100644
index 00000000..1286246f
--- /dev/null
+++ b/ruoyi-ui/src/api/MonthlyEquipment/index.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+import { download } from '../../utils/request'
+// 全景数据 - 运行环境接口
+
+
+// 设备状态柱状图按时间和类型
+export function getSystemStatusList(query) {
+ return request({
+ url: '/system/status/list',
+ method: 'get',
+ params: {
+ ...query,
+ }
+ })
+ }
+
+ //设备状态列表按时间和类型
+ export function getSystemStatusTabList(query) {
+ //system/status/tablist
+ return request({
+ url: '/system/status/tablist',
+ method: 'get',
+ params: {
+ ...query,
+ }
+ })
+ }
+
+
+ //设备状态列表按类型
+ export function getSystemStatusType() {
+ //system/status/tablist
+ return request({
+ url: '/system/status/type',
+ method: 'get',
+ params: {
+ // ...query,
+ }
+ })
+ }
+ //system/status/type
+
+ //设备状态列表按类型
+ export function getSystemStatusExport(query) {
+ //system/status/export
+ return download('/system/status/export',query,"file.xlsx");
+ // return request.post('/system/status/export',{
+ // ...query
+ // },{ headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+ // responseType: 'blob'})
+ }
\ No newline at end of file
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index 9db73fdd..d31b22f7 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -19,7 +19,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项,表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
// 超时
- timeout: 10000
+ timeout: 30000
})
// request拦截器
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/shexiangtou.png b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/shexiangtou.png
new file mode 100644
index 00000000..d9baa594
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/shexiangtou.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
index c10c506b..7ef5a96f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
@@ -82,7 +82,7 @@ let options = {
type: 'radar',
name: '安全作业',
data: [
- [100, 100, 100, 100, 100, 100, 100, 100,100, 100, 100, 100, 100, 100, 100, 100],
+ [100, 100, 100, 100, 100, 100, 100, 100,100, 100, 100, 100, 100, 100, 100, 100,100, 100, 100],
],
symbol: 'none',
@@ -102,7 +102,7 @@ let options = {
type: 'radar',
name: '安全作业',
data: [
- [80, 80, 80, 80, 80, 80, 80, 80,80, 80, 80, 80, 80, 80, 80, 80]
+ [80, 80, 80, 80, 80, 80, 80, 80,80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80]
],
symbol: 'none',
@@ -122,7 +122,7 @@ let options = {
type: 'radar',
name: '安全作业',
data: [
- [60, 60, 60, 60, 60, 60, 60, 60,60, 60, 60, 60, 60, 60, 60, 60],
+ [60, 60, 60, 60, 60, 60, 60, 60,60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60],
],
symbol: 'none',
@@ -142,7 +142,7 @@ let options = {
type: 'radar',
name: '安全作业',
data: [
- [40, 40, 40, 40, 40, 40, 40, 40,40, 40, 40, 40, 40, 40, 40, 40],
+ [40, 40, 40, 40, 40, 40, 40, 40,40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40],
],
symbol: 'none',
lineStyle: {
@@ -161,7 +161,7 @@ let options = {
type: 'radar',
name: '安全作业',
data: [
- [20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20],
+ [20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20],
],
symbol: 'none',
lineStyle: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
index 2371dd10..f9a96f92 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
@@ -16,12 +16,34 @@
components: {
WgtTitle
},
+ props:{
+ dataList:{
+ type:Array,
+ default:[],
+ }
+ },
data() {
return {
}
},
-
+ watch:{
+ dataList:(newD,oldD)=>{
+ let data = [];
+ let texts = [];
+ newD.forEach(element => {
+ data.push(parseInt(element.sucessRate,10));
+ texts.push({name:element.text, max: 100 });
+ });
+
+ chartsStatistics.radar.indicator = texts;
+ chartsStatistics.series[0].data = [data];
+
+ //console.log("=====aaa=========",this)
+ var myChart = echarts.init(document.getElementById('deviceUptime'));
+ myChart.setOption(chartsStatistics);
+ }
+ },
created() {
},
@@ -33,6 +55,7 @@
this.$nextTick(() => {
var myChart = echarts.init(document.getElementById('deviceUptime'));
myChart.setOption(chartsStatistics);
+ this.myChart = myChart;
});
});
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
index 4c3ea3a1..a790e505 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
@@ -3,9 +3,9 @@