Commit 74499e6a by jml0128

fix

1 parent 4c04b444
...@@ -149,7 +149,7 @@ export default { ...@@ -149,7 +149,7 @@ export default {
return dis * (this.isPrint ? printWidth : this.baseFontSize); return dis * (this.isPrint ? printWidth : this.baseFontSize);
}, },
changeCover() { changeCover() {
this.$emit('change', this.coverList[this.localIndex].id); this.$emit('change', this.coverList[this.localIndex]);
this.visibleCoverList = false; this.visibleCoverList = false;
}, },
handleMouseDown(e, pos) { handleMouseDown(e, pos) {
......
...@@ -4,20 +4,22 @@ ...@@ -4,20 +4,22 @@
--> -->
<template> <template>
<div> <div>
<div class="fixed-btn" v-if="!isPrint"> <div class="fixed-btn">
<div <div
class="" class=""
@click="dialogVisible = true" @click="dialogVisible = true"
v-if="questionData.findIndex(item => item.isDelete == 1) > -1" v-if="
!isPrint && questionData.findIndex(item => item.isDelete == 1) > -1
"
> >
<img src="../lib/svg/chexiao.svg" /> <img src="../lib/svg/chexiao.svg" />
撤销删除 撤销删除
</div> </div>
<div class="" @click="save"> <div class="" @click="save" v-if="!isPrint">
<img src="../lib/svg/baocun.svg" /> <img src="../lib/svg/baocun.svg" />
保存 保存
</div> </div>
<div class="" @click="exportFn"> <div class="" @click="exportFn" v-if="!isPrint || Bi.cantEdit == 1">
<img src="../lib/svg/daochu-tianchong.svg" /> <img src="../lib/svg/daochu-tianchong.svg" />
导出 导出
</div> </div>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: jml * @Author: jml
* @Date: 2021-02-26 15:38:10 * @Date: 2021-02-26 15:38:10
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-03 16:03:42 * @LastEditTime: 2021-07-05 18:15:51
--> -->
<template> <template>
<div class="xrk-components-bi bi" :class="{ 'bi-print': print }"> <div class="xrk-components-bi bi" :class="{ 'bi-print': print }">
...@@ -36,6 +36,7 @@ export default { ...@@ -36,6 +36,7 @@ export default {
props: { props: {
mobile: [Number, String, Boolean], mobile: [Number, String, Boolean],
print: [Number, String, Boolean], print: [Number, String, Boolean],
cantEdit: [Number, String],
projectType: [Number, String], projectType: [Number, String],
getBaseInfo: { getBaseInfo: {
type: Function, type: Function,
......
...@@ -128,10 +128,10 @@ export const chartConfig = () => { ...@@ -128,10 +128,10 @@ export const chartConfig = () => {
colors[0], colors[0],
data: data, data: data,
axis: [ axis: [
{ factorName: xFactor, name: '您的医保类型( )', names: x }, { factorName: xFactor, name: xAxisName, names: x },
{ {
factorName: yFactor, factorName: yFactor,
name: '日常药物的选择,您更偏向( )', name: yAxisName,
names: y names: y
} }
], ],
......
...@@ -10,7 +10,12 @@ ...@@ -10,7 +10,12 @@
:coverList="coverList" :coverList="coverList"
:coverId="coverId" :coverId="coverId"
:coverUrl="coverUrl" :coverUrl="coverUrl"
@change="id => (coverId = id)" @change="
({ id, templatePicUrl }) => {
coverId = id;
coverUrl = templatePicUrl;
}
"
></BiCover> ></BiCover>
<BiCatalogue class="bi-block" :catalogueArr="catalogueArr"></BiCatalogue> <BiCatalogue class="bi-block" :catalogueArr="catalogueArr"></BiCatalogue>
<BiOverview <BiOverview
...@@ -27,6 +32,7 @@ ...@@ -27,6 +32,7 @@
@page="setPage(arguments, 'page1')" @page="setPage(arguments, 'page1')"
></BiMission> ></BiMission>
<BiSingleChoice <BiSingleChoice
v-if="showSingleChoice.length > 0"
class="bi-block no-border" class="bi-block no-border"
:singleChoice="showSingleChoice" :singleChoice="showSingleChoice"
:pageWrap="true" :pageWrap="true"
...@@ -40,6 +46,7 @@ ...@@ -40,6 +46,7 @@
></BiSingleChoiceInfo> ></BiSingleChoiceInfo>
</BiSingleChoice> </BiSingleChoice>
<BiSingleChoice <BiSingleChoice
v-if="showSingleChoiceMixin.length > 0"
class="bi-block no-border" class="bi-block no-border"
:singleChoice="showSingleChoiceMixin" :singleChoice="showSingleChoiceMixin"
:pageWrap="true" :pageWrap="true"
...@@ -266,7 +273,7 @@ export default { ...@@ -266,7 +273,7 @@ export default {
}, },
{ {
name: '参与调研样本', name: '参与调研样本',
value: `${examinePeopleNumber}` value: `${examinePeopleNumber}`
}, },
{ {
name: '报表生成时间', name: '报表生成时间',
......
...@@ -10,7 +10,12 @@ ...@@ -10,7 +10,12 @@
:coverList="coverList" :coverList="coverList"
:coverId="coverId" :coverId="coverId"
:coverUrl="coverUrl" :coverUrl="coverUrl"
@change="id => (coverId = id)" @change="
({ id, templatePicUrl }) => {
coverId = id;
coverUrl = templatePicUrl;
}
"
></BiCover> ></BiCover>
<BiCatalogue class="bi-block" :catalogueArr="catalogueArr"></BiCatalogue> <BiCatalogue class="bi-block" :catalogueArr="catalogueArr"></BiCatalogue>
<BiOverview <BiOverview
...@@ -368,6 +373,7 @@ export default { ...@@ -368,6 +373,7 @@ export default {
disableTypes: [3, 4, 9, 10, 11] disableTypes: [3, 4, 9, 10, 11]
}), }),
item => ({ item => ({
hideThisChart: item.topicCountInfos.length < 7,
chartType: item.chartType || randomType([1, 2, 5, 6]), chartType: item.chartType || randomType([1, 2, 5, 6]),
blockTitle: '数字专区单日点击量Top5日期分布图', blockTitle: '数字专区单日点击量Top5日期分布图',
hideLegend: true, hideLegend: true,
...@@ -375,6 +381,7 @@ export default { ...@@ -375,6 +381,7 @@ export default {
disableTypes: [3, 4, 9, 10, 11] disableTypes: [3, 4, 9, 10, 11]
}), }),
item => ({ item => ({
hideThisChart: item.topicCountInfos.length < 7,
chartType: item.chartType || 9, chartType: item.chartType || 9,
blockTitle: '数字专区单日点击量Top5占周期总有效点击量占比分析图', blockTitle: '数字专区单日点击量Top5占周期总有效点击量占比分析图',
hideLegend: true, hideLegend: true,
...@@ -395,11 +402,15 @@ export default { ...@@ -395,11 +402,15 @@ export default {
if (check.isFunction(customConfig)) { if (check.isFunction(customConfig)) {
customConfig = customConfig(item); customConfig = customConfig(item);
} }
return ChartConfigFn.createConfig(dealAxis(item.topicCountInfos), { return {
...item, ...ChartConfigFn.createConfig(dealAxis(item.topicCountInfos), {
...customConfig ...item,
}); ...customConfig
}),
hideThisChart: customConfig.hideThisChart
};
}) })
.filter(item => !item.hideThisChart)
.sort((a, b) => { .sort((a, b) => {
if (a.sort < b.sort) { if (a.sort < b.sort) {
return -1; return -1;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!