Merge branch 'fix' into debug

src/views/chartShow/index.vue

@@ -101,7 +101,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, onMounted, ref } from 'vue';
+import { defineComponent, reactive, toRefs, onMounted, ref, nextTick } from 'vue';
 import { ElMessage } from 'element-plus';
 import _ from 'lodash';
 import { useRoute } from 'vue-router';
@@ -168,8 +168,10 @@ export default defineComponent({
         type === 'refresh' && ElMessage.success('刷新成功');
 
         //水印配置
-        const markDom = document.querySelector('.mark')
-        Data.WaterMark&&(markDom.style.backgroundImage = `url(${Data.WaterMark})`)
+        nextTick(()=>{
+          const markDom = document.querySelector('.mark')
+          Data.WaterMark&&(markDom.style.backgroundImage = `url(${Data.WaterMark})`)
+        })
       }catch (e) {
         loading.value = false;
         haveData.value = false;