From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/state.vue | 131 ++++++-------------------------------------
1 files changed, 18 insertions(+), 113 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/state.vue b/src/views/CNAS/resourceDemand/device/component/state.vue
index 6f425f1..da08131 100644
--- a/src/views/CNAS/resourceDemand/device/component/state.vue
+++ b/src/views/CNAS/resourceDemand/device/component/state.vue
@@ -2,27 +2,20 @@
<template>
<div>
<div class="search">
- <el-row :gutter="10" style="width: 100%;">
- <el-col :span="20" style="display: flex;flex-wrap: wrap;">
- <div class="search_thing">
- <div class="search_label">娴佺▼缂栧彿锛�</div>
- <div class="search_input">
- <el-input v-model="search.processNumber" clearable placeholder="璇疯緭鍏�" size="small" style="width: 100%"
- @keyup.enter.native="getDeviceStatePage(clickNodeVal.value)"></el-input>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 20px;">
- <el-button size="small" @click="resetSearch">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="getDeviceStatePage(clickNodeVal.value)">鏌� 璇�</el-button>
- </div>
- </el-col>
- <el-col :span="4">
- <div class="btns">
- <el-button size="small" type="primary" @click="dialogVisible = true">鏂板缓</el-button>
- <el-button :loading="outLoading" size="small" type="primary" @click="handleDown">瀵煎嚭Excel</el-button>
- </div>
- </el-col>
- </el-row>
+ <el-form :model="search" ref="search" size="small" :inline="true">
+ <el-form-item label="娴佺▼缂栧彿">
+ <el-input v-model="search.processNumber" clearable placeholder="璇疯緭鍏�" size="small" style="width: 100%"
+ @keyup.enter.native="getDeviceStatePage(clickNodeVal.value)"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button size="mini" type="primary" @click="getDeviceStatePage(clickNodeVal.value)">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetSearch">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <div>
+ <el-button size="small" type="primary" @click="dialogVisible = true">鏂板缓</el-button>
+ <el-button :loading="outLoading" size="small" type="primary" @click="handleDown">瀵煎嚭Excel</el-button>
+ </div>
</div>
<div>
<el-table :data="tableDatalist" height="calc(100vh - 20em)" style="width: 100% ;"
@@ -54,7 +47,7 @@
</el-table>
<el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]"
:total="search.total" layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
- @current-change="handleCurrentChange">
+ @current-change="handleCurrentChange" background>
</el-pagination>
</div>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="dialogVisible" title="璁惧鎯呭喌"
@@ -509,98 +502,10 @@
</script>
<style scoped>
-.dialog-content {
- max-height: 70vh;
- /* 璁剧疆鏈�澶ч珮搴� */
- overflow-y: auto;
- /* 鍚敤鍨傜洿婊氬姩 */
-}
-
-h4 {
- font-weight: 400;
- font-size: 16px;
- margin: 10px 0;
-}
-
-/*
-淇濆瓨鎻愪氦鎸夐挳鏍峰紡
-*/
-h4 .title {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
-}
-
-h4 .title .line {
- display: inline-block;
- width: 3px;
- height: 16px;
- background: #3A7BFA;
- margin-right: 4px;
-}
-
-.tables {
- width: 100%;
- height: calc(100vh - 15em);
-}
-
-.el-from {
- max-width: 400px;
- margin: 0 auto;
-}
-
-.form-row {
- display: flex;
- justify-content: space-between;
-}
-
-
-.form-row .el-form-item {
- flex: 1;
- /* 姣忎釜琛ㄥ崟椤瑰崰鎹浉鍚屾瘮渚嬬殑绌洪棿 */
- margin-right: 100px;
- /* 鍙�夛細涓哄彸渚у厓绱犳坊鍔犻棿璺� */
-}
-
-/* 绉婚櫎鏈�鍚庝竴涓厓绱犵殑鍙宠竟璺� */
-.form-row .el-form-item:last-child {
- margin-right: 0;
-
-}
-
.search {
- background-color: #fff;
- margin: 10px 0;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
-}
-
-.search_thing {
- display: flex;
- align-items: center;
- height: 40px;
-}
-
-.search_label {
- width: 70px;
- font-size: 14px;
- text-align: right;
-}
-
-.search_input {
- width: 70%;
-}
-
-.btns {
- position: absolute;
- right: 0;
- top: 50%;
- transform: translate(0, -50%);
-}
-
-.form .search_label {
- width: 120px;
+ justify-content: space-between;
+ margin-top: 10px;
}
</style>
--
Gitblit v1.9.3