From 1c867c77ba0ef64e0bc821fd5873a804cd839c20 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Fri, 16 Aug 2024 11:45:08 +0800
Subject: [PATCH] 1

---
 src/views/baseSystemInfo/DetailForm.vue | 4 ++--
 src/views/baseSystemInfo/index.vue      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue
index 11ba299..4963516 100644
--- a/src/views/baseSystemInfo/DetailForm.vue
+++ b/src/views/baseSystemInfo/DetailForm.vue
@@ -10,7 +10,7 @@
     <el-row :gutter="15" style="height: 65vh;" class="NCC-dialog-content" v-loading="loading">
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane label="应用信息" name="1">
-          <div class="system-info">
+          <div class="system-info" style="overflow:auto;height: calc(65vh - 65px); margin-bottom: -10px;">
             <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-100">主体企业:</div>
@@ -189,7 +189,7 @@
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="数据日志" name="5">
-          <div class="infinite-list-wrapper" style="overflow:auto;height: calc(65vh - 70px);">
+          <div class="infinite-list-wrapper" style="overflow:auto;height: calc(65vh - 65px); margin-bottom: -10px;">
             <el-timeline class="list" v-infinite-scroll="initInfoRecord" :infinite-scroll-disabled="record_disabled">
               <el-timeline-item
                   placement="top"
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 2058549..7733923 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -10,6 +10,7 @@
               <el-col :span="5">
                 <el-form-item label="">
                   <el-input
+                    clearable
                     v-model="query.keyword"
                     placeholder="请输入应用名称、企业名称进行查询"
                   />
@@ -36,7 +37,7 @@
                 <el-form-item label="">
                   <el-select
                     v-model="query.proId"
-                    placeholder="请先选择应用类型再选择类别"
+                    placeholder="请选择系统分类"
                     :disabled="!query.systemType"
                     clearable
                   >
@@ -100,7 +101,7 @@
               <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template>
               </el-table-column>
-              <el-table-column label="系统类型" prop="systemClass" align="left" show-overflow-tooltip>
+              <el-table-column label="系统分类" prop="systemClass" align="left" show-overflow-tooltip>
                 <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> -->
               </el-table-column>
               <el-table-column
--
libgit2 0.21.4