Browse Source

新主题,先不要发版

ZaiZai 1 year ago
parent
commit
4d6eeb9fa8
2 changed files with 45 additions and 84 deletions
  1. 24 25
      src/styles/page/using/query.scss
  2. 21 59
      src/views/using/query.vue

+ 24 - 25
src/styles/page/using/query.scss

@@ -219,31 +219,30 @@
             flex: 1;
             flex-basis: auto;
             margin-top: 10px;
-        }
-    }
-}
-
-.hc-gather-card-box {
-    position: relative;
-    //height: calc(100% - 180px);
-    .hc-card-item-main {
-        position: relative;
-        height: 100%;
-    }
-    .hc-card-item-file {
-        display: none;
-        margin-top: 24px;
-        .hc-icon-close {
-            font-size: 20px;
-        }
-    }
-    &.file-table {
-        .hc-card-item-main {
-            height: calc(100% - 344px);
-        }
-        .hc-card-item-file {
-            display: block;
-            height: 320px;
+            .hc-gather-card-table {
+                position: relative;
+                height: 100%;
+                .hc-card-item-main {
+                    position: relative;
+                    height: 100%;
+                }
+                .hc-card-item-file {
+                    display: none;
+                    margin-top: 24px;
+                    .hc-icon-close {
+                        font-size: 20px;
+                    }
+                }
+                &.file-table {
+                    .hc-card-item-main {
+                        height: calc(100% - 344px);
+                    }
+                    .hc-card-item-file {
+                        display: block;
+                        height: 320px;
+                    }
+                }
+            }
         }
     }
 }

+ 21 - 59
src/views/using/query.vue

@@ -92,8 +92,8 @@
                             <el-button v-if="tabKey === 'tab1'">下载</el-button>
                             <HcNewSwitch v-if="tabKey === 'tab2'" size="default" :datas="tabGuiData" :keys="tabGuiKey" @change="tabGuiChange" />
                         </template>
-                        <div class="relative h-full">
-                            <div :id="`hc_table_a_${uuid}`">
+                        <div v-if="tabKey === 'tab1'" class="hc-gather-card-table" :class="tableAllShow ? 'file-table' : ''">
+                            <div class="hc-card-item-main">
                                 <hc-card-item>
                                     <hc-table
                                         ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
@@ -109,8 +109,23 @@
                                     </template>
                                 </hc-card-item>
                             </div>
-                            <div :id="`hc_table_b_${uuid}`">
-                                22
+                            <div class="hc-card-item-file">
+                                <hc-card-item title="卷内文件">
+                                    <template #extra>
+                                        <div class="hc-icon-close text-hover" @click="tableFileCloseClick">
+                                            <HcIcon name="close" />
+                                        </div>
+                                    </template>
+                                    <hc-table
+                                        ref="tableFileRef" :column="tableFileColumn" :datas="tableFileData" :loading="tableFileLoading"
+                                        is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                                        @selection-change="tableFileSelection"
+                                    >
+                                        <template #action="{ row }">
+                                            <el-link type="primary" @click.stop="consultFileClick(row, 2)">查阅文件</el-link>
+                                        </template>
+                                    </hc-table>
+                                </hc-card-item>
                             </div>
                         </div>
                     </hc-tab-card>
@@ -119,41 +134,6 @@
         </div>
 
         <HcCard style="display:none;">
-            <div v-if="tabKey === 'tab1'" class="hc-gather-card-box" :class="tableAllShow ? 'file-table' : ''">
-                <HcCardItem ui="hc-card-item-main">
-                    <HcTable ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-current-row is-check :ui="hoverHand ? 'hover-hand' : ''" @selection-change="tableSelection" @row-click="tableRowClick">
-                        <template #action="{ row, index }">
-                            <el-button type="primary" size="small" @click.stop="consultFileClick(row, 1)">
-                                查阅案卷
-                            </el-button>
-                        </template>
-                    </HcTable>
-                    <template #action>
-                        <HcPages :pages="searchForm" @change="pageChange" />
-                    </template>
-                </HcCardItem>
-                <HcCardItem ui="hc-card-item-file" title="卷内文件">
-                    <template #extra>
-                        <div class="hc-icon-close text-hover" @click="tableFileCloseClick">
-                            <HcIcon name="close" />
-                        </div>
-                    </template>
-                    <HcTable ref="tableFileRef" :column="tableFileColumn" :datas="tableFileData" :loading="tableFileLoading" is-check @selection-change="tableFileSelection">
-                        <template #action="{ row, index }">
-                            <el-button type="primary" size="small" @click.stop="consultFileClick(row, 2)">
-                                查阅文件
-                            </el-button>
-                        </template>
-                        <!-- <template #fileName="{row}">
-                                    <span class="text-link text-hover" @click="viewfilePdf(row)">{{ row?.fileName }}</span>
-                         </template> -->
-                    </HcTable>
-                    <!-- <template #action>
-                        <HcPages :pages="InsearchForm" @change="InpageChange"/>
-                    </template> -->
-                </HcCardItem>
-            </div>
-
             <!-- 档案柜 -->
             <div v-if="tabKey === 'tab2'" class="hc-gather-card-box gui" :class="isMac ? 'is-mac' : ''">
                 <HcCardItem v-loading="tableLoading" ui="hc-card-item-main">
@@ -477,7 +457,7 @@ import { nextTick, onMounted, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
 import MetaTable from '../transfer/components/meta-table.vue'
 import HcMediaMic from './components/media-mic/index.vue'
-import { arrIndex, arrToId, getArrValue, getObjValue, getRandom, isArrIndex } from 'js-fast-way'
+import { arrIndex, arrToId, getArrValue, getObjValue, isArrIndex } from 'js-fast-way'
 import archiveQueryApi from '~api/using/query.js'
 import tuningApi from '~api/archiveConfig/tuning.js'
 import imageViewGui from '~src/assets/view/gui.png'
@@ -485,8 +465,6 @@ import imageViewGui1 from '~src/assets/view/gui1.png'
 import imageViewGui2 from '~src/assets/view/gui2.png'
 import { setTimeString } from '~src/utils/tools'
 
-const uuid = getRandom(4)
-
 //变量
 const useAppState = useAppStore()
 const projectId = ref(useAppState.getProjectId)
@@ -520,20 +498,8 @@ onMounted(() => {
     setAnnuals()
     setMonths()
     getTableData()
-    setSplitRef()
 })
 
-const setSplitRef = () => {
-    nextTick(() => {
-        window.$split(['#hc_table_a_' + uuid, '#hc_table_b_' + uuid], {
-            direction: 'vertical',
-            sizes: [70, 30],
-            snapOffset: 0,
-            minSize: [170, 500],
-        })
-    })
-}
-
 //截取日期
 const splitDate = (val)=>{
     if (val) {
@@ -1102,14 +1068,10 @@ const tableFileShow = ref(false)
 const tableRowClick = ({ row }) => {
     tableAllShow.value = true
     tableFileShow.value = true
-    // tableFileData.value =getArrValue( row['approvalFileList'])
-    // cscTableData1.value=getArrValue( row['approvalFileList'])
-    // InsearchForm.value.total=row['approvalFileList'].length
     fileInfo.value = row
     getArchiveFileListData()
-
-
 }
+
 const tableFileCloseClick = () => {
     tableAllShow.value = false
     tableFileShow.value = false