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

2.完成融合服务：打包模式，点击发布时间，只能按照正序排，不能按照倒序排列的问题；
3完成.融合服务：打包模式，点击收藏量，只能按照正序排，不能按照倒序排列的问题

front/src/views/home/components/integrationServiceOrder.vue

@@ -47,12 +47,10 @@ const integrationOrder = reactive({
 
 // 融合服务--排序
 const changeOrder = (i, val, type) => {
-  
-  console.log('i, val, type------------>', i, val, type);
   integrationOrder.orderField = val
   integrationOrder.orderType = type;
   // 0 apply_count ASC
-  let _index = integrationOrderList.value.findIndex(x => x.value = val)
+  let _index = integrationOrderList.value.findIndex(x => x.value == val)
   if (_index > -1) {
     integrationOrderList.value[_index].orderType = type
   }

front/src/views/home/infrastructurePage.vue

@@ -105,7 +105,13 @@
               <span>面积：{{ item.area }}m²</span>
             </div>
             <div class="bottonmContent">
+              <a-tooltip>
+                <template #title>{{ item.description }}</template>
+                <span>{{ item.description }}</span>
+              </a-tooltip>
+              <!-- <a-tooltip>
                 {{ item.description }}
+              </a-tooltip>        -->
             </div>
           </div>
           <a-button
@@ -851,11 +857,7 @@
 const meetingSelect = reactive({ data: [] })
 const meetingSelectOld = reactive({ data: [] })
 const meetingOnSelectChange = (selectedRowKeys) => {
-    console.log(
-      'selectedRowKeys changed: ',
-      selectedRowKeys,
-      meetingSelect.data
-    )
+  console.log('selectedRowKeys changed: ', selectedRowKeys, meetingSelect.data)
   meetingSelect.data = selectedRowKeys
   meetingSelectOld.data[meetingPagination.value.current - 1] =
     meetingSelect.data
@@ -2141,13 +2143,7 @@
     align: 'center',
   },
 ])
-  const onSelectChange = (
-    record,
-    selected,
-    selectedRows,
-    nativeEvent,
-    type
-  ) => {
+const onSelectChange = (record, selected, selectedRows, nativeEvent, type) => {
   record = JSON.parse(JSON.stringify(record))
   if (selected) {
     if (selectedRowKeys.value.length == 1000) {
@@ -2170,13 +2166,7 @@
   mybus.emit('selectTablePoint', selectedList.value)
   console.log('已选中======================>', selectedList.value)
 }
-  const onSelectChange2 = (
-    record,
-    selected,
-    selectedRows,
-    nativeEvent,
-    type
-  ) => {
+const onSelectChange2 = (record, selected, selectedRows, nativeEvent, type) => {
   console.log(
     '已选中======================>',
     record,
@@ -2189,10 +2179,7 @@
     selectedRowKeys.value.push(record.name)
     selectedRows.value.push(record.name)
   } else {
-      selectedRowKeys.value.splice(
-        selectedRowKeys.value.indexOf(record.name),
-        1
-      )
+    selectedRowKeys.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
     selectedRows.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
   }
 }
@@ -2610,6 +2597,14 @@
         font-size: 0.14rem;
         margin: 0.15rem 0 0.2rem 0;
       }
+      .bottonmContent {
+        width: 100%;
+        overflow: hidden; //超出隐藏
+        text-overflow: ellipsis; //超出文本设置为...
+        display: -webkit-box; //将div1转换为盒子模型
+        -webkit-line-clamp: 3; //设置div1的文本为2行
+        -webkit-box-orient: vertical; //从顶部向底部垂直布置子元素
+      }
     }
   }