qniao
/
print-package-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

样式修改，mock更换

devlop
mo-bai 3 years ago
parent
c08e0d9775
commit
678c0180e3
8 changed files with 52 additions and 146 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      apis/deviceApi.js
  2. 8
      apis/factoryApi.js
  3. 5
      components/business-components/factoryItem.vue
  4. 132
      pages/device-production-info/index.vue
  5. 45
      pages/digital-workshops/index.vue
  6. BIN
      static/imgs/factory/calc-icon.png
  7. BIN
      static/imgs/factory/clock-icon.png
  8. BIN
      static/imgs/factory/electric-box-icon.png

8
apis/deviceApi.js
View File

@ -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
})
}

8
apis/factoryApi.js
View File

@ -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
})
}

5
components/business-components/factoryItem.vue
View File

@ -9,10 +9,7 @@
</view>
</view>
<view class="center-group_1 flex-row">
<image
src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16508554099266202544.png"
class="image_10"
/>
<image src="/static/imgs/promotion/address-icon.png" class="image_10" />
<text class="text_13">{{ item.address }}</text>
<text class="text_14">{{ item.mileage === -1 ? '未知' : '距您' + item.mileage + 'km' }}</text>
</view>

132
pages/device-production-info/index.vue
View File

@ -38,39 +38,30 @@
<view class="flex-row section_4" v-show="curTab == 1">
<view class="flex-col group_11">
<view class="flex-row group_12">
<image
src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16510517429533841051.png"
class="image_6"
/>
<image src="/static/imgs/factory/electric-box-icon.png" class="image_6" />
<text class="text_16">当月产能(件)</text>
</view>
<text class="text_17">{{ info.monthCapacity }}</text>
<text class="text_18">今日：{{ info.todayCapacity }}</text>
<text class="text_19">昨日：{{ info.yesterdayCapacity }}</text>
<text class="text_20">累计：{{ info.totalCapacity }}</text>
<text class="text_18">昨日：{{ info.yesterdayCapacity }}</text>
<text class="text_18">累计：{{ info.totalCapacity }}</text>
</view>
<view class="flex-col group_13">
<view class="flex-row group_14">
<image
src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16510517429532568250.png"
class="image_6 image_8"
/>
<text class="text_21">当月工作</text>
<view class="flex-col group_11">
<view class="flex-row group_12">
<image src="/static/imgs/factory/clock-icon.png" class="image_6" />
<text class="text_16">当月工作</text>
</view>
<text class="text_22">{{ info.monthWorkHour }} h</text>
<text class="text_23">今日：{{ info.todayWorkHour }}</text>
<text class="text_24">昨日：{{ info.yesterdayWorkHour }}</text>
<text class="text_25">累计：{{ info.totalWorkHour }}</text>
<text class="text_17">{{ info.monthWorkHour }} h</text>
<text class="text_18">今日：{{ info.todayWorkHour }}</text>
<text class="text_18">昨日：{{ info.yesterdayWorkHour }}</text>
<text class="text_18">累计：{{ info.totalWorkHour }}</text>
</view>
<view class="flex-col equal-division-item">
<view class="flex-row group_15">
<image
src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16510517429530126367.png"
class="image_6 image_9"
/>
<text class="text_26">开机率</text>
<view class="flex-col group_11">
<view class="flex-row group_12">
<image src="/static/imgs/factory/calc-icon.png" class="image_6" />
<text class="text_16">开机率</text>
</view>
<text class="text_27">{{ info.startupRate }}%</text>
<text class="text_17">{{ info.startupRate }}%</text>
</view>
</view>
<view class="flex-col items-center empty-info" v-show="curTab == 2">
@ -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;

45
pages/digital-workshops/index.vue
View File

@ -20,17 +20,13 @@
</view>
<view class="bottom-group flex-col">
<view class="flex-row section_5">
<view class="flex-col group_3" v-for="(value, key) in listObj[curTab].type" :key="key">
<view>
<text class="text_5 text-ellipsis">{{ key }}</text>
<view class="grid-item justify-evenly group_4">
<view class="left-section"></view>
<text>生产中：{{ value[0] }}</text>
</view>
<view class="grid-item justify-evenly group_5">
<view class="left-section red"></view>
<text>闲置中：{{ value[1] }}</text>
</view>
<view class="flex-row group_3" v-for="(value, key) in listObj[curTab].type" :key="key">
<view class="group_4">
<text class="text_5">{{ key }}(</text>
<text class="text_7">{{ value[0] }}</text>
<text class="text_5">/</text>
<text class="text_11">{{ value[1] }}</text>
<text class="text_5">)</text>
</view>
</view>
<view v-if="!listObj['所有设备'].list || listObj['所有设备'].list.length == 0" class="flex-row-center-center empty_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 {

BIN
static/imgs/factory/calc-icon.png
View File

Before After
Width: 28  |  Height: 28  |  Size: 1.1 KiB

BIN
static/imgs/factory/clock-icon.png
View File

Before After
Width: 28  |  Height: 28  |  Size: 921 B

BIN
static/imgs/factory/electric-box-icon.png
View File

Before After
Width: 28  |  Height: 28  |  Size: 477 B
Write Preview
Loading…
Cancel
Save