@@ -46,23 +46,45 @@ export default {
name: "databaseSearch",
data(){
return{
+ scrolled: '',
+ moreFlag: false,
searchKey: '',
standList: [],
loading: true,
+ page: 1,
}
},
methods: {
+ scrool(){
+ let scrolled = this.$refs.cardBox.scrollTop
+ //获得可视区的高度
+ const windowHeight = this.$refs.cardBox.clientHeight
+ //获取滚动条的总高度
+ const scrollHeight = this.$refs.cardBox.scrollHeight
+ let windowScrolled = scrolled + windowHeight
+ this.scrolled = scrolled
+ if(scrollHeight - windowScrolled < 600 ){
+ //把距离顶部的距离加上可视区域的高度 等于或者大于滚动条的总高度就是到达底部
+ this.moreFlag = true
+ this.page++
+ }
+ },
onSearch(){
+ this.moreFlag = false
this.$http.post('search/searchCenter/searchSarBykey',{
selectIndex: 'fulltextserch',
selectValue: this.searchKey,
selectType: 'titleSearch',
- page: 1,
+ page: this.page,
pageSize: 20
},{
_this: this,
}, res => {
- this.standList = res.data.list
+ if(this.standList.length){
+ this.standList = this.standList.concat(res.data.list)
+ }else{
+ this.standList = res.data.list
+ }
console.log(this.standList);
this.loading = false
}, e => {
@@ -73,11 +95,21 @@ export default {
back(){
this.$router.push('/phoneHome')
},
+ jumpDetails(item){
+ this.$router.push({
+ name: 'domesticDetails',
+ query: {
+ id: item.id,
+ pageType: 'INLAND_STAND'
+ }
+ })
+ },
},
mounted(){
this.searchKey = this.$route.query.searchKey
this.onSearch()
- }
+ this.$refs.cardBox.addEventListener('scroll', this.scrool);
+ },
};
@@ -85,7 +117,6 @@ export default {
#database-search{
width: 100%;
height: 100%;
- overflow: auto;
margin: 0;
padding: 0;
background: #F6F6F6;
@@ -130,8 +161,9 @@ export default {
}
}
.card-box{
- height: 100%;
+ height: 85%;
position: relative;
+ overflow-y: scroll;
top: 100px;
}
.card-content{
diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue
index f42e31f8c..cfcf218d3 100644
--- a/src/pages/phone/domesticDetails.vue
+++ b/src/pages/phone/domesticDetails.vue
@@ -1,14 +1,4211 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
+ }}
+ {{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}
+
+
+
{{
+ sarStandardsInfoEO.standName || '-'
+ }}
+
{{
+ sarStandardsInfoEO.standEnName || '-'
+ }}
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ {{ file.oldFileName }}
+
+
+
+ 更多
+
+
+ -
+
+
+
+
+
+
+
+
+ {{ file.oldFileName }}
+
+
+
+ 更多
+
+
+ -
+
+
+
+
+
+
+
+
+ {{ file.oldFileName }}
+
+
+
+ 更多
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+ {{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}
+
+ {{
+ sarStandardsInfoEO.issueTime || '-'
+ }}
+
+
+
+
+ {{
+ sarStandardsInfoEO.standSystem || '-'
+ }}
+
+
+ {{
+ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
+ }}
+
+
+
+
+ {{ child.value || '-' }}
+
+
+
+
+
+
+
+
+
{{ item.showAll ? '收起' : '更多' }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ '-' }}
+
+
+
+
+
+
+ {{ child.value }}
+
+
+
+ {{ '-' }}
+
+
+
+ {{ child.value ? child.value : '-' }}
+
+
+ {{ child.value || '-' }}
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+ {{ item }}
+
+
+ -
+
+
+ {{ !child.value || child.value === 'null' ? '-' : child.value }}
+
+
+ {{ child.value || '-' }}
+
+
+
+
+
+
+
+
+
+ {{ child.value || '-' }}
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+ {{ item }}
+
+
+ -
+
+
+ {{ !child.value || child.value === 'null' ? '-' : child.value }}
+
+
+ {{ !child.value || child.value === 'null' || child.value === '[]' ? '-' : child.value }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 责任工程师
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 符合
+ 不符合
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ standShowItemEO.itemsNum
+ }}
+
+
+
+ {{
+ standShowItemEO.itemsName
+ }}
+
+
+
+ {{
+ standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
+ }}
+
+
+
+
+ {{
+ standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
+ }}
+
+
+
+
+ {{
+ standShowItemEO.xccssrq
+ }}
+
+
+
+ {{
+ standShowItemEO.zccssrq
+ }}
+
+
+
+ {{
+ standShowItemEO.applyArctic
+ }}
+
+
+
+ {{
+ standShowItemEO.responsibleUnit
+ }}
+
+
+
+
+ {{ standShowItemEO.dutyEngineer }}
+
+
+
+
+ {{ standShowItemEO.comparedWithPrevious }}
+
+
+
+
+
+ {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}
+
+
+
+
+
+
+
+ {{ standShowItemEO.complianceState }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $moment(scope.row.creationTime).format('YYYY-MM-DD') }}
+
+
+
+
+
+
+
+
+ 查看
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
+
+
+
+
+
+
+
{{ knowSee.title }}
+
{{ knowSee.content }}
+
+ {{ item.oldFileName }}
+
+
{{
+ knowSee.creationTime ? $moment(knowSee.creationTime).format('YYYY-MM-DD') : ''
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+ {{ item.listName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+ 导入失败
+
+
+
+
+
数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+
+
+
-
From 449b202f6d6d187fd446d117c03084927d2bdd86 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 31 May 2022 14:10:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20es?=
=?UTF-8?q?=20=E6=A0=87=E5=87=86=E8=B5=84=E6=BA=90=E6=9F=A5=E8=AF=A2=20?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=A3=80=E7=B4=A2=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/home2/components/searchGroup/index.vue | 1 -
src/pages/searchCenter/pages/advancedSearch.vue | 2 +-
src/pages/searchCenter/pages/standardSearch.vue | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/pages/home2/components/searchGroup/index.vue b/src/pages/home2/components/searchGroup/index.vue
index 952a5ca66..4c1023c35 100644
--- a/src/pages/home2/components/searchGroup/index.vue
+++ b/src/pages/home2/components/searchGroup/index.vue
@@ -16,7 +16,6 @@
-
+
{{ $dateFormat(new Date(scope.row.issueTime), "yyyy-MM-dd") }}
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 6935bd29f..74a5a45ff 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -35,7 +35,7 @@
{{ toggleConditionTips }}