소스 검색

样式修改

lilei 2 년 전
부모
커밋
468f8a5efb
5개의 변경된 파일29개의 추가작업 그리고 15개의 파일을 삭제
  1. 1 1
      public/version.json
  2. 12 8
      src/components/GlobalHeader/GlobalHeader.vue
  3. 13 3
      src/components/global.less
  4. 1 1
      src/layouts/BasicLayout.vue
  5. 2 2
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1657264580502
+  "version": 1657265946535
 }
 }

+ 12 - 8
src/components/GlobalHeader/GlobalHeader.vue

@@ -6,15 +6,19 @@
         :class="[fixedHeader && 'ant-header-fixedHeader', sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed', ]"
         :class="[fixedHeader && 'ant-header-fixedHeader', sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed', ]"
         :style="{ padding: '0' }">
         :style="{ padding: '0' }">
         <div v-if="mode === 'sidemenu'" class="header">
         <div v-if="mode === 'sidemenu'" class="header">
-          <a-icon v-if="device==='mobile'" class="trigger" :type="collapsed ? 'menu-fold' : 'menu-unfold'" @click="toggle"/>
-          <a-icon v-else class="trigger" :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggle"/>
+          <div class="hleft">
+            <a-icon v-if="device==='mobile'" class="trigger" :type="collapsed ? 'menu-fold' : 'menu-unfold'" @click="toggle"/>
+            <a-icon v-else class="trigger" :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggle"/>
+            <div>
+              <a-alert
+                style="display: inline-block;"
+                type="warning"
+                show-icon
+                v-if="$store.state.app.isLastDayForMonth&&$hasPermissions('M_mothEndTips')"
+                message="临到月底了,请尽快处理系统中没有完结的单据!" />
+            </div>
+          </div>
           <user-menu></user-menu>
           <user-menu></user-menu>
-          <a-alert
-            style="display: inline-block;"
-            type="warning"
-            show-icon
-            v-if="$store.state.app.isLastDayForMonth&&$hasPermissions('M_mothEndTips')"
-            message="临到月底了,请尽快处理系统中没有完结的单据!" />
         </div>
         </div>
         <div v-else :class="['top-nav-header-index', theme]">
         <div v-else :class="['top-nav-header-index', theme]">
           <div class="header-index-wide">
           <div class="header-index-wide">

+ 13 - 3
src/components/global.less

@@ -201,6 +201,9 @@ body {
     background: #fff;
     background: #fff;
     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
     position: relative;
     position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
   }
   }
   .ant-layout-header{
   .ant-layout-header{
     height: 44px;
     height: 44px;
@@ -208,10 +211,17 @@ body {
   }
   }
   .header,
   .header,
   .top-nav-header-index {
   .top-nav-header-index {
+    .hleft{
+      display:flex;
+    }
     .user-wrapper {
     .user-wrapper {
-      float: right;
-      height: 100%;
-
+      flex-grow:1;
+      overflow: auto;
+      height: 44px;
+      .content-box{
+        float:right;
+        text-align: right;
+      }
       .action {
       .action {
         cursor: pointer;
         cursor: pointer;
         padding: 0 12px;
         padding: 0 12px;

+ 1 - 1
src/layouts/BasicLayout.vue

@@ -227,7 +227,7 @@ export default {
     this.$store.dispatch('ToggleTheme', localStorage.getItem('DEFAULT_THEME') || 'dark')
     this.$store.dispatch('ToggleTheme', localStorage.getItem('DEFAULT_THEME') || 'dark')
     this.$store.dispatch('ToggleFontSize', localStorage.getItem('DEFAULT_FONT_SIZE') || 'small')
     this.$store.dispatch('ToggleFontSize', localStorage.getItem('DEFAULT_FONT_SIZE') || 'small')
     // 判断是否是当月25日后
     // 判断是否是当月25日后
-    this.$store.state.app.isLastDayForMonth = moment().date() >= 25
+    this.$store.state.app.isLastDayForMonth = moment().date() >= 5
     if (this.$store.state.app.isLastDayForMonth && this.$hasPermissions('M_mothEndTips')) {
     if (this.$store.state.app.isLastDayForMonth && this.$hasPermissions('M_mothEndTips')) {
       this.$notification.warning({
       this.$notification.warning({
         message: '提示',
         message: '提示',

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        target: 'http://192.168.0.215:8076/qpls-md',
-        // target: 'http://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.0.215:8076/qpls-md',
+        target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         // ws: false,
         ws: true,
         ws: true,
         changeOrigin: true,
         changeOrigin: true,