Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/using/query.vue

src/components/tree/hc-tree.vue

@@ -384,11 +384,12 @@ const dialogHide = ()=>{
 //排序弹窗
 const sortDialogShow = ref(false);
 const sortNodeMoadl = (node,data)=>{
-    if(data?.isStorageNode===1){
-        sortDialogShow.value = true;
-    }else{
-        window.$message.warning('非存储节点不允许排序')
-    }
+    // if(data?.isStorageNode===1){
+    //     sortDialogShow.value = true;
+    // }else{
+    //     window.$message.warning('非存储节点不允许排序')
+    // }
+    sortDialogShow.value = true;
     
 }
 const sortDialogHide = ()=>{

src/styles/page/archives/meta-data.scss

@@ -0,0 +1,37 @@
+.table-file {
+    position: relative;
+    // height: calc(100% - 140px);
+    height: calc(100% - 0px);
+    padding: 16px;
+    .hc-c-table-box {
+        position: relative;
+        height: 100%;
+    }
+    .hc-f-table-box {
+        position: relative;
+        border-radius: 10px;
+        height: 300px;
+        margin-top: 24px;
+        background: #f1f5f8;
+        .header-box {
+            border-bottom: initial;
+            display: flex;
+            justify-content: space-between;
+            height: 60px;
+            background-color:var(--el-fill-color-lighter);
+            line-height: 60px;
+            padding-left: 15px;
+            padding-right: 15px;
+            .hc-icon-close {
+                font-size: 18px;
+            }
+        }
+        .hc-file-table-box {
+            position: relative;
+            height: calc(100% - 55px);
+        }
+    }
+    &.file-table .hc-c-table-box {
+        height: calc(100% - 324px);
+    }
+}

src/styles/theme/archives/meta-data.scss

@@ -0,0 +1,42 @@
+html.dark{
+    .table-file {
+        position: relative;
+        // height: calc(100% - 140px);
+        height: calc(100% - 0px);
+        padding: 16px;
+        .hc-c-table-box {
+            position: relative;
+            height: 100%;
+        }
+        .hc-f-table-box {
+            position: relative;
+            border-radius: 10px;
+            padding: 10px;
+            height: 300px;
+            margin-top: 24px;
+            background:transparent;
+            border: 1px solid var(--el-color-primary);
+            .header-box {
+                border-bottom: initial;
+                display: flex;
+                justify-content: space-between;
+                height: 60px;
+                background-color:transparent;
+                color: var(--el-color-primary-dark-2);
+                line-height: 60px;
+                padding-left: 15px;
+                padding-right: 15px;
+                .hc-icon-close {
+                    font-size: 18px;
+                }
+            }
+            .hc-file-table-box {
+                position: relative;
+                height: calc(100% - 55px);
+            }
+        }
+        &.file-table .hc-c-table-box {
+            height: calc(100% - 324px);
+        }
+    }
+}

src/styles/theme/transfer/inspect.scss

@@ -105,7 +105,7 @@ html.dark {
         }
         .hc-csc-action-box {
             position: relative;
-            background: white;
+            background: transparent;
             border-radius: 10px;
             padding: 12px;
             height: 240px;

src/views/archives/components/meta-info.vue

@@ -1,12 +1,10 @@
 <template>
-    <el-drawer v-model="showModal"  v-if="showModal" title="元数据信息" class="hc-modal-border" draggable destroy-on-close @closed="cancelClick" :size="size"
-    ref="drawerRef" :modal-class="uis" :class="`hc-drawer-box ${ui}`"   >
-
-       <metaTable  :isEdit="isEdit" :loading="tabeloading" :metaDataTable="metaDataTable" @changemeDataTable="changemeDataTable"  v-if="metaDataTable.length>0"/>
+    <HcDialog :show="showModal" to-id="node-card-target" title="元数据信息" isToBody isTable isRowFooter widths="62rem">
+        <metaTable  :isEdit="isEdit" :loading="tabeloading" :metaDataTable="metaDataTable" @changemeDataTable="changemeDataTable"  v-if="metaDataTable.length>0"/>
        <HcNoData v-if="metaDataTable.length==0"/>
-        <template #footer>
+        <template #rightRowFooter>
 
-            <div class="dialog-footer" style="margin-top: 20px" v-if="isEdit">
+            <div class="dialog-footer " style="margin-top: 20px" v-if="isEdit">
                 <el-button size="large" @click="gobackClick">
                     <HcIcon name="close"/>
                     <span>返回</span>
@@ -16,7 +14,7 @@
                     <span>编辑</span>
                 </el-button>
             </div>
-            <div class="dialog-footer" style="margin-top: 20px" v-else>
+            <div class="dialog-footer fright" style="margin-top: 20px" v-else>
                 <el-button size="large" @click="cancelClick">
                     <HcIcon name="close"/>
                     <span>取消</span>
@@ -27,8 +25,8 @@
                 </el-button>
             </div>
         </template>
-    </el-drawer>
-
+          
+    </HcDialog>
 
 </template>
 
@@ -154,3 +152,8 @@ const saveClick = async () => {
 }
 
 </style>
+<style lang="scss" scoped>
+.fright{
+    float: right;
+}
+</style>

src/views/archives/components/meta-table.vue

@@ -10,7 +10,8 @@
                             <td class="hc-csc-meta-table-td name">{{item.containerName}}</td>
                             <td class="hc-csc-meta-table-td val" v-if="isEdit">{{item.keyValue}}</td>
                             <td  v-else style="padding:0px;border: none;">
-                                <input type="input" data-id="project" name="project[]" class="iptclass" v-model="item.keyValue" :disabled="item.captureMode===1">
+                                <!-- <input type="input" data-id="project" name="project[]" class="iptclass" v-model="item.keyValue" :disabled="item.captureMode===1"> -->
+                                <el-input type="input" data-id="project" name="project[]"  v-model="item.keyValue" :disabled="item.captureMode===1"/>
                             </td>
                         </tr>
                     </template>
@@ -194,7 +195,9 @@ const metaDataTable = ref([
         border-radius: 28px;
         border: 1px solid #dae8f3;
         padding-left: 5px;
-        outline-color:  #d6eafa;;
+        outline-color:  #d6eafa;
+       
+     
     }
 }
 </style>

src/views/archives/meta-data.vue

@@ -19,14 +19,14 @@
             <!--左右拖动-->
             <div class="horizontal-drag-line" @mousedown="onmousedown"/>
         </div>
-        <div class="hc-page-content-box">
+        <div class="hc-page-content-box" id="node-card-target">
             <HcCard title="已形成的案卷">
                 <!-- <template #header>
                     <div class="hc-card-header-table-title">
                       已形成的案卷
                   </div>
                 </template> -->
-                 <div class="body" :class="tableFileShow?'file-table':''">
+                 <div class="table-file" :class="tableFileShow?'file-table':''">
                     <div class="hc-c-table-box">
                         <HcTable ref="tableRef"
                         :column="tableColumn"
@@ -308,51 +308,11 @@ const ElTreeMenuClick = async ({key, node, data, keys}) => {
 }
 </script>
 
+
 <style lang="scss" scoped>
-.hc-card-header-table-title{
- font-size: 1.125rem;
-line-height: 1.75rem;
-}
-.rowbox{
-    text-align: center;
-}
- .body {
-        position: relative;
-        // height: calc(100% - 140px);
-        height: calc(100% - 0px);
-        padding: 16px;
-        .hc-c-table-box {
-            position: relative;
-            height: 100%;
-        }
-        .hc-f-table-box {
-            position: relative;
-            height: 300px;
-            margin-top: 24px;
-            background: #f1f5f8;
-            .header-box {
-                border-bottom: initial;
-                display: flex;
-                justify-content: space-between;
-                height: 60px;
-                background-color:var(--el-fill-color-lighter);
-                line-height: 60px;
-                padding-left: 15px;
-                padding-right: 15px;
-                .hc-icon-close {
-                    font-size: 18px;
-                }
-            }
-            .hc-file-table-box {
-                position: relative;
-                height: calc(100% - 55px);
-            }
-        }
-        &.file-table .hc-c-table-box {
-            height: calc(100% - 324px);
-        }
-    }
-  .hover-hand{
-      cursor: pointer;
-  }
+@import '~style/archives/meta-data.scss';
 </style>
+<style lang="scss">
+
+@import '../../styles/theme/archives/meta-data.scss';
+</style>

src/views/transfer/components/meta-table.vue

@@ -7,18 +7,20 @@
                         <td colspan="2" class="hc-csc-meta-table-td title" v-if="!iShowFile">案卷元数据信息</td>
                         <td colspan="2" class="hc-csc-meta-table-td title" v-else>文件元数据信息</td>
               </tr>
-                <template v-for="item in metaDataTable">
+                <template v-for="item in metaDataTableVal">
                   
-                    <tr class="hc-csc-meta-table-tr" v-if="item.type === 2">
-                        <td colspan="2" class="hc-csc-meta-table-td title">{{item.title}}</td>
+                    <tr class="hc-csc-meta-table-tr" v-if="item.isType === 1">
+                        <td colspan="2" class="hc-csc-meta-table-td title">{{item.containerName}}</td>
                     </tr>
                     <tr class="hc-csc-meta-table-tr" v-else>
-                        <td class="hc-csc-meta-table-td name">{{item.title}}</td>
-                        <td class="hc-csc-meta-table-td val">{{item.val}}</td>
+                        <td class="hc-csc-meta-table-td name">{{item.containerName}}</td>
+                        <td class="hc-csc-meta-table-td val">{{item.keyValue}}</td>
                     </tr>
                 </template>
             </table>
+            <HcNoData v-if="metaDataTableVal.length==0"/>
         </el-scrollbar>
+    
     </div>
 </template>
 
@@ -42,6 +44,10 @@ const props = defineProps({
     ishowFile:{
         type: Boolean,
         default: false
+    },
+    metaDataTable:{
+        type: [Array],
+        default: ''
     }
 })
 
@@ -50,15 +56,19 @@ const projectId = ref(props.projectId);
 const contractId = ref(props.contractId);
 const isLoading = ref(props.loading);
 const iShowFile = ref(props.ishowFile);
+const metaDataTableVal=ref(props.metaDataTable)
 
 //监听
 watch(() => [
     props.loading,
-    props.ishowFile
-], ([loading,ishowFile]) => {
+    props.ishowFile,
+    props.metaDataTable
+], ([loading,ishowFile,metaDataTable]) => {
+    console.log(metaDataTable,'metaDataTable');
     isLoading.value = loading;
     console.log(ishowFile,'ishowFile');
     iShowFile.value=ishowFile
+    metaDataTableVal.value=metaDataTable
 })
 
 //元数据

src/views/transfer/inspects.vue

@@ -106,7 +106,8 @@
                         </template>
                     </HcTable>
 
-                    <MetaTable :loading="cscTableLoading" v-if="tabTypeKey === 'tab5'"/>
+                    <MetaTable :loading="cscmetaTableLoading" v-if="tabTypeKey === 'tab5'"  :metaDataTable="cscmetaDataTabledata"   :ishowFile="ishowFile"/>
+                 
 
                     <HcTable :column="cscTableColumn5" :datas="cscTableData5" :loading="cscTableLoading" v-if="tabTypeKey === 'tab6'"/>
 
@@ -154,7 +155,7 @@
 
         <!--使用弹窗查看数据-->
         <HcDialog :show="cscTableDataModal" :title="cscTableDataTitle" widths="1080px" isTable :footer="false" @close="cscTableDataModalClose">
-            <MetaTable :loading="cscTableLoading" v-if="tabTypeKey === 'tab5'"/>
+            <MetaTable :loading="cscmetaTableLoading" v-if="tabTypeKey === 'tab5'"  :metaDataTable="cscmetaDataTabledata"  :ishowFile="ishowFile"/>
             <HcTable :column="cscTableColumn51" :datas="cscTableData5" :loading="cscTableLoading" v-if="tabTypeKey === 'tab6'"/>
         </HcDialog>
 
@@ -297,14 +298,18 @@ const viewPdf = async (id) => {
 //行被点击
 const isCarrySpotChecksDrawer = ref(false)
 const fileInfo=ref('')
+const checkmetaFileId=ref('')
 const tableRowClick = async({row}) => {
     //console.log(row)
     fileInfo.value=row
-    fileInfo.value.pageNumber=row['approvalFileList'].length||0
     cscTableData1.value=getArrValue( row['approvalFileList'])
     isCarrySpotChecksDrawer.value = true
     ishowAllopinion.value=true
     checkId.value=''
+    if(cscTableData1.value.length>0){
+        checkmetaFileId.value=cscTableData1.value[0].id
+    }
+   
     const url=await viewPdf(row.id)
         pdfUrl.value=url
         if(pdfUrl.value&&pdfUrl?.value.length>0&& isCarrySpotChecksDrawer.value){
@@ -324,10 +329,13 @@ const pdfUrl=ref('')
 const pdfLoading=ref(false)
 const changePdf=(row)=>{
     console.log(row,'row');
+    ishowFile.value=true
     pdfLoading.value=false
     pdfUrl.value=row['pdfFileUrl']||''
     checkId.value=row.id
+    checkmetaFileId.value=row.id
     ishowAllopinion.value=true
+
     getopiniondata()
     if(pdfUrl.value&&pdfUrl?.value.length>0&& isCarrySpotChecksDrawer.value){
             setTimeout(() => {
@@ -389,6 +397,9 @@ const tabTypeTab = ref([
 ]);
 const tabTypeChange = ({key}) => {
     tabTypeKey.value = key
+    if(key==='tab5'){
+        getmetaInfo()
+    }
 }
 
 const cscTableLoading = ref(false)
@@ -488,6 +499,7 @@ const cscTableDataModalShow = () => {
     const key = tabTypeKey.value;
     if (key === 'tab5') {
         cscTableDataTitle.value = '元数据'
+        getmetaInfo()
     } else if (key === 'tab6') {
         cscTableDataTitle.value = '验签包'
     }
@@ -505,6 +517,9 @@ const cscTableDataModalClose = () => {
 const onCarrySpotChecksDrawerClose = () => {
     isCarrySpotChecksDrawer.value = false
     pdfUrl.value=''
+    ishowFile.value=false
+    checkmetaFileId.value=''
+    tabTypeKey.value='tab1'
 }
 
 
@@ -523,6 +538,25 @@ const onmousedown = () => {
         document.onmouseup = null;
     }
 }
+//获取元数据
+const cscmetaTableLoading=ref(false)
+const cscmetaDataTabledata=ref([])
+const ishowFile=ref(false)
+//获取元数据信息
+
+const getmetaInfo=async(fileId)=>{
+ 
+    cscmetaTableLoading.value = true
+    const {error, code, data} = await tuningApi.getMetadataFileByid({
+        fileId: checkmetaFileId.value,
+    })
+    cscmetaTableLoading.value = false
+    if (!error && code === 200) {
+        cscmetaDataTabledata.value=getArrValue(data)
+    } else {
+        cscmetaDataTabledata.value=[]
+    }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/using/query.vue

@@ -1463,6 +1463,25 @@ const guiFileInfo = (item) => {
     guiInfoCurKey.value = item
 }
 
+//获取元数据
+const cscmetaTableLoading=ref(false)
+const cscmetaDataTabledata=ref([])
+//获取元数据信息
+
+const getmetaInfo=async(fileId)=>{
+
+    cscmetaTableLoading.value = true
+    const {error, code, data} = await tuningApi.getMetadataFileByid({
+        fileId: checkmetaFileId.value,
+    })
+    cscmetaTableLoading.value = false
+    if (!error && code === 200) {
+        cscmetaDataTabledata.value=getArrValue(data)
+    } else {
+        cscmetaDataTabledata.value=[]
+    }
+}
+
 //语音
 const isMicShow = ref(false)
 const mediaRecorderRef = ref(null)