Compare commits

...

2 Commits

6 changed files with 83 additions and 31 deletions

View File

@ -30,6 +30,8 @@
width: 100%;
height: 100%;
z-index: 999999;
display: flex;align-items: center;justify-content: center;
background: #E5EEF5;
}
#loader {
@ -193,15 +195,26 @@
color: #FFF;
opacity: 0.5;
}
.bgStyle{
width: 13%;
height: 17%;
border-radius: 10px;
background-image: url('./lodingCar.gif');
background-size: 100% 100%;
background-repeat: no-repeat;
background-position: center;
}
</style>
</head>
<body>
<div id="app">
<div id="loader-wrapper">
<div id="loader"></div>
<div class="loader-section section-left"></div>
<div class="loader-section section-right"></div>
<div class="load_title">正在加载系统资源,请耐心等待</div>
<!-- <div id="loader"></div> -->
<!-- <div class="loader-section section-left"></div>
<div class="loader-section section-right"></div> -->
<!-- <div class="load_title">正在加载系统资源,请耐心等待</div> -->
<div class="bgStyle"></div>
<!-- <img :src="require('./lodingCar.gif')" style="width: 80%;height: 80%;z-index: 99999999999999;" alt=""> -->
</div>
</div>
</body>

BIN
public/lodingCar.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 MiB

View File

@ -103,7 +103,7 @@ export default {
}
</script>
<style scoped>
<style lang="scss" scoped>
.pagination-container {
background: #fff;
padding: 32px 16px;
@ -111,4 +111,28 @@ export default {
.pagination-container.hidden {
display: none;
}
// --
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #FFF;
color: #2CBAB2;
border: 1px solid #2CBAB2;
}
// --
::v-deep .el-pagination.is-background .el-pager li {
background-color: #fff;
color: #666666;
border: 1px solid #CCCCCC;
}
// -
::v-deep .el-pagination.is-background .btn-prev {
background-color: #fff;
color: #666666;
border: 1px solid #CCCCCC;
}
// -
::v-deep .el-pagination.is-background .btn-next {
background-color: #fff;
color: #666666;
border: 1px solid #CCCCCC;
}
</style>

View File

@ -343,17 +343,25 @@
<!-- 装备列表表格 -->
<div class="card-container">
<el-row :gutter="10" class="mb8" style="display: flex; align-items: center">
<el-col :span="24">
<div class="card-header">
<el-row :gutter="10" class="mb8" style="display: flex; align-items: center;border-bottom: 1px solid #e4e7ed;">
<el-col :span="8">
<div class="card-header" style="border-bottom: 0px;">
<div>
<span class="table-title">装备列表 </span>
<span class="table-count" style="margin-left: 35px;"> {{ total }} 条记录</span>
</div>
<span>
</div>
</div>
</el-col>
<el-col :span="16">
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getDeviceList"
:columns="columns2" style="margin-left: 20px;margin-right: 20px;"
></right-toolbar>
<span>
<el-button
icon="el-icon-download"
style="float: right"
style="float: right;"
type="primary"
size="mini"
@click="exportData"
@ -361,13 +369,8 @@
导出数据
</el-button>
</span>
</div>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getDeviceList"
:columns="columns2"
></right-toolbar>
</el-row>
<el-table

View File

@ -1,6 +1,6 @@
<template>
<div>
<el-dialog :title="title" :visible.sync="visible" width="800px">
<el-dialog :title="title" :visible.sync="visible" width="600px">
<div v-if="processConfig && processConfig.nodeList" class="approval-progress" v-loading="loading">
<div class="section-header">审批进度</div>
<el-timeline>
@ -10,7 +10,10 @@
:timestamp="getNodeRecord(node) ? getNodeRecord(node).approveTime : ''"
placement="top"
:type="getNodeTagType(node)"
>
>
<template #dot>
<img src="../../../assets/images/timeIcon.png" class="custom-icon" alt="">
</template>
<div class="timeline-content">
<div class="node-title">
<span class="node-name">节点{{ node.nodeOrder }}{{ node.nodeName }}</span>
@ -144,6 +147,7 @@ export default {
.node-title {
display: flex;
align-items: center;
justify-content: space-between;
gap: 10px;
margin-bottom: 8px;
@ -154,10 +158,17 @@ export default {
}
.node-info {
font-size: 12px;
color: #606266;
font-size: 12px;
background: rgba(52, 226, 199,0.08);
color: #3F3F3F;
padding: 15px;
border-radius:5px;
line-height: 1.8;
}
}
}
.custom-icon{
width: 20px;
height: 20px;
}
</style>

View File

@ -83,13 +83,7 @@
</el-card>
<!-- 入库记录单 -->
<el-dialog title="" :visible.sync="recordVisible" width="65%" append-to-body>
<el-row class="btns" style="display: flex; justify-content: flex-end; gap: 8px">
<el-button size="mini" type="primary" style="background: #2CBAB2;" @click="handleDownloadPDF">下载</el-button>
<el-button size="mini" type="primary" style="background: #2CBAB2;" @click="onHandlePrint">打印</el-button>
<!-- <el-button size="mini" type="primary" @click="recordVisible = false">关闭</el-button> -->
</el-row>
<el-dialog title="" :visible.sync="recordVisible" width="65%" append-to-body>
<vue-easy-print v-if="recordVisible" ref="recordPrintRef" id="print-content" tableShow style="width: 100%">
<h2 style="text-align: center; font-size: 28px; margin-bottom: 50px; margin-top: 0;">入库记录单</h2>
<el-row class="record-row">
@ -143,6 +137,13 @@
</table>
</div>
</vue-easy-print>
<template slot="footer">
<el-row class="btns" style="display: flex; justify-content: flex-end; gap: 8px">
<el-button size="mini" type="primary" style="background: #2CBAB2;" @click="handleDownloadPDF">下载</el-button>
<el-button size="mini" type="primary" style="background: #2CBAB2;" @click="onHandlePrint">打印</el-button>
<el-button size="mini" type="primary" style="background: #2CBAB2;" @click="recordVisible = false">关闭</el-button>
</el-row>
</template>
</el-dialog>
</div>
</template>
@ -279,8 +280,8 @@ export default {
line-height: 40px;
}
.btns {
position: absolute;
right: 20px;
top: 60px;
// position: absolute;
// right: 20px;
// top: 60px;
}
</style>