Merge branch 'StableVersion' into develop

src/views/HistoryPage.vue

@@ -67,7 +67,7 @@
 						  <template #bodyCell="{ column, text, record ,index}">
 								<div class="operate_list" v-if="column?.Operations">
 									<div class="operate_item" @click="turnToDetail(record)">{{ $t('HistoryPage.Detail') }}</div>
-									<div class="operate_item" @click="renameCollection(record,index)">{{ $t('HistoryPage.Rename') }}</div>
+									<div class="operate_item" @click="renameCollection(record,index)">{{ $t('LibraryPage.Rename') }}</div>
 									<div class="operate_item" @click="retrieveHome(record)">{{ $t('HistoryPage.Retrieve') }}</div>
 									<div class="operate_item" @click="deleteGroup(record, index)">{{ $t('HistoryPage.Delete') }}</div>
 								</div>
@@ -82,6 +82,9 @@
 		<setLabel ref="setLabel"></setLabel>
 		<RobotAssist></RobotAssist>
 		<searchLabel ref="searchLabel"></searchLabel>
+		<div class="mark_loading" v-show="isShowMark">
+            <a-spin size="large" />
+        </div>
     </div>
 </template>
 <script lang="ts">
@@ -110,6 +113,7 @@ export default defineComponent({
     setup() {
         let rangePickerValue:any = ref([])
         let renameData:any = ref({}) //修改名字选中的数据
+		let isShowMark:any = ref(false)
         const columns:any = computed(()=>{
 			return [
 				{ title: useI18n().t('HistoryPage.CollectionsName'), align:'center', ellipsis: true, width: 150, dataIndex: 'name', key: 'collectionName' },
@@ -163,6 +167,7 @@ export default defineComponent({
 			props,
 			intersection,
 			selectCode,
+			isShowMark,
         }
     },
     data(){
@@ -198,7 +203,6 @@ export default defineComponent({
 				"userId": ''
 			}
 			
-			console.log(data);
 			Https.axiosPost(Https.httpUrls.queryClassification, data).then(
                 (rv: any) => {
 					this.options = rv
@@ -236,19 +240,23 @@ export default defineComponent({
         },
 
         getHistoryList(){
+			this.isShowMark = true
             let startDate:any = this.rangePickerValue ? new Date(this.rangePickerValue[0]).getTime(): ''
             let endDate:any = this.rangePickerValue ? new Date(this.rangePickerValue[1]).getTime(): ''
-            let data = {
-                page:this.currentPage,
-                size:this.pageSize,
-                collectionName:this.searchCollectionName,
-                startDate:startDate,
-                endDate:endDate
-            }
+           
 			let labelArr:any = []
 			this.value.labelValue.forEach((item:any)=>{
 				labelArr.push(item[item.length-1])
 			})
+			let data = {
+				classificationIdList:labelArr,
+                page:this.currentPage,
+                size:this.pageSize,
+                collectionName:this.searchCollectionName,
+                startDate:startDate,
+                endDate:endDate,
+				intersection:this.intersection,
+            }
 			// console.log(this.value.labelValue);
 			
 			// let data = {
@@ -271,8 +279,11 @@ export default defineComponent({
 						this.collectionList = rv.content
 						this.total = rv.total
 					}
+					this.isShowMark = false
                 }
-            );
+            ).catch(res=>{
+				this.isShowMark = false
+			});;
         },
 
         //删除分组