|
|
|
@ -3,7 +3,7 @@
|
|
|
|
|
* @Author: kery.chen
|
|
|
|
|
* @Description: 总体概览右侧
|
|
|
|
|
* @Date: 2021-11-30 11:08:50
|
|
|
|
|
* @LastEditTime: 2024-10-09 17:18:59
|
|
|
|
|
* @LastEditTime: 2024-10-11 11:57:43
|
|
|
|
|
* @FilePath : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentRight.vue
|
|
|
|
|
-->
|
|
|
|
|
<template>
|
|
|
|
@ -213,19 +213,19 @@ export default {
|
|
|
|
|
num: 0
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: (nmonth - 1) + '月',
|
|
|
|
|
name: (nmonth - 2) + '月',
|
|
|
|
|
num: 0
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: (nmonth - 1) + '月',
|
|
|
|
|
name: (nmonth - 3) + '月',
|
|
|
|
|
num: 0
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: (nmonth - 1) + '月',
|
|
|
|
|
name: (nmonth - 4) + '月',
|
|
|
|
|
num: 0
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: (nmonth - 1) + '月',
|
|
|
|
|
name: (nmonth - 5) + '月',
|
|
|
|
|
num: 0
|
|
|
|
|
},
|
|
|
|
|
// {
|
|
|
|
@ -382,20 +382,17 @@ export default {
|
|
|
|
|
async managescreenData(){
|
|
|
|
|
// let res = await managescreen()
|
|
|
|
|
screenqinglang().then(res=>{
|
|
|
|
|
let data1 = res.data.screenQinglangWeiguiResponse || [];
|
|
|
|
|
let data2 = res.data.screenQinglangWeifanResponse || [];
|
|
|
|
|
let data1 = res.data
|
|
|
|
|
let arr1 = [],arr2 = [];
|
|
|
|
|
data1.forEach(item=>{
|
|
|
|
|
let obj = {};
|
|
|
|
|
let objTwo = {};
|
|
|
|
|
obj.name = this.getDate(item.dateTime)
|
|
|
|
|
obj.num = item.count2;
|
|
|
|
|
objTwo.name = this.getDate(item.dateTime)
|
|
|
|
|
objTwo.num = item.count1;
|
|
|
|
|
arr2.push(obj)
|
|
|
|
|
})
|
|
|
|
|
data2.forEach(item=>{
|
|
|
|
|
let obj = {};
|
|
|
|
|
obj.name = this.getDate(item.dateTime)
|
|
|
|
|
obj.num = item.count1;
|
|
|
|
|
arr1.push(obj)
|
|
|
|
|
arr1.push(objTwo)
|
|
|
|
|
})
|
|
|
|
|
return {arr1,arr2}
|
|
|
|
|
}).then((res)=>{
|
|
|
|
@ -482,7 +479,8 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
getDate(date){
|
|
|
|
|
// 2023-10-17 15:14:07 截取月份
|
|
|
|
|
const result = /-(\d{2})-/.exec(date);
|
|
|
|
|
// const result = /-(\d{2})-/.exec(date);
|
|
|
|
|
const result = date.split("-")
|
|
|
|
|
if (result !== null && result.length > 1) {
|
|
|
|
|
const month = result[1];
|
|
|
|
|
switch(month){
|
|
|
|
|