From c89113ec9b5032b5553334ec6c9ac3700ba6c398 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 23 六月 2022 16:35:29 +0800
Subject: [PATCH] 1.设备管理、设备类型(查询、新增、删除)功能开发 2.设备管理、设备组(查询、新增、删除)功能开发

---
 src/views/template.vue |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/views/template.vue b/src/views/template.vue
index 9b5e59b..5a0e09c 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
-      <div style="height: 50px;">
+      <div>
         <el-form
           ref="form"
           :model="form"
@@ -9,7 +9,7 @@
           inline
           style="display: flex;justify-content: space-between"
         >
-          <div style="display: flex;justify-content: space-around;width: 85%">
+          <div class="elForm">
             <el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
               <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
             </el-form-item>
@@ -30,7 +30,7 @@
               <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="璇疯緭鍏�" />
             </el-form-item>
           </div>
-          <div style="display: flex;align-items: start;margin-top: 5px;">
+          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
             <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
             <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
@@ -46,8 +46,8 @@
         <el-table
           :data="tableData"
           border
+          :style="{width: 100+'%',height:tableHeight+'px',}"
           highlight-current-row
-          :style="{width: 100+'%',height:tableHeight+'px'}"
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
           @sort-change="sortChange"
@@ -57,7 +57,7 @@
           <!--            width="50"-->
           <!--          />-->
           <el-table-column
-            prop="id"
+            prop="RowNum"
             width="50"
             label="搴忓彿"
           />
@@ -384,13 +384,12 @@
           AddUpdateOrganization(data).then(res => {
             if (res.code === '200') {
               this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogVisible = false
               this.getOrganizationSearch()
             } else {
               this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
             }
           })
-
-          this.dialogVisible = false
         }
       })
     },
@@ -412,6 +411,8 @@
   height: 30px;
   display: flex;
   align-items: center;
+  border: 1px solid $main_color;
+  padding: 0 20px;
 }
 
 ::v-deep .el-button--info {
@@ -419,10 +420,16 @@
   height: 30px;
   display: flex;
   align-items: center;
+  padding: 0 20px;
 }
 
 ::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
   background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
 }
 
 .footerButton {
@@ -435,6 +442,7 @@
   height: 30px;
   display: flex;
   align-items: center;
+  padding: 0 20px;
 }
 
 ::v-deep .el-button--default:hover {
@@ -460,7 +468,8 @@
 }
 
 ::v-deep .el-input__inner {
-  height: 30px
+  height: 30px;
+  line-height: 30px;
 }
 
 ::v-deep .el-table .caret-wrapper {
@@ -495,20 +504,22 @@
 .el-checkbox.is-bordered.is-checked {
   border-color: $main_color;
 }
+
 ::v-deep .el-radio__input.is-checked .el-radio__inner {
   border-color: $main_color;
   background: $main_color;
 }
 
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
   border-color: $main_color;
   background: $main_color;
 }
+
 ::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
   color: $main_color !important;
 }
 
-::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered{
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
   margin: 10px 30px 0px 0;
 }
 
@@ -519,4 +530,11 @@
 ::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
   margin: 10px 30px 0px 0;
 }
+
+.elForm {
+  display: flex;
+  justify-content: flex-start;
+  width: 85%;
+  flex-wrap: wrap;
+}
 </style>

--
Gitblit v1.9.3