Browse Source

no message

kllay 3 days ago
parent
commit
5587f5883e

+ 9 - 8
src/views/system/home/index.vue

@@ -123,15 +123,16 @@
 										
 									</div>
 
+										<el-table   :data="teamRankings" style="width: 100%">
+											<el-table-column  type="index"  label="排名" width="80"/>
+											<el-table-column prop="device_name" label="设备名称"/>
+											<el-table-column  prop="device_code"  label="设备编码"/>
+											<el-table-column  prop="borrow_count" label="借用次数"/>
+											</el-table>
 																		
-										<div class="scroll-table-wrapper">
+										<!-- <div class="scroll-table-wrapper"> -->
 											<!-- 固定表头 -->
-											<el-table style="width: 100%" :show-empty="false" header-row-class-name="only-header">
-											<el-table-column  label="排名" width="80"/>
-											<el-table-column label="设备名称"/>
-											<el-table-column  label="设备编码"/>
-											<el-table-column  label="借用次数"/>
-											</el-table>
+											
 
 											<!-- <div class="wraptit">
 											<span>排名</span><span>设备名称</span><span>设备编号</span><span>借用次数</span>
@@ -147,7 +148,7 @@
 												</el-table>
 											</div>
 											</div> -->
-										</div>
+										<!-- </div> -->
 							
 									</div>
 								

+ 9 - 6
src/views/system/screenconsole/component/BorrowRankingList.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="ranking-panel">
       <div class="panel-header">
-        <el-select v-model="borrowType" placeholder="借用类型" style="width: 140px">
+        <el-select v-model="borrowType" placeholder="借用类型" style="width: 140px" @change="fetchRanking">
           <el-option label="全部" value="all" />
           <el-option label="常规借用" value="regular" />
           <el-option label="课堂借用" value="classroom" />
@@ -14,18 +14,19 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           style="margin-left: 10px"
+          @change="fetchRanking"
         />
   
-        <el-input
+        <!-- <el-input
           v-model="keyword"
           placeholder="搜索用户/设备"
           clearable
           style="margin-left: 10px; width: 200px"
-        />
+        /> -->
   
-        <el-button type="primary" @click="fetchRanking" style="margin-left: 10px">
+        <!-- <el-button type="primary" @click="fetchRanking" style="margin-left: 10px">
           查询
-        </el-button>
+        </el-button> -->
       </div>
   
       <el-table
@@ -84,7 +85,9 @@
     }
   }
   
-  onMounted(fetchRanking)
+  onMounted(()=>{
+    fetchRanking()
+  })
   </script>
   
   <style scoped>

+ 7 - 8
src/views/system/screenconsole/index.vue

@@ -16,34 +16,33 @@
 		</el-col>
 		</el-row>
 
-		<el-row :gutter="15" class="home-row" style="margin-top: 20px">
+		<!-- <el-row :gutter="15" class="home-row" style="margin-top: 20px">
 		<el-col :span="12">
-			<!-- <DeviceRanking  :apiData="apiData" :minValue="5" /> -->
 			<DeviceBorrowCountChart />
 		</el-col>
 		<el-col :span="12">
 			<DeviceBorrowDurationChart />
 		</el-col>
-		</el-row>
+		</el-row> -->
 
 		<el-row :gutter="15" class="home-row" style="margin-top: 20px">
-		<el-col :span="12">
+		<!-- <el-col :span="12">
 			<UtilizationTrend />
-		</el-col>
+		</el-col> -->
 		<el-col :span="12">
 			<BorrowTrendsChart />
 		</el-col>
 		</el-row>
 
 		<!-- 第二行 -->
-		<el-row :gutter="15" class="home-row" style="margin-top: 20px">
+		<!-- <el-row :gutter="15" class="home-row" style="margin-top: 20px">
 		<el-col :span="12">
 			<ActiveUsersPie />
-		</el-col>
+		</el-col> -->
 		<!-- <el-col :span="12">
 			<test1 />
 		</el-col> -->
-		</el-row>
+		<!-- </el-row> -->
 
 		<el-row :gutter="15" class="home-row" style="margin-top: 20px">
 		<el-col :span="8">