zhuliu 1 year ago
parent
commit
5a50b75a1a

+ 1 - 1
src/views/analyse/custom/components/Tabs/Item.vue

@@ -64,7 +64,7 @@ export default {
       this.$emit('handleAdd3')
       this.$emit('handleAdd3')
     },
     },
     exportReport(){
     exportReport(){
-      this.$alert('正在开发中...', '提示', {
+      this.$alert('敬请期待...', '提示', {
           confirmButtonText: '确定',
           confirmButtonText: '确定',
           callback: action => {
           callback: action => {
           }
           }

+ 0 - 1
src/views/analyse/custom/components/dialog/addAnalyseGroup.vue

@@ -69,7 +69,6 @@ export default {
   mounted() {},
   mounted() {},
   methods: {
   methods: {
     open(title,form){
     open(title,form){
-      console.log(form)
       this.title = title
       this.title = title
       this.form2 = form
       this.form2 = form
       this.dialogVisible = true
       this.dialogVisible = true

+ 2 - 0
src/views/analyse/custom/index.vue

@@ -300,6 +300,8 @@ export default {
       if (this.id && this.saveType == 0) {
       if (this.id && this.saveType == 0) {
         const response = await this.$api.queryAnalyseDetail({id:this.id})
         const response = await this.$api.queryAnalyseDetail({id:this.id})
         data = response.data
         data = response.data
+      }else{
+        
       }
       }
       var form2 = {
       var form2 = {
         ...data,
         ...data,

+ 2 - 1
src/views/analyse/custom/mixins.js

@@ -187,6 +187,7 @@ export const chartOption = {
         
         
         return obj[type]
         return obj[type]
       }
       }
+      return type
     },
     },
     getSeriesData() {
     getSeriesData() {
       let data = [], count = this.count
       let data = [], count = this.count
@@ -345,7 +346,7 @@ export const chartOption = {
           color: this.form.setting.config.color[0]?.color
           color: this.form.setting.config.color[0]?.color
         },
         },
         barWidth: this.form.setting.barWidth,
         barWidth: this.form.setting.barWidth,
-        label: this.getDataLabel()
+        label: this.getDataLabel(),
       }]
       }]
       let grid = {
       let grid = {
         show: this.form.setting.gridBackgroundColor?true:false,
         show: this.form.setting.gridBackgroundColor?true:false,