页面调试-查漏补缺

2 years ago · 01612dc1b3
9 changed files with 100 additions and 29 deletions
--- 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
--- 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);
  }
--- 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 {
--- 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 {
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@ -5,7 +5,8 @@
      <navbar />
    </div>
    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <div class="main-breadcrumb">
+      <div :class="['main-breadcrumb', {'is-center': routerCurrent === '/user/center'} ]">
+        <span v-if="routerCurrent === '/user/center'" class="center-bg" />
        <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
        <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
      </div>
@ -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;
+  }
 </style>
--- 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 // 请求超时时间
 })

--- a/src/views/prearchiveLibrary/index.vue
+++ b/src/views/prearchiveLibrary/index.vue
@ -0,0 +1,46 @@
+<template>
+  <div>预归档库</div>
+</template>
+
+<script>
+import crudCategory from '@/api/category/category'
+import CRUD, { presenter, header } from '@crud/crud'
+
+export default {
+  name: 'PrearchiveLibrary',
+  components: { },
+  cruds() {
+    return [
+      CRUD({
+        title: '预归档库', url: 'api/archives-type/menu',
+        crudMethod: { ...crudCategory },
+        optShow: {
+          add: false,
+          edit: true,
+          del: false,
+          download: false,
+          group: false
+        }
+      })
+    ]
+  },
+  mixins: [presenter(), header()],
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'prearchiveLibrary:add'],
+        edit: ['admin', 'prearchiveLibrary:edit'],
+        del: ['admin', 'prearchiveLibrary:del'],
+        sort: ['admin', 'prearchiveLibrary:sort']
+      }
+    }
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+</style>
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@ -1,6 +1,5 @@
 <template>
  <div class="app-container  category-container">
-    <!-- <span class="center-bg" /> -->
    <div class="container-main">
      <div class="elect-cont-left">
        <div class="container-left">
@ -91,7 +90,7 @@
                导出
              </el-button>
            </div>
-            <el-table v-loading="loading" :data="data" style="width: 100%;">
+            <el-table v-loading="loading" :data="data" style="width: 100%;" height="444px">
              <el-table-column prop="description" label="行为描述" />
              <el-table-column prop="requestIp" label="IP" />
              <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
@ -265,34 +264,30 @@ export default {

 .container-main{
  position: relative;
-}
-.center-bg{
-  position: absolute;
-  left: 0;
-  top: -55px;
-  width: 100%;
-  height: 196px;
-  background: url('~@/assets/images/grzx-bg.png') no-repeat left top;
-  background-size: contain;
+  margin-top: 90px;
+  z-index: 9;
 }
 .elect-cont-left{
  width: 368px !important;
  padding: 0 !important;
 }
 [data-theme=dark] .elect-cont-left .container-left{
-  min-height: calc(100vh - 158px) !important;
+  min-height: calc(100vh - 247px) !important;
+}
+[data-theme=dark] .elect-cont-right .container-right {
+    min-height: calc(100vh - 288px) !important;
 }
-// [data-theme=dark] .elect-cont-right .container-right {
-//     min-height: calc(100vh - 158px) !important;
-// }
 [data-theme=light] .elect-cont-right {
  padding: 20px 20px 0 0  !important;
 }
 [data-theme=light] .elect-cont-left .container-left{
-  min-height: calc(100vh - 138px) !important;
+  min-height: calc(100vh - 260px) !important;
 }
 [data-theme=light] .elect-cont-right .container-right {
-    min-height: calc(100vh - 178px) !important;
+    min-height: calc(100vh - 250px) !important;
+}
+[data-theme=dark] .category-container .tab-content .head-container{
+  margin: 20px 0 !important;
 }
 .user-content{
  color: #fff;
@ -395,6 +390,7 @@ export default {
      width: 76px;
    }
  }
+
 }
 .user-header-search{
  margin-bottom: 20px;
@ -423,4 +419,7 @@ select:-webkit-autofill {
 input {
  background-color: transparent;
 }
+.el-pagination{
+  margin: 20px 0 10px 0 !important
+}
 </style>
--- a/src/views/system/user/processCenter/index.vue
+++ b/src/views/system/user/processCenter/index.vue
@ -32,6 +32,7 @@
        v-loading="isLoading"
        :data="tableData"
        :row-class-name="cell"
+        height="500px"
        @row-click="clickRowHandler"
        @selection-change="selectionChangeHandler"
      >
@ -198,4 +199,7 @@ export default {
  color: #0348F3;
  border: 1px solid #0348F3;
 }
+.el-pagination{
+  margin: 20px 0 10px 0 !important
+}
 </style>