diff --git a/nezha-fronted/config/index.js b/nezha-fronted/config/index.js index 6918542a9..97c7b0130 100644 --- a/nezha-fronted/config/index.js +++ b/nezha-fronted/config/index.js @@ -11,22 +11,22 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/apis': { - target: 'http://192.168.40.42:8080/nz-admin', //设置调用接口域名和端口号别忘了加http + target: 'http://192.168.40.42:8080/nz-admin', // 设置调用接口域名和端口号别忘了加http changeOrigin: true, pathRewrite: { - '^/apis': '/' //这里理解成用‘/api’代替target里面的地址,组件中我们调接口时直接用/api代替 - }, + '^/apis': '/' // 这里理解成用‘/api’代替target里面的地址,组件中我们调接口时直接用/api代替 + } } }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 80, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, notifyOnErrors: true, poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - /** * Source Maps */ @@ -45,7 +45,7 @@ module.exports = { build: { // Template for index.html index: path.resolve(__dirname, '../dist/index.html'), - version:'1.2', + version: '1.2', // Paths assetsRoot: path.resolve(__dirname, '../dist'), assetsSubDirectory: 'static', diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue index bd476b63e..2e8c3d3b7 100644 --- a/nezha-fronted/src/components/chart/chart/chartStat.vue +++ b/nezha-fronted/src/components/chart/chart/chartStat.vue @@ -69,7 +69,7 @@ export default { x: 0, y: 0, title: 0, - value: 0, + value: 0, show: false }, fontSize: 12, diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index d60022d5e..7acde9f97 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -298,7 +298,7 @@ export default { this.scrollTopTimer = setTimeout(() => { this.copyDataList.forEach(item => { if (!this.$refs['grid-item' + item.id] || !this.$refs['grid-item' + item.id][0]) { - return; + return } const dom = this.$refs['grid-item' + item.id][0].$el if (dom) { diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index cd8a4016f..7dc87ff5f 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -291,3 +291,4 @@ export default { setChart(this.chartId, null) } } + \ No newline at end of file diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index 735ce2507..9c0c7d0bd 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -346,6 +346,7 @@ export default { } } }, + created () { let path = '' if (this.$route.fullPath.match(/\/(\S*)\?/)) { diff --git a/nezha-fronted/src/store/user.js b/nezha-fronted/src/store/user.js index 6dbdd8aae..030523fa6 100644 --- a/nezha-fronted/src/store/user.js +++ b/nezha-fronted/src/store/user.js @@ -71,7 +71,6 @@ const user = { }, actions: { loginSuccess (store, res) { - const defaultAppearance = { system_name: localStorage.getItem('nz-sys-name'), system_logo: localStorage.getItem('nz-sys-logo'), diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json index 5f74f5d01..abcddc473 100644 --- a/nezha-fronted/static/config.json +++ b/nezha-fronted/static/config.json @@ -1 +1 @@ -{"baseUrl":"/", "version": "21.04"} +{"baseUrl":"http://192.168.40.42:8080/", "version": "21.04"}