|
@@ -7,26 +7,26 @@
|
|
<span class="Micbold">可申诉的未执行策略</span>
|
|
<span class="Micbold">可申诉的未执行策略</span>
|
|
<span v-if="appealsArr.length>0">{{appealsArr.length}}</span>
|
|
<span v-if="appealsArr.length>0">{{appealsArr.length}}</span>
|
|
</div>
|
|
</div>
|
|
- <div class="execute" v-for="(item,index) in data" :key="index">
|
|
|
|
- <p class="date MicrYaHei">{{item.date}}</p>
|
|
|
|
|
|
+ <div class="execute">
|
|
|
|
+ <p class="date MicrYaHei">{{appealsDate?formatterStr(appealsDate):'--'}}</p>
|
|
<div class="card-box">
|
|
<div class="card-box">
|
|
- <div class="card" v-for="(item2,index) in item.info" :key="index+'i'">
|
|
|
|
- <div class="time">执行时间:{{item2.time}}</div>
|
|
|
|
|
|
+ <div class="card" v-for="(item,index) in appealsArr" :key="index+'i'">
|
|
|
|
+ <div class="time">执行时间:{{item.recommend?formatterStr2(item.recommend.time):'--'}}</div>
|
|
<div class="advice MicrYaHei">
|
|
<div class="advice MicrYaHei">
|
|
<span>策略建议</span>
|
|
<span>策略建议</span>
|
|
<span>冷机台数</span>
|
|
<span>冷机台数</span>
|
|
- <span>{{item2.ad1}}大{{item2.ad2}}小</span>
|
|
|
|
|
|
+ <span>{{item.recommend.chillerNumSetL||'--'}}大{{item.recommend.chillerNumSetS||'--'}}小</span>
|
|
<span>冷机出水温度</span>
|
|
<span>冷机出水温度</span>
|
|
- <span>{{item2.temp1}}°C</span>
|
|
|
|
|
|
+ <span>{{item.real?item.real.chillWaterOutTempSet:'--'}}°C</span>
|
|
</div>
|
|
</div>
|
|
<div class="advice">
|
|
<div class="advice">
|
|
<span>实际执行</span>
|
|
<span>实际执行</span>
|
|
<span>冷机台数</span>
|
|
<span>冷机台数</span>
|
|
- <span>{{item2.re1}}大{{item2.re2}}小</span>
|
|
|
|
|
|
+ <span>{{item.real?item.real.chillerNumSetLOrg:'--'}}大{{item.real?item.real.chillerNumSetSOrg:'--'}}小</span>
|
|
<span>冷机出水温度</span>
|
|
<span>冷机出水温度</span>
|
|
- <span>{{item2.temp2}}°C</span>
|
|
|
|
|
|
+ <span>{{item.real?item.real.chillWaterOutTempSetOrg:'--'}}°C</span>
|
|
</div>
|
|
</div>
|
|
- <div class="remark">备注:{{item2.remark}}</div>
|
|
|
|
|
|
+ <div class="remark">备注:{{item.remarks||'--'}}</div>
|
|
<div class="btn">
|
|
<div class="btn">
|
|
<el-button size="mini">查看快照</el-button>
|
|
<el-button size="mini">查看快照</el-button>
|
|
<el-button size="mini" type="primary">申诉</el-button>
|
|
<el-button size="mini" type="primary">申诉</el-button>
|
|
@@ -97,6 +97,7 @@ export default {
|
|
appealsArr: [],
|
|
appealsArr: [],
|
|
InAuditArr: [],
|
|
InAuditArr: [],
|
|
auditCompletedArr: [],
|
|
auditCompletedArr: [],
|
|
|
|
+ appealsDate: "",
|
|
data: [
|
|
data: [
|
|
{
|
|
{
|
|
date: "20202.01.13",
|
|
date: "20202.01.13",
|
|
@@ -158,7 +159,7 @@ export default {
|
|
}
|
|
}
|
|
]
|
|
]
|
|
}
|
|
}
|
|
- ],
|
|
|
|
|
|
+ ]
|
|
// review: [
|
|
// review: [
|
|
// {
|
|
// {
|
|
// date: "2020.02.12 08:30",
|
|
// date: "2020.02.12 08:30",
|
|
@@ -173,32 +174,32 @@ export default {
|
|
// advice: "冷水温度过高,没有及时按策略执行"
|
|
// advice: "冷水温度过高,没有及时按策略执行"
|
|
// }
|
|
// }
|
|
// ],
|
|
// ],
|
|
- complete: [
|
|
|
|
- {
|
|
|
|
- date: "08:30",
|
|
|
|
- title: "策略未执行申诉",
|
|
|
|
- time: "2020.01.30",
|
|
|
|
- sign: 7,
|
|
|
|
- img: require("../../assets/completed.png"),
|
|
|
|
- text: "申诉成功"
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- date: "08:30",
|
|
|
|
- title: "策略未执行申诉",
|
|
|
|
- time: "2020.01.30",
|
|
|
|
- sign: 5,
|
|
|
|
- img: require("../../assets/gray.png"),
|
|
|
|
- text: "未申诉"
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- date: "08:30",
|
|
|
|
- title: "策略未执行申诉",
|
|
|
|
- time: "2020.01.30",
|
|
|
|
- sign: 2,
|
|
|
|
- img: require("../../assets/error.png"),
|
|
|
|
- text: "申诉失败"
|
|
|
|
- }
|
|
|
|
- ]
|
|
|
|
|
|
+ // complete: [
|
|
|
|
+ // {
|
|
|
|
+ // date: "08:30",
|
|
|
|
+ // title: "策略未执行申诉",
|
|
|
|
+ // time: "2020.01.30",
|
|
|
|
+ // sign: 7,
|
|
|
|
+ // img: require("../../assets/completed.png"),
|
|
|
|
+ // text: "申诉成功"
|
|
|
|
+ // },
|
|
|
|
+ // {
|
|
|
|
+ // date: "08:30",
|
|
|
|
+ // title: "策略未执行申诉",
|
|
|
|
+ // time: "2020.01.30",
|
|
|
|
+ // sign: 5,
|
|
|
|
+ // img: require("../../assets/gray.png"),
|
|
|
|
+ // text: "未申诉"
|
|
|
|
+ // },
|
|
|
|
+ // {
|
|
|
|
+ // date: "08:30",
|
|
|
|
+ // title: "策略未执行申诉",
|
|
|
|
+ // time: "2020.01.30",
|
|
|
|
+ // sign: 2,
|
|
|
|
+ // img: require("../../assets/error.png"),
|
|
|
|
+ // text: "申诉失败"
|
|
|
|
+ // }
|
|
|
|
+ // ]
|
|
};
|
|
};
|
|
},
|
|
},
|
|
components: {
|
|
components: {
|
|
@@ -214,6 +215,22 @@ export default {
|
|
formatter1(date) {
|
|
formatter1(date) {
|
|
return moment.unix(date / 1000).format("YYYY.MM.DD");
|
|
return moment.unix(date / 1000).format("YYYY.MM.DD");
|
|
},
|
|
},
|
|
|
|
+ formatterStr(str) {
|
|
|
|
+ if (str) {
|
|
|
|
+ return (
|
|
|
|
+ str.substring(0, 4) +
|
|
|
|
+ "." +
|
|
|
|
+ str.substring(4, 6) +
|
|
|
|
+ "." +
|
|
|
|
+ str.substring(6, 8)
|
|
|
|
+ );
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ formatterStr2(str) {
|
|
|
|
+ if (str) {
|
|
|
|
+ return str.substring(0, 2) + ":" + str.substring(2, 4);
|
|
|
|
+ }
|
|
|
|
+ },
|
|
menu(item) {
|
|
menu(item) {
|
|
this.$router.push({
|
|
this.$router.push({
|
|
path: "/appeal/appealDetail",
|
|
path: "/appeal/appealDetail",
|
|
@@ -264,6 +281,10 @@ export default {
|
|
queryChillerExecuteInfo(params).then(res => {
|
|
queryChillerExecuteInfo(params).then(res => {
|
|
console.log("可申诉的未执行策略", res);
|
|
console.log("可申诉的未执行策略", res);
|
|
this.appealsArr = res.data ? res.data : [];
|
|
this.appealsArr = res.data ? res.data : [];
|
|
|
|
+ if (this.appealsArr.length > 0) {
|
|
|
|
+ this.appealsDate = this.appealsArr[0].recommend.date || "--";
|
|
|
|
+ console.log(this.appealsDate);
|
|
|
|
+ }
|
|
});
|
|
});
|
|
},
|
|
},
|
|
// 审核完成、超时未申诉
|
|
// 审核完成、超时未申诉
|
|
@@ -315,7 +336,7 @@ export default {
|
|
padding: 20px;
|
|
padding: 20px;
|
|
.left {
|
|
.left {
|
|
flex: 1;
|
|
flex: 1;
|
|
- min-width: 420px;
|
|
|
|
|
|
+ min-width: 480px;
|
|
.title {
|
|
.title {
|
|
display: flex;
|
|
display: flex;
|
|
align-items: center;
|
|
align-items: center;
|
|
@@ -385,6 +406,9 @@ export default {
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
color: rgba(31, 36, 41, 1);
|
|
color: rgba(31, 36, 41, 1);
|
|
}
|
|
}
|
|
|
|
+ span:nth-of-type(3) {
|
|
|
|
+ width: 115px;
|
|
|
|
+ }
|
|
span:nth-of-type(2),
|
|
span:nth-of-type(2),
|
|
span:nth-of-type(4) {
|
|
span:nth-of-type(4) {
|
|
height: 18px;
|
|
height: 18px;
|