Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/home/details.vue

@@ -195,7 +195,7 @@
     flex-direction: column;
     justify-content: space-between;
   }
-  .detail-content {
+  /* .detail-content {
     margin-top: 90px;
-  }
+  } */
 </style>

front/src/views/home/infrastructurePage.vue

@@ -61,6 +61,16 @@
           >
             重置
           </a-button> -->
+          
+        </div>
+        <div class="order">
+          申请时间
+          <span  @click="changeOrder(orderType) "  
+            class="arrow" :class="
+            orderType == 'ASC' 
+          ? 'down'
+          : ''
+      "></span>
         </div>
       </div>
       <div v-if="roomYuyue">
@@ -114,6 +124,7 @@
                 {{ item.description }}
               </a-tooltip>        -->
             </div>
+            <div style="font-size:14px;margin-top:40px">申请量：{{item.applyCount}}次</div>
           </div>
           <a-button
             style="
@@ -976,6 +987,7 @@
   const fileList = ref([])
   const useForm = Form.useForm
   const roomInput = ref('')
+  let orderType = ref('ASC')
   const rulesRef = reactive({
     bookDate: [
       {
@@ -1059,6 +1071,7 @@
     let roomStr = router.currentRoute.value.query.str
     if (roomStr) {
       roomInput.value = roomStr
+
       getCamera()
     }
     // 获取用户信息
@@ -1198,7 +1211,16 @@
     tabList.value[0].content.push('无人机')
     tabList.value[0].content.push('单兵设备')
   }
-
+  //申请时间排序
+  const changeOrder = (type) => {
+    if(type == 'DESC'){
+      type='ASC'
+    }else{
+      type = 'DESC'
+    }
+    orderType.value = type
+    searchData()
+}
   // 单个预览，当前点击数据
   const rowClickData = ref(null)
   // 打开视频预览
@@ -1268,6 +1290,7 @@
       page: roomPage.value,
       limit: roomLimit.value,
       roomName: roomInput.value,
+     
     }
     getYuyue(query).then(({ data: res }) => {
       dataRoom.value = res.data.list
@@ -1584,6 +1607,8 @@
       name: roomInput.value, //会客厅名称
       page: roomPage.value, //页码
       limit: roomLimit.value, //每页条数
+      orderField: "applyCount",
+      orderType: orderType.value
     }
     getRoomSearch(query).then(({ data: res }) => {
       roomList.value = res.data.list
@@ -2785,8 +2810,22 @@
 
     .roomSearch {
       display: flex;
-      align-items: center;
+      align-items: center; 
+      .order{
+        margin-left: 629px;
+        .arrow {
+      display: inline-block;
+      width: 12px;
+      height: 12px;
+      background: url('~@/assets/newHome/arrow.png');
+      margin-left: 10px;
+    }
 
+    .down {
+      background: url('~@/assets/newHome/down.png');
+      margin-top: 6px;
+    }
+      }
       .searchInput {
         display: flex;
         margin-right: 0.2rem;