caiaa пре 1 година
родитељ
комит
f449a806bd

+ 9 - 0
src/api/link.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function fetchLinkList(data) {
+  return request({
+    url: 'external/search',
+    method: 'post',
+    data: data
+  })
+}

+ 17 - 7
src/components/HeaderSearch/index.vue

@@ -141,13 +141,23 @@ export default {
   .header-search-select {
     width: 100%;
     // overflow: hidden;
-    ::v-deep .el-input__inner {
-      background-color: transparent;
-      border-radius: 22px;
-      // box-shadow: none !important;
-      border: 2px solid #ffffff;
-      color: #ffffff;
-      font-size: 14px;
+    ::v-deep {
+      .el-input__inner {
+        background-color: transparent;
+        border-radius: 22px;
+        // box-shadow: none !important;
+        border: 2px solid #ffffff;
+        color: #ffffff;
+        font-size: 14px;
+      }
+
+      .el-input__icon {
+        transform: none !important;
+
+        &:before {
+        content: "";
+        }
+      }
     }
   }
 }

+ 6 - 6
src/styles/headertop.scss

@@ -33,21 +33,21 @@ $headerTextColor: #ffffff;
       justify-content: center;
 
       .tip-system {
-        font-size: 2em;
-        font-weight: 400;
+        font-size: 26px;
+        font-weight: 500;
         letter-spacing: 2px;
       }
 
       .tip-theme {
         display: flex;
         justify-content: space-between;
-        font-size: 1.3em;
-        font-weight: 200;
-        letter-spacing: 20px;
+        font-size: 18px;
+        font-weight: 350;
+        letter-spacing: 15px;
         margin: 10px 0 0 2px;
 
         .tip-theme-right {
-          margin-right: -14px;
+          margin-right: -11px;
         }
       }
     }

+ 5 - 1
src/styles/index.scss

@@ -16,10 +16,14 @@ body {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
-  font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Arial, sans-serif;
+  font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Arial, sans-serif !important;
   background-color: #f5f8fe;
 }
 
+button {
+  font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Arial, sans-serif !important;
+}
+
 label {
   font-weight: 700;
 }

+ 6 - 2
src/views/home/Business.vue

@@ -140,9 +140,10 @@ export default {
     }
   }
   .type-title {
-    font-size: 19px;
+    font-size: 15px;
     color: rgba(0,0,0,0.85);
     margin-bottom: 10px;
+    font-weight: bold;
   }
 
   ::v-deep {
@@ -151,7 +152,7 @@ export default {
       margin-right: 20px;
     }
     .el-tabs__item {
-      font-size: 18px !important;
+      font-size: 16px !important;
     }
     .el-tabs__content {
       height: calc(100% - 55px);
@@ -160,6 +161,9 @@ export default {
         height: 100%;
       }
     }
+    .el-button {
+      color: rgba(0,0,0,0.85);
+    }
   }
 }
 </style>

+ 43 - 15
src/views/home/Link.vue

@@ -8,8 +8,8 @@
       <div class="link-content">
         <div class="link-box">
           <div class="link-item-box">
-            <a v-for="item in linkData" :key="item.id" class="link-item">
-              {{ item.name }}
+            <a v-for="item in tableData" :key="item.id" class="link-item" :href="item.url">
+              {{ item.designation }}
             </a>
           </div>
         </div>
@@ -22,24 +22,52 @@
 </template>
 
 <script>
