Quellcode durchsuchen

[Bugfix] Fix display issue

AA vor 11 Monaten
Ursprung
Commit
e15d7dff8d

+ 4 - 1
package.json

@@ -65,5 +65,8 @@
     "node": ">=8.9",
     "npm": ">= 3.0.0"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "volta": {
+    "node": "16.20.2"
+  }
 }

+ 1 - 1
src/layout/components/AppMain.vue

@@ -6,7 +6,7 @@
       </keep-alive>
     </transition>
     <span class="footer">
-      Copyright © 2023 厦门市巨龙信息科技有限公司  建议使用1280*768以上分辨率
+      <!-- Copyright © 2023 厦门市巨龙信息科技有限公司  建议使用1280*768以上分辨率 -->
     </span>
     <section>
       <!-- <div class="">在线留言</div> -->

+ 4 - 4
src/layout/components/HeaderTop.vue

@@ -25,7 +25,7 @@
                     <el-avatar :size="32" fit="fill" :src="item.icon | formatFileUrl" />
                   </span>
                   <ellipsis-tooltip :content="item.systemName" placement="top" class="top-name" width="200px">
-                    <a @click="$jumpTo('app', item.id, item.systemNumber, item.url)">{{ item.systemName }}</a>
+                    <a @click="$jumpTo('app', item.id, item.systemName, item.url)">{{ item.systemName }}</a>
                   </ellipsis-tooltip>
                   <span class="top-count"><svg-icon icon-class="remen" class="hot-icon" />{{ formatCount(item.hits) }}</span>
                   <el-button v-if="item.isStar === 1" type="primary" size="small" style="width:68px; cursor: default">已收藏</el-button>
@@ -40,7 +40,7 @@
                 <div v-for="(item, index) in bizTopData" :key="item.id" class="top-item">
                   <span :class="['top-rank', index<=2 ? 'top-rank_'+index : '']">{{ index + 1 }}</span>
                   <ellipsis-tooltip :content="item.businessName" placement="top" class="top-name" width="200px">
-                    <a @click="$jumpTo('business', item.id, item.businessNumber, item.url)">{{ item.businessName }}</a>
+                    <a @click="$jumpTo('business', item.id, item.businessName, item.url)">{{ item.businessName }}</a>
                   </ellipsis-tooltip>
                   <span class="top-count"><svg-icon icon-class="remen" class="hot-icon" />{{ formatCount(item.hits) }}</span>
                   <el-button v-if="item.isStar === 1" type="primary" size="small" style="width:68px; cursor: default">已收藏</el-button>
