diff --git a/src/lib/axios.js b/src/lib/axios.js index 99de3ab..eba6fea 100644 --- a/src/lib/axios.js +++ b/src/lib/axios.js @@ -11,7 +11,8 @@ import { message } from 'ant-design-vue'; import axios from 'axios'; import { clearAllCoolies, getTokenFromCookie } from '/@/utils/cookie-util'; import { localClear } from '/@/utils/local-util'; - +import { useRouter } from 'vue-router'; +const router = useRouter(); // token的消息头 const TOKEN_HEADER = 'x-access-token'; @@ -56,7 +57,7 @@ smartAxios.interceptors.response.use( localClear(); //跳转到登录页面,直接使用页面刷新的策略 setTimeout(() => { - location.href = '/'; + router.push("/login"); }, 300); return Promise.reject(response); }else if(res.code === 200){ diff --git a/src/views/business/case/imgEditor.vue b/src/views/business/case/imgEditor.vue index a58e5e8..4cebed7 100644 --- a/src/views/business/case/imgEditor.vue +++ b/src/views/business/case/imgEditor.vue @@ -7,7 +7,7 @@ import { message, Modal } from 'ant-design-vue'; import { ref, onBeforeUnmount, nextTick } from 'vue'; import 'tui-image-editor/dist/tui-image-editor.css'; import 'tui-color-picker/dist/tui-color-picker.css'; -import ImageEditor from 'tui-image-editor'; +import ImageEditor from 'tui-image-editor/dist/tui-image-editor'; import { caseplatformCaseApi } from '/@/api/business/case/caseplatform-case-api'; import { FileUtil } from '/@/utils/fileutil'; import dayjs from 'dayjs'; @@ -358,7 +358,9 @@ const fileToBase64 = (file) => { }); }; const init = (src) => { +// console.log(ImageEditor); instance.value = new ImageEditor(document.querySelector('#tui-image-editor'), { + includeUI: { loadImage: { path: src+'?time='+new Date().getTime(), @@ -372,14 +374,9 @@ const init = (src) => { theme: customTheme, // 自定义样式 }, cssMaxWidth: 1000, // canvas 最大宽度 - cssMaxHeight: 600 + cssMaxHeight: 800 }) - setTimeout(() => { - instance.value.setBrush({ - color: '#000000', - width: 12, - }); - },1000); + document.getElementsByClassName('tui-image-editor-main')[0].style.top = '45px'; // 调整图片显示位置 //document.getElementsByClassName('tie-btn-reset tui-image-editor-item help')[0].style.display = 'none'; // 隐藏顶部重置按钮 document.getElementsByClassName('tie-text-align-button')[0].style.display = 'none'; // 隐藏文字对齐选项