2c62af75 by lihua

fix: 首页分两部分滚动

1 parent 9860d8cc
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 清除 30 清除
31 </div> --> 31 </div> -->
32 </div> 32 </div>
33 <div style="min-height: 250px;" v-loading="listDataLoading"> 33 <div style="min-height: 250px; height: calc(100% - 170px);" v-loading="listDataLoading">
34 <template v-for="(tenantName) in Object.keys(productListData)"> 34 <template v-for="(tenantName) in Object.keys(productListData)">
35 <div class="data-header-input"> 35 <div class="data-header-input">
36 <div>{{ '数据交付方:' + tenantName }}</div> 36 <div>{{ '数据交付方:' + tenantName }}</div>
...@@ -199,7 +199,7 @@ import { ref } from "vue"; ...@@ -199,7 +199,7 @@ import { ref } from "vue";
199 import { 199 import {
200 getParamsList, 200 getParamsList,
201 getReleaseYears, 201 getReleaseYears,
202 getSubjectDomainDataTree, 202 // getSubjectDomainDataTree,
203 getReleaseListData, 203 getReleaseListData,
204 getReleaseDataCertiDetail 204 getReleaseDataCertiDetail
205 } from '@/api/modules/dataTrustedSpace'; 205 } from '@/api/modules/dataTrustedSpace';
...@@ -235,7 +235,13 @@ const damType = ref('0'); ...@@ -235,7 +235,13 @@ const damType = ref('0');
235 235
236 const releaseYear = ref(0); 236 const releaseYear = ref(0);
237 237
238 const subjectDomainList: any = ref([]); 238 const subjectDomainList: any = ref([{
239 paramValue: '2',
240 paramName: '医疗健康'
241 }, {
242 paramValue: '1',
243 paramName: '医药企业'
244 }]);
239 /** 记录主题第一级的选中值 */ 245 /** 记录主题第一级的选中值 */
240 const subjectDomainFirst = ref('2'); 246 const subjectDomainFirst = ref('2');
241 247
...@@ -341,6 +347,11 @@ watch(() => releaseYear.value, () => { ...@@ -341,6 +347,11 @@ watch(() => releaseYear.value, () => {
341 getTableData(); 347 getTableData();
342 }) 348 })
343 349
350 watch(() => subjectDomainFirst.value, () => {
351 clearPageInfo()
352 getTableData();
353 })
354
344 watch(() => selectDataInfo.value.damGuid, (val) => { 355 watch(() => selectDataInfo.value.damGuid, (val) => {
345 if (!val) { 356 if (!val) {
346 complianceListInfo.value = []; 357 complianceListInfo.value = [];
...@@ -429,15 +440,15 @@ onBeforeMount(() => { ...@@ -429,15 +440,15 @@ onBeforeMount(() => {
429 proxy.$ElMessage.error(resp.msg); 440 proxy.$ElMessage.error(resp.msg);
430 } 441 }
431 })); 442 }));
432 ps.push(getSubjectDomainDataTree().then((res: any) => { 443 // ps.push(getSubjectDomainDataTree().then((res: any) => {
433 if (res.code == '00000') { 444 // if (res.code == '00000') {
434 subjectDomainList.value = res.data || []; 445 // subjectDomainList.value = res.data || [];
435 subjectDomainFirst.value = subjectDomainList?.[0]?.paramValue || '2'; 446 // subjectDomainFirst.value = subjectDomainList?.[0]?.paramValue || '2';
436 } else { 447 // } else {
437 fullscreenLoading.value = false; 448 // fullscreenLoading.value = false;
438 proxy.$ElMessage.error(res.msg); 449 // proxy.$ElMessage.error(res.msg);
439 } 450 // }
440 })); 451 // }));
441 Promise.all(ps).then((res) => { 452 Promise.all(ps).then((res) => {
442 getTableData().then(() => { 453 getTableData().then(() => {
443 fullscreenLoading.value = false; 454 fullscreenLoading.value = false;
...@@ -465,7 +476,7 @@ const handleDownFile = () => { ...@@ -465,7 +476,7 @@ const handleDownFile = () => {
465 .home-full-wrap { 476 .home-full-wrap {
466 height: 100%; 477 height: 100%;
467 width: 100%; 478 width: 100%;
468 overflow-y: auto; 479 // overflow-y: auto;
469 overflow-x: hidden; 480 overflow-x: hidden;
470 background-color: #f5f5f6; 481 background-color: #f5f5f6;
471 } 482 }
...@@ -474,11 +485,17 @@ const handleDownFile = () => { ...@@ -474,11 +485,17 @@ const handleDownFile = () => {
474 // height: 100%; 485 // height: 100%;
475 display: flex; 486 display: flex;
476 justify-content: space-between; 487 justify-content: space-between;
488 height: 100%;
489 width: 100%;
477 490
478 .home-dam-main { 491 .home-dam-main {
479 background-color: #fff; 492 background-color: #fff;
480 width: calc(100% - 456px); 493 width: calc(100% - 456px);
481 min-height: 600px; 494 height: 100%;
495 overflow-y: hidden;
496 &:hover {
497 overflow-y: auto;
498 }
482 } 499 }
483 } 500 }
484 501
...@@ -708,6 +725,12 @@ const handleDownFile = () => { ...@@ -708,6 +725,12 @@ const handleDownFile = () => {
708 .dam-detail-right { 725 .dam-detail-right {
709 width: 450px; 726 width: 450px;
710 background-color: #fff; 727 background-color: #fff;
728 height: 100%;
729 overflow-y: hidden;
730
731 &:hover {
732 overflow-y: auto;
733 }
711 734
712 .dam-detail { 735 .dam-detail {
713 padding: 24px; 736 padding: 24px;
......
...@@ -180,6 +180,7 @@ const formItems = ref([ ...@@ -180,6 +180,7 @@ const formItems = ref([
180 type: 'input', 180 type: 'input',
181 placeholder: '请输入', 181 placeholder: '请输入',
182 field: 'reportIssuingInstitution', 182 field: 'reportIssuingInstitution',
183 maxlength: 50,
183 default: '', 184 default: '',
184 required: false, 185 required: false,
185 visible: true 186 visible: true
...@@ -213,6 +214,7 @@ const formItems = ref([ ...@@ -213,6 +214,7 @@ const formItems = ref([
213 placeholder: '请输入', 214 placeholder: '请输入',
214 field: 'opinionIssuingInstitution', 215 field: 'opinionIssuingInstitution',
215 default: '', 216 default: '',
217 maxlength: 50,
216 required: false, 218 required: false,
217 visible: true 219 visible: true
218 }, 220 },
...@@ -245,6 +247,7 @@ const formItems = ref([ ...@@ -245,6 +247,7 @@ const formItems = ref([
245 placeholder: '请输入', 247 placeholder: '请输入',
246 field: 'planIssuingInstitution', 248 field: 'planIssuingInstitution',
247 default: '', 249 default: '',
250 maxlength: 50,
248 required: false, 251 required: false,
249 visible: true 252 visible: true
250 }, 253 },
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!