Commit d1770f55 by jml0128

feat

1 parent 794f2e06
...@@ -115,7 +115,8 @@ export default { ...@@ -115,7 +115,8 @@ export default {
coverId: { coverId: {
default: 0, default: 0,
type: [Number, String] type: [Number, String]
} },
coverUrl: String
}, },
data() { data() {
return { return {
...@@ -131,10 +132,10 @@ export default { ...@@ -131,10 +132,10 @@ export default {
}, },
computed: { computed: {
chooseBackground() { chooseBackground() {
const a = const a = this.coverList.find(item => item.id == this.coverId) ||
this.coverList.find(item => item.id == this.coverId) || this.coverList[0] || {
this.coverList[0] || templatePicUrl: this.coverUrl
{}; };
return a; return a;
} }
}, },
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
ref="cover" ref="cover"
:coverList="coverList" :coverList="coverList"
:coverId="coverId" :coverId="coverId"
:coverUrl="coverUrl"
@change="id => (coverId = id)" @change="id => (coverId = id)"
></BiCover> ></BiCover>
<BiCatalogue class="bi-block" :catalogueArr="catalogueArr"></BiCatalogue> <BiCatalogue class="bi-block" :catalogueArr="catalogueArr"></BiCatalogue>
...@@ -103,6 +104,7 @@ export default { ...@@ -103,6 +104,7 @@ export default {
singleChoiceMixin: [], singleChoiceMixin: [],
missionData: [], missionData: [],
coverId: 0, coverId: 0,
coverUrl: '',
coverContent: [], coverContent: [],
coverList: [], coverList: [],
projectName: '', projectName: '',
...@@ -181,6 +183,7 @@ export default { ...@@ -181,6 +183,7 @@ export default {
const { const {
id, id,
coverTemplateId, // 模板ID coverTemplateId, // 模板ID
coverTemplateUrl = '',
styleConfigureId, // 配置ID styleConfigureId, // 配置ID
title, title,
...@@ -210,6 +213,7 @@ export default { ...@@ -210,6 +213,7 @@ export default {
styleConfigureId styleConfigureId
}; };
this.coverId = coverTemplateId; this.coverId = coverTemplateId;
this.coverUrl = coverTemplateUrl;
const biCreateDt = date.dateFormat(createDt, 'Y-M-D'); const biCreateDt = date.dateFormat(createDt, 'Y-M-D');
this.projectName = `${projectName}${biCreateDt}服务报告`; this.projectName = `${projectName}${biCreateDt}服务报告`;
this.coverContent = [ this.coverContent = [
...@@ -329,7 +333,7 @@ export default { ...@@ -329,7 +333,7 @@ export default {
disableTypes: [3, 4] disableTypes: [3, 4]
}), }),
ChartConfigFn.createConfig([], { ChartConfigFn.createConfig([], {
...infoArr[1], ...group3,
hideLegend: true, hideLegend: true,
hideChart: true, hideChart: true,
hideTitle: true hideTitle: true
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
ref="cover" ref="cover"
:coverList="coverList" :coverList="coverList"
:coverId="coverId" :coverId="coverId"
:coverUrl="coverUrl"
@change="id => (coverId = id)" @change="id => (coverId = id)"
></BiCover> ></BiCover>
<BiCatalogue class="bi-block" :catalogueArr="catalogueArr"></BiCatalogue> <BiCatalogue class="bi-block" :catalogueArr="catalogueArr"></BiCatalogue>
...@@ -108,6 +109,7 @@ export default { ...@@ -108,6 +109,7 @@ export default {
page2Info: [], page2Info: [],
page3Info: [], page3Info: [],
coverId: 0, coverId: 0,
coverUrl: '',
coverContent: [], coverContent: [],
coverList: [], coverList: [],
singleChoice: [], singleChoice: [],
...@@ -195,6 +197,7 @@ export default { ...@@ -195,6 +197,7 @@ export default {
const { const {
biInfoId, biInfoId,
coverTemplateId, // 模板ID coverTemplateId, // 模板ID
coverTemplateUrl = '',
styleConfigureId, // 配置ID styleConfigureId, // 配置ID
title, title,
...@@ -220,6 +223,7 @@ export default { ...@@ -220,6 +223,7 @@ export default {
styleConfigureId styleConfigureId
}; };
this.coverId = coverTemplateId; this.coverId = coverTemplateId;
this.coverUrl = coverTemplateUrl;
const biCreateDt = date.dateFormat(createDt, 'Y-M-D'); const biCreateDt = date.dateFormat(createDt, 'Y-M-D');
this.projectName = `${projectName}${biCreateDt}服务报告`; this.projectName = `${projectName}${biCreateDt}服务报告`;
this.coverContent = [ this.coverContent = [
......
...@@ -20,7 +20,7 @@ export const dealLegends = (arr = []) => { ...@@ -20,7 +20,7 @@ export const dealLegends = (arr = []) => {
`${cur.genderType || cur.xTopicName}${cur.num || `${cur.genderType || cur.xTopicName}${cur.num ||
cur.countNum || cur.countNum ||
0}人,占比${base.numberFormat( 0}人,占比${base.numberFormat(
(cur.num || cur.countNum || 0) / total, total ? (cur.num || cur.countNum || 0) / total : 0,
0.01 0.01
)}%` )}%`
); );
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!