Merge branch 'develop' into release-test

@@ -79,6 +79,7 @@ const changeTab = (pane: any, ev: any) => {
 };
 };
 const removeTab = (targetName) => {
 const removeTab = (targetName) => {
   // const tabs = tabbarList.value.filter(item => item.visible ?? true);
   // const tabs = tabbarList.value.filter(item => item.visible ?? true);
+  debugger
   const tabs = tabbarList.value;
   const tabs = tabbarList.value;
   let activeName = tabbarActive.value, nextTab: any = {};
   let activeName = tabbarActive.value, nextTab: any = {};
   const setTabs = (activeTab) => {
   const setTabs = (activeTab) => {

@@ -50,9 +50,6 @@ const routes: RouteRecordRaw[] = [
           cache: true,
           cache: true,
           reuse: true
           reuse: true
         },
         },
-        beforeEnter: (to, from) => {
-          to.meta.title = `详情-${to.query.name}`;
-        }
       }
       }
     ],
     ],
   },
   },

@@ -295,6 +295,13 @@ const getDetailInfo = () => {
     ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
     ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
       if (res.code == proxy.$passCode) {
       if (res.code == proxy.$passCode) {
         const data = res.data || {};
         const data = res.data || {};
+        if (fullPath === route.fullPath) {
+          document.title = `详情-${data.daName}`;
+        }
+        let tab: any = userStore.tabbar.find((tab: any) => tab.fullPath === fullPath);
+        if (tab) {
+          tab.meta.title = `详情-${data.daName}`;
+        }
         let { approveVO } = data;
         let { approveVO } = data;
         detailInfo.value = data;
         detailInfo.value = data;
         assetDetailInfo.value = data;
         assetDetailInfo.value = data;

@@ -729,8 +729,9 @@ const rejectDialogBtnClick = (btn, info) => {
   position: relative;
   position: relative;
 }
 }
 
 
-:deep(.el-carousel__container) {
-  margin-bottom: 16px;
+:deep(.el-carousel) {
+  margin: 0 -16px 16px;
+  padding: 0 16px;
 
 
   .card-content {
   .card-content {
     width: calc(25% - 12px);
     width: calc(25% - 12px);