diff --git a/settings.js b/settings.js index a031001..5a873b6 100644 --- a/settings.js +++ b/settings.js @@ -20,10 +20,10 @@ module.exports = { * 是否使用阿里云OSS文件存储 */ OSSConfig: { - accessKeyId: "LTAILVNVeJZkF4PV", - accessKeySecret: "YKBrFuyEQQJBXRklt4kIVS3vwS5q4U", - region: "huatek-oss.oss-cn-beijing.aliyuncs.com", - bucket: "huatek-oss", + // accessKeyId: "LTAILVNVeJZkF4PV", + // accessKeySecret: "YKBrFuyEQQJBXRklt4kIVS3vwS5q4U", + // region: "huatek-oss.oss-cn-beijing.aliyuncs.com", + // bucket: "huatek-oss", }, InfraredPic: "http://192.168.135.81:88", diff --git a/src/boilerplate/utils/auth.js b/src/boilerplate/utils/auth.js index 08a43d6..705b3c0 100644 --- a/src/boilerplate/utils/auth.js +++ b/src/boilerplate/utils/auth.js @@ -1,15 +1,15 @@ -import Cookies from 'js-cookie' +// import Cookies from 'js-cookie' -const TokenKey = 'Admin-Token' +// const TokenKey = 'Admin-Token' -export function getToken() { - return Cookies.get(TokenKey) -} +// export function getToken() { +// return Cookies.get(TokenKey) +// } -export function setToken(token) { - return Cookies.set(TokenKey, token) -} +// export function setToken(token) { +// return Cookies.set(TokenKey, token) +// } -export function removeToken() { - return Cookies.remove(TokenKey) -} +// export function removeToken() { +// return Cookies.remove(TokenKey) +// } diff --git a/src/views/onLineMonitoring/model/index.vue b/src/views/onLineMonitoring/model/index.vue index dc252f7..a3e47dc 100644 --- a/src/views/onLineMonitoring/model/index.vue +++ b/src/views/onLineMonitoring/model/index.vue @@ -1526,7 +1526,8 @@ canvas { top: 0; transform-origin: left top; width: vw(500); - // min-height: vw(320); + //min-height: vw(320); + min-height: vw(320); font-size: 18px; color: #fff; transition: all 0.5s linear;