815c1c89 by lihua

fix: 去掉移入显示滚动

1 parent 0dac2563
...@@ -1369,9 +1369,9 @@ const viewDeliveryFile = (file) => { ...@@ -1369,9 +1369,9 @@ const viewDeliveryFile = (file) => {
1369 </el-table-column> 1369 </el-table-column>
1370 <el-table-column prop="contract" label="合同" min-width="200px" align="left"> 1370 <el-table-column prop="contract" label="合同" min-width="200px" align="left">
1371 <template #default="scope"> 1371 <template #default="scope">
1372 <a v-for="item in scope.row.contractInfo" underline="hover" style="margin-right: 12px;cursor: pointer;" 1372 <a v-for="(item, index) in scope.row.contractInfo" underline="hover" style="margin-right: 8px;cursor: pointer;"
1373 @click="clickContractDetail(item)">{{ 1373 @click="clickContractDetail(item)">{{
1374 item.dataContractName }}</a> 1374 item.dataContractName + (index < scope.row.contractInfo?.length - 1 ? '、' : '') }}</a>
1375 </template> 1375 </template>
1376 </el-table-column> 1376 </el-table-column>
1377 <el-table-column prop="uploadTime" label="上传时间" width="180px" align="left"> 1377 <el-table-column prop="uploadTime" label="上传时间" width="180px" align="left">
......
...@@ -323,14 +323,18 @@ const oldScrollTop = ref(0); ...@@ -323,14 +323,18 @@ const oldScrollTop = ref(0);
323 function toTop(className: string) { 323 function toTop(className: string) {
324 requestAnimationFrame(() => { 324 requestAnimationFrame(() => {
325 let dom = document.getElementsByClassName(className)[0] 325 let dom = document.getElementsByClassName(className)[0]
326 dom.scrollIntoView({ 326 dom && (dom.scrollTop = 0);
327 block: 'start', 327 // dom.scrollIntoView({
328 behavior: 'instant', 328 // block: 'start',
329 }) 329 // behavior: 'instant',
330 // })
330 }) 331 })
331 } 332 }
332 const handleDataClick = (item, index) => { 333 const handleDataClick = (item, index) => {
333 selectDataInfo.value = item; 334 selectDataInfo.value = item;
335 nextTick(() => {
336 toTop('dam-detail-right')
337 })
334 } 338 }
335 339
336 function clearPageInfo() { 340 function clearPageInfo() {
...@@ -492,10 +496,7 @@ const handleDownFile = () => { ...@@ -492,10 +496,7 @@ const handleDownFile = () => {
492 background-color: #fff; 496 background-color: #fff;
493 width: calc(100% - 456px); 497 width: calc(100% - 456px);
494 height: 100%; 498 height: 100%;
495 overflow-y: hidden; 499 overflow-y: auto;
496 &:hover {
497 overflow-y: auto;
498 }
499 } 500 }
500 } 501 }
501 502
...@@ -726,11 +727,7 @@ const handleDownFile = () => { ...@@ -726,11 +727,7 @@ const handleDownFile = () => {
726 width: 450px; 727 width: 450px;
727 background-color: #fff; 728 background-color: #fff;
728 height: 100%; 729 height: 100%;
729 overflow-y: hidden; 730 overflow-y: auto;
730
731 &:hover {
732 overflow-y: auto;
733 }
734 731
735 .dam-detail { 732 .dam-detail {
736 padding: 24px; 733 padding: 24px;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!