dolphin-weex-bc 0.0.11 → 0.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/dist/index.native.js +903 -581
- package/dist/index.native.js.map +1 -1
- package/dist/index.web.js +2038 -1844
- package/dist/index.web.js.map +1 -1
- package/package.json +2 -2
- package/packages/dof-consumables/assets/css/index.css +18 -7
- package/packages/dof-consumables/assets/css/index_diablo.css +230 -0
- package/packages/dof-consumables/index.vue +170 -100
- package/packages/dof-xiaomei-card/index.vue +1 -1
- package/packages/material-event/index.js +63 -13
|
@@ -1,44 +1,63 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="material-wrapper" :style="{ width: width + 'px' }" ref="materialBox">
|
|
3
3
|
<template v-for="(item, index) in deviceMaterialList">
|
|
4
|
-
<div
|
|
4
|
+
<div
|
|
5
|
+
class="material-list"
|
|
6
|
+
:style="{
|
|
7
|
+
width: width + 'px',
|
|
8
|
+
'background-color': isDiablo ? '#101315' : needBackground ? '#fff' : '#F6F7F9',
|
|
9
|
+
'margin-bottom': isScale ? '15px' : '34px'
|
|
10
|
+
}"
|
|
11
|
+
:key="index"
|
|
12
|
+
>
|
|
5
13
|
<template v-if="item.consumables && item.consumables.length > 0">
|
|
6
|
-
<div class="material-title">
|
|
14
|
+
<div :class="['material-title', isDiablo && 'material-title-isDiablo']">
|
|
7
15
|
<image
|
|
8
|
-
class="title-icon"
|
|
16
|
+
:class="['title-icon', isScale && 'title-icon-isScale']"
|
|
9
17
|
:src="item.deviceInfo.deviceIcon ? item.deviceInfo.deviceIcon : ''"
|
|
10
|
-
style="width:88px; height:88px;"
|
|
11
18
|
></image>
|
|
12
19
|
<div class="title-content">
|
|
13
|
-
<text class="title-txt1-1">{{
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
</
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
<
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
<text class="title-
|
|
30
|
-
|
|
31
|
-
|
|
20
|
+
<text :class="['title-txt1-1', isScale && 'title-txt1-1-isScale', isDiablo && 'title-txt1-1-isDiablo']">{{
|
|
21
|
+
item.deviceInfo.deviceName
|
|
22
|
+
}}</text>
|
|
23
|
+
<div class="title-txt3-box">
|
|
24
|
+
<!-- 因为动态class会产生不预期的bug，先暂时用ifelse处理 -->
|
|
25
|
+
<text v-if="isScale && isDiablo" class="title-txt2-o1">{{ item.deviceInfo.roomName }}</text>
|
|
26
|
+
<text v-else-if="isScale" class="title-txt2-o2">{{ item.deviceInfo.roomName }}</text>
|
|
27
|
+
<text v-else-if="isDiablo" class="title-txt2-o3">{{ item.deviceInfo.roomName }}</text>
|
|
28
|
+
<text v-else-if="!isScale && !isDiablo" class="title-txt2-o4">{{ item.deviceInfo.roomName }}</text>
|
|
29
|
+
|
|
30
|
+
<text v-if="isScale && isDiablo" class="title-txt2-user1-1"> | </text>
|
|
31
|
+
<text v-else-if="isScale" class="title-txt2-user2"> | </text>
|
|
32
|
+
<text v-else-if="isDiablo" class="title-txt2-user3-3"> | </text>
|
|
33
|
+
<text v-else-if="!isScale && !isDiablo" class="title-txt2-user4"> | </text>
|
|
34
|
+
|
|
35
|
+
<template v-if="item.deviceInfo.isOnline == 1">
|
|
36
|
+
<text v-if="isScale && isDiablo" class="title-txt2-user1">在线</text>
|
|
37
|
+
<text v-else-if="isScale" class="title-txt2-user2">在线</text>
|
|
38
|
+
<text v-else-if="isDiablo" class="title-txt2-user3">在线</text>
|
|
39
|
+
<text v-else-if="!isScale && !isDiablo" class="title-txt2-user4">在线</text>
|
|
40
|
+
</template>
|
|
41
|
+
<template v-else>
|
|
42
|
+
<text v-if="isScale && isDiablo" class="title-txt2-user-n1">离线</text>
|
|
43
|
+
<text v-else-if="isScale" class="title-txt2-user-n2">离线</text>
|
|
44
|
+
<text v-else-if="isDiablo" class="title-txt2-user-n3">离线</text>
|
|
45
|
+
<text v-else-if="!isScale && !isDiablo" class="title-txt2-user-n4">离线</text>
|
|
46
|
+
</template>
|
|
47
|
+
</div>
|
|
32
48
|
</div>
|
|
33
49
|
</div>
|
|
34
50
|
<div v-for="it in item.consumables" :key="it.consumablesCode">
|
|
35
51
|
<template>
|
|
36
|
-
<div
|
|
52
|
+
<div
|
|
53
|
+
:class="['material-item', isScale && 'material-item-isScale', isDiablo && 'material-item-isDiablo']"
|
|
54
|
+
@click="goDetailThrottle(it, item)"
|
|
55
|
+
>
|
|
37
56
|
<div class="item-left">
|
|
38
57
|
<template v-if="item.deviceInfo.isOnline == 1 && it.remainingValueType != 5">
|
|
39
58
|
<template v-if="it.remainingValue == 0 || it.remainingValue > 0">
|
|
40
59
|
<midea-wave-progress-view
|
|
41
|
-
class="drag-slider"
|
|
60
|
+
:class="['drag-slider', isScale && 'drag-slider-isScale']"
|
|
42
61
|
:accessible="true"
|
|
43
62
|
:ariaLabel="水波进度条"
|
|
44
63
|
:accessibilityHint="水波进度条"
|
|
@@ -46,89 +65,138 @@
|
|
|
46
65
|
v-if="it.remainingValueType == 4"
|
|
47
66
|
>
|
|
48
67
|
</midea-wave-progress-view>
|
|
49
|
-
<div
|
|
50
|
-
|
|
68
|
+
<div
|
|
69
|
+
:class="[
|
|
70
|
+
'progresscycle-wrapper',
|
|
71
|
+
isDiablo && 'progresscycle-wrapper-isDiablo',
|
|
72
|
+
isScale && 'progresscycle-wrapper-isScale'
|
|
73
|
+
]"
|
|
74
|
+
v-else
|
|
75
|
+
>
|
|
76
|
+
<midea-progresscycle-view
|
|
77
|
+
:class="['progresscycle', isScale && 'progresscycle-isScale']"
|
|
78
|
+
:data="it.chartData"
|
|
79
|
+
>
|
|
51
80
|
</midea-progresscycle-view>
|
|
52
81
|
</div>
|
|
53
82
|
</template>
|
|
54
83
|
<template v-else>
|
|
55
|
-
<div
|
|
56
|
-
|
|
84
|
+
<div
|
|
85
|
+
:class="[
|
|
86
|
+
'circle-noData',
|
|
87
|
+
isScale && 'circle-noData-isScale',
|
|
88
|
+
isDiablo && 'circle-noData-isDiablo'
|
|
89
|
+
]"
|
|
90
|
+
>
|
|
91
|
+
<text :class="['noData-txt', isDiablo && 'noData-txt-isDiablo']">- -</text>
|
|
57
92
|
</div>
|
|
58
93
|
</template>
|
|
59
94
|
</template>
|
|
60
95
|
<template v-else-if="it.remainingValueType == 5 && it.icons && it.icons.icon1">
|
|
61
|
-
<div
|
|
96
|
+
<div
|
|
97
|
+
:class="[
|
|
98
|
+
'circle-noData1',
|
|
99
|
+
isScale && 'circle-noData1-isScale',
|
|
100
|
+
isDiablo && 'circle-noData1-isDiablo'
|
|
101
|
+
]"
|
|
102
|
+
>
|
|
62
103
|
<image class="title-icon-noData1" :src="it.icons.icon1" style="width:88px; height:88px;"></image>
|
|
63
104
|
</div>
|
|
64
105
|
</template>
|
|
65
106
|
<template v-else>
|
|
66
|
-
<div
|
|
67
|
-
|
|
107
|
+
<div
|
|
108
|
+
:class="[
|
|
109
|
+
'circle-noData',
|
|
110
|
+
isScale && 'circle-noData-isScale',
|
|
111
|
+
isDiablo && 'circle-noData-isDiablo'
|
|
112
|
+
]"
|
|
113
|
+
>
|
|
114
|
+
<text :class="['noData-txt', isDiablo && 'noData-txt-isDiablo']">- -</text>
|
|
68
115
|
</div>
|
|
69
116
|
</template>
|
|
70
117
|
</div>
|
|
71
118
|
<div class="item-right">
|
|
72
119
|
<div class="item-right-txt">
|
|
73
|
-
<text
|
|
120
|
+
<text
|
|
121
|
+
:class="['item-txt1', isScale && 'item-txt1-isScale', isDiablo && 'item-txt1-isDiablo']"
|
|
122
|
+
:style="{ width: width / (686 / 350) + 'px' }"
|
|
123
|
+
>{{ it.name }}</text
|
|
124
|
+
>
|
|
74
125
|
<template v-if="item.deviceInfo.isOnline == 1 && it.remainingValueType != 5">
|
|
75
|
-
<
|
|
76
|
-
<
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
<text class="item-txt3">存在较多杂质，请立即清洁或更换</text>
|
|
102
|
-
</template>
|
|
103
|
-
</div>
|
|
104
|
-
<div v-else>
|
|
105
|
-
<text class="item-txt4" style="color: #8E969B">未获取到设备耗材数据</text>
|
|
106
|
-
</div>
|
|
107
|
-
</template>
|
|
126
|
+
<div class="item-txt2-row" v-if="it.remainingValue == 0 || it.remainingValue > 0">
|
|
127
|
+
<text
|
|
128
|
+
:class="['item-txt4', isScale && 'item-txt4-isScale', isDiablo && 'item-txt4-isDiablo']"
|
|
129
|
+
v-if="it.remainingStatus == 2"
|
|
130
|
+
>{{ it.classification == 3 ? '洁净度良好，请放心使用' : '余量充足，请放心使用' }}</text
|
|
131
|
+
>
|
|
132
|
+
<text
|
|
133
|
+
:class="['item-txt5', isScale && 'item-txt5-isScale', isDiablo && 'item-txt5-isDiablo']"
|
|
134
|
+
v-else-if="it.remainingStatus == 1 && it.remainingValueType != 4"
|
|
135
|
+
>{{
|
|
136
|
+
it.classification == 3 ? '洁净度下降，建议及时清洗' : '即将用尽，建议及时补充或更换'
|
|
137
|
+
}}</text
|
|
138
|
+
>
|
|
139
|
+
<text
|
|
140
|
+
v-else
|
|
141
|
+
:class="['item-txt3', isScale && 'item-txt3-isScale', isDiablo && 'item-txt3-isDiablo']"
|
|
142
|
+
>{{
|
|
143
|
+
it.classification == 3 ? '洁净度严重不足，请立即清洗' : '已用尽，请立即补充或更换'
|
|
144
|
+
}}</text
|
|
145
|
+
>
|
|
146
|
+
</div>
|
|
147
|
+
<div v-else>
|
|
148
|
+
<text :class="['item-txt4', isScale && 'item-txt4-isScale', isDiablo && 'item-txt4-isDiablo']"
|
|
149
|
+
>未获取到设备耗材数据</text
|
|
150
|
+
>
|
|
151
|
+
</div>
|
|
108
152
|
</template>
|
|
109
153
|
<template v-else-if="it.remainingValueType == 5"> </template>
|
|
110
154
|
<template v-else>
|
|
111
155
|
<div>
|
|
112
|
-
<text class="item-txt4
|
|
156
|
+
<text :class="['item-txt4', isScale && 'item-txt4-isScale', isDiablo && 'item-txt4-isDiablo']"
|
|
157
|
+
>未获取到设备耗材数据</text
|
|
158
|
+
>
|
|
113
159
|
</div>
|
|
114
160
|
</template>
|
|
115
161
|
</div>
|
|
116
162
|
<div class="item-right-arrow">
|
|
117
|
-
<div
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
163
|
+
<div
|
|
164
|
+
:class="['btn-purhase', isScale && 'btn-purhase-isScale', isDiablo && 'btn-purhase-isDiablo']"
|
|
165
|
+
v-if="it.btnType > 0"
|
|
166
|
+
@click="buyGoods(it, item.deviceInfo, false)"
|
|
167
|
+
>
|
|
168
|
+
<text
|
|
169
|
+
:class="['txt-purhase', isScale && 'txt-purhase-isScale', isDiablo && 'txt-purhase-isDiablo']"
|
|
170
|
+
v-if="it.btnType == 1"
|
|
171
|
+
>购买</text
|
|
172
|
+
>
|
|
173
|
+
<text
|
|
174
|
+
:class="['txt-purhase', isScale && 'txt-purhase-isScale', isDiablo && 'txt-purhase-isDiablo']"
|
|
175
|
+
v-else-if="it.btnType == 2"
|
|
176
|
+
>保养</text
|
|
177
|
+
>
|
|
178
|
+
<text
|
|
179
|
+
:class="['txt-purhase', isScale && 'txt-purhase-isScale', isDiablo && 'txt-purhase-isDiablo']"
|
|
180
|
+
v-else-if="it.btnType == 3"
|
|
181
|
+
>更换</text
|
|
182
|
+
>
|
|
183
|
+
<text
|
|
184
|
+
:class="['txt-purhase', isScale && 'txt-purhase-isScale', isDiablo && 'txt-purhase-isDiablo']"
|
|
185
|
+
v-else-if="it.btnType == 4"
|
|
186
|
+
>{{ it.classification == 3 ? '清洗' : '清洁' }}</text
|
|
187
|
+
>
|
|
122
188
|
</div>
|
|
123
189
|
|
|
124
190
|
<image
|
|
125
|
-
class="arrow-icon"
|
|
191
|
+
:class="['arrow-icon', isScale && 'arrow-icon-isScale', isDiablo && 'arrow-icon-isDiablo']"
|
|
126
192
|
resize="stretch"
|
|
127
193
|
:src="arrowIcon"
|
|
128
|
-
style="width:24px; height:24px;color:#C7C7CC;"
|
|
129
194
|
v-if="it.remainingValueType != 5"
|
|
130
195
|
></image>
|
|
131
|
-
<div
|
|
196
|
+
<div
|
|
197
|
+
:class="['arrow-icon', isScale && 'arrow-icon-isScale', isDiablo && 'arrow-icon-isDiablo']"
|
|
198
|
+
v-else
|
|
199
|
+
></div>
|
|
132
200
|
</div>
|
|
133
201
|
</div>
|
|
134
202
|
</div>
|
|
@@ -151,7 +219,7 @@ const dom = weex.requireModule('dom')
|
|
|
151
219
|
import { Bridge } from 'dolphin-native-bridge'
|
|
152
220
|
import Icon from './settings/icon.base64'
|
|
153
221
|
import { throttle } from 'lodash'
|
|
154
|
-
import
|
|
222
|
+
import MaterialEvent from '../material-event/index'
|
|
155
223
|
|
|
156
224
|
export default {
|
|
157
225
|
components: {},
|
|
@@ -177,6 +245,22 @@ export default {
|
|
|
177
245
|
type: String,
|
|
178
246
|
default: '686'
|
|
179
247
|
},
|
|
248
|
+
isDiablo: {
|
|
249
|
+
type: Boolean,
|
|
250
|
+
default: false
|
|
251
|
+
},
|
|
252
|
+
isScale: {
|
|
253
|
+
type: Boolean,
|
|
254
|
+
default: false
|
|
255
|
+
},
|
|
256
|
+
isCurrentHome: {
|
|
257
|
+
type: Boolean,
|
|
258
|
+
default: false
|
|
259
|
+
},
|
|
260
|
+
needBackground: {
|
|
261
|
+
type: Boolean,
|
|
262
|
+
default: false
|
|
263
|
+
},
|
|
180
264
|
isFilterShow: {
|
|
181
265
|
type: Boolean,
|
|
182
266
|
default: true // 是否是分层模式
|
|
@@ -185,27 +269,7 @@ export default {
|
|
|
185
269
|
data() {
|
|
186
270
|
return {
|
|
187
271
|
deviceMaterialList: this.data,
|
|
188
|
-
|
|
189
|
-
chartData: {
|
|
190
|
-
completedColor: '#00a4f2', //环形进度条未完成后的颜色默认#267AFF
|
|
191
|
-
incompletedColor: '#f9f9f9', //环形进度条未完成后的颜色，默认透明
|
|
192
|
-
thickness: 3, //环形进度条宽度，默认4
|
|
193
|
-
cornerRadius: 44, //环形的半径，默认是width/2
|
|
194
|
-
totalCounter: 100, //环形进度条的最大值，默认是360
|
|
195
|
-
progressCounter: 80, //设置进度值，默认是从0-360, 默认为0
|
|
196
|
-
autoProgress: false, //设置是否需要自动执行环形进度，默认false, 如果设置为true，则每秒进度值+1操作
|
|
197
|
-
clockwise: false, //环形自动执行进度的方向，默认是true，即顺时针方向，false为逆时针方向
|
|
198
|
-
startingSlice: 360, //环形进度开始的起始位置，当totalCounter为360的时候，0: 0点钟位置起点，90:3点钟位置起点 180:6点钟位置起点
|
|
199
|
-
pointShow: false, //环形进度中的进度球是否需要显示，默认不显示
|
|
200
|
-
pointRadius: 8, //默认是环形进度宽度的一半
|
|
201
|
-
pointColor: '#FFFFFF', //环形进度中的进度球颜色
|
|
202
|
-
duration: 1000
|
|
203
|
-
},
|
|
204
|
-
arrowIcon: Icon.icon_arrow,
|
|
205
|
-
from: '',
|
|
206
|
-
homegroupId: '',
|
|
207
|
-
applianceCode: '',
|
|
208
|
-
deviceInfo: {}
|
|
272
|
+
arrowIcon: Icon.icon_arrow
|
|
209
273
|
}
|
|
210
274
|
},
|
|
211
275
|
computed: {
|
|
@@ -250,7 +314,9 @@ export default {
|
|
|
250
314
|
methods: {
|
|
251
315
|
async getAllMaterialList() {
|
|
252
316
|
try {
|
|
253
|
-
this.deviceMaterialList = await
|
|
317
|
+
this.deviceMaterialList = await MaterialEvent.getAllMaterialList(this.materialParams, {
|
|
318
|
+
isDiablo: this.isDiablo
|
|
319
|
+
})
|
|
254
320
|
console.log('新的耗材数据' + JSON.stringify(this.deviceMaterialList))
|
|
255
321
|
this.getInnerHeight()
|
|
256
322
|
} catch (error) {
|
|
@@ -262,7 +328,10 @@ export default {
|
|
|
262
328
|
|
|
263
329
|
async getMaterialList() {
|
|
264
330
|
try {
|
|
265
|
-
this.deviceMaterialList = await
|
|
331
|
+
this.deviceMaterialList = await MaterialEvent.getMaterialList(this.materialParams, {
|
|
332
|
+
isDiablo: this.isDiablo,
|
|
333
|
+
isCurrentHome: this.isCurrentHome
|
|
334
|
+
})
|
|
266
335
|
console.log('新的耗材数据' + JSON.stringify(this.deviceMaterialList))
|
|
267
336
|
this.getInnerHeight()
|
|
268
337
|
} catch (error) {
|
|
@@ -273,7 +342,7 @@ export default {
|
|
|
273
342
|
},
|
|
274
343
|
|
|
275
344
|
setWavePercent(item) {
|
|
276
|
-
|
|
345
|
+
return MaterialEvent.setWavePercent(item)
|
|
277
346
|
},
|
|
278
347
|
|
|
279
348
|
// 跳转前节流
|
|
@@ -432,3 +501,4 @@ export default {
|
|
|
432
501
|
</script>
|
|
433
502
|
|
|
434
503
|
<style src="./assets/css/index.css" />
|
|
504
|
+
<style src="./assets/css/index_diablo.css" />
|
|
@@ -67,7 +67,7 @@ const serviceList = {
|
|
|
67
67
|
querySkuIdByItemCodes: '/api/cms_bff/mtc-bff-app/m2c/querySkuIdByItemCodes' //https://api.midea.com/project/6804/interface/882168?groupId=19962&cateId=123676&filterText=kuIdByItemCodes&label=%E5%95%86%E5%93%81%E6%9C%8D%E5%8A%A1&tab=
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
const
|
|
70
|
+
const MaterialEvent = {
|
|
71
71
|
//** 中控后台服务 start **/
|
|
72
72
|
getRequestCommonParam() {
|
|
73
73
|
return {
|
|
@@ -462,6 +462,41 @@ const materialEvent = {
|
|
|
462
462
|
)
|
|
463
463
|
},
|
|
464
464
|
|
|
465
|
+
convertToJson(str) {
|
|
466
|
+
let result = str
|
|
467
|
+
if (typeof str == 'string') {
|
|
468
|
+
try {
|
|
469
|
+
result = JSON.parse(str)
|
|
470
|
+
} catch (error) {
|
|
471
|
+
console.error(error)
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
return result
|
|
475
|
+
},
|
|
476
|
+
|
|
477
|
+
//统一JS->Native接口
|
|
478
|
+
commandInterfaceWrapper(param) {
|
|
479
|
+
return new Promise((resolve, reject) => {
|
|
480
|
+
bridgeModule.commandInterface(
|
|
481
|
+
JSON.stringify(param),
|
|
482
|
+
resData => {
|
|
483
|
+
resolve(this.convertToJson(resData))
|
|
484
|
+
},
|
|
485
|
+
error => {
|
|
486
|
+
reject(error)
|
|
487
|
+
}
|
|
488
|
+
)
|
|
489
|
+
})
|
|
490
|
+
},
|
|
491
|
+
|
|
492
|
+
//获取当前家庭信息
|
|
493
|
+
getCurrentHomeInfo() {
|
|
494
|
+
let param = {
|
|
495
|
+
operation: 'getCurrentHomeInfo'
|
|
496
|
+
}
|
|
497
|
+
return this.commandInterfaceWrapper(param)
|
|
498
|
+
},
|
|
499
|
+
|
|
465
500
|
//对一个设备下的耗材进行排序
|
|
466
501
|
sortConsumables(consumables) {
|
|
467
502
|
return consumables.sort((a, b) => {
|
|
@@ -494,8 +529,13 @@ const materialEvent = {
|
|
|
494
529
|
|
|
495
530
|
deviceMaterialList: [],
|
|
496
531
|
|
|
532
|
+
isDiablo: false,
|
|
533
|
+
|
|
534
|
+
isCurrentHome: false,
|
|
535
|
+
|
|
497
536
|
//批量查询耗材的情况
|
|
498
|
-
async getAllMaterialList(params) {
|
|
537
|
+
async getAllMaterialList(params, options) {
|
|
538
|
+
if (options.isDiablo) this.isDiablo = options.isDiablo
|
|
499
539
|
return new Promise(async (resolve, reject) => {
|
|
500
540
|
try {
|
|
501
541
|
console.log('进来这里啦' + JSON.stringify(params))
|
|
@@ -516,11 +556,19 @@ const materialEvent = {
|
|
|
516
556
|
})
|
|
517
557
|
},
|
|
518
558
|
|
|
519
|
-
async getMaterialList(params) {
|
|
559
|
+
async getMaterialList(params, options) {
|
|
560
|
+
if (options.isDiablo) this.isDiablo = options.isDiablo
|
|
561
|
+
if (options.isCurrentHome) this.isCurrentHome = options.isCurrentHome
|
|
520
562
|
return new Promise(async (resolve, reject) => {
|
|
521
563
|
try {
|
|
522
|
-
console.log('进来这里啦' + JSON.stringify(params))
|
|
523
|
-
|
|
564
|
+
console.log('进来这里啦11' + JSON.stringify(params))
|
|
565
|
+
let deviceList = []
|
|
566
|
+
if (options.isCurrentHome) {
|
|
567
|
+
const res = await this.getCurrentHomeInfo()
|
|
568
|
+
deviceList = res.deviceList
|
|
569
|
+
} else {
|
|
570
|
+
deviceList = await this.getDeviceList(params.homegroupId)
|
|
571
|
+
}
|
|
524
572
|
await this.queryBatchMaterialSingle(deviceList, params)
|
|
525
573
|
console.log('最终的deviceMaterialList：' + JSON.stringify(this.deviceMaterialList))
|
|
526
574
|
resolve(this.deviceMaterialList)
|
|
@@ -605,7 +653,8 @@ const materialEvent = {
|
|
|
605
653
|
//处理接口返回数据
|
|
606
654
|
async handleMaterialRes(deviceList) {
|
|
607
655
|
let tmpcodeList = []
|
|
608
|
-
let circleColorList = ['#F56428', '#FFAA10', '#00A4F2']
|
|
656
|
+
let circleColorList = this.isDiablo ? ['#D35936', '#BE8214', '#0490D3'] : ['#F56428', '#FFAA10', '#00A4F2']
|
|
657
|
+
console.log('颜色集合：' + JSON.stringify(circleColorList))
|
|
609
658
|
this.deviceMaterialList.forEach(item => {
|
|
610
659
|
let device = deviceList.findIndex(it => item.applianceCode == it.deviceId)
|
|
611
660
|
|
|
@@ -633,6 +682,8 @@ const materialEvent = {
|
|
|
633
682
|
const percent = it.percent
|
|
634
683
|
? it.percent
|
|
635
684
|
: Math.ceil(this.floatMul(this.floatDiv(it.remainingValue, it.total), 100))
|
|
685
|
+
|
|
686
|
+
chartData.incompletedColor = this.isDiablo ? '#2b2f32' : '#ffffff'
|
|
636
687
|
it.chartData = {
|
|
637
688
|
...chartData,
|
|
638
689
|
...{
|
|
@@ -824,7 +875,7 @@ const materialEvent = {
|
|
|
824
875
|
(it.washingServiceGoodsInfo.skulink || it.washingServiceGoodsInfo.skuId)))
|
|
825
876
|
) {
|
|
826
877
|
it.btnType = 4
|
|
827
|
-
it.btnText = '清洁'
|
|
878
|
+
it.btnText = it.classification == 3 ? '清洗' : '清洁'
|
|
828
879
|
}
|
|
829
880
|
}
|
|
830
881
|
}
|
|
@@ -839,15 +890,14 @@ const materialEvent = {
|
|
|
839
890
|
let type = item.remainingStatus
|
|
840
891
|
let percent = type == 2 ? 0.4 : 0.05
|
|
841
892
|
let percentTxt = type == 2 ? '充足' : '不足'
|
|
842
|
-
let textColorList = ['#F56428', '#F56428', '#00A4F2']
|
|
843
|
-
let frontColorList = ['#F56428', '#F56428', '#9fdaf5']
|
|
844
|
-
let backColorList = ['#fc9791', '#fc9791', '#c7e8f7']
|
|
845
|
-
|
|
893
|
+
let textColorList = this.isDiablo ? ['#D35926', '#D35926', '#0490D3'] : ['#F56428', '#F56428', '#00A4F2']
|
|
894
|
+
let frontColorList = this.isDiablo ? ['#D35926', '#D35926', '#ADE0F6'] : ['#F56428', '#F56428', '#9fdaf5']
|
|
895
|
+
let backColorList = this.isDiablo ? ['#FCA6A1', '#FCA6A1', '#CFEBF8'] : ['#fc9791', '#fc9791', '#c7e8f7']
|
|
846
896
|
return {
|
|
847
897
|
frontWaveColor: frontColorList[type], //已完成后的颜色默认#FFFFFF
|
|
848
898
|
backWaveColor: backColorList[type],
|
|
849
899
|
animate: true,
|
|
850
|
-
backgroundColor: '#FFFFFF', //背景色 默认为#000000
|
|
900
|
+
backgroundColor: this.isDiablo ? '#1E2326' : '#FFFFFF', //背景色 默认为#000000
|
|
851
901
|
progress: percent, // 进度 [0 ... 1]
|
|
852
902
|
textFont: 11, //字体大小，默认为14
|
|
853
903
|
text: percentTxt, //文本 默认为空
|
|
@@ -857,4 +907,4 @@ const materialEvent = {
|
|
|
857
907
|
}
|
|
858
908
|
}
|
|
859
909
|
|
|
860
|
-
export default
|
|
910
|
+
export default MaterialEvent
|