Browse Source

Merge remote-tracking branch 'origin/master'

liu.shiyi 1 year ago
parent
commit
756a1d17f2

+ 0 - 2
data-room-ui/packages/BigScreenDesign/PageDesignTop.vue

@@ -449,7 +449,6 @@ export default {
           if (dataUrl) {
             if (showSize(dataUrl) > 200) {
               // const newData = compressImage(dataUrl, 800)
-              // console.log(111, newData)
               // const url = dataURLtoBlob(dataUrl)
               // // 压缩到500KB,这里的500就是要压缩的大小,可自定义
               // const imgRes = await imageConversion.compressAccurately(url, {
@@ -461,7 +460,6 @@ export default {
               // pageInfo.coverPicture = base64.result
               this.$message.info('由于封面图片过大,进行压缩中')
               const compressCoverPicture = await compressImage(dataUrl, { width: 1280, height: 720, size: 400, quality: 1 })
-              console.log(showSize(compressCoverPicture))
               pageInfo.coverPicture = compressCoverPicture
             } else {
               pageInfo.coverPicture = dataUrl

+ 0 - 1
data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue

@@ -382,7 +382,6 @@ export default {
   },
   methods: {
     changeImg(val){
-      console.log(val)
       this.$set(this.config,'imgUrl',val.url)
     },
     init(){

+ 1 - 2
data-room-ui/packages/PlotRender/index.vue

@@ -181,7 +181,6 @@ export default {
           }
         }
         if(config.chartType=='Treemap'){
-          console.log(data)
           const xAxis = config.setting.find(item => item.field === 'xField')?.value
           const listData = data.children.map(item => {
             if (xAxis && typeof item[xAxis] === 'number') {
@@ -190,7 +189,7 @@ export default {
             return item
           })
           config.option.data={name:'root',children:[...listData]}
-          console.log(config.option.data)
+          // console.log(config.option.data)
         }else{
            // 如果维度为数字类型则转化为字符串,否则在不增加其他配置的情况下会导致图标最后一项不显示(g2plot官网已说明)
           const xAxis = config.setting.find(item => item.field === 'xField')?.value