|
@@ -85,17 +85,17 @@
|
|
<span class="compare_plan_name" v-if="userData1.length > 0"
|
|
<span class="compare_plan_name" v-if="userData1.length > 0"
|
|
>计划名称:{{ userData1[0].planName }}</span
|
|
>计划名称:{{ userData1[0].planName }}</span
|
|
>
|
|
>
|
|
- <!-- <span class="compare_plan_time" v-if="multipleSelection[0]"
|
|
|
|
- >结束时间:{{ multipleSelection[0].planEndTime }}</span
|
|
|
|
- > -->
|
|
|
|
|
|
+ <span class="compare_plan_time" v-if="multipleSelection[0]"
|
|
|
|
+ >结束时间:{{ planEndTime }}</span
|
|
|
|
+ >
|
|
</div>
|
|
</div>
|
|
<div class="compare_plan_out2">
|
|
<div class="compare_plan_out2">
|
|
<span class="compare_plan_name" v-if="userData2.length > 0"
|
|
<span class="compare_plan_name" v-if="userData2.length > 0"
|
|
>计划名称:{{ userData2[0].planName }}</span
|
|
>计划名称:{{ userData2[0].planName }}</span
|
|
>
|
|
>
|
|
- <!-- <span class="compare_plan_time" v-if="multipleSelection[1]"
|
|
|
|
- >结束时间:{{ multipleSelection[1].planEndTime }}</span
|
|
|
|
- > -->
|
|
|
|
|
|
+ <span class="compare_plan_time" v-if="multipleSelection[1]"
|
|
|
|
+ >结束时间:{{ planEndTime }}</span
|
|
|
|
+ >
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="compare_class">
|
|
<div class="compare_class">
|
|
@@ -356,6 +356,7 @@ export default {
|
|
echarts_des_list2: [],
|
|
echarts_des_list2: [],
|
|
echarts_data_list2: [],
|
|
echarts_data_list2: [],
|
|
echarts_name_list2: [],
|
|
echarts_name_list2: [],
|
|
|
|
+ planEndTime: "",
|
|
};
|
|
};
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
@@ -492,9 +493,9 @@ export default {
|
|
xAxis: {
|
|
xAxis: {
|
|
type: "category",
|
|
type: "category",
|
|
data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
|
|
data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
|
|
- axisLabel:{
|
|
|
|
- interval:0
|
|
|
|
- }
|
|
|
|
|
|
+ axisLabel: {
|
|
|
|
+ interval: 0,
|
|
|
|
+ },
|
|
},
|
|
},
|
|
yAxis: {
|
|
yAxis: {
|
|
type: "value",
|
|
type: "value",
|
|
@@ -519,6 +520,7 @@ export default {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
open(val) {
|
|
open(val) {
|
|
|
|
+ this.planEndTime = val.planEndTime;
|
|
this.userInfo = val;
|
|
this.userInfo = val;
|
|
this.dialogVisible = true;
|
|
this.dialogVisible = true;
|
|
this.searchTarget();
|
|
this.searchTarget();
|
|
@@ -548,7 +550,7 @@ export default {
|
|
if (res && res.code == 200) {
|
|
if (res && res.code == 200) {
|
|
this.orgName1 = res.data.user.orgName;
|
|
this.orgName1 = res.data.user.orgName;
|
|
let a = res.data.report;
|
|
let a = res.data.report;
|
|
-
|
|
|
|
|
|
+ debugger;
|
|
this.userData1 = a;
|
|
this.userData1 = a;
|
|
if (this.userData2.length == 0) {
|
|
if (this.userData2.length == 0) {
|
|
this.formatterDataW(a, false, 1);
|
|
this.formatterDataW(a, false, 1);
|
|
@@ -782,17 +784,19 @@ export default {
|
|
margin-right: 10px;
|
|
margin-right: 10px;
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
|
|
+ flex-direction: column;
|
|
.compare_plan_time {
|
|
.compare_plan_time {
|
|
|
|
+ margin-top: 6px;
|
|
color: #999999;
|
|
color: #999999;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
.compare_plan_out2 {
|
|
.compare_plan_out2 {
|
|
margin-left: 10px;
|
|
margin-left: 10px;
|
|
flex: 1;
|
|
flex: 1;
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
.compare_plan_time {
|
|
.compare_plan_time {
|
|
|
|
+ margin-top: 6px;
|
|
color: #999999;
|
|
color: #999999;
|
|
}
|
|
}
|
|
}
|
|
}
|