+
diff --git a/vue/src/layout/components/langSelect.vue b/vue/src/layout/components/langSelect.vue
new file mode 100644
index 00000000..080f6651
--- /dev/null
+++ b/vue/src/layout/components/langSelect.vue
@@ -0,0 +1,62 @@
+
+
-
-
-
+
+
+
-
-
-
-
-
- 个人中心
-
-
- 布局设置
-
-
- 退出登录
-
-
-
-
- ![]()
-
+
+
+
+ {{ $t('navbar.personalCenter') }}
+
+
+ {{ $t('settings.title') }}
+
+
+ {{ $t('navbar.logout') }}
+
+
+
-
+ ![]()
+
+
+
+
+
+
+ {{ item.language }}
+
+
+
+
+
+
+
+
+
diff --git a/vue/src/main.js b/vue/src/main.js
index f953bde2..a151c864 100644
--- a/vue/src/main.js
+++ b/vue/src/main.js
@@ -1,101 +1,101 @@
-import Vue from 'vue'
+import Vue from 'vue';
-import Cookies from 'js-cookie'
+import Cookies from 'js-cookie';
-import Element from 'element-ui'
-import './assets/styles/element-variables.scss'
-import busEvent from '@/utils/busEvent'
+import Element from 'element-ui';
+import './assets/styles/element-variables.scss';
+import busEvent from '@/utils/busEvent';
-import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/ruoyi.scss' // ruoyi css
-import App from './App'
-import store from './store'
-import router from './router'
-import directive from './directive' // directive
-import plugins from './plugins' // plugins
-import { download } from '@/utils/request'
+import '@/assets/styles/index.scss'; // global css
+import '@/assets/styles/ruoyi.scss'; // ruoyi css
+import App from './App';
+import store from './store';
+import router from './router';
+import directive from './directive'; // directive
+import plugins from './plugins'; // plugins
+import { download } from '@/utils/request';
+import { i18n } from '@/lang';
-import './assets/icons' // icon
-import './permission' // permission control
-import { getDicts } from "@/api/system/dict/data";
-import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import './assets/icons'; // icon
+import './permission'; // permission control
+import { getDicts } from '@/api/system/dict/data';
+import { getConfigKey } from '@/api/system/config';
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from '@/utils/ruoyi';
// 分页组件
-import Pagination from "@/components/Pagination";
+import Pagination from '@/components/Pagination';
// 自定义表格工具组件
-import RightToolbar from "@/components/RightToolbar"
+import RightToolbar from '@/components/RightToolbar';
// 富文本组件
-import Editor from "@/components/Editor"
+import Editor from '@/components/Editor';
// 文件上传组件
-import FileUpload from "@/components/FileUpload"
+import FileUpload from '@/components/FileUpload';
// 图片上传组件
-import ImageUpload from "@/components/ImageUpload"
+import ImageUpload from '@/components/ImageUpload';
// 图片预览组件
-import ImagePreview from "@/components/ImagePreview"
+import ImagePreview from '@/components/ImagePreview';
// 字典标签组件
-import DictTag from '@/components/DictTag'
+import DictTag from '@/components/DictTag';
// 头部标签组件
-import VueMeta from 'vue-meta'
+import VueMeta from 'vue-meta';
// 字典数据组件
-import DictData from '@/components/DictData'
+import DictData from '@/components/DictData';
// Echart
-import * as echarts from 'echarts'
+import * as echarts from 'echarts';
// 一键复制粘贴板组件
-import VueClipboard from 'vue-clipboard2'
+import VueClipboard from 'vue-clipboard2';
// Mqtt工具
-import mqttTool from '@/utils/mqttTool'
+import mqttTool from '@/utils/mqttTool';
-import ItemWrap from './views/bigScreen/components/item-wrap/item-wrap.vue'
-import Message from './views/bigScreen/components/message/message.vue'
-import Reacquire from './views/bigScreen/components/reacquire/reacquire.vue'
-import {loading,borderBox13,digitalFlop,waterLevelPond,scrollBoard,capsuleChart,borderBox8,decoration12,decoration3,decoration9,activeRingChart} from '@jiaminghi/data-view'
+import ItemWrap from './views/bigScreen/components/item-wrap/item-wrap.vue';
+import Message from './views/bigScreen/components/message/message.vue';
+import Reacquire from './views/bigScreen/components/reacquire/reacquire.vue';
+import { loading, borderBox13, digitalFlop, waterLevelPond, scrollBoard, capsuleChart, borderBox8, decoration12, decoration3, decoration9, activeRingChart } from '@jiaminghi/data-view';
// datav组件 ,会导致生成文件无法打开
-Vue.use(loading)
-Vue.use(borderBox13)
-Vue.use(borderBox8)
-Vue.use(digitalFlop)
-Vue.use(capsuleChart)
-Vue.use(waterLevelPond)
-Vue.use(scrollBoard)
-Vue.use(decoration12)
-Vue.use(activeRingChart)
-Vue.use(decoration3)
-Vue.use(decoration9)
+Vue.use(loading);
+Vue.use(borderBox13);
+Vue.use(borderBox8);
+Vue.use(digitalFlop);
+Vue.use(capsuleChart);
+Vue.use(waterLevelPond);
+Vue.use(scrollBoard);
+Vue.use(decoration12);
+Vue.use(activeRingChart);
+Vue.use(decoration3);
+Vue.use(decoration9);
// 自定义组件
-Vue.component("ItemWrap",ItemWrap)
-Vue.component("Message",Message)
-Vue.component("Reacquire",Reacquire)
-
+Vue.component('ItemWrap', ItemWrap);
+Vue.component('Message', Message);
+Vue.component('Reacquire', Reacquire);
// 全局方法挂载
-Vue.prototype.getDicts = getDicts
-Vue.prototype.getConfigKey = getConfigKey
-Vue.prototype.parseTime = parseTime
-Vue.prototype.resetForm = resetForm
-Vue.prototype.addDateRange = addDateRange
-Vue.prototype.selectDictLabel = selectDictLabel
-Vue.prototype.selectDictLabels = selectDictLabels
-Vue.prototype.download = download
-Vue.prototype.handleTree = handleTree
-Vue.prototype.$echarts = echarts
-Vue.prototype.$mqttTool = mqttTool
-Vue.prototype.$busEvent = busEvent
+Vue.prototype.getDicts = getDicts;
+Vue.prototype.getConfigKey = getConfigKey;
+Vue.prototype.parseTime = parseTime;
+Vue.prototype.resetForm = resetForm;
+Vue.prototype.addDateRange = addDateRange;
+Vue.prototype.selectDictLabel = selectDictLabel;
+Vue.prototype.selectDictLabels = selectDictLabels;
+Vue.prototype.download = download;
+Vue.prototype.handleTree = handleTree;
+Vue.prototype.$echarts = echarts;
+Vue.prototype.$mqttTool = mqttTool;
+Vue.prototype.$busEvent = busEvent;
// 全局组件挂载
-Vue.component('DictTag', DictTag)
-Vue.component('Pagination', Pagination)
-Vue.component('RightToolbar', RightToolbar)
-Vue.component('Editor', Editor)
-Vue.component('FileUpload', FileUpload)
-Vue.component('ImageUpload', ImageUpload)
-Vue.component('ImagePreview', ImagePreview)
-Vue.use(VueClipboard)
-Vue.use(directive)
-Vue.use(plugins)
-Vue.use(VueMeta)
-DictData.install()
+Vue.component('DictTag', DictTag);
+Vue.component('Pagination', Pagination);
+Vue.component('RightToolbar', RightToolbar);
+Vue.component('Editor', Editor);
+Vue.component('FileUpload', FileUpload);
+Vue.component('ImageUpload', ImageUpload);
+Vue.component('ImagePreview', ImagePreview);
+Vue.use(VueClipboard);
+Vue.use(directive);
+Vue.use(plugins);
+Vue.use(VueMeta);
+DictData.install();
/**
* If you don't want to use mock-server
@@ -107,20 +107,22 @@ DictData.install()
*/
Vue.use(Element, {
- size: Cookies.get('size') || 'medium' // set element-ui default size
-})
+ size: Cookies.get('size') || 'medium', // set element-ui default size
+ i18n: (key, value) => i18n.t(key, value), // 这里会根据选的语言切换Element-ui的语言
+});
-Vue.config.productionTip = false
+Vue.config.productionTip = false;
new Vue({
- el: '#app',
- router,
- store,
- render: h => h(App)
-})
+ el: '#app',
+ router,
+ store,
+ i18n,
+ render: (h) => h(App),
+});
// 表格带边框
Element.Table.props.border = {
- default:true,
- type:Boolean
-}
+ default: true,
+ type: Boolean,
+};
diff --git a/vue/src/settings.js b/vue/src/settings.js
index d0640a68..cfea5788 100644
--- a/vue/src/settings.js
+++ b/vue/src/settings.js
@@ -1,3 +1,4 @@
+import Cookies from 'js-cookie';
module.exports = {
/**
* 侧边栏主题 深色主题theme-dark，浅色主题theme-light
@@ -40,5 +41,9 @@ module.exports = {
* The default is only used in the production env
* If you want to also use it in dev, you can pass ['production', 'development']
*/
- errorLog: 'production'
+ errorLog: 'production',
+ /**
+ * 默认语言 先從cookies拿，沒有從瀏覽器語言拿，最後用'zh-CN'
+ */
+ language: Cookies.get('language') || navigator.language || navigator.browserLanguage || 'zh-CN',
}
diff --git a/vue/src/store/getters.js b/vue/src/store/getters.js
index 8adb1b65..de61f26f 100644
--- a/vue/src/store/getters.js
+++ b/vue/src/store/getters.js
@@ -1,19 +1,20 @@
const getters = {
- sidebar: state => state.app.sidebar,
- size: state => state.app.size,
- device: state => state.app.device,
- dict: state => state.dict.dict,
- visitedViews: state => state.tagsView.visitedViews,
- cachedViews: state => state.tagsView.cachedViews,
- token: state => state.user.token,
- avatar: state => state.user.avatar,
- name: state => state.user.name,
- introduction: state => state.user.introduction,
- roles: state => state.user.roles,
- permissions: state => state.user.permissions,
- permission_routes: state => state.permission.routes,
- topbarRouters:state => state.permission.topbarRouters,
- defaultRoutes:state => state.permission.defaultRoutes,
- sidebarRouters:state => state.permission.sidebarRouters,
-}
-export default getters
+ sidebar: (state) => state.app.sidebar,
+ size: (state) => state.app.size,
+ device: (state) => state.app.device,
+ dict: (state) => state.dict.dict,
+ visitedViews: (state) => state.tagsView.visitedViews,
+ cachedViews: (state) => state.tagsView.cachedViews,
+ token: (state) => state.user.token,
+ avatar: (state) => state.user.avatar,
+ name: (state) => state.user.name,
+ introduction: (state) => state.user.introduction,
+ roles: (state) => state.user.roles,
+ permissions: (state) => state.user.permissions,
+ permission_routes: (state) => state.permission.routes,
+ topbarRouters: (state) => state.permission.topbarRouters,
+ defaultRoutes: (state) => state.permission.defaultRoutes,
+ sidebarRouters: (state) => state.permission.sidebarRouters,
+ language: (state) => state.app.language,
+};
+export default getters;
diff --git a/vue/src/store/modules/settings.js b/vue/src/store/modules/settings.js
index 2455a1e2..d7e63b57 100644
--- a/vue/src/store/modules/settings.js
+++ b/vue/src/store/modules/settings.js
@@ -1,42 +1,50 @@
-import defaultSettings from '@/settings'
+import defaultSettings from '@/settings';
+import Cookies from 'js-cookie';
-const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
+const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle, language } = defaultSettings;
-const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
+const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '';
const state = {
- title: '',
- theme: storageSetting.theme || '#409EFF',
- sideTheme: storageSetting.sideTheme || sideTheme,
- showSettings: showSettings,
- topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
- tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
- fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
- sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
- dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle
-}
+ title: '',
+ theme: storageSetting.theme || '#409EFF',
+ sideTheme: storageSetting.sideTheme || sideTheme,
+ showSettings: showSettings,
+ topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
+ tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
+ fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
+ sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
+ dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle,
+ language: language,
+};
const mutations = {
- CHANGE_SETTING: (state, { key, value }) => {
- if (state.hasOwnProperty(key)) {
- state[key] = value
- }
- }
-}
+ CHANGE_SETTING: (state, { key, value }) => {
+ if (state.hasOwnProperty(key)) {
+ state[key] = value;
+ }
+ },
+ SET_LANG: (state, lang) => {
+ state.language = lang;
+ Cookies.set('language', lang);
+ },
+};
const actions = {
- // 修改布局设置
- changeSetting({ commit }, data) {
- commit('CHANGE_SETTING', data)
- },
- // 设置网页标题
- setTitle({ commit }, title) {
- state.title = title
- }
-}
+ // 修改布局设置
+ changeSetting({ commit }, data) {
+ commit('CHANGE_SETTING', data);
+ },
+ // 设置网页标题
+ setTitle({ commit }, title) {
+ state.title = title;
+ },
+ setLang({ commit }, lang) {
+ commit('SET_LANG', lang);
+ },
+};
export default {
- namespaced: true,
- state,
- mutations,
- actions
-}
-
+ namespaced: true,
+ state,
+ mutations,
+ actions,
+};
diff --git a/vue/src/utils/request.js b/vue/src/utils/request.js
index d1f0a050..21a4dabb 100644
--- a/vue/src/utils/request.js
+++ b/vue/src/utils/request.js
@@ -1,146 +1,160 @@
-import axios from 'axios'
-import { Notification, MessageBox, Message, Loading } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/auth'
-import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from "@/utils/ruoyi";
-import cache from '@/plugins/cache'
-import { saveAs } from 'file-saver'
+import axios from 'axios';
+import { Notification, MessageBox, Message, Loading } from 'element-ui';
+import store from '@/store';
+import { getToken } from '@/utils/auth';
+import errorCode from '@/utils/errorCode';
+import { tansParams, blobValidate } from '@/utils/ruoyi';
+import cache from '@/plugins/cache';
+import { saveAs } from 'file-saver';
let downloadLoadingInstance;
// 是否显示重新登录
export let isRelogin = { show: false };
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
// 创建axios实例
const service = axios.create({
- // axios中请求配置有baseURL选项，表示请求URL公共部分
- baseURL: process.env.VUE_APP_BASE_API,
- // 超时
- timeout: 20000
-})
+ // axios中请求配置有baseURL选项，表示请求URL公共部分
+ baseURL: process.env.VUE_APP_BASE_API,
+ // 超时
+ timeout: 20000,
+});
// request拦截器
-service.interceptors.request.use(config => {
- // 是否需要设置 token
- const isToken = (config.headers || {}).isToken === false
- // 是否需要防止数据重复提交
- const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
- if (getToken() && !isToken) {
- config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
- }
- // get请求映射params参数
- if (config.method === 'get' && config.params) {
- let url = config.url + '?' + tansParams(config.params);
- url = url.slice(0, -1);
- config.params = {};
- config.url = url;
- }
- if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
- const requestObj = {
- url: config.url,
- data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
- time: new Date().getTime()
+service.interceptors.request.use(
+ (config) => {
+ config.headers.language = store.state.settings.language;
+ // 是否需要设置 token
+ const isToken = (config.headers || {}).isToken === false;
+ // 是否需要防止数据重复提交
+ const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
+ if (getToken() && !isToken) {
+ config.headers['Authorization'] = 'Bearer ' + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
+ }
+ // get请求映射params参数
+ if (config.method === 'get' && config.params) {
+ let url = config.url + '?' + tansParams(config.params);
+ url = url.slice(0, -1);
+ config.params = {};
+ config.url = url;
+ }
+ if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+ const requestObj = {
+ url: config.url,
+ data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+ time: new Date().getTime(),
+ };
+ const sessionObj = cache.session.getJSON('sessionObj');
+ if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+ cache.session.setJSON('sessionObj', requestObj);
+ } else {
+ const s_url = sessionObj.url; // 请求地址
+ const s_data = sessionObj.data; // 请求数据
+ const s_time = sessionObj.time; // 请求时间
+ const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
+ if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+ const message = '数据正在处理，请勿重复提交';
+ console.warn(`[${s_url}]: ` + message);
+ return Promise.reject(new Error(message));
+ } else {
+ cache.session.setJSON('sessionObj', requestObj);
+ }
+ }
+ }
+ return config;
+ },
+ (error) => {
+ console.log(error);
+ Promise.reject(error);
}
- const sessionObj = cache.session.getJSON('sessionObj')
- if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
- cache.session.setJSON('sessionObj', requestObj)
- } else {
- const s_url = sessionObj.url; // 请求地址
- const s_data = sessionObj.data; // 请求数据
- const s_time = sessionObj.time; // 请求时间
- const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
- if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
- const message = '数据正在处理，请勿重复提交';
- console.warn(`[${s_url}]: ` + message)
- return Promise.reject(new Error(message))
- } else {
- cache.session.setJSON('sessionObj', requestObj)
- }
- }
- }
- return config
-}, error => {
- console.log(error)
- Promise.reject(error)
-})
+);
// 响应拦截器
-service.interceptors.response.use(res => {
- // 未设置状态码则默认成功状态
- const code = res.data.code || 200;
- // 获取错误信息
- const msg = errorCode[code] || res.data.msg || errorCode['default']
- // 二进制数据则直接返回
- if(res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer'){
- return res.data
+service.interceptors.response.use(
+ (res) => {
+ // 未设置状态码则默认成功状态
+ const code = res.data.code || 200;
+ // 获取错误信息
+ const msg = errorCode[code] || res.data.msg || errorCode['default'];
+ // 二进制数据则直接返回
+ if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+ return res.data;
+ }
+ if (code === 401) {
+ if (!isRelogin.show) {
+ isRelogin.show = true;
+ MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' })
+ .then(() => {
+ isRelogin.show = false;
+ store.dispatch('LogOut').then(() => {
+ location.href = '/index';
+ });
+ })
+ .catch(() => {
+ isRelogin.show = false;
+ });
+ }
+ return Promise.reject('无效的会话，或者会话已过期，请重新登录。');
+ } else if (code === 500) {
+ Message({ message: msg, type: 'error' });
+ return Promise.reject(new Error(msg));
+ } else if (code === 601) {
+ Message({ message: msg, type: 'warning' });
+ return Promise.reject('error');
+ } else if (code !== 200) {
+ Notification.error({ title: msg });
+ return Promise.reject('error');
+ } else {
+ return res.data;
+ }
+ },
+ (error) => {
+ console.log('err' + error);
+ let { message } = error;
+ if (message == 'Network Error') {
+ message = '后端接口连接异常';
+ } else if (message.includes('timeout')) {
+ message = '系统接口请求超时';
+ } else if (message.includes('Request failed with status code')) {
+ message = '系统接口' + message.substr(message.length - 3) + '异常';
+ }
+ Message({ message: message, type: 'error', duration: 5 * 1000 });
+ return Promise.reject(error);
}
- if (code === 401) {
- if (!isRelogin.show) {
- isRelogin.show = true;
- MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
- isRelogin.show = false;
- store.dispatch('LogOut').then(() => {
- location.href = '/index';
- })
- }).catch(() => {
- isRelogin.show = false;
- });
- }
- return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
- } else if (code === 500) {
- Message({ message: msg, type: 'error' })
- return Promise.reject(new Error(msg))
- } else if (code === 601) {
- Message({ message: msg, type: 'warning' })
- return Promise.reject('error')
- } else if (code !== 200) {
- Notification.error({ title: msg })
- return Promise.reject('error')
- } else {
- return res.data
- }
- },
- error => {
- console.log('err' + error)
- let { message } = error;
- if (message == "Network Error") {
- message = "后端接口连接异常";
- } else if (message.includes("timeout")) {
- message = "系统接口请求超时";
- } else if (message.includes("Request failed with status code")) {
- message = "系统接口" + message.substr(message.length - 3) + "异常";
- }
- Message({ message: message, type: 'error', duration: 5 * 1000 })
- return Promise.reject(error)
- }
-)
+);
// 通用下载方法
export function download(url, params, filename, config) {
- downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
- return service.post(url, params, {
- transformRequest: [(params) => { return tansParams(params) }],
- headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
- responseType: 'blob',
- ...config
- }).then(async (data) => {
- const isLogin = await blobValidate(data);
- if (isLogin) {
- const blob = new Blob([data])
- saveAs(blob, filename)
- } else {
- const resText = await data.text();
- const rspObj = JSON.parse(resText);
- const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
- Message.error(errMsg);
- }
- downloadLoadingInstance.close();
- }).catch((r) => {
- console.error(r)
- Message.error('下载文件出现错误，请联系管理员！')
- downloadLoadingInstance.close();
- })
+ downloadLoadingInstance = Loading.service({ text: '正在下载数据，请稍候', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' });
+ return service
+ .post(url, params, {
+ transformRequest: [
+ (params) => {
+ return tansParams(params);
+ },
+ ],
+ headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+ responseType: 'blob',
+ ...config,
+ })
+ .then(async (data) => {
+ const isLogin = await blobValidate(data);
+ if (isLogin) {
+ const blob = new Blob([data]);
+ saveAs(blob, filename);
+ } else {
+ const resText = await data.text();
+ const rspObj = JSON.parse(resText);
+ const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'];
+ Message.error(errMsg);
+ }
+ downloadLoadingInstance.close();
+ })
+ .catch((r) => {
+ console.error(r);
+ Message.error('下载文件出现错误，请联系管理员！');
+ downloadLoadingInstance.close();
+ });
}
-export default service
+export default service;
diff --git a/vue/src/views/dataCenter/analysis.vue b/vue/src/views/dataCenter/analysis.vue
index 6b5a6f72..22336a8a 100644
--- a/vue/src/views/dataCenter/analysis.vue
+++ b/vue/src/views/dataCenter/analysis.vue
@@ -3,7 +3,7 @@
+
+
- 搜索
- 重置
+ {{ $t('search') }}
+ {{ $t('reset') }}
- 变量历史数据折线图
+ {{ $t('dataCenter.analysis.349202-21') }}
-
- 变量下发次数统计
+ {{ $t('dataCenter.analysis.349202-23') }}
-
- 变量实时数值表
+ {{ $t('dataCenter.analysis.349202-24') }}
- 搜索
- 重置
- 导出
+ {{ $t('search') }}
+ {{ $t('reset') }}
+
+ {{ $t('export') }}
- 曲线趋势图
+ {{ $t('dataCenter.history.384934-10') }}
-
-
-