From 678c0180e3c6571c933545b5867dd54b01e4e184 Mon Sep 17 00:00:00 2001
From: mo-bai <1873032855@qq.com>
Date: Thu, 28 Apr 2022 18:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8Cmo?=
=?UTF-8?q?ck=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apis/deviceApi.js | 8 +-
apis/factoryApi.js | 8 +-
.../business-components/factoryItem.vue | 5 +-
pages/device-production-info/index.vue | 132 +++---------------
pages/digital-workshops/index.vue | 45 +++---
static/imgs/factory/calc-icon.png | Bin 0 -> 1143 bytes
static/imgs/factory/clock-icon.png | Bin 0 -> 921 bytes
static/imgs/factory/electric-box-icon.png | Bin 0 -> 477 bytes
8 files changed, 52 insertions(+), 146 deletions(-)
create mode 100644 static/imgs/factory/calc-icon.png
create mode 100644 static/imgs/factory/clock-icon.png
create mode 100644 static/imgs/factory/electric-box-icon.png
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 0000000000000000000000000000000000000000..cc72145edea7e05bf97e5c4f7b5f28203fa6111b
GIT binary patch
literal 1143
zcmV--1c>{IP)Px#1am@3R0s$N2z&@+hyVZtAxT6*R7i=X)?bWWRTana&pP+EkWSPg6SWz@7b$JS
z0|{siDSwLE8be}Yv`|B0Vv19ON8ow%OPS!bX1U3;D1S!;)L+3su@wL-%RX_+*L
zKA|n06prAaDF-|pZ=EY#^n9{58!mH`$~Q4^&cq;%s_e8S4$Tj^F_%aW;?m+7$1Bpy
z(qWY`VUaX|PfOPb%TY-w?DKCsjKsvbfg5v`bRRCn7@oAiGg|S#Id}KNyhPJ_+#m%0
zu4CA?c)K@nW3JM%NeE%oq|F|QlXHS*+i-pcoA43oxGA@v9^(|SF5_cmXV3eaANf^G
z%?ox4dNCfwCxt(2x>qaOP@xt`{mm{EM*lAuY>lJBFg}p3H0c}Dk80p$Zc+}Q
z6oXiVwc7S(OY;oaZLY>2uuH!+-~!L#pID^Nx*GTwE7bqlxCNe>8O1&2YLm*f()+l|
zF`qvJR@sk>@R}(vf>v~dr^>Q5T3J=n3efS&S)|{uPV2W8dr9R)Nu+-c*cakw#<~$c
z@Dkd%$b`!)X&DGF&n^@8f+^4Xm%mC&F(&=4C+w%*oe^Psj0>-q#Ftj3H
zMyH5pzOW&WXgGjv(l1PSHNP`!oK;<69;tA!WU+GIu-mP~50Kb{wy8*%%i|-BF;_b@A@s>2I?yKu(!IsY{
zkZ`PAeKx=CYbv*v``X{ie(CGQw}e7`%eM4#35my5TW?@6w(BrnoFS|+3Sa^SaTzE`ajQd*4Tdfk~0rc_vObduvxmYc>bZ`DgW_D+he>3=n`$Ki$E5k
zgC|bkS#Mw+pjnOu>q-EaR14&=FeWvm0hMLl|E#v7Dmy$BubwS*?}IShmHlN>uTiVD
zx1~3*$3pw31u}o&w6(G_;c}IwItEqxq$%lr;fQo__W84yeF%S>r65PYPx#1am@3R0s$N2z&@+hyVZsLrFwIR7i=n);(yIcNE9*&w0FwrV@Oq!FJH4wqUW9
zLN+TDw6lY;cIr|p6-&{{mqdxw7eW>nvAPLqq3BW&bZG}yF`~2x#dgTj5(gDuz~tth
z4$pJrHOxSadLhfSD
znZaCU(k|@A@&y;hB(A8tI3IX+V1M@F5MFN?eIneJ#uXk)-5PrEp0K*b?x}Rvskqu6
zus?T7dxa&{$Q^vA!>GZi|IAzf&IA?Urq0bVJGAItfw%W
zj^rj`KzYybqmyx_)ud>F^-6oI-k<9BEeZyw;ull)N_VS~9r|-et4X=TGC)R@clJcx
zK0`6KC|Iiw<_b0E@TN4W(`N?bFPb|nqp=wv!}G!N3*YA+9)gRu#%b
zOyS}G1Z?%YtcK_4GNpTwj{0(scV>(}!*E>i;#n2CWz~Lcq9)vz)?-bZs5)xst$s5V
zUZh7F)>QFaH|9aDs%Pu*J{d&L;-polu}f=Oe4%HS_+bWqbJZGiDW+<|C_WNaJL+BE
z_;o&7TyPA>7FblN{kamGs@^Rq)LmB=PZ~aH%Tc>}O`qmTgr7=aS)H#`CR-iJO|yT!
zNFB}|^i{o4C*rPYdfi1lRVJ(fhjP^`!3MKaI4&%eQp5S?R0$l4N7C79Y^}mc2Xn>0
zhSd!S8&OvN)A8HOKsXgwh0B%EMm6UQSkG7|-SgHr1ayq5H?Z988&##=)>iE+HLBr!>z%a^Y^p!k3EQiBwgH_jvvrI~qY6Ja
vLw`QCyYf<*;kZ>;=CKK59=H@!i*fNce|-c)>_;%j00000NkvXXu0mjfwam4X
literal 0
HcmV?d00001
diff --git a/static/imgs/factory/electric-box-icon.png b/static/imgs/factory/electric-box-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf99ab75c47fb5d9da1f341c6ba06a6d981dcb3f
GIT binary patch
literal 477
zcmV<30V4j1P)Px#1am@3R0s$N2z&@+hyVZqhen>JM&lXAb9ke$1aU
zVOjfm4|j#ZFLP~_rowAa;^q8sECe0oZ9K+TeCh<`Dz?lVI*zv&gS~~2up=?^)N#D&
zggeY#>Bxp1`~+?+g>5z9uI`wbg4CZM?yU@Nlp|S*8wT%IO{@hr`i`?AOd9-Yvy}kP
zV&Y~IZ{!H$bur6p_|H}1@LE3byeM0`^*4Z*rC|}UKFTj~lIlajO3C@2>_{
zZJNCAPHi2nfjKk~9{x9=O?$Gwle7Zn&_LF^YYnt%uWO$yIfs~Y*L2XOi+vmuk4o~C
zJN%uyG{s42nqr5|lVJ?P2bxPEoW!KOe-;Dd)UyTt$cv_kVs~`y7A@U%1GZed?!XFn
z-GCMDIst3kK{&`)bN^S+mp%&LYKsBslCX_0_}tL4hwCfK*zN>7&vBuC^O5ogd(dCN
T6?tmN00000NkvXXu0mjfz^U1{
literal 0
HcmV?d00001