Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-04-28 16:55:23 +08:00
commit 0ba80b20e7
10 changed files with 129 additions and 48 deletions

View File

@ -40,5 +40,80 @@ export default {
.el-form-item__label { .el-form-item__label {
color: #fff; color: #fff;
} }
.el-table th {
// #253855 #30619B
background: linear-gradient(to bottom, #2B313D, #3267A7);
color: #fff;
border-bottom: 1px solid #84FCFD !important;
}
.el-table tr {
background-color: #335684;
color: #fff;
}
.el-table--striped .el-table__body tr.el-table__row--striped td {
background-color: #25447D;
color: #fff;
}
.el-table td,.building-top .el-table th.is-leaf {
border-bottom: 1px solid #6983A5;
}
.el-table::before{
border-bottom: 1px solid #6983A5;
background-color: #6983A5;
height: 1px;
}
.el-table--enable-row-hover .el-table__body tr:hover>td {
background-color: #6983A5;
}
.el-pagination__total {
color: #E1E3E6;
}
.el-pagination__jump {
color: #E1E3E6;
}
.el-input__inner {
background-color: transparent;
border: 1px solid #77E2E7;
color: #E1E3E6;
}
.el-pagination__sizes .el-input .el-input__inner {
color: #E3E4E7;
border: 1px solid #E3E4E7;
}
.el-pagination__editor.el-input .el-input__inner {
color: #E3E4E7;
border: 1px solid #E3E4E7;
}
.el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {
color: #E3E4E7;
border: 1px solid #E3E4E7;
background-color: transparent;
}
.el-pagination.is-background .btn-next {
color: #E3E4E7;
border: 1px solid #E3E4E7;
background-color: transparent;
}
.el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #98F4FB;
color: #000;
}
.el-button--primary {
background-color: #84FCFD;
border: #84FCFD;
color: #285050;
}
.el-button--default {
background-color: transparent;
border: 1px solid #84FCFD;
color: #D5D6DA;
}
.el-table__empty-block {
background-color: #335684;
.el-table__empty-text {
color: #D5D6DA;
}
}
} }
</style> </style>

View File

