Merge pull request #1283 from dataease/dev

frontend/src/components/widget/DeWidget/TimeComplex.vue

 <template>
   <div>
-    <canvas id="canvas" width="500" height="500" />
+    <canvas :id="'complex_canvas'+element.id" width="500" height="500" />
   </div>
 </template>
 
@@ -30,7 +30,7 @@ export default {
     }
   },
   mounted() {
-    this.canvas = document.getElementById('canvas')
+    this.canvas = document.getElementById('complex_canvas' + this.element.id)
     this.initCtx()
     this.initCtxBack()
     this.initNumBack()

frontend/src/components/widget/DeWidget/TimeSimple.vue

@@ -2,7 +2,7 @@
   <div :style="{ 'height': containerHeight}">
     <div ref="canvasContainer" class="time-s-class" style="height: calc(100% - 50px);" :style="{'margin':timeMargin +'px'}">
       <canvas
-        id="canvas"
+        :id="'simple-canvas'+element.id"
         class="de-canvas"
         :width="canvas_width"
         :height="canvas_height"
@@ -47,7 +47,7 @@ export default {
     }
   },
   mounted() {
-    this.canvas = document.getElementById('canvas')
+    this.canvas = document.getElementById('simple-canvas' + this.element.id)
     this.draw = this.canvas.getContext('2d')
     this.canvas_width = this.element.style.width
     this.canvas_height = this.element.style.height

frontend/src/views/panel/SubjectSetting/index.vue

 <template>
   <el-row class="slider-container">
     <div
-      style="height: 40px; line-height: 40px; padding-left: 15px; text-align: left; white-space: pre; text-overflow: ellipsis; left: 0px; right: 0px; top: 0px; font-weight: 700"
+      style="height: 40px; padding-left: 15px; text-align: left; white-space: pre; text-overflow: ellipsis; left: 0px; right: 0px; top: 0px; font-weight: 700"
     >
       {{ $t('panel.dashboard_theme') }}
     </div>