@@ -217,7 +217,9 @@ export default {
position: fixed;
left: 0px;
z-index: 30;
+
display: flex;
+ display:none;
box-sizing: border-box;
align-items: center;
padding: 0 90px;
diff --git a/src/main.js b/src/main.js
index c8833b0..91e101d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,7 @@ import App from './App.vue'
import router from "./router/router.js"
import { QuillEditor } from '@vueup/vue-quill'
import '@vueup/vue-quill/dist/vue-quill.snow.css';
-
+import htmlToPdf from '@/uitl/htmlToPdf.js'
import ElementPlus from 'element-plus';
import 'element-plus/dist/index.css'
@@ -19,6 +19,7 @@ let app=createApp(App)
app.config.globalProperties.$bucketName = "nianhua-test"
app.use(router)
+app.use(htmlToPdf)
app.use(ElementPlus,{locale:zhCn});
app.use(VueAxios,axios)
app.mount('#app')
diff --git a/src/uitl/htmlToPdf.js b/src/uitl/htmlToPdf.js
new file mode 100644
index 0000000..50e210d
--- /dev/null
+++ b/src/uitl/htmlToPdf.js
@@ -0,0 +1,74 @@
+// 导出页面为PDF格式
+// import html2Canvas from 'html2canvas'
+// import JSPDF from 'jspdf'
+// export default{
+// install (app) {
+// app.config.globalProperties.getPdf = function () {
+// console.log(123123);
+// var title = this.htmlTitle
+// console.log(document.querySelector('#pdfDom'));
+// html2Canvas( document.querySelector('#pdfDom') , {
+// allowTaint: true
+// }).then(function (canvas) {
+// let contentWidth = canvas.width
+// let contentHeight = canvas.height
+// let pageHeight = contentWidth / 592.28 * 841.89
+// let leftHeight = contentHeight
+// let position = 0
+// let imgWidth = 595.28
+// let imgHeight = 592.28 / contentWidth * contentHeight
+// let pageData = canvas.toDataURL('image/jpeg', 1.0)
+// let PDF = new JsPDF('', 'pt', 'a4')
+// if (leftHeight < pageHeight) {
+// PDF.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight)
+// } else {
+// while (leftHeight > 0) {
+// PDF.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
+// leftHeight -= pageHeight
+// position -= 841.89
+// if (leftHeight > 0) {
+// PDF.addPage()
+// }
+// }
+// }
+// PDF.save(title + '.pdf')
+// }
+// )
+// }
+// }
+// }
+
+// 导出页面为PDF格式
+import html2canvas from "html2canvas"
+import JSPDF from "jspdf"
+export default {
+install (app) {
+ app.config.globalProperties.ExportSavePdf = function (htmlTitle, currentTime) {
+var element = document.getElementById("pdfCentent")
+html2canvas(element, {
+logging: false
+}).then(function (canvas) {
+var pdf = new JSPDF("p", "mm", "a4") // A4纸，纵向
+var ctx = canvas.getContext("2d")
+var a4w = 170; var a4h = 257 // A4大小，210mm x 297mm，四边各保留20mm的边距，显示区域170x257
+var imgHeight = Math.floor(a4h * canvas.width / a4w) // 按A4显示比例换算一页图像的像素高度
+var renderedHeight = 0
+
+while (renderedHeight < canvas.height) {
+var page = document.createElement("canvas")
+page.width = canvas.width
+page.height = Math.min(imgHeight, canvas.height - renderedHeight)// 可能内容不足一页
+
+// 用getImageData剪裁指定区域，并画到前面创建的canvas对象中
+page.getContext("2d").putImageData(ctx.getImageData(0, renderedHeight, canvas.width, Math.min(imgHeight, canvas.height - renderedHeight)), 0, 0)
+pdf.addImage(page.toDataURL("image/jpeg", 1.0), "JPEG", 10, 10, a4w, Math.min(a4h, a4w * page.height / page.width)) // 添加图像到页面，保留10mm边距
+
+renderedHeight += imgHeight
+if (renderedHeight < canvas.height) { pdf.addPage() }// 如果后面还有内容，添加一个空页
+// delete page;
+}
+pdf.save(htmlTitle + currentTime)
+})
+}
+}
+}
\ No newline at end of file
diff --git a/src/view/consumer.vue b/src/view/consumer.vue
index 837977e..31eb31f 100644
--- a/src/view/consumer.vue
+++ b/src/view/consumer.vue
@@ -18,13 +18,14 @@
>
-
-
-
+
+
@@ -180,6 +181,7 @@ export default {
value1:true,
drawer: false,
value: "",
+ selectClassData:[],
Time: "",
usernameData: {},
tableData: [],
@@ -189,7 +191,7 @@ export default {
consumerData: {
current: 1,
keyword: "",
- type: "",
+ type: 1,
size: 10,
endTime: "",
startTime: "",
@@ -199,6 +201,7 @@ export default {
mounted() {
// 初始化获取数据
this.getConsumer();
+ this.addCation()
},
methods: {
// 时间格式转换
@@ -210,6 +213,27 @@ export default {
},
usernameDatatitIf(ifS) {
this.usernameDataIf = ifS;
+ },
+ addCation() {
+ let param = new URLSearchParams();
+ let that = this;
+
+ param.append("code", "member_search_type");
+
+
+
+ this.axios
+ .get("/hysc/system/dict/dictionary", {
+ params: param,
+ })
+ .then(function (response) {
+ console.log(response.data.data,"555");
+ that.selectClassData = response.data.data ;
+
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
},
// 查看用户信息
queryName(data) {
@@ -323,8 +347,8 @@ export default {
// endTime: "",
// startTime: "",
// },
-
- console.log(this.consumerData.type);
+
+
if (this.consumerData.keyword&&this.consumerData.type == "") {
this.consumerData.type="手机号"
}
diff --git a/src/view/index.vue b/src/view/index.vue
index f0c0849..62d3edd 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -397,6 +397,9 @@ export default {
}
.indexTitIf {
background: #fff;
+ background: #fff;
+ background-color: #0544a4;
+ color: #fff;
}
.indexTit {
background: #ddd;
diff --git a/src/view/projectTopic.vue b/src/view/projectTopic.vue
index f6e7a9f..51438b6 100644
--- a/src/view/projectTopic.vue
+++ b/src/view/projectTopic.vue
@@ -96,8 +96,12 @@
-
-
+
+
+
+
+
+
