From af0d559bf26036e1cff3345f5794a24979280ea1 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Thu, 13 Apr 2023 18:04:26 +0800
Subject: [PATCH] 样式调整

---
 src/views/standard/card/index.vue   | 61 +++++++++++++++++++++++++++++++++++--------------------------
 src/views/standard/device/index.vue |  3 +--
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
index 6d8d405..c5c5483 100644
--- a/src/views/standard/card/index.vue
+++ b/src/views/standard/card/index.vue
@@ -21,30 +21,6 @@
               :props="props"
               :show-all-levels="false"
             ></el-cascader>
-            <el-input
-              placeholder="请输入学生姓名"
-              v-model="query.studentName"
-              class="input-with-select"
-              @keyup.enter.native="(page = 1), _QueryData(2)"
-            >
-              <el-button
-                slot="append"
-                icon="el-icon-search"
-                @click="(page = 1), _QueryData(2)"
-              ></el-button>
-            </el-input>
-            <el-input
-              placeholder="请输入学生学号"
-              v-model="query.studentCode"
-              class="input-with-select"
-              @keyup.enter.native="(page = 1), _QueryData(3)"
-            >
-              <el-button
-                slot="append"
-                icon="el-icon-search"
-                @click="(page = 1), _QueryData(3)"
-              ></el-button>
-            </el-input>
           </template>
           <template v-if="role == 'ROLE_JITUAN'">
             <el-select
@@ -63,7 +39,7 @@
             </el-select>
           </template>
           <el-select
-            class="sel"
+            class="sel sel3"
             v-model="query.operationType"
             placeholder="选择类型"
           >
@@ -90,6 +66,32 @@
             >
             </el-date-picker>
           </div>
+          <template v-if="role == 'ROLE_XUEXIAO'">
+            <el-input
+              placeholder="请输入学生姓名"
+              v-model="query.studentName"
+              class="input-with-select sel"
+              @keyup.enter.native="(page = 1), _QueryData(2)"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-search"
+                @click="(page = 1), _QueryData(2)"
+              ></el-button>
+            </el-input>
+            <el-input
+              placeholder="请输入学生学号"
+              v-model="query.studentCode"
+              class="input-with-select sel"
+              @keyup.enter.native="(page = 1), _QueryData(3)"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-search"
+                @click="(page = 1), _QueryData(3)"
+              ></el-button>
+            </el-input>
+          </template>
           <el-button type="primary" round @click="(page = 1), _QueryData(4)"
             >筛选</el-button
           >
@@ -377,10 +379,17 @@ export default {
 }
 .answer-header {
   .sel-box {
+    .sel {
+      margin-right: 20px;
+      min-width: 120px;
+    }
     .sel2 {
-      width: 300px;
+      width: 200px;
       margin-right: 20px;
     }
+    .sel3 {
+      min-width: 80px;
+    }
     .d1 {
       margin-right: 20px;
     }
diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue
index e66ae47..3c59c8d 100644
--- a/src/views/standard/device/index.vue
+++ b/src/views/standard/device/index.vue
@@ -277,9 +277,8 @@
                 prop="sn"
                 label="设备编码"
                 align="center"
-                width="160"
               ></el-table-column>
-              <el-table-column label="学生信息" align="center" width="120"
+              <el-table-column label="学生信息" align="center"
                 ><template slot-scope="scoped"
                   ><p
                     v-for="(item, index) in scoped.row.studentList"
--
libgit2 0.21.4