|
@@ -4,8 +4,8 @@
|
|
|
<div class="air-desc">
|
|
|
<p class="air-title">空调</p>
|
|
|
<p class="air-temperature">
|
|
|
- {{ airData.tempSet ? airData.tempSet : "--" }}
|
|
|
- <sup>℃</sup>
|
|
|
+ {{ airData.tempSet ? airData.tempSet : "" }}
|
|
|
+ <sup v-if="airData.tempSet">℃</sup>
|
|
|
</p>
|
|
|
<!-- <p class="air-model">
|
|
|
<span v-if="modeName">
|
|
@@ -110,8 +110,8 @@
|
|
|
airSetText.toWhere === 'toCold' || airSetText.toWhere === 'toWarm'
|
|
|
"
|
|
|
>
|
|
|
- <div class="air-temp-num">{{ temperature }}</div>
|
|
|
- <div
|
|
|
+ <!-- <div class="air-temp-num">{{ temperature }}</div> -->
|
|
|
+ <!-- <div
|
|
|
class="air-temp-num"
|
|
|
:class="{
|
|
|
'arrow-cooling': airSetText.toWhere == 'toCold',
|
|
@@ -119,23 +119,30 @@
|
|
|
}"
|
|
|
>
|
|
|
→
|
|
|
+ </div> -->
|
|
|
+ <div v-if="airSetText.notice" class="air-temp-num">
|
|
|
+ {{ airSetText.notice }}
|
|
|
</div>
|
|
|
- <div v-if="airSetText.designTemperature" class="air-temp-num">
|
|
|
- {{ airSetText.designTemperature }}
|
|
|
+ <div v-else class="air-temp-load">
|
|
|
+ <van-loading type="spinner" />
|
|
|
</div>
|
|
|
- <div v-else class="air-temp-num-load">
|
|
|
+ <!-- <div v-else class="air-temp-num-load">
|
|
|
<img
|
|
|
style="padding-top: 4px; height: 20px; width: 20px"
|
|
|
:src="parseImgUrl('page-officehome', 'loading.svg')"
|
|
|
/>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</div>
|
|
|
- <p v-if="airSetText.notice" class="air-notice">
|
|
|
- <span>{{ airSetText.notice }}</span>
|
|
|
+ <p
|
|
|
+ v-if="airSetText.remark && airSetText.remark.length"
|
|
|
+ class="air-notice"
|
|
|
+ >
|
|
|
+ <span
|
|
|
+ v-for="(remarkItem, index) in airSetText.remark"
|
|
|
+ :key="'remark' + index"
|
|
|
+ >{{ remarkItem }}</span
|
|
|
+ >
|
|
|
</p>
|
|
|
- <div v-else class="air-temp-load">
|
|
|
- <van-loading type="spinner" />
|
|
|
- </div>
|
|
|
</div>
|
|
|
<div class="dialog-btns" @click.stop="closeDialog">
|
|
|
<span>确定</span>
|
|
@@ -208,7 +215,7 @@ export default defineComponent({
|
|
|
setup(props, contx) {
|
|
|
const propsVal = props;
|
|
|
let airData: any = {
|
|
|
- avg: "--", // 算法调节温度(目标值)
|
|
|
+ avg: "", // 算法调节温度(目标值)
|
|
|
icon: 1, // 固定框文案ID 7 为关机,其它都是开机
|
|
|
spaceStatus: "", // 固定框文案展示
|
|
|
notice: "", // 弹框文案展示
|
|
@@ -236,6 +243,7 @@ export default defineComponent({
|
|
|
airSetText: {
|
|
|
// 空调反馈文案
|
|
|
notice: "",
|
|
|
+ remark: [],
|
|
|
nowImg: "",
|
|
|
toWhere: "",
|
|
|
designTemperature: 0,
|
|
@@ -357,6 +365,7 @@ export default defineComponent({
|
|
|
if (type === "feedback") {
|
|
|
if (resData.notice) {
|
|
|
proxyData.airSetText.notice = resData.notice;
|
|
|
+ proxyData.airSetText.remark = resData.remark.split("*");
|
|
|
if (proxyData.feedbackTimer) {
|
|
|
clearTimeout(proxyData.feedbackTimer); // 拿到反馈文案清除定时器
|
|
|
proxyData.getAirInfoToTimer();
|
|
@@ -481,6 +490,7 @@ export default defineComponent({
|
|
|
*/
|
|
|
// 温度切换的时候调整文案
|
|
|
proxyData.airSetText.notice = "";
|
|
|
+ proxyData.airSetText.remark = [];
|
|
|
const paramObj = {
|
|
|
projectId: propsVal.projectId, // 项目id
|
|
|
objectId: propsVal.spaceId, // 空间id
|
|
@@ -504,6 +514,7 @@ export default defineComponent({
|
|
|
if (btnType !== "sw") {
|
|
|
if (resData.notice) {
|
|
|
proxyData.airSetText.notice = resData.notice;
|
|
|
+ proxyData.airSetText.remark = resData.remark.split("*");
|
|
|
} else {
|
|
|
proxyData.getFeedbackTimer(btnType, resData.id);
|
|
|
}
|
|
@@ -746,7 +757,7 @@ export default defineComponent({
|
|
|
.air-dialog-content {
|
|
|
position: relative;
|
|
|
width: 100%;
|
|
|
- height: 360px;
|
|
|
+ height: 340px;
|
|
|
|
|
|
.dialog-top {
|
|
|
position: relative;
|
|
@@ -809,17 +820,21 @@ export default defineComponent({
|
|
|
}
|
|
|
|
|
|
.air-notice {
|
|
|
- padding-top: 25px;
|
|
|
+ padding-top: 10px;
|
|
|
padding-left: 48px;
|
|
|
padding-right: 48px;
|
|
|
- text-align: left;
|
|
|
- display: flex;
|
|
|
+ text-align: center;
|
|
|
+ // display: flex;
|
|
|
justify-content: center;
|
|
|
font-family: PingFang SC;
|
|
|
font-size: 15px;
|
|
|
font-weight: 400;
|
|
|
line-height: 21px;
|
|
|
color: rgba(77, 82, 98, 1);
|
|
|
+ span {
|
|
|
+ display: block;
|
|
|
+ padding-bottom: 5px;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.air-temp-load {
|
|
@@ -843,8 +858,8 @@ export default defineComponent({
|
|
|
line-height: 1;
|
|
|
color: #4d5262;
|
|
|
background: #ffffff;
|
|
|
- box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.05), 0px 4px 15px rgba(0, 0, 0, 0.15);
|
|
|
- border-radius: 25px;
|
|
|
+ border: 1px solid #c4c4c4;
|
|
|
+ border-radius: 30px;
|
|
|
cursor: pointer;
|
|
|
|
|
|
span {
|