diff --git a/src/components/AmphiPosition/index.vue b/src/components/AmphiPosition/index.vue
index 82f0e1e..7556870 100644
--- a/src/components/AmphiPosition/index.vue
+++ b/src/components/AmphiPosition/index.vue
@@ -727,7 +727,7 @@ export default {
"#3ba272",
],
legend: {
- data: ["一区", "二区", "三区", "四区", "五区", "六区"],
+ data: dataX,
top: "5%",
textStyle: {
color: "#e9ebee",
diff --git a/src/components/ViewPDF/index.vue b/src/components/ViewPDF/index.vue
index f9461a2..8f82769 100644
--- a/src/components/ViewPDF/index.vue
+++ b/src/components/ViewPDF/index.vue
@@ -52,7 +52,9 @@
width="60%"
:before-close="handleClose"
>
-
+
@@ -75,7 +77,9 @@ export default {
dcPlOptions: [],
pdfDataList: [],
dialogVisible: false,
- pdfUrl: "",
+ pdfUrl: "", //pdf文件地址
+ pageCount: 0, //当前页
+ numPages: 0, //总页数
};
},
mounted() {
@@ -115,7 +119,13 @@ export default {
});
},
pdfChange(item) {
- this.pdfUrl = `http://kban.runpengsoft.com/upload/${this.formData.dcCh}/${this.formData.dcPl}/PDF/${item}.pdf`;
+ this.pdfUrl = pdf.createLoadingTask(
+ `http://kban.runpengsoft.com/upload/${this.formData.dcCh}/${this.formData.dcPl}/PDF/${item}.pdf`
+ );
+ this.pdfUrl.promise
+ .then((pdf) => {
+ this.numPages = pdf.numPages;
+ });
this.dialogVisible = true;
},
handleClose() {
@@ -192,6 +202,7 @@ export default {
max-width: calc(100% - 30px) !important;
background-color: #134094 !important;
border: 1px solid #016ae0;
+ padding-bottom: 20px;
}
.el-dialog__title {
display: flex;
@@ -207,7 +218,7 @@ export default {
width: 100% !important;
}
}
- .el-dialog__headerbtn .el-dialog__close{
+ .el-dialog__headerbtn .el-dialog__close {
color: #fff !important;
}
}
diff --git a/src/styles/index.css b/src/styles/index.css
index 9159d29..8812ea8 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -94,3 +94,8 @@
::-webkit-scrollbar-corner {
background: transparent !important;
}
+
+.dv-scroll-board .header .header-item,
+.dv-scroll-board .rows .ceil {
+ text-align: center !important;
+}
diff --git a/src/styles/index.min.css b/src/styles/index.min.css
index 260ea32..fc22a85 100644
--- a/src/styles/index.min.css
+++ b/src/styles/index.min.css
@@ -1 +1 @@
-@import url(f:\gj-erp-kban-vue\src\styles\font\font.css);.el-input__inner{background-color:rgba(1,1,1,0) !important;border:2px solid #00c0ef !important;color:#72e3ff !important;font-weight:bold}.table-sum tr td{border:1px solid #5bc0de;padding-top:0.3rem;padding-bottom:0.3rem;text-indent:10px}.formData-box{width:300px;position:relative;top:10px;display:flex}.formData-box .query-btn{height:22px;background-color:#00c0ef;color:white;border:#00cdff 2px solid;min-width:50px;border-radius:5px;margin-left:20px;text-align:center;font-size:14px;position:relative;top:2px;cursor:pointer}.formData-box .el-form-item__label{color:#fff}.el-select .el-input .el-select__caret{color:#00c0ef !important}.el-table,.el-table tr,.el-table__fixed-right::before,.el-table__fixed::before{background-color:rgba(1,1,1,0) !important}.el-table th,.el-table td{text-align:center !important;height:30px !important;padding:0 !important;color:#fff}.el-table-column--selection .cell{padding-left:0 !important;padding-right:0 !important}.el-table--border{border:none !important}.el-table .el-table__cell{padding:0 !important}.el-table--border::after,.el-table--group::after,.el-table::before{border:none !important;background-color:rgba(1,1,1,0) !important}::-webkit-scrollbar{width:6px;height:6px}::-webkit-scrollbar-thumb{border-radius:10px;background:#fff;-webkit-box-shadow:inset006pxrgba(0, 0, 0, 0.5)}::-webkit-scrollbar-corner{background:transparent !important}
+@import url(f:\gj-erp-kban-vue\src\styles\font\font.css);.el-input__inner{background-color:rgba(1,1,1,0) !important;border:2px solid #00c0ef !important;color:#72e3ff !important;font-weight:bold}.table-sum tr td{border:1px solid #5bc0de;padding-top:0.3rem;padding-bottom:0.3rem;text-indent:10px}.formData-box{width:300px;position:relative;top:10px;display:flex}.formData-box .query-btn{height:22px;background-color:#00c0ef;color:white;border:#00cdff 2px solid;min-width:50px;border-radius:5px;margin-left:20px;text-align:center;font-size:14px;position:relative;top:2px;cursor:pointer}.formData-box .el-form-item__label{color:#fff}.el-select .el-input .el-select__caret{color:#00c0ef !important}.el-table,.el-table tr,.el-table__fixed-right::before,.el-table__fixed::before{background-color:rgba(1,1,1,0) !important}.el-table th,.el-table td{text-align:center !important;height:30px !important;padding:0 !important;color:#fff}.el-table-column--selection .cell{padding-left:0 !important;padding-right:0 !important}.el-table--border{border:none !important}.el-table .el-table__cell{padding:0 !important}.el-table--border::after,.el-table--group::after,.el-table::before{border:none !important;background-color:rgba(1,1,1,0) !important}::-webkit-scrollbar{width:6px;height:6px}::-webkit-scrollbar-thumb{border-radius:10px;background:#fff;-webkit-box-shadow:inset006pxrgba(0, 0, 0, 0.5)}::-webkit-scrollbar-corner{background:transparent !important}.dv-scroll-board .header .header-item,.dv-scroll-board .rows .ceil{text-align:center !important}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 4af8a83..62584a0 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -16,7 +16,7 @@
position: relative;
top: 10px;
display: flex;
- .query-btn{
+ .query-btn {
height: 22px;
background-color: #00c0ef;
color: white;
@@ -81,3 +81,8 @@
::-webkit-scrollbar-corner {
background: rgba(0, 0, 0, 0) !important;
}
+
+.dv-scroll-board .header .header-item,
+.dv-scroll-board .rows .ceil {
+ text-align: center !important;
+}