@@ -238,7 +238,7 @@ export default {
         this.sysLoading = false
         this.$message({
           type: 'success',
-          message: '收藏成功!'
+          message: '收藏成功'
         })
       }).catch(error => {
         console.log(error)
@@ -258,7 +258,7 @@ export default {
         this.bizLoading = false
         this.$message({
           type: 'success',
-          message: '收藏成功!'
+          message: '收藏成功'
         })
       }).catch(error => {
         console.log(error)

+ 1 - 1
src/styles/variables.scss

@@ -23,7 +23,7 @@ $sideBarWidth: 210px;
 $siderBarCollapseWidth: 64px;
 $headerHeightNum: 100;
 $headerHeight: $headerHeightNum + 0px;
-$footerHeightNum: 32;
+$footerHeightNum: 0;
 $footerHeight: $footerHeightNum + 0px; // must greater than 15px
 $tagHeight: 42px; // must greater than 40px
 $mainTopPadding: 10px;

+ 1 - 1
src/utils/request.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { Message } from 'element-ui'
+// import { Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 

+ 0 - 15
src/views/error-page/401.vue

@@ -5,10 +5,6 @@
     </el-button>
     <el-row>
       <el-col :span="12">
-        <h1 class="text-jumbo text-ginormous">
-          Oops!
-        </h1>
-        gif来源<a href="https://zh.airbnb.com/" target="_blank">airbnb</a> 页面
         <h2>你没有权限去该页面</h2>
         <ul class="list-unstyled">
           <li class="link-type">
@@ -18,13 +14,7 @@
           </li>
         </ul>
       </el-col>
-      <el-col :span="12">
-        <img width="313" height="428" alt="未找到">
-      </el-col>
     </el-row>
-    <el-dialog :visible.sync="dialogVisible" title="随便看">
-      <img class="pan-img">
-    </el-dialog>
   </div>
 </template>
 
@@ -32,11 +22,6 @@
 
 export default {
   name: 'Page401',
-  data() {
-    return {
-      dialogVisible: false
-    }
-  },
   methods: {
     back() {
       if (this.$route.query.noGoBack) {

+ 24 - 212
src/views/error-page/404.vue

@@ -1,228 +1,40 @@
 <template>
-  <div class="wscn-http404-container">
-    <div class="wscn-http404">
-      <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
-        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
-      </div>
-      <div class="bullshit">
-        <div class="bullshit__oops">OOPS!</div>
-        <div class="bullshit__info">All rights reserved
-          <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
-        </div>
-        <div class="bullshit__headline">{{ message }}</div>
-        <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div>
-        <a href="" class="bullshit__return-home">Back to home</a>
-      </div>
-    </div>
+  <div class="http404-container">
+    <div class="http404__headline">请求不存在</div>
+    <a href="" class="http404__return-home">返回首页</a>
   </div>
 </template>
 
 <script>
-
 export default {
-  name: 'Page404',
-  computed: {
-    message() {
-      return 'The webmaster said that you can not enter this page...'
-    }
-  }
+  name: 'Page404'
 }
 </script>
 
 <style lang="scss" scoped>
-.wscn-http404-container{
-  transform: translate(-50%,-50%);
+.http404-container {
   position: absolute;
   top: 40%;
   left: 50%;
+  transform: translate(-50%, -50%);
+
+  font-size: 24px;
+  line-height: 1.2;
+  text-align: center;
+  font-weight: bold;
 }
-.wscn-http404 {
-  position: relative;
-  width: 1200px;
-  padding: 0 50px;
-  overflow: hidden;
-  .pic-404 {
-    position: relative;
-    float: left;
-    width: 600px;
-    overflow: hidden;
-    &__parent {
-      width: 100%;
-    }
-    &__child {
-      position: absolute;
-      &.left {
-        width: 80px;
-        top: 17px;
-        left: 220px;
-        opacity: 0;
-        animation-name: cloudLeft;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1s;
-      }
-      &.mid {
-        width: 46px;
-        top: 10px;
-        left: 420px;
-        opacity: 0;
-        animation-name: cloudMid;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1.2s;
-      }
-      &.right {
-        width: 62px;
-        top: 100px;
-        left: 500px;
-        opacity: 0;
-        animation-name: cloudRight;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1s;
-      }
-      @keyframes cloudLeft {
-        0% {
-          top: 17px;
-          left: 220px;
-          opacity: 0;
-        }
-        20% {
-          top: 33px;
-          left: 188px;
-          opacity: 1;
-        }
-        80% {
-          top: 81px;
-          left: 92px;
-          opacity: 1;
-        }
-        100% {
-          top: 97px;
-          left: 60px;
-          opacity: 0;
-        }
-      }
-      @keyframes cloudMid {
-        0% {
-          top: 10px;
-          left: 420px;
-          opacity: 0;
-        }
-        20% {
-          top: 40px;
-          left: 360px;
-          opacity: 1;
-        }
-        70% {
-          top: 130px;
-          left: 180px;
-          opacity: 1;
-        }
-        100% {
-          top: 160px;
-          left: 120px;
-          opacity: 0;
-        }
-      }
-      @keyframes cloudRight {
-        0% {
-          top: 100px;
-          left: 500px;
-          opacity: 0;
-        }
-        20% {
-          top: 120px;
-          left: 460px;
-          opacity: 1;
-        }
-        80% {
-          top: 180px;
-          left: 340px;
-          opacity: 1;
-        }
-        100% {
-          top: 200px;
-          left: 300px;
-          opacity: 0;
-        }
-      }
-    }
-  }
-  .bullshit {
-    position: relative;
-    float: left;
-    width: 300px;
-    padding: 30px 0;
-    overflow: hidden;
-    &__oops {
-      font-size: 32px;
-      font-weight: bold;
-      line-height: 40px;
-      color: #1482f0;
-      opacity: 0;
-      margin-bottom: 20px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-fill-mode: forwards;
-    }
-    &__headline {
-      font-size: 20px;
-      line-height: 24px;
-      color: #222;
-      font-weight: bold;
-      opacity: 0;
-      margin-bottom: 10px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.1s;
-      animation-fill-mode: forwards;
-    }
-    &__info {
-      font-size: 13px;
-      line-height: 21px;
-      color: grey;
-      opacity: 0;
-      margin-bottom: 30px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.2s;
-      animation-fill-mode: forwards;
-    }
-    &__return-home {
-      display: block;
-      float: left;
-      width: 110px;
-      height: 36px;
-      background: #1482f0;
-      border-radius: 100px;
-      text-align: center;
-      color: #ffffff;
-      opacity: 0;
-      font-size: 14px;
-      line-height: 36px;
-      cursor: pointer;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.3s;
-      animation-fill-mode: forwards;
-    }
-    @keyframes slideUp {
-      0% {
-        transform: translateY(60px);
-        opacity: 0;
-      }
-      100% {
-        transform: translateY(0);
-        opacity: 1;
-      }
-    }
-  }
+
+.http404__headline {
+  color: #222;
+  margin-bottom: 20px;
+}
+
+.http404__return-home {
+  display: block;
+  padding: 15px;
+  background: #1482f0;
+  border-radius: 100px;
+  color: #ffffff;
+  cursor: pointer;
 }
 </style>

+ 1 - 1
src/views/error-page/500.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    500: Internal Server Error
+    500: 系统出错,请联系管理员!
   </div>
 </template>
 

+ 5 - 5
src/views/home/components/LinkList.vue

@@ -111,17 +111,17 @@ export default {
 
 .link-box {
   background-color: rgba(0, 0, 0, 0.02);
+  padding: 20px;
 }
 
 .link-item-box {
-  height: 100%;
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
+  // height: 100%;
+  display: grid;
+  grid-template-columns: repeat(7, 1fr);
+  gap: 20px;
 }
 
 .link-item {
-  padding: 20px;
   font-size: 16px;
   color: rgba(0,0,0,0.85);
 }

+ 4 - 1
src/views/info/CommAdd.vue

@@ -22,7 +22,7 @@
               <el-input v-model="formData.title" clearable placeholder="请输入" />
             </el-form-item>
             <el-form-item prop="receivers" label="接收人">
-              <el-select v-model="formData.receivers" multiple clearable placeholder="请选择" style="width:calc(100% - 100px)">
+              <el-select v-model="formData.receivers" multiple collapse-tags clearable placeholder="请选择" style="width:calc(100% - 100px)">
                 <el-option
                   v-for="item in receiverOptions"
                   :key="item.idCard"
@@ -246,5 +246,8 @@ export default {
   .form-box {
     width: 100%;
   }
+  .select-popper{
+    height: 100px;
+  }
 }
 </style>

+ 1 - 1
src/views/info/InfoView.vue

@@ -27,7 +27,7 @@
           <span />
         </el-form-item>
         <el-form-item label="发布范围">
-          <span />
+          <span>{{ formData.scopeName }}</span>
         </el-form-item>
         <el-form-item label="附件">
           <el-link

+ 1 - 1
src/views/info/NoticeAdd.vue

@@ -15,7 +15,7 @@
           <el-input v-model="formData.title" clearable placeholder="请输入" />
         </el-form-item>
         <el-form-item prop="scopeIds" label="发布范围">
-          <el-select v-model="formData.scopeIds" multiple clearable placeholder="请选择" style="width:calc(100% - 110px)">
+          <el-select v-model="formData.scopeIds" multiple collapse-tags clearable placeholder="请选择" style="width:calc(100% - 110px)">
             <el-option
               v-for="item in deptOptions"
               :key="item.orgCode"