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/jcsz/yhqd.vue |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 0583958..56a8215 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">
-      <!--    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">-->
+    <!--    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">-->
+    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
       <div>
         <el-form
           ref="form"
@@ -10,23 +10,24 @@
           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.UserCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+              <el-input v-model="form.UserCode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
-              <el-input v-model="form.UserName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+              <el-input v-model="form.UserName" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="鎵�灞炵粍缁�" style=" display: flex;">
               <el-cascader
                 ref="cascader"
+                filterable
                 :options="StuOrgArr"
                 :props="defaultProps"
                 @change="cascaderChange"
               />
             </el-form-item>
             <el-form-item label="宸ヨ祫绫诲瀷" style=" display: flex;">
-              <el-select v-model="form.wagetype" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+              <el-select v-model="form.wagetype" filterable style="width: 200px" placeholder="璇烽�夋嫨">
                 <el-option
                   v-for="item in wagetypeArr"
                   :key="item.value"
@@ -36,7 +37,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="鍦ㄨ亴鐘舵��" style=" display: flex;">
-              <el-select v-model="form.Enable" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+              <el-select v-model="form.Enable" filterable style="width: 200px" placeholder="璇烽�夋嫨">
                 <el-option
                   v-for="item in EnableArr"
                   :key="item.value"
@@ -56,13 +57,13 @@
         <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
         <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
       </div>
-      <!--      :style="{width: 100+'%',height:tableHeight+'px'}"-->
       <div style="display: flex;border: 1px solid #eee">
         <el-table
           :data="tableData"
           border
+          stripe
           highlight-current-row
-
+          :style="{width: 100+'%',height:tableHeight+'px'}"
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
           @sort-change="sortChange"
@@ -193,6 +194,7 @@
         <el-form-item label="鍦ㄨ亴鐘舵��" prop="Enable">
           <el-select
             v-model="dialogForm.Enable"
+            filterable
             style="width: 220px"
             placeholder="璇烽�夋嫨"
           >
@@ -209,6 +211,7 @@
             <el-cascader
               ref="dialogCascader"
               key="cascaderKey"
+              filterable
               :options="StuOrgArr"
               :props="defaultProps"
               style="width: 220px;"
@@ -218,6 +221,7 @@
           <el-form-item label="宸ヨ祫绫诲瀷" prop="wagetype">
             <el-select
               v-model="dialogForm.wagetype"
+              filterable
               style="width: 220px"
               placeholder="璇烽�夋嫨"
             >
@@ -354,7 +358,7 @@
         prop: 'lm_date', // 鎺掑簭瀛楁
         order: 'desc', // 鎺掑簭瀛楁
         page: 1, // 绗嚑椤�
-        rows: 10 // 姣忛〉澶氬皯鏉�
+        rows: 20 // 姣忛〉澶氬皯鏉�
       },
       StuOrgArr: [], // 鎵�灞炵粍缁囨暟缁�
       defaultProps: {
@@ -872,17 +876,25 @@
   height: 30px;
   display: flex;
   align-items: center;
+  border: 1px solid $main_color;
+  padding: 0 20px;
 }
 
-::v-deep .el-button--info {
+::v-deep .el-button--info{
   //background-color: $main_color !important;
   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 {
@@ -895,6 +907,7 @@
   height: 30px;
   display: flex;
   align-items: center;
+  padding: 0 20px;
 }
 
 ::v-deep .el-button--default:hover {
@@ -1052,4 +1065,10 @@
   }
 
 }
+.elForm {
+  display: flex;
+  justify-content: flex-start;
+  width: 100%;
+  flex-wrap: wrap;
+}
 </style>

--
Gitblit v1.9.3