From 15426bccdc2134994800437f26e9a0ed6de9f9a5 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 31 Oct 2022 16:03:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=B3=BB=E7=BB=9F=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/home.js          |   9 +-
 front/src/views/home/apply.vue | 247 ++++++++++++++++-----------------
 2 files changed, 130 insertions(+), 126 deletions(-)

diff --git a/front/src/api/home.js b/front/src/api/home.js
index b3043eec..0b8269c3 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-10-26 10:35:36
+ * @LastEditTime: 2022-10-31 15:52:57
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -63,6 +63,13 @@ export function pageWithAttrs(data) {
     data,
   })
 }
+// 筛选
+export function getAppListByDept() {
+  return request({
+    url: '/resource/getAppListByDept',
+    method: 'get',
+  })
+}
 // 获取hls视频流
 export function getHls(params) {
   return request({
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 0f99b1cd..26e1fcf8 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -260,7 +260,11 @@
   import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
   import mybus from '@/myplugins/mybus'
   import { sgcDel, getApplyForm } from '@/api/personalCenter'
-  import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
+  import {
+    pageWithAttrs,
+    updateIntegrationServices,
+    getAppListByDept,
+  } from '@/api/home'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   import { getIntegrationDetail, soldierApply } from '@/api/home'
   import { useStore } from 'vuex'
@@ -782,25 +786,18 @@
           })
         }
       }
-      pageWithAttrs({
-        pageNum: 1,
-        pageSize: 99999,
-        type: '应用资源',
-        name: '',
-        infoList: [],
-      }).then((res) => {
+      getAppListByDept().then((res) => {
+        console.log('res=====>', res.data.data)
         if (res.data.code == 0) {
-          if (res.data.data.records.length == 0) {
+          if (res.data.data.length == 0) {
             message.warning('该关键词，暂无应用资源！')
           } else {
             // 过滤本单位的应用系统
-            res.data.data.records.map((val) => {
-              if (val.deptName === deptName) {
-                systemOptions2.value.push({
-                  value: val.name,
-                  label: val.name,
-                })
-              }
+            res.data.data.map((val) => {
+              systemOptions2.value.push({
+                value: val.NAME,
+                label: val.NAME,
+              })
             })
             // console.log('第一次获取===================>', systemOptions2.value)
           }
@@ -958,130 +955,130 @@
   }
 </script>
 <style scoped lang="less">
-  #apply-container {
-    // background-color: #f5f8fc;
-    height: 100%;
-    width: 100%;
-    margin: 0.8rem auto 0;
+#apply-container {
+  // background-color: #f5f8fc;
+  height: 100%;
+  width: 100%;
+  margin: 0.8rem auto 0;
+  display: flex;
+  justify-content: space-between;
+
+  aside {
+    width: 282px;
+    height: 96%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% 0 3%;
+  }
+
+  article {
+    width: 1090px;
+    height: 99%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% auto;
+  }
+
+  .form-container {
+    padding: 20px 20px 30px 20px;
+
+    .title {
+      font-size: 20px;
+      color: #000;
+      font-weight: bold;
+      margin-bottom: 20px;
+    }
+  }
+
+  .base-info {
     display: flex;
     justify-content: space-between;
+  }
 
-    aside {
-      width: 282px;
-      height: 96%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% 0 3%;
-    }
+  .flex-row-start {
+    justify-content: flex-start;
+    align-items: center;
+  }
 
-    article {
-      width: 1090px;
-      height: 99%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% auto;
-    }
+  :deep(.ant-form-item-label) {
+    label {
+      color: #666;
+      font-size: 16px;
 
-    .form-container {
-      padding: 20px 20px 30px 20px;
-
-      .title {
-        font-size: 20px;
-        color: #000;
-        font-weight: bold;
-        margin-bottom: 20px;
+      &::after {
+        content: '';
       }
     }
-
-    .base-info {
-      display: flex;
-      justify-content: space-between;
-    }
-
-    .flex-row-start {
-      justify-content: flex-start;
-      align-items: center;
-    }
-
-    :deep(.ant-form-item-label) {
-      label {
-        color: #666;
-        font-size: 16px;
-
-        &::after {
-          content: '';
-        }
-      }
-    }
-
-    :deep(.ant-form-item-required) {
-      &::before {
-        font-size: 8px;
-        margin-right: 10px;
-      }
-    }
-
-    :deep(.ant-input) {
-      border: 1px solid #e0e0e0;
-      border-radius: 6px;
-    }
-
-    .success {
-      div {
-        width: 100px;
-        margin: 80px auto 40px;
-      }
-
-      text-align: center;
-      font-size: 20px;
-      font-weight: bold;
-      color: #000;
-    }
   }
 
-  .applicationScene {
-    :deep(.ant-select-selector) {
-      overflow-x: scroll;
-    }
-
-    :deep(.ant-select-selection-overflow) {
-      flex-wrap: nowrap;
+  :deep(.ant-form-item-required) {
+    &::before {
+      font-size: 8px;
+      margin-right: 10px;
     }
   }
 
-  textarea {
-    resize: none;
-    font-size: 14px;
-  }
-
-  .bottom-btn {
-    display: flex;
-    justify-content: center;
-    // position: fixed;
-  }
-
-  .cancel-apply {
-    width: 80px;
-    height: 38px;
-    margin-right: 20px;
-    background: #e1edfa;
-    color: #0087ff;
-    font-size: 14px;
+  :deep(.ant-input) {
+    border: 1px solid #e0e0e0;
     border-radius: 6px;
-    border: none;
-    padding: 0;
-    text-align: center;
   }
 
-  .confirm-apply {
-    width: 80px;
-    height: 38px;
-    background: #0087ff;
-    color: #fff;
-    font-size: 14px;
-    border-radius: 6px;
-    border: none;
-    padding: 0;
+  .success {
+    div {
+      width: 100px;
+      margin: 80px auto 40px;
+    }
+
     text-align: center;
+    font-size: 20px;
+    font-weight: bold;
+    color: #000;
   }
+}
+
+.applicationScene {
+  :deep(.ant-select-selector) {
+    overflow-x: scroll;
+  }
+
+  :deep(.ant-select-selection-overflow) {
+    flex-wrap: nowrap;
+  }
+}
+
+textarea {
+  resize: none;
+  font-size: 14px;
+}
+
+.bottom-btn {
+  display: flex;
+  justify-content: center;
+  // position: fixed;
+}
+
+.cancel-apply {
+  width: 80px;
+  height: 38px;
+  margin-right: 20px;
+  background: #e1edfa;
+  color: #0087ff;
+  font-size: 14px;
+  border-radius: 6px;
+  border: none;
+  padding: 0;
+  text-align: center;
+}
+
+.confirm-apply {
+  width: 80px;
+  height: 38px;
+  background: #0087ff;
+  color: #fff;
+  font-size: 14px;
+  border-radius: 6px;
+  border: none;
+  padding: 0;
+  text-align: center;
+}
 </style>