diff --git a/.env.development b/.env.development index dbff133..04e8238 100644 --- a/.env.development +++ b/.env.development @@ -3,18 +3,16 @@ ENV = 'development' # 接口地址 #内网服务地址 -VUE_APP_BASE_API = 'http://192.168.99.107:7070' -VUE_APP_WS_API = 'ws://192.168.99.107:7071' +VUE_APP_BASE_API = 'http://192.168.99.107:7077' +VUE_APP_WS_API = 'ws://192.168.99.107:7077' VUE_APP_CAMERA_API = '192.168.99.107:3000' -# 刘力-本地服地址 -#VUE_APP_BASE_API = 'http://192.168.99.65:7070' -#VUE_APP_WS_API = 'ws://192.168.99.65:7071' # 许镇-本地服地址 #VUE_APP_BASE_API = 'http://192.168.99.84:7070' #VUE_APP_WS_API = 'ws://192.168.99.84:7070' -#VUE_APP_BASE_API = 'http://192.168.99.84:11100/' 测试新版login用过 +#VUE_APP_BASE_API = 'http://192.168.99.84:11100' +#VUE_APP_WS_API = 'ws://192.168.99.84:11100' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index 1cb4d9b..0341cc7 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -1017,7 +1017,7 @@ } [data-theme=dark] .process-center { - height: calc(100vh - 202px); + height: calc(100vh - 290px); margin-top: -30px; .process-right{ padding-right: 20px; @@ -1025,7 +1025,7 @@ } } [data-theme=light] .process-center { - height: calc(100vh - 193px); + height: calc(100vh - 283px); .process-right{ width: calc(100vw - 964px); } diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 4f32772..2882cf0 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -22,8 +22,6 @@ @include bg_color; @include siderBar-set; padding-bottom: 50px; - overflow: hidden; - overflow-y: scroll; // reset element-ui css .horizontal-collapse-transition { diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 684177e..2109108 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -32,6 +32,7 @@ export default { position: relative; @include main_bg_color; overflow: hidden; + z-index: 101; } .fixed-header+.app-main { diff --git a/src/layout/index.vue b/src/layout/index.vue index ce69794..887c662 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -5,7 +5,8 @@
-
+
+
@@ -42,6 +43,11 @@ export default { Theme }, mixins: [ResizeMixin], + data() { + return { + routerCurrent: null + } + }, computed: { ...mapState({ sidebar: state => state.app.sidebar, @@ -59,7 +65,13 @@ export default { } } }, + watch: { + $route(route) { + this.routerCurrent = route.path + } + }, mounted() { + this.routerCurrent = this.$route.path if (Cookies.get('theme')) { this.$refs.theme.theme = Cookies.get('theme') this.$store.dispatch('settings/changeSetting', { @@ -142,4 +154,18 @@ export default { } } } + .is-center{ + position: relative; + position: fixed; + background-color: transparent !important; + } + .center-bg{ + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 196px; + background: url('~@/assets/images/grzx-bg.png') no-repeat left top; + background-size: cover; + } diff --git a/src/utils/request.js b/src/utils/request.js index 1f58b23..0297fc6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -12,7 +12,6 @@ import { reject } from 'core-js/fn/promise' const service = axios.create({ baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/', // api 的 base_url // baseURL: process.env.NODE_ENV === 'production' ? 'http://192.168.99.84:7070' : '/', // api 的 base_url - timeout: Config.timeout // 请求超时时间 }) diff --git a/src/views/prearchiveLibrary/index.vue b/src/views/prearchiveLibrary/index.vue new file mode 100644 index 0000000..7237e26 --- /dev/null +++ b/src/views/prearchiveLibrary/index.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue index e7ce96b..aea7e5f 100644 --- a/src/views/system/user/center.vue +++ b/src/views/system/user/center.vue @@ -1,6 +1,5 @@