diff --git a/apis/deviceApi.js b/apis/deviceApi.js
index d84faa0..e8d074c 100644
--- a/apis/deviceApi.js
+++ b/apis/deviceApi.js
@@ -75,8 +75,8 @@ export function getEquipmentList(data = {}) {
*/
export function getEquipmentInfo(data = {}) {
return http.get({
- // url: `/base-paper-trading/get/mechanical-equipment/${data.id}`,
- url: `https://console-mock.apipost.cn/app/mock/project/00682407-8a2f-402b-ae05-bea0dace4b58/getDeviceInfo`,
+ url: `/base-paper-trading/get/mechanical-equipment/${data.id}`,
+ // url: `https://console-mock.apipost.cn/app/mock/project/00682407-8a2f-402b-ae05-bea0dace4b58/getDeviceInfo`,
data
})
}
@@ -108,8 +108,8 @@ export function removeDevice(data = {}) {
*/
export function getDeviceListV2(data = {}) {
return http.get({
- // url: `/base-paper-trading/get/mechanical-equipment/new/list`,
- url: `https://console-mock.apipost.cn/app/mock/project/00682407-8a2f-402b-ae05-bea0dace4b58/getList`,
+ url: `/base-paper-trading/get/mechanical-equipment/new/list`,
+ // url: `https://console-mock.apipost.cn/app/mock/project/00682407-8a2f-402b-ae05-bea0dace4b58/getList`,
data
})
}
diff --git a/apis/factoryApi.js b/apis/factoryApi.js
index cfdc429..b882ef2 100644
--- a/apis/factoryApi.js
+++ b/apis/factoryApi.js
@@ -67,8 +67,8 @@ export function getCaseList(data = {}) {
*/
export function getCameraListApi(data = {}) {
return http.get({
- // url: `/base-paper-trading/get/factory/camera/list`,
- url: `https://console-mock.apipost.cn/app/mock/project/00682407-8a2f-402b-ae05-bea0dace4b58/getCameraList`,
+ url: `/base-paper-trading/get/factory/camera/list`,
+ // url: `https://console-mock.apipost.cn/app/mock/project/00682407-8a2f-402b-ae05-bea0dace4b58/getCameraList`,
data
})
}
@@ -78,8 +78,8 @@ export function getCameraListApi(data = {}) {
*/
export function getMyFactoryList(data = {}) {
return http.get({
- // url: `/yyt-uec/get/my/factory/list`,
- url: `https://console-mock.apipost.cn/app/mock/project/00682407-8a2f-402b-ae05-bea0dace4b58/getFactoryList`,
+ url: `/yyt-uec/get/my/factory/list`,
+ // url: `https://console-mock.apipost.cn/app/mock/project/00682407-8a2f-402b-ae05-bea0dace4b58/getFactoryList`,
data
})
}
diff --git a/components/business-components/factoryItem.vue b/components/business-components/factoryItem.vue
index 4c8258e..cf7c904 100644
--- a/components/business-components/factoryItem.vue
+++ b/components/business-components/factoryItem.vue
@@ -9,10 +9,7 @@
-
+
{{ item.address }}
{{ item.mileage === -1 ? '未知' : '距您' + item.mileage + 'km' }}
diff --git a/pages/device-production-info/index.vue b/pages/device-production-info/index.vue
index ffcace4..51f50a7 100644
--- a/pages/device-production-info/index.vue
+++ b/pages/device-production-info/index.vue
@@ -38,39 +38,30 @@
-
+
当月产能(件)
{{ info.monthCapacity }}
今日：{{ info.todayCapacity }}
- 昨日：{{ info.yesterdayCapacity }}
- 累计：{{ info.totalCapacity }}
+ 昨日：{{ info.yesterdayCapacity }}
+ 累计：{{ info.totalCapacity }}
-
-
-
- 当月工作
+
+
+
+ 当月工作
- {{ info.monthWorkHour }} h
- 今日：{{ info.todayWorkHour }}
- 昨日：{{ info.yesterdayWorkHour }}
- 累计：{{ info.totalWorkHour }}
+ {{ info.monthWorkHour }} h
+ 今日：{{ info.todayWorkHour }}
+ 昨日：{{ info.yesterdayWorkHour }}
+ 累计：{{ info.totalWorkHour }}
-
-
-
- 开机率
+
+
+
+ 开机率
- {{ info.startupRate }}%
+ {{ info.startupRate }}%
@@ -257,12 +248,15 @@ export default {
.group_11 {
margin-top: 30rpx;
flex: 1 1 auto;
+ width: 30%;
+ text-align: center;
.group_12 {
padding-left: 8rpx;
color: rgb(136, 136, 136);
font-size: 24rpx;
line-height: 33rpx;
white-space: nowrap;
+ justify-content: center;
.text_16 {
margin-left: 9rpx;
}
@@ -283,94 +277,6 @@ export default {
line-height: 33rpx;
white-space: nowrap;
}
- .text_19 {
- margin-top: 5rpx;
- color: rgb(136, 136, 136);
- font-size: 24rpx;
- line-height: 33rpx;
- white-space: nowrap;
- }
- .text_20 {
- margin-top: 5rpx;
- align-self: left;
- color: rgb(136, 136, 136);
- font-size: 24rpx;
- line-height: 33rpx;
- white-space: nowrap;
- }
- }
- .group_13 {
- margin-left: 40rpx;
- margin-top: 30rpx;
- .group_14 {
- padding-left: 28rpx;
- color: rgb(136, 136, 136);
- font-size: 24rpx;
- line-height: 33rpx;
- white-space: nowrap;
- .image_8 {
- margin-bottom: 2rpx;
- }
- .text_21 {
- margin-left: 8rpx;
- }
- }
- .text_22 {
- margin-top: 12rpx;
- align-self: center;
- color: rgb(51, 51, 51);
- font-size: 28rpx;
- font-weight: 500;
- line-height: 40rpx;
- white-space: nowrap;
- }
- .text_23 {
- margin-top: 6rpx;
- color: rgb(136, 136, 136);
- font-size: 24rpx;
- line-height: 33rpx;
- white-space: nowrap;
- }
- .text_24 {
- margin-top: 5rpx;
- color: rgb(136, 136, 136);
- font-size: 24rpx;
- line-height: 33rpx;
- white-space: nowrap;
- }
- .text_25 {
- margin-top: 5rpx;
- color: rgb(136, 136, 136);
- font-size: 24rpx;
- line-height: 33rpx;
- white-space: nowrap;
- }
- }
- .equal-division-item {
- margin-left: 30rpx;
- padding: 29rpx 25rpx 67rpx 25rpx;
- .group_15 {
- color: rgb(136, 136, 136);
- font-size: 24rpx;
- line-height: 33rpx;
- white-space: nowrap;
- .image_9 {
- margin-left: 75rpx;
- }
- .text_26 {
- margin-left: 8rpx;
- }
- }
- .text_27 {
- margin-right: 23rpx;
- margin-top: 12rpx;
- align-self: flex-end;
- color: rgb(51, 51, 51);
- font-size: 28rpx;
- font-weight: 500;
- line-height: 40rpx;
- white-space: nowrap;
- }
}
.image_6 {
width: 28rpx;
diff --git a/pages/digital-workshops/index.vue b/pages/digital-workshops/index.vue
index 261e3dd..a65f3ae 100644
--- a/pages/digital-workshops/index.vue
+++ b/pages/digital-workshops/index.vue
@@ -20,17 +20,13 @@
-
-
- {{ key }}
-
-
- 生产中：{{ value[0] }}
-
-
-
- 闲置中：{{ value[1] }}
-
+
+
+ {{ key }}(
+ {{ value[0] }}
+ /
+ {{ value[1] }}
+ )
@@ -297,17 +293,24 @@ export default {
width: 24%;
margin-right: 6rpx;
margin-bottom: 16rpx;
- .text_5 {
- color: rgb(31, 31, 31);
- font-size: 28rpx;
- line-height: 40rpx;
- width: 100%;
- }
.group_4 {
- margin-top: 10rpx;
- }
- .group_5 {
- margin-top: 9rpx;
+ white-space: nowrap;
+ height: 40rpx;
+ .text_5 {
+ color: rgb(31, 31, 31);
+ font-size: 28rpx;
+ line-height: 40rpx;
+ }
+ .text_7 {
+ color: rgb(82, 196, 26);
+ font-size: 28rpx;
+ line-height: 40rpx;
+ }
+ .text_11 {
+ color: rgb(255, 72, 73);
+ font-size: 28rpx;
+ line-height: 40rpx;
+ }
}
}
.empty_1 {
diff --git a/static/imgs/factory/calc-icon.png b/static/imgs/factory/calc-icon.png
new file mode 100644
index 0000000..cc72145
Binary files /dev/null and b/static/imgs/factory/calc-icon.png differ
diff --git a/static/imgs/factory/clock-icon.png b/static/imgs/factory/clock-icon.png
new file mode 100644
index 0000000..a55c6fb
Binary files /dev/null and b/static/imgs/factory/clock-icon.png differ
diff --git a/static/imgs/factory/electric-box-icon.png b/static/imgs/factory/electric-box-icon.png
new file mode 100644
index 0000000..cf99ab7
Binary files /dev/null and b/static/imgs/factory/electric-box-icon.png differ