修改自动数据查询

chuanyi_client2/src/views/my_report/index.vue

@@ -1318,6 +1318,10 @@ export default {
       setTimeout(() => {
         const sheet = luckysheet.getLuckysheetfile()[0]
         let optionData = sheet.data
+        let elements = document.getElementsByClassName(info.className);
+        for (let i = 0; i < elements.length; i++) {
+          elements[i].parentNode.removeChild(elements[i]);
+        }
         try {
           let flag = true
           insertLuckysheetEChart({
@@ -1569,12 +1573,31 @@ export default {
         let _data = res.data
         if (!_data) {
           loading.close()
-          if (this.reportIntervalTag) clearInterval(this.reportIntervalTag)
+          // if (this.reportIntervalTag) clearInterval(this.reportIntervalTag)
           return
         }
         this.chooseCurrMyReport = _data
         this.chooseMyReport = res.data
-        this.setLuckysheetStatus(_data, true, '', loading)
+        // this.setLuckysheetStatus(_data, true, '', loading)
+        // 报表数据
+        let reportTableData = _data.reportTableData
+        let luckyData = JSON.parse(reportTableData)
+        // 基础数据项值
+        let baseItem = luckyData.baseItem
+        // 数据项
+        let reportTableItemList = _data.reportTableItemList
+        let reportChartList = _data.reportChartList
+        // 报表类型
+        let reportTableType = _data.reportTableType
+        for (let i in reportChartList) {
+          this.insertEChartInfo(reportChartList[i])
+        }
+        // 绘制基础数据项
+        this.drawBaseInfo(baseItem)
+        // 绘制数据值
+        this.drawTableData(reportTableItemList, reportTableType)
+        luckysheet.setRangeShow('BH1')
+        loading.close()
       }).catch((e) => {
         if (this.reportIntervalTag) clearInterval(this.reportIntervalTag)
         loading.close()

chuanyi_client2/src/views/run_config/index.vue

@@ -1466,6 +1466,10 @@ export default {
       setTimeout(() => {
         const sheet = luckysheet.getLuckysheetfile()[0]
         let optionData = sheet.data
+        let elements = document.getElementsByClassName(info.className);
+        for (let i = 0; i < elements.length; i++) {
+          elements[i].parentNode.removeChild(elements[i]);
+        }
         try {
           let flag = true
           insertLuckysheetEChart({
@@ -1775,12 +1779,31 @@ export default {
         let _data = res.data
         if (!_data) {
           loading.close()
-          if (this.reportIntervalTag) clearInterval(this.reportIntervalTag)
+          // if (this.reportIntervalTag) clearInterval(this.reportIntervalTag)
           return
         }
         this.chooseCurrMyReport = _data
         this.chooseMyReport = res.data
-        this.setLuckysheetStatus(_data, true, '', loading)
+        // this.setLuckysheetStatus(_data, true, '', loading)
+        // 报表数据
+        let reportTableData = _data.reportTableData
+        let luckyData = JSON.parse(reportTableData)
+        // 基础数据项值
+        let baseItem = luckyData.baseItem
+        // 数据项
+        let reportTableItemList = _data.reportTableItemList
+        let reportChartList = _data.reportChartList
+        // 报表类型
+        let reportTableType = _data.reportTableType
+        for (let i in reportChartList) {
+          this.insertEChartInfo(reportChartList[i])
+        }
+        // 绘制基础数据项
+        this.drawBaseInfo(baseItem)
+        // 绘制数据值
+        this.drawTableData(reportTableItemList, reportTableType)
+        luckysheet.setRangeShow('BH1')
+        loading.close()
       }).catch((e) => {
         if (this.reportIntervalTag) clearInterval(this.reportIntervalTag)
         loading.close()