[v1.1.20220314] 調整顯示Bug

1.  顯示長條圖之後，有個按鈕是放大統計圖，按了之後統計圖高度會超過瀏覽器顯示範圍，以至於無法關閉長條圖
2. 點選頁面瀏覽按鈕之後，再點選X(關閉)會一直轉圈圈

HiTeachCC/ClientApp/src/components/Chart/Bar.vue

@@ -66,8 +66,8 @@ export default {
       let echartdata = this.$store.state.echartbaranswer
       console.log(echartdata, 'echarts数据！')
       let ncolor = ['#0097FF', '#0097FF', '#0097FF', '#0097FF', '#0097FF', '#0097FF', '#0097FF', '#0097FF', '#0097FF', '#0097FF']
-      if (this.currentOptionViewHeight() ==660) {
-        this.barheight = '600'
+      if (this.currentOptionViewHeight() ==(window.innerHeight*0.8).toFixed(0)) {
+        this.barheight = ((window.innerHeight*0.8).toFixed(0)-60).toString()
         document.getElementById('main').style.height = this.barheight + 'px'
         let shopCharts = this.$echarts.init(document.getElementById('main'))
         shopCharts.resize()

HiTeachCC/ClientApp/src/components/Chart/OptionView.vue

@@ -428,7 +428,7 @@ export default {
       styleObjScreen: {
         isShow: true,
         width: '100%',
-        height: '720px',
+        height: `${window.innerHeight*0.8}px`,
         maxWidth: '1920px',
         marginLeft: '0px',
         marginTop: '0px',
@@ -833,9 +833,9 @@ export default {
         this.current = ''
 
         this.fullscreen = '0'
-        this.cssheightL = '660'
+        this.cssheightL = `${window.innerHeight*0.8-60}`
         this.$store.state.cssvalue = '1'
-        this.$store.state.optionViewHeight= 660
+        this.$store.state.optionViewHeight= window.innerHeight*0.8-60
         this.$emit('styleObjScreen', this.styleObjScreen)
       } else if (e === 'screen') {
         this.aspectRatio = 'default'
@@ -1003,7 +1003,7 @@ export default {
         this.current = ''
 
         this.fullscreen = '0'
-        this.cssheightL = '660'
+        this.cssheightL = `${window.innerHeight*0.8-60}`
         this.$store.state.cssvalue = '1'
         this.$emit('styleObjScreen', this.styleObjScreen)
       }
@@ -1217,8 +1217,8 @@ export default {
         this.cssheightL = '240'
         ;(this.$store.state.optionViewHeight = 240), (this.poptipStyle = 'poptipStyleWidth poptipTop')
       } else {
-        this.cssheightL = '660'
-        this.$store.state.optionViewHeight = 660
+        this.cssheightL = `${window.innerHeight*0.8-60}`
+        this.$store.state.optionViewHeight = window.innerHeight*0.8-60
         this.poptipStyle = 'poptipStyleWidth poptipBottom'
       }
     },

HiTeachCC/ClientApp/src/store.js

@@ -142,7 +142,7 @@ export default new Vuex.Store({
         isExportPDFNow:false,
         currentPage:0,
         pdfLimit:20,
-        version: 'v1.2.20220311'
+        version: 'v1.1.20220314'
     },
   mutations: {
 

HiTeachCC/ClientApp/src/views/Board.vue

@@ -659,7 +659,7 @@ export default {
             text: text,
             fontSize: 18,
             fill: 'black',
-            fontStyle:'bold',
+            fontStyle: 'bold',
             padding: 10,
             lineHeight: 1.5,
             wrap: 'none',
@@ -1493,6 +1493,10 @@ export default {
               that.layer.draw()
             })
           }
+          imageObj.onerror = function() {
+            console.debug('圖片載入失敗')
+            that.$q.loading.hide()
+          }
         }
       }
     },
@@ -1909,7 +1913,7 @@ export default {
               } else {
                 console.log(target, '拖动的元素')
 
-                if (target.className != 'text' && target.attrs.name != 'pastTextContent'&&target.attrs.name != 'pastImgContent') {
+                if (target.className != 'text' && target.attrs.name != 'pastTextContent' && target.attrs.name != 'pastImgContent') {
                   target.draggable(true)
                   //介于是否拖动
                 } else if (target.attrs.name != 'pastTextContent') {