center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #1283 from dataease/dev

Browse Source 
Dev
This commit is contained in:
王嘉豪 2021-11-26 10:59:38 +08:00 committed by GitHub
commit 41479705b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/components/widget/DeWidget/DeShowDate.vue
View File

@ -1,12 +1,12 @@
<template>
<div style="height: 100%">
<time-default v-if="element.formatInfo.openMode === '0'" :ref="element.id" :element="element" />
<time-default v-if="element.formatInfo.openMode === '0'" :ref="element.id" :element="element" />
<time-elec v-if="element.formatInfo.openMode === '1'" :ref="element.id" :element="element" />
<time-elec v-if="element.formatInfo.openMode === '1'" :ref="element.id" :element="element" />
<time-simple v-if="element.formatInfo.openMode === '2'" :ref="element.id" :element="element" />
<time-simple v-if="element.formatInfo.openMode === '2'" :ref="element.id" :element="element" />
<time-complex v-if="element.formatInfo.openMode === '3'" :ref="element.id" :element="element" />
<time-complex v-if="element.formatInfo.openMode === '3'" :ref="element.id" :element="element" />
</div>
</template>

4
frontend/src/components/widget/DeWidget/TimeComplex.vue
View File

@ -1,6 +1,6 @@
<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()

4
frontend/src/components/widget/DeWidget/TimeSimple.vue
View File

@ -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

2
frontend/src/views/panel/SubjectSetting/index.vue
View File

@ -1,7 +1,7 @@
<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>