Skip to content

jml0128 / xrk-bi

Go to a project
Commit 98a9e556 by jml0128
Options

feat

1 parent dd64d1cd
Inline Side-by-side
Showing with 28 additions and 19 deletions
.gitignore
...@@ -10,3 +10,5 @@ yarn.lock ...@@ -10,3 +10,5 @@ yarn.lock
*.ntvs* *.ntvs*
*.njsproj *.njsproj
*.sln *.sln
dist
\ No newline at end of file
2.pdf
No preview for this file type
src/packages/bi/src/main.vue
...@@ -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-01 14:30:15 * @LastEditTime: 2021-07-02 14:42:12
--> -->
<template> <template>
<div class="xrk-components-bi bi" :class="{ 'bi-print': print }"> <div class="xrk-components-bi bi" :class="{ 'bi-print': print }">
......
src/packages/bi/src/project/20-configurable.vue
...@@ -300,6 +300,7 @@ export default { ...@@ -300,6 +300,7 @@ export default {
]; ];
}, },
dealFixedInfo(infoArr) { dealFixedInfo(infoArr) {
// eslint-disable-next-line no-unused-vars
const [group1 = {}, group2 = {}, group3 = {}, group4 = {}] = infoArr; const [group1 = {}, group2 = {}, group3 = {}, group4 = {}] = infoArr;
this.missionData = [ this.missionData = [
ChartConfigFn.createConfig(dealAxis(group1.fixedCountInfos), { ChartConfigFn.createConfig(dealAxis(group1.fixedCountInfos), {
...@@ -424,10 +425,9 @@ export default { ...@@ -424,10 +425,9 @@ export default {
this.dealChoice(topicInfo.data.data || []); this.dealChoice(topicInfo.data.data || []);
this.dealChoiceMixin(topicMixinInfo.data.data || []); this.dealChoiceMixin(topicMixinInfo.data.data || []);
this.coverList = tempaletList.data.data || []; this.coverList = tempaletList.data.data || [];
window.status = '1';
} }
); );
window.status = 'completed';
} }
}; };
</script> </script>
......
src/packages/bi/src/project/6-zone.vue
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
methods: { methods: {
dealBaseInfo(info) { dealBaseInfo(info) {
const { const {
id, biInfoId,
coverTemplateId, // 模板ID coverTemplateId, // 模板ID
styleConfigureId, // 配置ID styleConfigureId, // 配置ID
...@@ -201,8 +201,8 @@ export default { ...@@ -201,8 +201,8 @@ export default {
titlePosition, titlePosition,
aspEnterpriseNameWrite, aspEnterpriseNameWrite,
aspNamePosition, aspNamePosition,
styleConfigureSettlementTime, settlementTime,
styleConfigureSettlementTimePosition, settlementTimePosition,
dataCollectNumber, dataCollectNumber,
projectName = '-', projectName = '-',
...@@ -210,13 +210,13 @@ export default { ...@@ -210,13 +210,13 @@ export default {
aspEnterpriseName = '-', aspEnterpriseName = '-',
taskTime = 0, taskTime = 0,
taskStartTime, taskStartTime,
settlementTime, taskEndTime,
taskSum, taskSum,
executePeopleNumber, executePeopleNumber,
createDt createDt
} = info; } = info;
this.biInfo = { this.biInfo = {
biInfoId: id, biInfoId: biInfoId,
styleConfigureId styleConfigureId
}; };
this.coverId = coverTemplateId; this.coverId = coverTemplateId;
...@@ -228,8 +228,8 @@ export default { ...@@ -228,8 +228,8 @@ export default {
pos: titlePosition pos: titlePosition
}, },
{ {
name: styleConfigureSettlementTime, name: settlementTime,
pos: styleConfigureSettlementTimePosition pos: settlementTimePosition
}, },
{ {
name: aspEnterpriseNameWrite, name: aspEnterpriseNameWrite,
...@@ -258,7 +258,7 @@ export default { ...@@ -258,7 +258,7 @@ export default {
}, },
{ {
name: '任务结算时间', name: '任务结算时间',
value: settlementTime value: taskEndTime
}, },
{ {
name: '报表生成时间', name: '报表生成时间',
...@@ -427,6 +427,7 @@ export default { ...@@ -427,6 +427,7 @@ export default {
biInfoId: biInfoId, biInfoId: biInfoId,
commandType: 2, commandType: 2,
biStyleConfigureInfo: { biStyleConfigureInfo: {
biInfoId: biInfoId,
aspEnterpriseNameWrite: content[2].name || '', //乙方封面名称 aspEnterpriseNameWrite: content[2].name || '', //乙方封面名称
aspNamePosition: JSON.stringify(content[2].pos), //乙方封面名称位置 aspNamePosition: JSON.stringify(content[2].pos), //乙方封面名称位置
styleConfigId: styleConfigureId, //封面配置ID styleConfigId: styleConfigureId, //封面配置ID
...@@ -436,11 +437,14 @@ export default { ...@@ -436,11 +437,14 @@ export default {
title: content[0].name || '', //封面标题 title: content[0].name || '', //封面标题
titlePosition: JSON.stringify(content[0].pos) //标题位置 titlePosition: JSON.stringify(content[0].pos) //标题位置
}, },
styleConfigureFixedDetailList: chartConfigToSetInfo(this.missionData), styleConfigureFixedDetailList: chartConfigToSetInfo(
hgtgDetailList: chartConfigToSetInfo([ this.missionData,
...this.singleChoice, biInfoId
...this.singleChoiceMixin ),
]) hgtgDetailList: chartConfigToSetInfo(
[...this.singleChoice, ...this.singleChoiceMixin],
biInfoId
)
}); });
}, },
exportBi() { exportBi() {
...@@ -464,9 +468,9 @@ export default { ...@@ -464,9 +468,9 @@ export default {
this.dealChoice(topicInfo.data.data || []); this.dealChoice(topicInfo.data.data || []);
this.dealChoiceMixin(topicMixinInfo.data.data || []); this.dealChoiceMixin(topicMixinInfo.data.data || []);
this.coverList = tempaletList.data.data || []; this.coverList = tempaletList.data.data || [];
window.status = '1';
} }
); );
window.status = 'completed';
} }
}; };
</script> </script>
......
src/packages/bi/src/project/tools.js
...@@ -31,12 +31,14 @@ export const randomType = (arr = []) => { ...@@ -31,12 +31,14 @@ export const randomType = (arr = []) => {
return arr[Math.ceil(Math.random() * arr.length)] || arr[0]; return arr[Math.ceil(Math.random() * arr.length)] || arr[0];
}; };
export const chartConfigToSetInfo = chartConfigs => { export const chartConfigToSetInfo = (chartConfigs, biInfoId) => {
return chartConfigs.map((item, index) => { return chartConfigs.map((item, index) => {
const { baseInfo, desc, analysisDesc, analysis, isDelete, chart } = item; const { baseInfo, desc, analysisDesc, analysis, isDelete, chart } = item;
const { id, type } = baseInfo; const { id, type } = baseInfo;
const { customText = '', setShow } = desc; const { customText = '', setShow } = desc;
return { return {
biInfoId: biInfoId,
id: id,
groupDetailId: id, groupDetailId: id,
topicDetailId: id, topicDetailId: id,
fixedId: id, fixedId: id,
......
webpack.config.js
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
var path = require('path'); var path = require('path');
var webpack = require('webpack'); var webpack = require('webpack');
var entry = var entry =
process.env.NODE_ENV !== 'development' process.env.NODE_ENV === 'development'
? './src/main.js' ? './src/main.js'
: './src/lib/index.js'; : './src/lib/index.js';
module.exports = { module.exports = {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!