|
@@ -105,11 +105,7 @@
|
|
</div>
|
|
</div>
|
|
<div class="dialog-text">
|
|
<div class="dialog-text">
|
|
<div
|
|
<div
|
|
- class="air-body-item-num"
|
|
|
|
- v-if="
|
|
|
|
- airSetText.toWhere === 'toCold' || airSetText.toWhere === 'toWarm'
|
|
|
|
- "
|
|
|
|
- >
|
|
|
|
|
|
+ class="air-body-item-num">
|
|
<!-- <div class="air-temp-num">{{ temperature }}</div> -->
|
|
<!-- <div class="air-temp-num">{{ temperature }}</div> -->
|
|
<!-- <div
|
|
<!-- <div
|
|
class="air-temp-num"
|
|
class="air-temp-num"
|
|
@@ -365,7 +361,9 @@ export default defineComponent({
|
|
if (type === "feedback") {
|
|
if (type === "feedback") {
|
|
if (resData.notice) {
|
|
if (resData.notice) {
|
|
proxyData.airSetText.notice = resData.notice;
|
|
proxyData.airSetText.notice = resData.notice;
|
|
- proxyData.airSetText.remark = resData.remark.split("*");
|
|
|
|
|
|
+ if(resData.remark && resData.remark.length){
|
|
|
|
+ proxyData.airSetText.remark =resData.remark.split("*")
|
|
|
|
+ }
|
|
if (proxyData.feedbackTimer) {
|
|
if (proxyData.feedbackTimer) {
|
|
clearTimeout(proxyData.feedbackTimer); // 拿到反馈文案清除定时器
|
|
clearTimeout(proxyData.feedbackTimer); // 拿到反馈文案清除定时器
|
|
proxyData.getAirInfoToTimer();
|
|
proxyData.getAirInfoToTimer();
|
|
@@ -512,9 +510,12 @@ export default defineComponent({
|
|
proxyData.updateAirText(btnType, airText);
|
|
proxyData.updateAirText(btnType, airText);
|
|
// 改变温度和风量的时候给弹窗设置文案
|
|
// 改变温度和风量的时候给弹窗设置文案
|
|
if (btnType !== "sw") {
|
|
if (btnType !== "sw") {
|
|
|
|
+ // debugger
|
|
if (resData.notice) {
|
|
if (resData.notice) {
|
|
proxyData.airSetText.notice = resData.notice;
|
|
proxyData.airSetText.notice = resData.notice;
|
|
- proxyData.airSetText.remark = resData.remark.split("*");
|
|
|
|
|
|
+ if(resData.remark && resData.remark.length){
|
|
|
|
+ proxyData.airSetText.remark =resData.remark.split("*")
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
proxyData.getFeedbackTimer(btnType, resData.id);
|
|
proxyData.getFeedbackTimer(btnType, resData.id);
|
|
}
|
|
}
|