commit

src/views/datasheet_manage/customAnalysis/addAnalysisSheet.vue

@@ -231,14 +231,14 @@ export default {
 
       this.$message.success(res.Msg);
 
-      const { ExcelInfoId, UniqueCode } = res.Data;
+      // const { ExcelInfoId, UniqueCode } = res.Data;
       
       this.$router.replace({
         path: '/sheetAnalysisList',
-        query: {
-          code: UniqueCode,
-          id: ExcelInfoId
-        }
+        // query: {
+        //   code: UniqueCode,
+        //   id: ExcelInfoId
+        // }
       })
     },300),
 

src/views/datasheet_manage/customAnalysis/list.vue

@@ -679,7 +679,7 @@ export default {
 
         this.sheetDetailInfo = res.Data.ExcelInfo;
         this.dataToalPage =  Math.max(...res.Data.SheetList.map(_ => _.PageNum));
-        this.sheetAllcellData = res.Data.SheetList.map(_ => JSON.parse(_.Data.Data));
+        this.sheetAllcellData = res.Data.SheetList.map(_ => _.Data ? JSON.parse(_.Data.Data) : []);
 
         this.getCellData(res.Data.SheetList)
       });
@@ -711,10 +711,11 @@ export default {
       }else {
         console.log(this.sheetAllcellData)
         this.sheetConfigOpt.data = sheets.map((_,index) => ({
-          // index: _.Sort, //工作表索引
+          index: _.Sort, //工作表索引
           order: _.Sort, //工作表的下标
           name: _.SheetName,
-          calcChain: _.CalcChain?JSON.parse(_.CalcChain):{},
+          calcChain: _.CalcChain?JSON.parse(_.CalcChain):[],
+          // calcChain: _.CalcChain?[{r:27,c:4,index:1}]:[],
           config: JSON.parse(_.Config),
           celldata: this.sheetAllcellData[index],
         }))