Merge branch 'master' of http://47.110.251.215:3000/web/hc_archives

src/components/tree/hc-tree.vue

@@ -376,7 +376,7 @@ const setTreeMenuDataClick = ({key,node,data}) => {
             syncNodeMoadl(node);
             break;
         case 'sort':
-            sortNodeMoadl(node);
+            sortNodeMoadl(node,data);
             break;
     }
 }
@@ -398,8 +398,13 @@ const dialogHide = ()=>{
 
 //排序弹窗
 const sortDialogShow = ref(false);
-const sortNodeMoadl = ()=>{
-    sortDialogShow.value = true;
+const sortNodeMoadl = (node,data)=>{
+    if(data?.isStorageNode===1){
+        sortDialogShow.value = true;
+    }else{
+        window.$message.warning('非存储节点不允许排序')
+    }
+    
 }
 const sortDialogHide = ()=>{
     sortDialogShow.value = false;

src/views/file/collection.vue

@@ -706,8 +706,8 @@ const sortingTableSelection = (rows,list,event) => {
 
 //删除
 const sortingDelData = (row,index) => {
-    // sortingItemData.value.splice(index,1);
-  
+    sortingItemData.value.splice(index,1);
+    if(row.boxNumber){
         delMessage(async () => {
             const { error, code } = await archiveFileApi.removeAllocation({
                 boxName: row.boxName,
@@ -719,6 +719,9 @@ const sortingDelData = (row,index) => {
                 sortingClick()
             }
         })
+    }
+  
+       
     
 }
 
@@ -1034,6 +1037,7 @@ const certificationStatus = async () => {
 //获取图幅类型
 const sheetType = ref([])
 const sheetTypeStatus = async () => {
+    console.log(1111111);
     const { error, code, data } = await tasksApi.queryTaskTypeStatus({
         typeOrStatus: 'sheet_type'
     })
@@ -1102,6 +1106,8 @@ const setTableUploadColumn = () => {
             {key:'isElement', name: '是否四要素'},
             {key:'action', name: '操作', width: 100}
         ]
+        sheetTypeStatus()
+        sheetSourceStatus()
     } else {
         tableUploadColumn.value = [
             {key:'fileNumber', name: '文件编号'},

src/views/using/stats.vue

@@ -4,7 +4,7 @@
             <template #header>
                 <div class="hc-project-box">
                     <HcIcon name="stack" class="project-icon"/>
-                    <span class="project-alias">{{projectInfo['projectAlias']}}</span>
+                    <span class="project-alias">{{projectInfo?.projectAlias}}</span>
                 </div>
             </template>
             <div class="hc-chart-flex">