@ -11,6 +11,7 @@
v-bind="$attrs" v-bind="$attrs"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
style="color: #E1E3E6;"
/> />
</div> </div>
</template> </template>
@ -106,7 +107,7 @@ export default {
<style scoped> <style scoped>
.pagination-container { .pagination-container {
margin-top: 20px; margin-top: 20px;
background: #fff; /* background: #fff; */
/* padding: 32px 16px; */ /* padding: 32px 16px; */
display: flex; display: flex;
justify-content: end; justify-content: end;

View File

@ -11,13 +11,13 @@
<el-form :model="formData" ref="form" label-width="80px" :inline="false" size="small" inline width="100%"> <el-form :model="formData" ref="form" label-width="80px" :inline="false" size="small" inline width="100%">
<el-row > <el-row >
<el-col :span="12"> <el-col :span="12">
<el-form-item class="formItem" label="维修情况" size="small"> <el-form-item class="formItem" size="small">
<div class="chart" id="fixPieChart" ref="pieChart"></div> <div class="chart" id="fixPieChart" ref="pieChart"></div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="formItem" label=" 配件使用情况" label-width="110px" size="small"> <el-form-item class="formItem" size="small">
<div class="chart" id="fixBarChart"></div> <div class="chart" id="fixBarChart"></div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -53,7 +53,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%" stripe>
<el-table-column <el-table-column
v-for="item in tableColumn" v-for="item in tableColumn"
:prop="item.prop" :prop="item.prop"
@ -76,9 +76,9 @@
/> />
</div> </div>
<span slot="footer" class="dialog-footer"> <!-- <span slot="footer" class="dialog-footer">
<el-button @click="open = false"> </el-button> <el-button @click="open = false"> </el-button>
</span> </span> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -148,7 +148,7 @@ export default {
}, },
{ {
label: '维修状态', label: '维修状态',
prop: 'repairStatus', prop: 'statusName',
align: 'center' align: 'center'
} }
], ],
@ -162,8 +162,8 @@ export default {
}, },
methods: { methods: {
setOpen(params) { setOpen(params) {
this.open = params.open, this.open = params.open
this.maType = params.maType, this.maType = params.maType
this.tableData = [] this.tableData = []
this.total = 0 this.total = 0
setTimeout(() => { setTimeout(() => {
@ -179,7 +179,7 @@ export default {
pageNum: this.queryParams.pageNum, pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
maType: this.maType, maType: this.maType,
materialCode: this.formData.repairCode.trim(), repairCode: this.formData.repairCode.trim(),
unitId: this.formData.materialReqUnitValue, unitId: this.formData.materialReqUnitValue,
projectId: this.formData.materialReqProjectValue, projectId: this.formData.materialReqProjectValue,
} }
@ -224,13 +224,19 @@ export default {
if (key === 'num2' && data[key]) pieData.push({ value: data[key], name: '维修合格' }) if (key === 'num2' && data[key]) pieData.push({ value: data[key], name: '维修合格' })
if (key === 'num3' && data[key]) pieData.push({ value: data[key], name: '维修报废' }) if (key === 'num3' && data[key]) pieData.push({ value: data[key], name: '维修报废' })
} }
pieData.sort((a, b) => {
const order = ['待维修', '维修合格', '维修报废'];
return order.indexOf(a.name) - order.indexOf(b.name);
});
data.accessVoList.forEach(item => { data.accessVoList.forEach(item => {
if (item.partName && item.partNum) { if (item.partName && item.partNum) {
barData.yAxisData.push(item.partName) barData.yAxisData.push(item.partName)
barData.seriesData.push(item.partNum) barData.seriesData.push(item.partNum)
} }
}) })
console.log('🚀 ~ getChart ~ barData:', barData);
if (barData.yAxisData.length > 5) barData.yAxisData = barData.yAxisData.slice(0, 5)
if (barData.seriesData.length > 5) barData.seriesData = barData.seriesData.slice(0, 5)
this.myPieChart(pieData) this.myPieChart(pieData)
this.myBarChart(barData) this.myBarChart(barData)
}, },
@ -240,12 +246,11 @@ export default {
let option = { let option = {
color: ['#E89E42', '#ABF04B', '#C7352A'], color: ['#E89E42', '#ABF04B', '#C7352A'],
title: { title: {
text: ' 维修情况',
subtext: '', subtext: '',
left: 'left', left: 'left',
textStyle: { textStyle: {
color: '#fff', color: '#fff',
//
backgroundColor: 'url(../../../../assets/img/dialog/Heading.png)'
} }
}, },
tooltip: { tooltip: {
@ -291,6 +296,7 @@ export default {
color: '#fff' color: '#fff'
}, },
title: { title: {
text: ' 配件使用情况',
subtext: '', subtext: '',
left: 'left', left: 'left',
textStyle: { textStyle: {
@ -358,8 +364,7 @@ export default {
.content{ .content{
padding: 20px; padding: 20px;
.el-row { .el-row {
.formItem { .formItem {
font-size: 20px !important;
background-image: url('../../assets/img/dialog/Heading.png'); background-image: url('../../assets/img/dialog/Heading.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 0 10px; background-position: 0 10px;

View File

@ -48,7 +48,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%" stripe>
<el-table-column <el-table-column
v-for="item in tableColumn" v-for="item in tableColumn"
:prop="item.prop" :prop="item.prop"
@ -71,9 +71,9 @@
/> />
</div> </div>
<span slot="footer" class="dialog-footer"> <!-- <span slot="footer" class="dialog-footer">
<el-button @click="open = false"> </el-button> <el-button @click="open = false"> </el-button>
</span> </span> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -164,8 +164,8 @@ export default {
}, },
methods: { methods: {
setOpen(params) { setOpen(params) {
this.open = params.open, this.open = params.open
this.maType = params.maType, this.maType = params.maType
this.tableData = [] this.tableData = []
this.total = 0 this.total = 0
setTimeout(() => { setTimeout(() => {

View File

@ -25,7 +25,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%" stripe>
<el-table-column <el-table-column
v-for="item in tableColumn" v-for="item in tableColumn"
:prop="item.prop" :prop="item.prop"
@ -48,9 +48,9 @@
/> />
</div> </div>
<span slot="footer" class="dialog-footer"> <!-- <span slot="footer" class="dialog-footer">
<el-button @click="open = false"> </el-button> <el-button @click="open = false"> </el-button>
</span> </span> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

View File

@ -25,7 +25,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%" stripe>
<el-table-column <el-table-column
v-for="item in tableColumn" v-for="item in tableColumn"
:prop="item.prop" :prop="item.prop"
@ -48,9 +48,9 @@
/> />
</div> </div>
<span slot="footer" class="dialog-footer"> <!-- <span slot="footer" class="dialog-footer">
<el-button @click="open = false"> </el-button> <el-button @click="open = false"> </el-button>
</span> </span> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -139,8 +139,8 @@ export default {
}, },
methods: { methods: {
setOpen(params) { setOpen(params) {
this.open = params.open, this.open = params.open
this.maType = params.maType, this.maType = params.maType
this.tableData = [] this.tableData = []
this.total = 0 this.total = 0
setTimeout(() => { setTimeout(() => {

View File

@ -39,7 +39,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%" stripe>
<el-table-column <el-table-column
v-for="item in tableColumn" v-for="item in tableColumn"
:prop="item.prop" :prop="item.prop"
@ -62,9 +62,9 @@
/> />
</div> </div>
<span slot="footer" class="dialog-footer"> <!-- <span slot="footer" class="dialog-footer">
<el-button @click="open = false"> </el-button> <el-button @click="open = false"> </el-button>
</span> </span> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -141,8 +141,8 @@ export default {
}, },
methods: { methods: {
setOpen(params) { setOpen(params) {
this.open = params.open, this.open = params.open
this.maType = params.maType, this.maType = params.maType
this.tableData = [] this.tableData = []
this.total = 0 this.total = 0
setTimeout(() => { setTimeout(() => {

View File

@ -39,7 +39,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%" stripe>
<el-table-column <el-table-column
v-for="item in tableColumn" v-for="item in tableColumn"
:prop="item.prop" :prop="item.prop"
@ -62,9 +62,9 @@
/> />
</div> </div>
<span slot="footer" class="dialog-footer"> <!-- <span slot="footer" class="dialog-footer">
<el-button @click="open = false"> </el-button> <el-button @click="open = false"> </el-button>
</span> </span> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -141,8 +141,8 @@ export default {
}, },
methods: { methods: {
setOpen(params) { setOpen(params) {
this.open = params.open, this.open = params.open
this.maType = params.maType, this.maType = params.maType
this.tableData = [] this.tableData = []
this.total = 0 this.total = 0
setTimeout(() => { setTimeout(() => {

View File

@ -48,7 +48,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%" stripe>
<el-table-column <el-table-column
v-for="item in tableColumn" v-for="item in tableColumn"
:prop="item.prop" :prop="item.prop"
@ -71,9 +71,9 @@
/> />
</div> </div>
<span slot="footer" class="dialog-footer"> <!-- <span slot="footer" class="dialog-footer">
<el-button @click="open = false"> </el-button> <el-button @click="open = false"> </el-button>
</span> </span> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -164,8 +164,8 @@ export default {
}, },
methods: { methods: {
setOpen(params) { setOpen(params) {
this.open = params.open, this.open = params.open
this.maType = params.maType, this.maType = params.maType
this.tableData = [] this.tableData = []
this.total = 0 this.total = 0
setTimeout(() => { setTimeout(() => {

View File

@ -48,7 +48,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%" stripe>
<el-table-column <el-table-column
v-for="item in tableColumn" v-for="item in tableColumn"
:prop="item.prop" :prop="item.prop"
@ -82,9 +82,9 @@
/> />
</div> </div>
<span slot="footer" class="dialog-footer"> <!-- <span slot="footer" class="dialog-footer">
<el-button @click="open = false"> </el-button> <el-button @click="open = false"> </el-button>
</span> </span> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -191,8 +191,8 @@ export default {
}, },
methods: { methods: {
setOpen(params) { setOpen(params) {
this.open = params.open, this.open = params.open
this.maType = params.maType, this.maType = params.maType
this.tableData = [] this.tableData = []
this.total = 0 this.total = 0
setTimeout(() => { setTimeout(() => {