浏览代码

样式调整

zy1125 1 年之前
父节点
当前提交
6d537e75e5
共有 4 个文件被更改,包括 28 次插入21 次删除
  1. 3 3
      src/assets/css/left.scss
  2. 10 7
      src/components/home.vue
  3. 8 5
      src/components/left.vue
  4. 7 6
      src/components/right.vue

+ 3 - 3
src/assets/css/left.scss

@@ -236,11 +236,11 @@
236 236
      border-radius: 10px;
237 237
 
238 238
      span {
239
-         font-size: 16px;
240
-         width: 166px;
239
+         font-size: 15.5px;
240
+         width: 175px;
241 241
          font-family: Microsoft YaHei UI;
242 242
          // border: 1px solid red;
243
-         margin: 6px;
243
+         margin:  6px 0 6px 4px;
244 244
          font-weight: 400;
245 245
          //  padding: 0;
246 246
 

+ 10 - 7
src/components/home.vue

@@ -32,14 +32,17 @@
32 32
                         <div class="list" style="text-align: center;width: 100%;">
33 33
                         {{ item[0].value }}
34 34
                         </div>
35
-
36
-                        <div class="listtitlebox">
37
-                            <div   v-for="item2 in item" class="listtitle">
38 35
                         
39
-                        <span class="name"> {{ item2.name }} :</span>
40
-                        <span v-if="item2.value!='在线'" class="value">{{ item2.value }}</span>
41
-                        <span v-else style=" font-family: 100; margin-left: 5px;color: #10C383;">{{ item2.value }}</span>
42
-                     </div>
36
+                        <div class="listtitlebox">
37
+                                <div   v-for="item2 in item" class="listtitle" >
38
+                            
39
+                                
40
+                            
41
+                                    <span class="name"> {{ item2.name }} :</span>
42
+                                <span v-if="item2.value!='在线'" class="value">{{ item2.value }}</span>
43
+                                <span v-else style=" font-family: 100; margin-left: 5px;color: #10C383;">{{ item2.value }}</span>
44
+                         
45
+                            </div>
43 46
                         </div>
44 47
                         
45 48
                     </div>

+ 8 - 5
src/components/left.vue

@@ -56,7 +56,7 @@
56 56
                             <li >{{ item.percentage ?item.percentage: '—' }}</li>
57 57
                       
58 58
                             <li>
59
-                                <el-button size="small" class="look" @click.prevent="handleRoom(item)">查看</el-button>
59
+                                <el-button size="small" v-if="item.leaf" class="look" @click.prevent="handleRoom(item)">查看</el-button>
60 60
                             </li>
61 61
 
62 62
                         </ul>
@@ -76,10 +76,10 @@
76 76
 
77 77
 
78 78
 
79
-                <span><span class="title">班级: </span>{{ classInfo && classInfo.className }}</span>
80
-                <span><span class="title">课程名称: </span>{{ classInfo && classInfo.courseName }}</span>
79
+                <span><span class="title">班级: </span>  <span style="width: 105px; display: inline-flex;">{{ classInfo && classInfo.className }}</span> </span>
80
+                <span><span class="title">课程名称: </span>   <span style="width: 94px; display: inline-flex;">{{ classInfo && classInfo.courseName }}</span>    </span>
81 81
                 <span><span class="title">应到人数: </span>{{ classInfo && classInfo.expected }}</span>
82
-                <span><span class="title">教室: </span>{{ classInfo && classInfo.class }}</span>
82
+                <span><span class="title">教室: </span>  <span style=";width: 120px; display: inline-flex;"> {{ classInfo && classInfo.class }} </span>     </span>
83 83
                 <span><span class="title">实到人数: </span>{{ classInfo && classInfo.actual }}</span>
84 84
                 <span><span class="title">老师: </span>{{ classInfo && classInfo.teacher }}</span>
85 85
             </div>
@@ -189,10 +189,13 @@ export default ({
189 189
         let classInfo = ref({})
190 190
         const handleRoom = function (item) {
191 191
 
192
-            popoverVisible.value = true;
192
+        console.log('kankanitem',item);
193
+       setTimeout(() => {
194
+        popoverVisible.value = true;
193 195
             classInfo.value = item;
194 196
          
195 197
             classInfo.value.online = classInfo.value.status == "在用" ? true : false
198
+       }, 2400);
196 199
     
197 200
             mousemoveHandler(1000, 60)
198 201
 

+ 7 - 6
src/components/right.vue

@@ -14,16 +14,17 @@
14 14
                 <div class="list">
15 15
                     <div class="item_r">
16 16
                         <img :src="d2img" alt="">
17
-                        <div class="percent">
18
-                            在线&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ equipmentTotal.online }}
19
-                            <span>(个)</span>
17
+                        <div class="percent" style="display: flex;justify-content: space-between;">
18
+                            <a>在线</a> <a>{{ equipmentTotal.online }} <span>(个)</span> </a>
19
+                            
20 20
                         </div>
21 21
                     </div>
22 22
                     <div class="item_r">
23 23
                         <img :src="d3img" alt="">
24
-                        <div class="percent">
25
-                            离线&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {{ equipmentTotal.underline }}
26
-                            <span>(个)</span>
24
+                        <div class="percent" style="display: flex;justify-content: space-between;">
25
+                            <a>离线</a> <a>{{ equipmentTotal.underline }} <span>(个)</span> </a>
26
+                             
27
+                    
27 28
                         </div>
28 29
                     </div>
29 30
                 </div>