Commit 1c867c77ba0ef64e0bc821fd5873a804cd839c20
1 parent
3662215e
1
Showing
2 changed files
with
5 additions
and
4 deletions
src/views/baseSystemInfo/DetailForm.vue
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | <el-row :gutter="15" style="height: 65vh;" class="NCC-dialog-content" v-loading="loading"> | 10 | <el-row :gutter="15" style="height: 65vh;" class="NCC-dialog-content" v-loading="loading"> |
| 11 | <el-tabs v-model="activeName" type="card" @tab-click="handleClick"> | 11 | <el-tabs v-model="activeName" type="card" @tab-click="handleClick"> |
| 12 | <el-tab-pane label="应用信息" name="1"> | 12 | <el-tab-pane label="应用信息" name="1"> |
| 13 | - <div class="system-info"> | 13 | + <div class="system-info" style="overflow:auto;height: calc(65vh - 65px); margin-bottom: -10px;"> |
| 14 | <el-col :span="24"> | 14 | <el-col :span="24"> |
| 15 | <div class="form-item"> | 15 | <div class="form-item"> |
| 16 | <div class="label w-100">主体企业:</div> | 16 | <div class="label w-100">主体企业:</div> |
| @@ -189,7 +189,7 @@ | @@ -189,7 +189,7 @@ | ||
| 189 | </el-table> | 189 | </el-table> |
| 190 | </el-tab-pane> | 190 | </el-tab-pane> |
| 191 | <el-tab-pane label="数据日志" name="5"> | 191 | <el-tab-pane label="数据日志" name="5"> |
| 192 | - <div class="infinite-list-wrapper" style="overflow:auto;height: calc(65vh - 70px);"> | 192 | + <div class="infinite-list-wrapper" style="overflow:auto;height: calc(65vh - 65px); margin-bottom: -10px;"> |
| 193 | <el-timeline class="list" v-infinite-scroll="initInfoRecord" :infinite-scroll-disabled="record_disabled"> | 193 | <el-timeline class="list" v-infinite-scroll="initInfoRecord" :infinite-scroll-disabled="record_disabled"> |
| 194 | <el-timeline-item | 194 | <el-timeline-item |
| 195 | placement="top" | 195 | placement="top" |
src/views/baseSystemInfo/index.vue
| @@ -10,6 +10,7 @@ | @@ -10,6 +10,7 @@ | ||
| 10 | <el-col :span="5"> | 10 | <el-col :span="5"> |
| 11 | <el-form-item label=""> | 11 | <el-form-item label=""> |
| 12 | <el-input | 12 | <el-input |
| 13 | + clearable | ||
| 13 | v-model="query.keyword" | 14 | v-model="query.keyword" |
| 14 | placeholder="请输入应用名称、企业名称进行查询" | 15 | placeholder="请输入应用名称、企业名称进行查询" |
| 15 | /> | 16 | /> |
| @@ -36,7 +37,7 @@ | @@ -36,7 +37,7 @@ | ||
| 36 | <el-form-item label=""> | 37 | <el-form-item label=""> |
| 37 | <el-select | 38 | <el-select |
| 38 | v-model="query.proId" | 39 | v-model="query.proId" |
| 39 | - placeholder="请先选择应用类型再选择类别" | 40 | + placeholder="请选择系统分类" |
| 40 | :disabled="!query.systemType" | 41 | :disabled="!query.systemType" |
| 41 | clearable | 42 | clearable |
| 42 | > | 43 | > |
| @@ -100,7 +101,7 @@ | @@ -100,7 +101,7 @@ | ||
| 100 | <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip> | 101 | <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip> |
| 101 | <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template> | 102 | <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template> |
| 102 | </el-table-column> | 103 | </el-table-column> |
| 103 | - <el-table-column label="系统类型" prop="systemClass" align="left" show-overflow-tooltip> | 104 | + <el-table-column label="系统分类" prop="systemClass" align="left" show-overflow-tooltip> |
| 104 | <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> --> | 105 | <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> --> |
| 105 | </el-table-column> | 106 | </el-table-column> |
| 106 | <el-table-column | 107 | <el-table-column |