已生成报表数据

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -142,7 +142,7 @@
               <el-form-item label="模式值" prop="modeValue">
                 <el-input v-model="groupRateForm.modeValue" placeholder="请输入模式值"
                           oninput="value=value.replace(/[^0-9.]/g,'')">
-                  <template slot="append" v-if="groupRateForm.readMode == '2'">秒</template>
+                  <template slot="append" v-if="groupRateForm.readMode == '0'">秒</template>
                 </el-input>
               </el-form-item>
               <el-form-item label='取值模式' prop="valueMode">

chuanyi_client2/src/views/my_report/index.vue

@@ -528,8 +528,8 @@ export default {
       }
       const loading = showLoading(this, '加载中，请稍候···')
       getReportTableById(data.id).then(res => {
+        loading.close()
         if (!res.data) {
-          loading.close()
           this.$message({
             message: '选择的报表不存在！',
             type: 'warning'
@@ -540,10 +540,14 @@ export default {
         this.chooseMyReport = res.data
         let reportTableData = res.data.reportTableData
         let luckyData = JSON.parse(reportTableData)
-        this.drawLuckyExcel(luckyData, () => {
-          this.btnType = 'show'
-          loading.close()
-        })
+        // this.drawLuckyExcel(luckyData, () => {
+        //   this.btnType = 'show'
+        //   loading.close()
+        // })
+        luckysheet.destroy()
+        let option = luckyData.option
+        option.data = luckyData.data
+        luckysheet.create(option)
       }).catch((e) => {
         console.log(e)
         loading.close()