From 13a60da2424da8cd50e52e35e0126e23e34ea6f3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 15:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/CNAS/process/reportResults/index.vue |   65 +++++++-------------------------
 1 files changed, 15 insertions(+), 50 deletions(-)

diff --git a/src/views/CNAS/process/reportResults/index.vue b/src/views/CNAS/process/reportResults/index.vue
index 9cf49ca..a3415d1 100644
--- a/src/views/CNAS/process/reportResults/index.vue
+++ b/src/views/CNAS/process/reportResults/index.vue
@@ -1,16 +1,19 @@
 <template>
-  <div class="report-results">
+  <div class="capacity-scope">
     <div class="search">
-      <div class="search_thing">
-        <div class="search_label">妫�楠屾姤鍛婄紪鍙凤細</div>
-        <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.insReportCode"
-            @keyup.enter.native="refreshTable()"></el-input></div>
+      <div>
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+          <el-form-item label="妫�楠屾姤鍛婄紪鍙�" prop="insReportCode">
+            <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.insReportCode"
+                      @keyup.enter.native="refreshTable()"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+          </el-form-item>
+        </el-form>
       </div>
-      <div class="search_thing" style="padding-left: 30px;">
-        <el-button size="small" @click="refresh()">閲� 缃�</el-button>
-        <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
-      </div>
-      <div class="btn">
+      <div>
         <el-button size="small" type="primary" @click="handleDown" :loading="outLoading" v-if="outPower">瀵煎嚭</el-button>
         <el-button size="small" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
       </div>
@@ -311,11 +314,9 @@
 
 <style scoped>
 .search {
-  background-color: #fff;
-  height: 80px;
+  height: 46px;
   display: flex;
-  align-items: center;
-  position: relative;
+  justify-content: space-between;
 }
 
 .search_thing {
@@ -332,41 +333,5 @@
 
 .search_input {
   width: calc(100% - 110px);
-}
-
-.table {
-  background-color: #fff;
-  height: calc(100% - 60px - 80px - 10px - 40px);
-  padding: 20px;
-}
-
-.tables {
-  table-layout: fixed;
-  width: 100%;
-}
-
-.tables td {
-  height: 40px;
-  width: 100px;
-  text-align: center;
-  font-size: 14px;
-  word-wrap: break-word;
-  white-space: normal;
-}
-
-.en {
-  font-size: 12px;
-  word-break: break-word;
-  /* 鑷姩鏂 */
-  overflow-wrap: break-word;
-  /* 闃叉婧㈠嚭 */
-  white-space: normal;
-  /* 榛樿鎹㈣ */
-}
-
-.btn {
-  position: absolute;
-  top: 16px;
-  right: 20px;
 }
 </style>

--
Gitblit v1.9.3