页面加载修改
This commit is contained in:
parent
fae5b91b46
commit
50322b46e4
|
|
@ -30,6 +30,8 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
z-index: 999999;
|
z-index: 999999;
|
||||||
|
display: flex;align-items: center;justify-content: center;
|
||||||
|
background: #E5EEF5;
|
||||||
}
|
}
|
||||||
|
|
||||||
#loader {
|
#loader {
|
||||||
|
|
@ -193,15 +195,26 @@
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
opacity: 0.5;
|
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>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app">
|
<div id="app">
|
||||||
<div id="loader-wrapper">
|
<div id="loader-wrapper">
|
||||||
<div id="loader"></div>
|
<!-- <div id="loader"></div> -->
|
||||||
<div class="loader-section section-left"></div>
|
<!-- <div class="loader-section section-left"></div>
|
||||||
<div class="loader-section section-right"></div>
|
<div class="loader-section section-right"></div> -->
|
||||||
<div class="load_title">正在加载系统资源,请耐心等待</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>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 9.0 MiB |
|
|
@ -103,7 +103,7 @@ export default {
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style lang="scss" scoped>
|
||||||
.pagination-container {
|
.pagination-container {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
padding: 32px 16px;
|
padding: 32px 16px;
|
||||||
|
|
@ -111,4 +111,28 @@ export default {
|
||||||
.pagination-container.hidden {
|
.pagination-container.hidden {
|
||||||
display: none;
|
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>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -343,17 +343,25 @@
|
||||||
|
|
||||||
<!-- 装备列表表格 -->
|
<!-- 装备列表表格 -->
|
||||||
<div class="card-container">
|
<div class="card-container">
|
||||||
<el-row :gutter="10" class="mb8" style="display: flex; align-items: center">
|
<el-row :gutter="10" class="mb8" style="display: flex; align-items: center;border-bottom: 1px solid #e4e7ed;">
|
||||||
<el-col :span="24">
|
<el-col :span="8">
|
||||||
<div class="card-header">
|
<div class="card-header" style="border-bottom: 0px;">
|
||||||
<div>
|
<div>
|
||||||
<span class="table-title">装备列表 </span>
|
<span class="table-title">装备列表 </span>
|
||||||
<span class="table-count" style="margin-left: 35px;"> 共 {{ total }} 条记录</span>
|
<span class="table-count" style="margin-left: 35px;"> 共 {{ total }} 条记录</span>
|
||||||
</div>
|
</div>
|
||||||
<span>
|
</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
|
<el-button
|
||||||
icon="el-icon-download"
|
icon="el-icon-download"
|
||||||
style="float: right"
|
style="float: right;"
|
||||||
type="primary"
|
type="primary"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="exportData"
|
@click="exportData"
|
||||||
|
|
@ -361,13 +369,8 @@
|
||||||
导出数据
|
导出数据
|
||||||
</el-button>
|
</el-button>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<right-toolbar
|
|
||||||
:showSearch.sync="showSearch"
|
|
||||||
@queryTable="getDeviceList"
|
|
||||||
:columns="columns2"
|
|
||||||
></right-toolbar>
|
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-table
|
<el-table
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<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 v-if="processConfig && processConfig.nodeList" class="approval-progress" v-loading="loading">
|
||||||
<div class="section-header">审批进度</div>
|
<div class="section-header">审批进度</div>
|
||||||
<el-timeline>
|
<el-timeline>
|
||||||
|
|
@ -10,7 +10,10 @@
|
||||||
:timestamp="getNodeRecord(node) ? getNodeRecord(node).approveTime : ''"
|
:timestamp="getNodeRecord(node) ? getNodeRecord(node).approveTime : ''"
|
||||||
placement="top"
|
placement="top"
|
||||||
:type="getNodeTagType(node)"
|
:type="getNodeTagType(node)"
|
||||||
>
|
>
|
||||||
|
<template #dot>
|
||||||
|
<img src="../../../assets/images/timeIcon.png" class="custom-icon" alt="">
|
||||||
|
</template>
|
||||||
<div class="timeline-content">
|
<div class="timeline-content">
|
||||||
<div class="node-title">
|
<div class="node-title">
|
||||||
<span class="node-name">节点{{ node.nodeOrder }}:{{ node.nodeName }}</span>
|
<span class="node-name">节点{{ node.nodeOrder }}:{{ node.nodeName }}</span>
|
||||||
|
|
@ -144,6 +147,7 @@ export default {
|
||||||
.node-title {
|
.node-title {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
margin-bottom: 8px;
|
margin-bottom: 8px;
|
||||||
|
|
||||||
|
|
@ -154,10 +158,17 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
.node-info {
|
.node-info {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: #606266;
|
background: rgba(52, 226, 199,0.08);
|
||||||
|
color: #3F3F3F;
|
||||||
|
padding: 15px;
|
||||||
|
border-radius:5px;
|
||||||
line-height: 1.8;
|
line-height: 1.8;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.custom-icon{
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -83,13 +83,7 @@
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
||||||
<!-- 入库记录单 -->
|
<!-- 入库记录单 -->
|
||||||
<el-dialog title="" :visible.sync="recordVisible" width="65%" append-to-body>
|
<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>
|
|
||||||
|
|
||||||
<vue-easy-print v-if="recordVisible" ref="recordPrintRef" id="print-content" tableShow style="width: 100%">
|
<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>
|
<h2 style="text-align: center; font-size: 28px; margin-bottom: 50px; margin-top: 0;">入库记录单</h2>
|
||||||
<el-row class="record-row">
|
<el-row class="record-row">
|
||||||
|
|
@ -143,6 +137,13 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</vue-easy-print>
|
</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>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -279,8 +280,8 @@ export default {
|
||||||
line-height: 40px;
|
line-height: 40px;
|
||||||
}
|
}
|
||||||
.btns {
|
.btns {
|
||||||
position: absolute;
|
// position: absolute;
|
||||||
right: 20px;
|
// right: 20px;
|
||||||
top: 60px;
|
// top: 60px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue