Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop
Showing
3 changed files
with
4 additions
and
19 deletions
| ... | @@ -175,9 +175,8 @@ const dialogInfo = ref({ | ... | @@ -175,9 +175,8 @@ const dialogInfo = ref({ |
| 175 | ], | 175 | ], |
| 176 | }, | 176 | }, |
| 177 | }); | 177 | }); |
| 178 | 178 | /** TODO 改成IPO分成三个小模块 */ | |
| 179 | const dialogBtnClick = (btn, info) => { | 179 | const dialogBtnClick = (btn, info) => { |
| 180 | console.log('btn', btn, info); | ||
| 181 | if (btn.value == 'submit') { | 180 | if (btn.value == 'submit') { |
| 182 | if (!userReceiveCheckList.value.length) { | 181 | if (!userReceiveCheckList.value.length) { |
| 183 | ElMessage.error('请勾选数据接收方'); | 182 | ElMessage.error('请勾选数据接收方'); | ... | ... |
| ... | @@ -111,7 +111,7 @@ const baseInfoFormItems = ref([ | ... | @@ -111,7 +111,7 @@ const baseInfoFormItems = ref([ |
| 111 | type: 'input', | 111 | type: 'input', |
| 112 | placeholder: '请输入', | 112 | placeholder: '请输入', |
| 113 | field: 'damName', | 113 | field: 'damName', |
| 114 | maxlength: 20, | 114 | maxlength: 30, |
| 115 | default: '', | 115 | default: '', |
| 116 | required: true | 116 | required: true |
| 117 | }, | 117 | }, |
| ... | @@ -720,7 +720,7 @@ const save = () => { | ... | @@ -720,7 +720,7 @@ const save = () => { |
| 720 | params.guid = damGuid.value; | 720 | params.guid = damGuid.value; |
| 721 | params.foundMode = route.query.foundMode; | 721 | params.foundMode = route.query.foundMode; |
| 722 | if (route.query.dataSources != '1') { | 722 | if (route.query.dataSources != '1') { |
| 723 | let userData = userStore.userData; | 723 | let userData = JSON.parse(userStore.userData); |
| 724 | params.rightMain = userData.tenantGuid; | 724 | params.rightMain = userData.tenantGuid; |
| 725 | params.rightMainName = userData.tenantName; | 725 | params.rightMainName = userData.tenantName; |
| 726 | } else { | 726 | } else { |
| ... | @@ -746,7 +746,7 @@ const save = () => { | ... | @@ -746,7 +746,7 @@ const save = () => { |
| 746 | fullscreenLoading.value = true; | 746 | fullscreenLoading.value = true; |
| 747 | console.log(params, 'params'); | 747 | console.log(params, 'params'); |
| 748 | if (route.query.dataSources != '1') { | 748 | if (route.query.dataSources != '1') { |
| 749 | let userData = userStore.userData; | 749 | let userData = JSON.parse(userStore.userData); |
| 750 | params.rightMain = userData.tenantGuid; | 750 | params.rightMain = userData.tenantGuid; |
| 751 | params.rightMainName = userData.tenantName; | 751 | params.rightMainName = userData.tenantName; |
| 752 | } else { | 752 | } else { | ... | ... |
| ... | @@ -315,20 +315,6 @@ const getTableData = () => { | ... | @@ -315,20 +315,6 @@ const getTableData = () => { |
| 315 | }); | 315 | }); |
| 316 | } | 316 | } |
| 317 | 317 | ||
| 318 | const showDetailItem: any = ref(null); | ||
| 319 | |||
| 320 | const oldScrollTop = ref(0); | ||
| 321 | |||
| 322 | // 回到顶部 | ||
| 323 | function toTop(className: string) { | ||
| 324 | requestAnimationFrame(() => { | ||
| 325 | let dom = document.getElementsByClassName(className)[0] | ||
| 326 | dom.scrollIntoView({ | ||
| 327 | block: 'start', | ||
| 328 | behavior: 'instant', | ||
| 329 | }) | ||
| 330 | }) | ||
| 331 | } | ||
| 332 | const handleDataClick = (item, index) => { | 318 | const handleDataClick = (item, index) => { |
| 333 | selectDataInfo.value = item; | 319 | selectDataInfo.value = item; |
| 334 | } | 320 | } | ... | ... |
-
Please register or sign in to post a comment