feat

.gitignore

@@ -10,3 +10,5 @@ yarn.lock
 *.ntvs*
 *.njsproj
 *.sln
+
+dist
\ No newline at end of file

src/packages/bi/src/main.vue

@@ -3,7 +3,7 @@
  * @Author: jml
  * @Date: 2021-02-26 15:38:10
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-01 14:30:15
+ * @LastEditTime: 2021-07-02 14:42:12
 -->
 <template>
   <div class="xrk-components-bi bi" :class="{ 'bi-print': print }">

src/packages/bi/src/project/20-configurable.vue

@@ -300,6 +300,7 @@ export default {
       ];
     },
     dealFixedInfo(infoArr) {
+      // eslint-disable-next-line no-unused-vars
       const [group1 = {}, group2 = {}, group3 = {}, group4 = {}] = infoArr;
       this.missionData = [
         ChartConfigFn.createConfig(dealAxis(group1.fixedCountInfos), {
@@ -424,10 +425,9 @@ export default {
         this.dealChoice(topicInfo.data.data || []);
         this.dealChoiceMixin(topicMixinInfo.data.data || []);
         this.coverList = tempaletList.data.data || [];
+        window.status = '1';
       }
     );
-
-    window.status = 'completed';
   }
 };
 </script>

src/packages/bi/src/project/6-zone.vue

@@ -193,7 +193,7 @@ export default {
   methods: {
     dealBaseInfo(info) {
       const {
-        id,
+        biInfoId,
         coverTemplateId, // 模板ID
         styleConfigureId, // 配置ID
 
@@ -201,8 +201,8 @@ export default {
         titlePosition,
         aspEnterpriseNameWrite,
         aspNamePosition,
-        styleConfigureSettlementTime,
-        styleConfigureSettlementTimePosition,
+        settlementTime,
+        settlementTimePosition,
         dataCollectNumber,
 
         projectName = '-',
@@ -210,13 +210,13 @@ export default {
         aspEnterpriseName = '-',
         taskTime = 0,
         taskStartTime,
-        settlementTime,
+        taskEndTime,
         taskSum,
         executePeopleNumber,
         createDt
       } = info;
       this.biInfo = {
-        biInfoId: id,
+        biInfoId: biInfoId,
         styleConfigureId
       };
       this.coverId = coverTemplateId;
@@ -228,8 +228,8 @@ export default {
           pos: titlePosition
         },
         {
-          name: styleConfigureSettlementTime,
-          pos: styleConfigureSettlementTimePosition
+          name: settlementTime,
+          pos: settlementTimePosition
         },
         {
           name: aspEnterpriseNameWrite,
@@ -258,7 +258,7 @@ export default {
           },
           {
             name: '任务结算时间',
-            value: settlementTime
+            value: taskEndTime
           },
           {
             name: '报表生成时间',
@@ -427,6 +427,7 @@ export default {
         biInfoId: biInfoId,
         commandType: 2,
         biStyleConfigureInfo: {
+          biInfoId: biInfoId,
           aspEnterpriseNameWrite: content[2].name || '', //乙方封面名称
           aspNamePosition: JSON.stringify(content[2].pos), //乙方封面名称位置
           styleConfigId: styleConfigureId, //封面配置ID
@@ -436,11 +437,14 @@ export default {
           title: content[0].name || '', //封面标题
           titlePosition: JSON.stringify(content[0].pos) //标题位置
         },
-        styleConfigureFixedDetailList: chartConfigToSetInfo(this.missionData),
-        hgtgDetailList: chartConfigToSetInfo([
-          ...this.singleChoice,
-          ...this.singleChoiceMixin
-        ])
+        styleConfigureFixedDetailList: chartConfigToSetInfo(
+          this.missionData,
+          biInfoId
+        ),
+        hgtgDetailList: chartConfigToSetInfo(
+          [...this.singleChoice, ...this.singleChoiceMixin],
+          biInfoId
+        )
       });
     },
     exportBi() {
@@ -464,9 +468,9 @@ export default {
         this.dealChoice(topicInfo.data.data || []);
         this.dealChoiceMixin(topicMixinInfo.data.data || []);
         this.coverList = tempaletList.data.data || [];
+        window.status = '1';
       }
     );
-    window.status = 'completed';
   }
 };
 </script>

src/packages/bi/src/project/tools.js

@@ -31,12 +31,14 @@ export const randomType = (arr = []) => {
   return arr[Math.ceil(Math.random() * arr.length)] || arr[0];
 };
 
-export const chartConfigToSetInfo = chartConfigs => {
+export const chartConfigToSetInfo = (chartConfigs, biInfoId) => {
   return chartConfigs.map((item, index) => {
     const { baseInfo, desc, analysisDesc, analysis, isDelete, chart } = item;
     const { id, type } = baseInfo;
     const { customText = '', setShow } = desc;
     return {
+      biInfoId: biInfoId,
+      id: id,
       groupDetailId: id,
       topicDetailId: id,
       fixedId: id,

webpack.config.js

@@ -6,7 +6,7 @@
 var path = require('path');
 var webpack = require('webpack');
 var entry =
-  process.env.NODE_ENV !== 'development'
+  process.env.NODE_ENV === 'development'
     ? './src/main.js'
     : './src/lib/index.js';
 module.exports = {