mt-fe-group/yudao-init
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'projects/mescc/zhp' (#93) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #93
This commit is contained in:
朱菊兰 2024-07-11 15:15:28 +08:00
commit 53b10a9847
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/Breadcrumb/index.vue
View File

@ -35,12 +35,12 @@ export default {
if (val == true) { if (val == true) {
let item = document.getElementsByClassName('el-breadcrumb__separator') let item = document.getElementsByClassName('el-breadcrumb__separator')
// let item =document.getElementsByClassName('') // let item =document.getElementsByClassName('')
item[0].classList.add("changeColor") item[0].style.color = rgba(255, 255, 255, 0.45)
item[1].classList.add("changeColor") item[1].style.color = rgba(255, 255, 255, 0.45)
} else { } else {
let item = document.getElementsByClassName('el-breadcrumb__separator') let item = document.getElementsByClassName('el-breadcrumb__separator')
item[0].classList.remove("changeColor") item[0].style.color = ''
item[1].classList.remove("changeColor") item[1].style.color = ''
} }
}, },
$route(route) { $route(route) {
@ -103,11 +103,11 @@ export default {
color:rgba(0, 0, 0, 0.65) color:rgba(0, 0, 0, 0.65)
} }
</style> </style>
<style lang="scss"> <!-- <style lang="scss">
.changeColor { .changeColor {
--theme-color: rgba(255, 255, 255, 0.45); --theme-color: rgba(255, 255, 255, 0.45);
} }
.el-breadcrumb__separator { .el-breadcrumb__separator {
color:var(--theme-color); color:var(--theme-color);
} }
</style> </style> -->

5
src/views/produce/workOrder/dayReportComponents/dayReportExportChart/productYield.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-07-08 14:51:47 * @Date: 2024-07-08 14:51:47
* @LastEditTime: 2024-07-09 11:07:47 * @LastEditTime: 2024-07-11 14:48:15
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -67,12 +67,13 @@ export default {
legend: { legend: {
bottom: 0, bottom: 0,
left: 'center', left: 'center',
itemGap:40, itemGap:60,
}, },
series: [ series: [
{ {
// name: 'Access From', // name: 'Access From',
type: 'pie', type: 'pie',
center: ['50%', '45%'],
radius: ['50%', '70%'], radius: ['50%', '70%'],
avoidLabelOverlap: false, avoidLabelOverlap: false,
data: this.pieList, data: this.pieList,

2
src/views/report/productionSituationMW.vue
View File

@ -82,7 +82,7 @@
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight" <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
:legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" /> :legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
</el-col> </el-col>
<el-col :span="6" style="margin-top: 30px"> <el-col :span="6" style="margin-top: 21px">
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'" :chartNum="chartNum" /> :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'" :chartNum="chartNum" />
</el-col> </el-col>

2
src/views/report/productionSituationTablets.vue
View File

@ -83,7 +83,7 @@
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight" <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
:legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" /> :legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
</el-col> </el-col>
<el-col :span="6" style="margin-top: 30px"> <el-col :span="6" style="margin-top: 21px">
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId=" 'chartDayTarget'" :chartNum="chartNum" /> :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId=" 'chartDayTarget'" :chartNum="chartNum" />
</el-col> </el-col>