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

Compare commits

base: mt-fe-group:fedff36ff0a4a2e4ee2e35b410759937a69dc660
Branches Tags
mt-fe-group:master
mt-fe-group:lb
mt-fe-group:zjl
mt-fe-group:gtz
..
compare: mt-fe-group:40268268699defa09094f64ff7277246176c0b38
Branches Tags
mt-fe-group:lb
mt-fe-group:master
mt-fe-group:zjl
mt-fe-group:gtz

No commits in common. "fedff36ff0a4a2e4ee2e35b410759937a69dc660" and "40268268699defa09094f64ff7277246176c0b38" have entirely different histories.
fedff36ff0 ... 4026826869

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

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

@ -63,7 +63,6 @@ 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;
@ -93,26 +92,6 @@ 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;