+import { fetchLinkList } from '@/api/link'
+import { hasValidRecords } from '@/utils/convert'
+
 export default {
   name: 'HomeLink',
   data() {
     return {
-      linkData: [
-        { id: '1', name: 'LinkLinkLink1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '2', name: 'LinkLinkLink2', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '5', name: 'LinkLinkLinkCCCCC5LinkLinkLinkCCCCC5LinkLinkLinkCCCCC5LinkLinkLinkCCCCC5', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '3', name: 'LinkLinkLinkAAA3', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '4', name: 'LinkLinkLinkBB4', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '6', name: 'LinkLinkLink6', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '7', name: 'LinkLinkLink7', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '8', name: 'LinkLinkLink8', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '9', name: 'LinkLinkLink9', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '10', name: 'LinkLinkLink9LinkLinkLink9LinkLinkLink9LinkLinkLink9LinkLinkLink9LinkLinkLink9LinkLinkLink9LinkLinkLink9LinkLinkLink9LinkLinkLink9', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '11', name: 'LinkLinkLink10', link: '', createDate: '2023-07-07 10:01:02' }
-      ]
+      // table
+      tableData: [],
+      loading: false
+    }
+  },
+  created() {
+    this.getTablelist()
+  },
+  methods: {
+    // 获取table数据
+    getTablelist() {
+      this.loading = true
+      const params = {
+        page: 1,
+        size: 6,
+        order: 'create_time',
+        params: {
+          delFlag: 0
+        }
+      }
+      fetchLinkList(params).then(response => {
+        this.loading = false
+        if (hasValidRecords(response)) {
+          this.tableData = response.data.records
+        } else {
+          this.tableData = []
+        }
+      }).catch(error => {
+        console.log(error)
+        this.loading = false
+        this.$message({
+          type: 'error',
+          duration: 0,
+          showClose: true,
+          message: '获取消息列表出错: ' + error.message
+        })
+      })
     }
+
   }
 }
 </script>

+ 2 - 2
src/views/home/Message.vue

@@ -217,7 +217,7 @@ export default {
     height: 30px;
     &>span {
       display: inline-block;
-      font-size: 14px;
+      font-size: 15px;
     }
   }
 
@@ -231,7 +231,7 @@ export default {
       height: 40px;
     }
     .el-tabs__item {
-      font-size: 18px !important;
+      font-size: 16px !important;
     }
     .el-tabs__content {
       height: calc(100% - 55px);

+ 4 - 0
src/views/home/Search.vue

@@ -37,5 +37,9 @@ export default {
   height: 100%;
   align-items: center;
   background-color: #ffffff;
+
+  ::v-deep .el-input__inner {
+    border: 1px solid #c0c2c7;
+  }
 }
 </style>

+ 1 - 0
src/views/home/Specification.vue

@@ -12,6 +12,7 @@
               <el-link :underline="false" @click="showDetail(scope.row.id)">{{ scope.row.title }}</el-link>
             </template>
           </el-table-column>
+          <el-table-column prop="createOrgName" width="300" show-overflow-tooltip />
           <el-table-column prop="createTime" width="150" />
         </el-table>
       </el-scrollbar>

+ 17 - 9
src/views/home/System.vue

@@ -110,11 +110,17 @@ export default {
       // width: 100%;
     }
     .el-carousel__button {
-      background-color: #cccccc;
       opacity: 1;
+      width: 19px !important;
+      height: 6px !important;
+      border-radius: 10px !important;
+      background-color: rgba(0,0,0,0.09) !important;
     }
     .el-carousel__indicator.is-active .el-carousel__button {
-      background-color: #0056dd;
+      width: 25px !important;
+      height: 6px !important;
+      border-radius: 10px !important;
+      background-color: rgba(0,0,0,0.22) !important;
     }
     .el-carousel__indicator--horizontal {
       padding: 12px 4px 2px 4px;
@@ -132,20 +138,22 @@ export default {
     padding: 10px 0;
 
     .system-item-box {
-      width: 170px;
+      width: 150px;
       height: 130px;
-      border: 1px solid rgba(0,0,0,0.09);
+      border: 1px solid rgba(0,0,0,0.15);
       border-radius:  10px;
       display: flex;
       flex-direction: column;
       justify-content: center;
       align-items: center;
-      margin: 5px calc(10% - 85px);
+      margin: 5px calc((100% - 900px) / 12) !important;
       cursor: pointer;
 
       .system-title {
-        font-size: 16px;
-        color: rgba(0,0,0,0.65);
+        width: 100%;
+        text-align: center;
+        font-size: 14px;
+        color: rgba(0,0,0,0.85);
         margin-top: 10px;
         text-overflow: ellipsis;
         overflow: hidden;
@@ -156,8 +164,8 @@ export default {
 
   @media only screen and (min-width: 1680px) {
     .system-item-box {
-      width: 170px !important;
-      margin: 5px calc(10% - 85px) !important;
+      width: 150px !important;
+      margin: 5px calc((100% - 900px) / 12) !important;
     }
   }
 

+ 3 - 2
src/views/home/index.vue

@@ -69,10 +69,10 @@ export default {
     },
     componentProps(index) {
       if (index === '3') {
-        return { title: '我的应用', pageSize: 10, appType: -1 }
+        return { title: '我的应用', pageSize: 12, appType: -1 }
       }
       if (index === '4') {
-        return { title: '专项工具', pageSize: 5, appType: 35 }
+        return { title: '专项工具', pageSize: 6, appType: 35 }
       }
       return {}
     }
@@ -97,6 +97,7 @@ $msgCardHeaderHeight: 43px;
           padding: 10px 10px !important;
           height: $msgCardHeaderHeight;
           span{
+            font-size: 17px;
             font-weight: bold;
           }
         }

+ 0 - 1
src/views/info/components/DeptTree.vue

@@ -18,7 +18,6 @@
         :default-expanded-keys="defaultExpandedKeys"
         show-checkbox
         :expand-on-click-node="false"
-        check-strictly
         check-on-click-node
         :filter-node-method="filterNode"
       />

+ 0 - 1
src/views/info/components/DeptUser.vue

@@ -41,7 +41,6 @@
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             show-checkbox
-            check-strictly
             check-on-click-node
             @check="handleNodeChecked"
           />