mt-fe-group/11-mes-new
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into lb

Browse Source
This commit is contained in:
lb 2022-12-01 08:55:17 +08:00
commit fedff36ff0
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/orderManage/orderManagerCockpit/components/orderStatus.vue
View File

@ -1,19 +1,19 @@
<template> <template>
<div class="state-box"> <div class="state-box">
<span v-if="this.injectData.status === 1"> <span v-if="this.injectData.status === 1">
<svg-icon icon-class="yellow_dot" style="font-size: 14px; position: relative; top: .08em" /> <svg-icon icon-class="yellow_dot" class="tip"/>
在途 在途
</span> </span>
<span v-if="this.injectData.status === 2"> <span v-if="this.injectData.status === 2">
<svg-icon icon-class="blue_dot" style="font-size: 14px; position: relative; top: .08em" /> <svg-icon icon-class="blue_dot" class="tip"/>
已下发 已下发
</span> </span>
<span v-if="this.injectData.status === 3"> <span v-if="this.injectData.status === 3">
<svg-icon icon-class="green_dot" style="font-size: 14px; position: relative; top: .08em" /> <svg-icon icon-class="green_dot" class="tip" />
已完成 已完成
</span> </span>
<span v-if="this.injectData.status === 4"> <span v-if="this.injectData.status === 4">
<svg-icon icon-class="orange_dot" style="font-size: 14px; position: relative; top: .08em" /> <svg-icon icon-class="orange_dot" class="tip" />
待下发 待下发
</span> </span>
</div> </div>
@ -44,8 +44,11 @@ export default {
} }
} }
</script> </script>
<style scoped> <style lang="scss" scoped>
.state-box { .state-box {
height: calc(15px * var(--beilv)) .tip {
font-size: calc(14px * var(--beilv));
vertical-align: middle;
}
} }
</style> </style>

21
src/views/orderManage/orderManagerCockpit/components/workOrder.vue
View File

@ -63,6 +63,7 @@ export default {
justify-content: space-between; justify-content: space-between;
.box { .box {
width: 49.5%; width: 49.5%;
height: 49.5%;
margin-bottom: 8px; margin-bottom: 8px;
background-image: url('../../../../assets/img/cockpit/module-back.png'); background-image: url('../../../../assets/img/cockpit/module-back.png');
background-repeat: no-repeat; background-repeat: no-repeat;
@ -92,6 +93,26 @@ export default {
background: #366F5D; background: #366F5D;
} }
} }
::-webkit-scrollbar {
width: calc(8px * var(--beilv));
}
::-webkit-scrollbar-track {
background-color: #14243f;
border-radius: 0;
}
::-webkit-scrollbar-button {
width: calc(8px * var(--beilv));
height: calc(8px * var(--beilv));
background: #5bc4bf9f;
position: relative;
}
::-webkit-scrollbar-thumb {
border-radius: calc(8px * var(--beilv));
background: #5bc4bf9f;
}
} }
.progress-box { .progress-box {
border-radius: 5px; border-radius: 5px;