Преглед на файлове

修改设备列表弹窗样式,
修改搜索框输入文字样式

mifei преди 1 седмица
родител
ревизия
4ca35bf85b
променени са 9 файла, в които са добавени 69 реда и са изтрити 22 реда
  1. 2 1
      public/config.js
  2. BIN
      public/img/no-data.png
  3. 1 0
      src/App.vue
  4. 8 0
      src/assets/css/home.scss
  5. 9 1
      src/assets/css/left.scss
  6. 2 0
      src/assets/css/right.scss
  7. 3 1
      src/components/home.vue
  8. 21 10
      src/components/left.vue
  9. 23 9
      src/components/right.vue

+ 2 - 1
public/config.js

@@ -15,5 +15,6 @@ window.g = {
15
     // BASE_API: "http://192.168.4.219:12397/ioc-server",
15
     // BASE_API: "http://192.168.4.219:12397/ioc-server",
16
     // UE_IP: "http://192.168.4.159"
16
     // UE_IP: "http://192.168.4.159"
17
     // UE_IP: "http://127.0.0.1:80"
17
     // UE_IP: "http://127.0.0.1:80"
18
-    UE_IP: "ws://192.168.4.152:81"
18
+    // UE_IP: "ws://192.168.4.152:81"
19
+    UE_IP: "ws://192.168.4.148:88"
19
 };
20
 };

BIN
public/img/no-data.png


+ 1 - 0
src/App.vue

@@ -8,6 +8,7 @@
8
 -->
8
 -->
9
 
9
 
10
 <template >
10
 <template >
11
+
11
     <router-view />
12
     <router-view />
12
     <!-- <UeVideo /> -->
13
     <!-- <UeVideo /> -->
13
 </template>
14
 </template>

+ 8 - 0
src/assets/css/home.scss

@@ -22,6 +22,14 @@
22
         }
22
         }
23
     }
23
     }
24
 }
24
 }
25
+.bg-shadow{
26
+    width: 100vw;
27
+    height: 100vh;
28
+    position: absolute;
29
+    top: 0;
30
+    left: 0;
31
+    pointer-events: none;
32
+}
25
 
33
 
