Commit 2c78b6c0 authored by 陈珠河's avatar 陈珠河

Feat: 添加公告功能并调整登陆授权

parent 182365ea
......@@ -12,6 +12,7 @@ axios.defaults.retry = 1;
axios.defaults.retryDelay = 1000;
// 设置defaults.baseURL
axios.defaults.baseURL = _config.baseUrl;
axios.defaults.headers.common['auth-token'] = window.localStorage.getItem('south-samrtweb-token') || '';
// 请求超时拦截,重新请求
axios.interceptors.response.use(function(response) {
......@@ -24,17 +25,10 @@ axios.interceptors.response.use(function(response) {
message: '请求服务好像出错了,' + status
});
return Promise.reject(response);
}/* else if (data.status === 2) {
Message({
type: 'error',
message: '请求服务后台处理出现了错误'
});
} else if (data.status === 1) {
Message({
type: 'warning',
message: '请求服务处理出现了异常,' + data.message
});
} */
} else if (response.data.data && response.data.data.hasOwnProperty('token')) {
window.localStorage.setItem('south-samrtweb-token', response.data.data.token);
axios.defaults.headers.common['auth-token'] = window.localStorage.getItem('south-samrtweb-token') || '';
}
return Promise.resolve(response);
}, function axiosRetryInterceptor(err) {
......
......@@ -12,8 +12,8 @@
},
"dependencies": {
"core-js": "^2.6.5",
"smart-charts": "^1.0.0-alpha",
"smart-web": "^2.2.3",
"smart-charts": "^1.0.0",
"smart-web": "^2.3.0",
"vue": "^2.6.10",
"vue-progressbar": "^0.7.5",
"vue-router": "^3.1.3",
......
......@@ -12,6 +12,7 @@ axios.defaults.retry = 1;
axios.defaults.retryDelay = 1000;
// 设置defaults.baseURL
axios.defaults.baseURL = _config.baseUrl;
axios.defaults.headers.common['auth-token'] = window.localStorage.getItem('south-samrtweb-token') || '';
// 请求超时拦截,重新请求
axios.interceptors.response.use(function(response) {
......@@ -24,17 +25,10 @@ axios.interceptors.response.use(function(response) {
message: '请求服务好像出错了,' + status
});
return Promise.reject(response);
}/* else if (data.status === 2) {
Message({
type: 'error',
message: '请求服务后台处理出现了错误'
});
} else if (data.status === 1) {
Message({
type: 'warning',
message: '请求服务处理出现了异常,' + data.message
});
} */
} else if (response.data.data && response.data.data.hasOwnProperty('token')) {
window.localStorage.setItem('south-samrtweb-token', response.data.data.token);
axios.defaults.headers.common['auth-token'] = window.localStorage.getItem('south-samrtweb-token') || '';
}
return Promise.resolve(response);
}, function axiosRetryInterceptor(err) {
......
import { cb } from '../extend';
export default {
announce: () => import('@/views/businessConfig/announce').then(cb),
businessConfiguration: () => import('@/views/businessConfig/businessConfiguration').then(cb)
};
<template>
<sw-announce></sw-announce>
</template>
<script>
import SwAnnounce from 'smart-web/packages/announce';
import 'smart-web/packages/styles/src/announce.scss';
export default {
name: 'announce',
components: {
SwAnnounce
}
};
</script>
......@@ -29,7 +29,7 @@ export default {
name: '新建流程',
componentName: 'appIframe'
};
const url = baseUrl + '/modeler.html?modelId=' + modelId;
const url = baseUrl + '/modeler.html?modelId=' + modelId + '&token=' + window.localStorage.getItem('south-samrtweb-token');
openTab(data, { url: url });
},
......@@ -39,9 +39,7 @@ export default {
name: '编辑流程',
componentName: 'editProcess'
};
const url = baseUrl + '/modeler.html?modelId=' + modelId;
// let url = process.env.NODE_ENV === 'development' ? serviceUrl + '/smartweb2' : '.'
// url += '/workflow-designer/index.html?modelId=' + this.currentNode.id
const url = baseUrl + '/modeler.html?modelId=' + modelId + '&token=' + window.localStorage.getItem('south-samrtweb-token');
openTab(data, { url: url, reload: true });
},
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment