Compare commits

..

No commits in common. "20e237ff6a4fad2e31cc9845284f571fd31c6411" and "6e5de0544bc74b7f7ae408134612485645dc2ba6" have entirely different histories.

2 changed files with 4 additions and 43 deletions

View File

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

View File

@ -61,16 +61,6 @@
> >
重置 重置
</a-button> --> </a-button> -->
</div>
<div class="order">
申请时间
<span @click="changeOrder(orderType) "
class="arrow" :class="
orderType == 'ASC'
? 'down'
: ''
"></span>
</div> </div>
</div> </div>
<div v-if="roomYuyue"> <div v-if="roomYuyue">
@ -124,7 +114,6 @@
{{ item.description }} {{ item.description }}
</a-tooltip> --> </a-tooltip> -->
</div> </div>
<div style="font-size:14px;margin-top:40px">申请量{{item.applyCount}}</div>
</div> </div>
<a-button <a-button
style=" style="
@ -987,7 +976,6 @@
const fileList = ref([]) const fileList = ref([])
const useForm = Form.useForm const useForm = Form.useForm
const roomInput = ref('') const roomInput = ref('')
let orderType = ref('ASC')
const rulesRef = reactive({ const rulesRef = reactive({
bookDate: [ bookDate: [
{ {
@ -1071,7 +1059,6 @@
let roomStr = router.currentRoute.value.query.str let roomStr = router.currentRoute.value.query.str
if (roomStr) { if (roomStr) {
roomInput.value = roomStr roomInput.value = roomStr
getCamera() getCamera()
} }
// //
@ -1211,16 +1198,7 @@
tabList.value[0].content.push('无人机') tabList.value[0].content.push('无人机')
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) const rowClickData = ref(null)
// //
@ -1290,7 +1268,6 @@
page: roomPage.value, page: roomPage.value,
limit: roomLimit.value, limit: roomLimit.value,
roomName: roomInput.value, roomName: roomInput.value,
} }
getYuyue(query).then(({ data: res }) => { getYuyue(query).then(({ data: res }) => {
dataRoom.value = res.data.list dataRoom.value = res.data.list
@ -1607,8 +1584,6 @@
name: roomInput.value, // name: roomInput.value, //
page: roomPage.value, // page: roomPage.value, //
limit: roomLimit.value, // limit: roomLimit.value, //
orderField: "applyCount",
orderType: orderType.value
} }
getRoomSearch(query).then(({ data: res }) => { getRoomSearch(query).then(({ data: res }) => {
roomList.value = res.data.list roomList.value = res.data.list
@ -2811,21 +2786,7 @@
.roomSearch { .roomSearch {
display: flex; 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 { .searchInput {
display: flex; display: flex;
margin-right: 0.2rem; margin-right: 0.2rem;