26
 .el-container {
34
 .el-container {
27
     height: 938px;
35
     height: 938px;

+ 9 - 1
src/assets/css/left.scss

@@ -16,7 +16,7 @@
16
     display: flex;
16
     display: flex;
17
     flex-direction: column;
17
     flex-direction: column;
18
     padding: 11px 10px 15px 10px; //教室分类统计
18
     padding: 11px 10px 15px 10px; //教室分类统计
19
-
19
+    pointer-events: auto;
20
     .left_top {
20
     .left_top {
21
         box-sizing: border-box;
21
         box-sizing: border-box;
22
         width: 392px;
22
         width: 392px;
@@ -337,6 +337,14 @@
337
             }
337
             }
338
             .scroll-container{
338
             .scroll-container{
339
                 flex: 1;
339
                 flex: 1;
340
+                .empty-container{
341
+                    margin-top: 10px;
342
+                    display: flex;
343
+                    justify-content: center;
344
+                    align-items: center;
345
+                    height: 100%;
346
+                    background: rgba(26, 86, 154, 0.16);
347
+                }
340
             }
348
             }
341
 
349
 
342
             .vue3-seamless-scroll {
350
             .vue3-seamless-scroll {

+ 2 - 0
src/assets/css/right.scss

@@ -327,6 +327,8 @@
327
                 width: 100%;
327
                 width: 100%;
328
                 height: 100%;
328
                 height: 100%;
329
                 position: relative;
329
                 position: relative;
330
+                overflow: hidden;
331
+                clip-path: polygon(1% 0, 99% 0, 100% 2%, 100% 100%, 80% 100%, 20% 100%, 0 100%, 0 2%);
330
                 // background-color: red;
332
                 // background-color: red;
331
                 
333
                 
332
                 // -webkit-clip-path: polygon(4% 0, 96% 0, 100% 4%, 100% 80%, 100% 99%, 0 100%, 0% 80%, 0 4%);
334
                 // -webkit-clip-path: polygon(4% 0, 96% 0, 100% 4%, 100% 80%, 100% 99%, 0 100%, 0% 80%, 0 4%);

+ 3 - 1
src/components/home.vue

@@ -1,7 +1,7 @@
1
 <template>
1
 <template>
2
   <!-- <div class="container" > -->
2
   <!-- <div class="container" > -->
3
   <Header />
3
   <Header />
4
-
4
+  <img class="bg-shadow" :src="bgShadow" alt="" srcset="">
5
   <Left v-if="isShowLeft" ref="childRef" @childMethod="childMethod"></Left>
5
   <Left v-if="isShowLeft" ref="childRef" @childMethod="childMethod"></Left>
6
   <right v-if="isShowRight"></right>
6
   <right v-if="isShowRight"></right>
7
   <div
7
   <div
@@ -98,6 +98,7 @@
98
     <el-table
98
     <el-table
99
       :data="deviceDetailsList"
99
       :data="deviceDetailsList"
100
       border
100
       border
101
+      :resizable="false"
101
       height="350px"
102
       height="350px"
102
       style="width: 100%; background: rgba(0, 0, 0, 0)"
103
       style="width: 100%; background: rgba(0, 0, 0, 0)"
103
     >
104
     >
@@ -105,6 +106,7 @@
105
         align="center"
106
         align="center"
106
         type="index"
107
         type="index"
107
         label="序号"
108
         label="序号"
109
+        width="100px"
108
       ></el-table-column>
110
       ></el-table-column>
109
       <el-table-column
111
       <el-table-column
110
         align="center"
112
         align="center"

+ 21 - 10
src/components/left.vue

@@ -98,7 +98,7 @@
98
         <div class="usering-free">
98
         <div class="usering-free">
99
           <div class="usering-box">
99
           <div class="usering-box">
100
             <div class="text">
100
             <div class="text">
101
-              使用中{{ getPercentage || 0 }}%
101
+              使用中{{ getPercentage || 0 }}%
102
               <span class="num">{{ occupiedClassroomsCount || 0 }}间</span>
102
               <span class="num">{{ occupiedClassroomsCount || 0 }}间</span>
103
             </div>
103
             </div>
104
           </div>
104
           </div>
@@ -287,7 +287,12 @@
287
                 </template>
287
                 </template>
288
               </scroll>
288
               </scroll>
289
             </div>
289
             </div>
290
+
291
+            <div v-else class="empty-container">
292
+              <img :src="noData" alt="" srcset="">
293
+            </div>
290
           </div>
294
           </div>
295
+         
291
         </div>
296
         </div>
292
         <!-- </div> -->
297
         <!-- </div> -->
293
       </div>
298
       </div>
@@ -690,7 +695,7 @@ export default {
690
     let scrollContainerHeight = ref(null);
695
     let scrollContainerHeight = ref(null);
691
     onMounted(() => {
696
     onMounted(() => {
692
       getClassData();
697
       getClassData();
693
-      start();
698
+      //start();
694
       // 获取教师下拉选择数据
699
       // 获取教师下拉选择数据
695
       getClassSelections();
700
       getClassSelections();
696
       //获取教室列表数据
701
       //获取教室列表数据
@@ -769,7 +774,7 @@ export default {
769
     const getPercentage = computed(() => {
774
     const getPercentage = computed(() => {
770
       const total = classRoom.value.length;
775
       const total = classRoom.value.length;
771
       const occupied = occupiedClassroomsCount.value;
776
       const occupied = occupiedClassroomsCount.value;
772
-      return ((occupied / total) * 100).toFixed(2) || 0;
777
+      return (((occupied / total) * 100).toFixed(2))=='NaN'?0:(((occupied / total) * 100).toFixed(2)) ;
773
     });
778
     });
774
 
779
 
775
     // 获取教师下拉选择
780
     // 获取教师下拉选择
@@ -859,6 +864,7 @@ export default {
859
     };
864
     };
860
     const leftimg = ref("./img/");
865
     const leftimg = ref("./img/");
861
     const frame = ref("./img/frame.png");
866
     const frame = ref("./img/frame.png");
867
+    const noData = ref("./img/no-data.png");
862
     return {
868
     return {
863
       roomVisible,
869
       roomVisible,
864
       classCount,
870
       classCount,
@@ -907,6 +913,7 @@ export default {
907
       offset,
913
       offset,
908
       scrollContainerHeight,
914
       scrollContainerHeight,
909
       scrollContainerRef,
915
       scrollContainerRef,
916
+      noData
910
     };
917
     };
911
   },
918
   },
912
 };
919
 };
@@ -934,18 +941,19 @@ export default {
934
 
941
 
935
 .el-popper {
942
 .el-popper {
936
   border: 2px solid #1a2d47 !important;
943
   border: 2px solid #1a2d47 !important;
937
-  background: rgba(1, 18, 35, 0.87) !important;
938
-  border-radius: 1px !important;
944
+  background: rgba(1, 18, 35, 0.60) !important;
945
+  border-radius: 4px !important;
946
+
939
 }
947
 }
940
 .el-dropdown-menu {
948
 .el-dropdown-menu {
941
-  background: rgba(1, 18, 35, 0.87) !important;
949
+  background: rgba(1, 18, 35, 0.60) !important;
942
   border: none !important;
950
   border: none !important;
943
-  border-radius: 2px !important;
951
+  border-radius: 4px !important;
952
+  padding: 2px  !important;
944
 }
953
 }
945
 .el-dropdown-menu__item {
954
 .el-dropdown-menu__item {
946
-  color: rgba(255, 255, 255, 0.75);
947
-  border-radius: 2px !important;
948
-  border-radius: 2px !important;
955
+  color: rgba(255, 255, 255, 0.72);
956
+  border-radius: 4px !important;
949
 }
957
 }
950
 .popper__arrow::after {
958
 .popper__arrow::after {
951
   background: rgba(255, 255, 255, 0.12);
959
   background: rgba(255, 255, 255, 0.12);
@@ -966,4 +974,7 @@ export default {
966
 .el-popper__arrow {
974
 .el-popper__arrow {
967
   display: none;
975
   display: none;
968
 }
976
 }
977
+.el-input__inner{
978
+  color: #fff !important;
979
+}
969
 </style>
980
 </style>

+ 23 - 9
src/components/right.vue

@@ -472,11 +472,15 @@ export default {
472
   }
472
   }
473
 }
473
 }
474
 .deviceDialog {
474
 .deviceDialog {
475
+  border-radius: 4px 4px 0px 0px;
476
+
475
   .el-dialog__header {
477
   .el-dialog__header {
478
+    border-radius: 4px 4px 0px 0px;
479
+
476
     height: 39px;
480
     height: 39px;
477
     line-height: 39px;
481
     line-height: 39px;
478
-    padding: 0;
479
-    background-color: #1b67d9;
482
+    padding: 5px;
483
+    background-color: #0082d3;
480
     margin-right: 0;
484
     margin-right: 0;
481
     text-indent: 14px;
485
     text-indent: 14px;
482
 
486
 
@@ -497,10 +501,14 @@ export default {
497
   }
501
   }
498
   .el-dialog__body {
502
   .el-dialog__body {
499
     // padding: 10px !important;
503
     // padding: 10px !important;
500
-    background-color: rgba(0, 0, 0, 0.5) !important;
504
+    // background-color: rgba(0, 0, 0, 0.5) !important;
505
+    background: rgba(6, 22, 30, 0.48) !important;
506
+    
507
+
508
+    padding:8px 10px;
501
     .el-table {
509
     .el-table {
502
       --el-table-border-color: #253f48;
510
       --el-table-border-color: #253f48;
503
-      --el-table-row-hover-bg-color: rgba(0, 0, 0, 0.7);
511
+      --el-table-row-hover-bg-color: rgba(0, 0, 0, 0.3);
504
       .normal {
512
       .normal {
505
         text-align: center;
513
         text-align: center;
506
         /* text/pc/02-55-Regular */
514
         /* text/pc/02-55-Regular */
@@ -549,10 +557,16 @@ export default {
549
       }
557
       }
550
     }
558
     }
551
     .el-table th.el-table__cell {
559
     .el-table th.el-table__cell {
552
-      background-color: rgba(0, 0, 0, 0.5);
560
+      background: rgba(6, 22, 30, 0.48) !important;
561
+    
553
     }
562
     }
554
     .el-table tr {
563
     .el-table tr {
555
-      background-color: rgba(0, 0, 0, 0.5);
564
+      background: rgba(6, 22, 30, 0.48) !important;
565
+
566
+    }
567
+    .el-table thead {
568
+      background: rgba(6, 22, 30, 0.48) !important;
569
+
556
     }
570
     }
557
     .el-table td.el-table__cell,
571
     .el-table td.el-table__cell,
558
     .el-table th.el-table__cell.is-leaf {
572
     .el-table th.el-table__cell.is-leaf {
@@ -566,7 +580,7 @@ export default {
566
     height: 39px;
580
     height: 39px;
567
     line-height: 39px;
581
     line-height: 39px;
568
     padding: 0px;
582
     padding: 0px;
569
-    background-color: #1b67d9;
583
+    background-color: #0082d3;
570
     margin-right: 0;
584
     margin-right: 0;
571
     text-indent: 10px;
585
     text-indent: 10px;
572
 
586
 
@@ -588,8 +602,8 @@ export default {
588
 
602
 
589
   .el-dialog__body {
603
   .el-dialog__body {
590
     padding: 10px !important;
604
     padding: 10px !important;
591
-    background-color: rgba(0, 0, 0, 0.2) !important;
592
-
605
+    background: rgba(6, 22, 30, 0.85) !important;
606
+    bortder-radius: 4px !important;
593
     .details-container {
607
     .details-container {
594
       color: #fff;
608
       color: #fff;
595
 
609