diff --git a/src/main.js b/src/main.js index 3fc758d..11b1b5c 100644 --- a/src/main.js +++ b/src/main.js @@ -6,12 +6,12 @@ import router from './router/router'; import './permission'; // 权限 import './error'; // 日志 import store from './store'; -import { loadStyle } from './util/util' +import {loadStyle} from './util/util' import * as urls from '@/config/env'; import Element from 'element-ui'; import { - iconfontUrl, - iconfontVersion + iconfontUrl, + iconfontVersion } from '@/config/env'; import i18n from './lang' // Internationalization import './styles/common.scss'; @@ -21,28 +21,29 @@ import basicContainer from './components/basic-container/main' Vue.use(router) Vue.use(VueAxios, axios) Vue.use(Element, { - i18n: (key, value) => i18n.t(key, value) + i18n: (key, value) => i18n.t(key, value) }) Vue.use(window.AVUE, { - i18n: (key, value) => i18n.t(key, value) + size: 'small', + i18n: (key, value) => i18n.t(key, value) }) //注册全局容器 Vue.component('basicContainer', basicContainer) // 加载相关url地址 Object.keys(urls).forEach(key => { - Vue.prototype[key] = urls[key]; + Vue.prototype[key] = urls[key]; }) // 动态加载阿里云字体库 iconfontVersion.forEach(ele => { - loadStyle(iconfontUrl.replace('$key', ele)); + loadStyle(iconfontUrl.replace('$key', ele)); }) Vue.config.productionTip = false; new Vue({ - router, - store, - i18n, - render: h => h(App) -}).$mount('#app') \ No newline at end of file + router, + store, + i18n, + render: h => h(App) +}).$mount('#app') diff --git a/src/views/authority/apiscope.vue b/src/views/authority/apiscope.vue index cf4b83f..b2a7ac4 100644 --- a/src/views/authority/apiscope.vue +++ b/src/views/authority/apiscope.vue @@ -101,6 +101,8 @@ scopeMenuName: "菜单", menu: true, option: { + height:'auto', + calcHeight:'350', tip: false, dialogWidth: "60%", tree: true, diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue index c7ecb2b..8a56226 100644 --- a/src/views/authority/datascope.vue +++ b/src/views/authority/datascope.vue @@ -101,6 +101,8 @@ scopeMenuName: "菜单", menu: true, option: { + height:'auto', + calcHeight:'350', tip: false, dialogWidth: "60%", tree: true, diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue index ae434e7..e136435 100644 --- a/src/views/authority/role.vue +++ b/src/views/authority/role.vue @@ -103,6 +103,8 @@ total: 0 }, option: { + height:'auto', + calcHeight:'350', tip: false, tree: true, border: true, diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue index ce9dda1..7bd3307 100644 --- a/src/views/desk/notice.vue +++ b/src/views/desk/notice.vue @@ -50,6 +50,8 @@ }, selectionList: [], option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/flow/follow.vue b/src/views/flow/follow.vue index 8a55471..cd1705e 100644 --- a/src/views/flow/follow.vue +++ b/src/views/flow/follow.vue @@ -61,6 +61,8 @@ followBox: false, deleteReason: '', option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/flow/manager.vue b/src/views/flow/manager.vue index 3143196..56e1f19 100644 --- a/src/views/flow/manager.vue +++ b/src/views/flow/manager.vue @@ -135,6 +135,8 @@ label: '挂起' }], option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/flow/model.vue b/src/views/flow/model.vue index 5313e56..10c4578 100644 --- a/src/views/flow/model.vue +++ b/src/views/flow/model.vue @@ -138,6 +138,8 @@ category: [], categoryValue: '', option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue index 18d483f..11a1f29 100644 --- a/src/views/monitor/log/api.vue +++ b/src/views/monitor/log/api.vue @@ -34,6 +34,8 @@ total: 0 }, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, @@ -59,7 +61,8 @@ }, { label: "软件环境", - prop: "env" + prop: "env", + width:'80', }, { label: "日志名", @@ -67,7 +70,8 @@ }, { label: "请求方法", - prop: "method" + prop: "method", + width:'80' }, { label: "请求接口", @@ -75,7 +79,8 @@ }, { label: "日志时间", - prop: "createTime" + prop: "createTime", + width:'160' }, { label: "用户代理", diff --git a/src/views/monitor/log/error.vue b/src/views/monitor/log/error.vue index 5b5f753..f3f0caf 100644 --- a/src/views/monitor/log/error.vue +++ b/src/views/monitor/log/error.vue @@ -34,6 +34,8 @@ total: 0 }, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, @@ -46,28 +48,29 @@ { label: "服务id", prop: "serviceId", - search: true + search: true, + width:'120' }, { label: "服务host", prop: "serverHost", - search: true + search: true, + width:'120' }, { label: "服务ip", - prop: "serverIp" + prop: "serverIp", + width:'160' }, { label: "软件环境", - prop: "env" - }, - { - label: "日志名", - prop: "title" + prop: "env", + width:'80' }, { label: "请求方法", - prop: "method" + prop: "method", + width:'80' }, { label: "请求接口", @@ -75,7 +78,8 @@ }, { label: "日志时间", - prop: "createTime" + prop: "createTime", + width:'160' }, { label: "用户代理", diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue index 4c08d0b..feeb080 100644 --- a/src/views/monitor/log/usual.vue +++ b/src/views/monitor/log/usual.vue @@ -34,6 +34,8 @@ total: 0 }, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, @@ -59,7 +61,8 @@ }, { label: "软件环境", - prop: "env" + prop: "env", + width:'80' }, { label: "日志级别", @@ -75,7 +78,8 @@ }, { label: "日志时间", - prop: "logData" + prop: "logData", + width:'160' }, { label: "用户代理", diff --git a/src/views/resource/oss.vue b/src/views/resource/oss.vue index 831b084..5001256 100644 --- a/src/views/resource/oss.vue +++ b/src/views/resource/oss.vue @@ -64,6 +64,8 @@ }, selectionList: [], option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/system/client.vue b/src/views/system/client.vue index 963d764..d87ad82 100644 --- a/src/views/system/client.vue +++ b/src/views/system/client.vue @@ -46,6 +46,8 @@ }, selectionList: [], option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue index d53a0ac..bb7d026 100644 --- a/src/views/system/dept.vue +++ b/src/views/system/dept.vue @@ -58,6 +58,8 @@ total: 0 }, option: { + height:'auto', + calcHeight:'350', tip: false, tree: true, border: true, diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue index 7bde324..3ea26c4 100644 --- a/src/views/system/dict.vue +++ b/src/views/system/dict.vue @@ -53,6 +53,8 @@ total: 0 }, option: { + height:'auto', + calcHeight:'350', tip: false, tree: true, border: true, diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue index ddd725c..3089100 100644 --- a/src/views/system/menu.vue +++ b/src/views/system/menu.vue @@ -53,6 +53,8 @@ total: 0 }, option: { + height:'auto', + calcHeight:'350', tip: false, dialogWidth: "60%", tree: true, diff --git a/src/views/system/param.vue b/src/views/system/param.vue index 1e43bae..e7883d1 100644 --- a/src/views/system/param.vue +++ b/src/views/system/param.vue @@ -46,6 +46,8 @@ total: 0 }, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue index 79b5684..c3a5d12 100644 --- a/src/views/system/tenant.vue +++ b/src/views/system/tenant.vue @@ -46,6 +46,8 @@ total: 0 }, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue index 077f215..f63608e 100644 --- a/src/views/system/topmenu.vue +++ b/src/views/system/topmenu.vue @@ -85,6 +85,8 @@ menuGrantList: [], menuTreeObj: [], option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/system/user.vue b/src/views/system/user.vue index c177b5e..4f8a99d 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -92,6 +92,8 @@ deptTree: [], }, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue index e34e79a..d002373 100644 --- a/src/views/tool/code.vue +++ b/src/views/tool/code.vue @@ -53,6 +53,8 @@ total: 0 }, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/work/claim.vue b/src/views/work/claim.vue index c19b2f0..634df3d 100644 --- a/src/views/work/claim.vue +++ b/src/views/work/claim.vue @@ -85,6 +85,8 @@ flowUrl: '', workBox: false, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/work/done.vue b/src/views/work/done.vue index d69e171..71ef710 100644 --- a/src/views/work/done.vue +++ b/src/views/work/done.vue @@ -78,6 +78,8 @@ flowUrl: '', workBox: false, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/work/send.vue b/src/views/work/send.vue index 68c4aac..f112a36 100644 --- a/src/views/work/send.vue +++ b/src/views/work/send.vue @@ -82,6 +82,8 @@ flowUrl: '', workBox: false, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/work/start.vue b/src/views/work/start.vue index a24993e..cda4eb7 100644 --- a/src/views/work/start.vue +++ b/src/views/work/start.vue @@ -86,6 +86,8 @@ flowUrl: '', workBox: false, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/src/views/work/todo.vue b/src/views/work/todo.vue index 183f9e9..a9bf9ac 100644 --- a/src/views/work/todo.vue +++ b/src/views/work/todo.vue @@ -85,6 +85,8 @@ flowUrl: '', workBox: false, option: { + height:'auto', + calcHeight:'350', tip: false, border: true, index: true, diff --git a/vue.config.js b/vue.config.js index 21e008d..ee4aad7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,7 +25,10 @@ module.exports = { port: 1888, proxy: { '/api': { - target: 'https://saber.bladex.vip/api', + //本地服务接口地址 + target: 'http://localhost', + //远程演示服务地址 + //target: 'https://saber.bladex.vip/api', ws: true, pathRewrite: { '^/api': '/'