Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
liyeyun
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cfld-frontend
liyeyun
Commits
beae7b2c
Commit
beae7b2c
authored
Dec 27, 2023
by
shilei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '20231227_change_list_id' into 'master'
20231227 change list See merge request
!3
parents
12431e64
fc1dea32
Show whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
83 additions
and
38 deletions
+83
-38
ContactInfo.vue
src/components/detail/ContactInfo.vue
+4
-1
DetailInfoCell.vue
src/components/detail/DetailInfoCell.vue
+2
-2
DetailMain.vue
src/components/detail/DetailMain.vue
+6
-2
MiniListItem.vue
src/components/detail/MiniListItem.vue
+4
-1
SecretInfo.vue
src/components/detail/SecretInfo.vue
+2
-2
useListView.ts
src/composable/useListView.ts
+2
-2
carrierDetail.ts
src/types/api/carrierDetail.ts
+6
-2
carrierList.ts
src/types/api/carrierList.ts
+4
-2
developZoneDetail.ts
src/types/api/developZoneDetail.ts
+6
-2
developZoneList.ts
src/types/api/developZoneList.ts
+3
-1
industrialParkDetail.ts
src/types/api/industrialParkDetail.ts
+7
-2
industrialParkList.ts
src/types/api/industrialParkList.ts
+3
-1
landDetail.ts
src/types/api/landDetail.ts
+4
-1
landList.ts
src/types/api/landList.ts
+4
-2
myParkDevelopDetail.ts
src/types/api/myParkDevelopDetail.ts
+6
-2
myParkList.ts
src/types/api/myParkList.ts
+3
-1
policyList.ts
src/types/api/policyList.ts
+4
-1
CarrierDetail.vue
src/views/carrier/CarrierDetail.vue
+1
-1
DevelopZoneDetail.vue
src/views/develop/DevelopZoneDetail.vue
+4
-4
HomeView.vue
src/views/home/HomeView.vue
+1
-1
IndustrialParkDetail.vue
src/views/industrial-park/IndustrialParkDetail.vue
+4
-3
IndustryPolicyDetail.vue
src/views/industry/IndustryPolicyDetail.vue
+2
-1
LandDetail.vue
src/views/land/LandDetail.vue
+1
-1
No files found.
src/components/detail/ContactInfo.vue
View file @
beae7b2c
...
@@ -49,7 +49,10 @@ import { useLoginModal } from '../login/login.ts';
...
@@ -49,7 +49,10 @@ import { useLoginModal } from '../login/login.ts';
const
props
=
withDefaults
(
const
props
=
withDefaults
(
defineProps
<
{
defineProps
<
{
personName
:
string
;
personName
:
string
;
id
:
number
;
/** 主键id */
id
:
string
;
/** 业务id */
businessId
:
string
;
detailType
:
DetailType
;
detailType
:
DetailType
;
}
>
(),
}
>
(),
{},
{},
...
...
src/components/detail/DetailInfoCell.vue
View file @
beae7b2c
...
@@ -91,7 +91,7 @@ export interface DetailInfoCellProps {
...
@@ -91,7 +91,7 @@ export interface DetailInfoCellProps {
/** 解锁次数 */
/** 解锁次数 */
secretNum
?:
number
;
secretNum
?:
number
;
/** 详情id */
/** 详情id */
detailId
?:
number
;
detailId
?:
string
;
/** 详情类型 */
/** 详情类型 */
detailType
?:
DetailType
;
detailType
?:
DetailType
;
/** 是否已解锁 */
/** 是否已解锁 */
...
@@ -111,7 +111,7 @@ const props = withDefaults(defineProps<DetailInfoCellProps>(), {
...
@@ -111,7 +111,7 @@ const props = withDefaults(defineProps<DetailInfoCellProps>(), {
infos
:
null
,
infos
:
null
,
exampleType
:
undefined
,
exampleType
:
undefined
,
secretNum
:
-
1
,
secretNum
:
-
1
,
detailId
:
-
1
,
detailId
:
'-1'
,
detailType
:
DetailType
.
industrial
,
detailType
:
DetailType
.
industrial
,
isUnlocked
:
false
,
isUnlocked
:
false
,
tabIndex
:
-
1
,
tabIndex
:
-
1
,
...
...
src/components/detail/DetailMain.vue
View file @
beae7b2c
...
@@ -71,7 +71,8 @@
...
@@ -71,7 +71,8 @@
</div>
</div>
<div
class=
"mt-[68px]"
>
<div
class=
"mt-[68px]"
>
<ContactInfo
<ContactInfo
:id=
"detail.id"
:id=
"detail.businessId"
:businessId=
"detail.businessId"
:person-name=
"detail.contactPerson"
:person-name=
"detail.contactPerson"
:detail-type=
"type"
:detail-type=
"type"
></ContactInfo>
></ContactInfo>
...
@@ -116,7 +117,10 @@ export interface HeaderDetail {
...
@@ -116,7 +117,10 @@ export interface HeaderDetail {
contactPerson
:
string
;
contactPerson
:
string
;
/** 联系电话 */
/** 联系电话 */
contactPhone
:
string
;
contactPhone
:
string
;
id
:
number
;
/** 主键id */
id
:
string
;
/** 业务id */
businessId
:
string
;
/** vr列表 */
/** vr列表 */
vrUrlList
?:
{
vrUrlList
?:
{
/** vr封面 */
/** vr封面 */
...
...
src/components/detail/MiniListItem.vue
View file @
beae7b2c
...
@@ -30,7 +30,10 @@ export interface MiniDetail {
...
@@ -30,7 +30,10 @@ export interface MiniDetail {
imgUrl
:
string
;
imgUrl
:
string
;
name
:
string
;
name
:
string
;
info
:
string
;
info
:
string
;
id
:
number
;
/** 主键id */
id
:
string
;
/** 业务id */
businessId
:
string
;
isVr
?:
number
;
isVr
?:
number
;
}
}
withDefaults
(
withDefaults
(
...
...
src/components/detail/SecretInfo.vue
View file @
beae7b2c
...
@@ -73,7 +73,7 @@ const props = withDefaults(
...
@@ -73,7 +73,7 @@ const props = withDefaults(
/** 样例类型 */
/** 样例类型 */
exampleType
:
ExampleType
;
exampleType
:
ExampleType
;
limitNum
:
number
;
limitNum
:
number
;
detailId
:
number
;
detailId
:
string
;
detailType
:
DetailType
;
detailType
:
DetailType
;
}
>
(),
}
>
(),
{},
{},
...
@@ -85,7 +85,7 @@ const appStore = useAppStore();
...
@@ -85,7 +85,7 @@ const appStore = useAppStore();
const
{
request
:
unlock
}
=
useRequest
<
const
{
request
:
unlock
}
=
useRequest
<
any
,
any
,
{
{
businessId
:
number
;
businessId
:
string
;
type
:
UnlockType
;
type
:
UnlockType
;
}
}
>
(
RequestUrl
.
unlockInfo
,
{
>
(
RequestUrl
.
unlockInfo
,
{
...
...
src/composable/useListView.ts
View file @
beae7b2c
...
@@ -11,7 +11,7 @@ import { useJump } from './useJump.ts';
...
@@ -11,7 +11,7 @@ import { useJump } from './useJump.ts';
type
CurrentUrl
=
RequestUrl
|
ShallowRef
<
{
target
:
RequestUrl
}
>
;
type
CurrentUrl
=
RequestUrl
|
ShallowRef
<
{
target
:
RequestUrl
}
>
;
export
function
useListView
<
export
function
useListView
<
T
extends
{
id
:
number
;
[
index
:
string
]:
any
},
T
extends
{
id
:
string
;
[
index
:
string
]:
any
},
C
extends
Record
<
any
,
any
>
&
{
name
?:
string
},
C
extends
Record
<
any
,
any
>
&
{
name
?:
string
},
>
(
url
:
CurrentUrl
,
specialParams
:
Ref
<
Record
<
string
,
any
>>
=
{}
as
any
)
{
>
(
url
:
CurrentUrl
,
specialParams
:
Ref
<
Record
<
string
,
any
>>
=
{}
as
any
)
{
const
{
open
,
router
}
=
useJump
();
const
{
open
,
router
}
=
useJump
();
...
@@ -98,7 +98,7 @@ export function useListView<
...
@@ -98,7 +98,7 @@ export function useListView<
open
({
open
({
name
,
name
,
query
:
{
query
:
{
id
:
item
.
i
d
,
id
:
item
.
businessI
d
,
},
},
});
});
};
};
...
...
src/types/api/carrierDetail.ts
View file @
beae7b2c
...
@@ -23,7 +23,9 @@ export interface CarrierDetailResp {
...
@@ -23,7 +23,9 @@ export interface CarrierDetailResp {
/** 占地面积(单位:亩) */
/** 占地面积(单位:亩) */
coverArea
:
number
;
coverArea
:
number
;
/** 主键id */
/** 主键id */
id
:
number
;
id
:
string
;
/** 业务id */
businessId
:
string
;
/** 图片 */
/** 图片 */
imgUrl
:
string
;
imgUrl
:
string
;
/** 总投资额(亿元) */
/** 总投资额(亿元) */
...
@@ -66,7 +68,9 @@ export interface CarrierDetailResp {
...
@@ -66,7 +68,9 @@ export interface CarrierDetailResp {
/** 层数 */
/** 层数 */
floorNumber
:
number
;
floorNumber
:
number
;
/** 主键id */
/** 主键id */
id
:
number
;
id
:
string
;
/** 业务id */
businessId
:
string
;
/** 轮播图 */
/** 轮播图 */
imgUrls
:
string
[];
imgUrls
:
string
[];
/** 招商信息 */
/** 招商信息 */
...
...
src/types/api/carrierList.ts
View file @
beae7b2c
...
@@ -40,8 +40,10 @@ export interface CarrierListItem {
...
@@ -40,8 +40,10 @@ export interface CarrierListItem {
cityCode
:
string
;
cityCode
:
string
;
/** */
/** */
cityName
:
string
;
cityName
:
string
;
/** */
/** 主键id */
id
:
number
;
id
:
string
;
/** 业务id */
businessId
:
string
;
/** 首屏图片 */
/** 首屏图片 */
imgUrl
:
string
;
imgUrl
:
string
;
/** 载体类型 */
/** 载体类型 */
...
...
src/types/api/developZoneDetail.ts
View file @
beae7b2c
...
@@ -46,7 +46,9 @@ export interface DevelopZoneDetailResp {
...
@@ -46,7 +46,9 @@ export interface DevelopZoneDetailResp {
/** 供暖单价(元/m³) */
/** 供暖单价(元/m³) */
heatingPrice
:
string
;
heatingPrice
:
string
;
/** 主键id */
/** 主键id */
id
:
number
;
id
:
string
;
/** 业务id */
businessId
:
string
;
/** 轮播图 */
/** 轮播图 */
imgUrlList
:
string
[];
imgUrlList
:
string
[];
/** 工业用电(元/㎡/天) */
/** 工业用电(元/㎡/天) */
...
@@ -72,7 +74,9 @@ export interface DevelopZoneDetailResp {
...
@@ -72,7 +74,9 @@ export interface DevelopZoneDetailResp {
/** */
/** */
cityName
:
string
;
cityName
:
string
;
/** id */
/** id */
id
:
number
;
id
:
string
;
/** id */
businessId
:
string
;
/** 首屏图片 */
/** 首屏图片 */
imgUrl
:
string
;
imgUrl
:
string
;
/** */
/** */
...
...
src/types/api/developZoneList.ts
View file @
beae7b2c
...
@@ -31,7 +31,9 @@ export interface DevelopZoneItem {
...
@@ -31,7 +31,9 @@ export interface DevelopZoneItem {
/** 城市 */
/** 城市 */
cityName
:
string
;
cityName
:
string
;
/** 主键id */
/** 主键id */
id
:
number
;
id
:
string
;
/** 业务id */
businessId
:
string
;
/** 图片链接 */
/** 图片链接 */
imgUrl
:
string
;
imgUrl
:
string
;
/** 招商方向 */
/** 招商方向 */
...
...
src/types/api/industrialParkDetail.ts
View file @
beae7b2c
...
@@ -63,7 +63,10 @@ export interface IndustrialParkDetailResp {
...
@@ -63,7 +63,10 @@ export interface IndustrialParkDetailResp {
/** 载体类型 */
/** 载体类型 */
type
:
string
;
type
:
string
;
name
:
string
;
name
:
string
;
id
:
number
;
/** 主键id */
id
:
string
;
/** 业务id */
businessId
?:
string
;
}[];
}[];
/** 产业政策 */
/** 产业政策 */
parkPolicy
:
ListInfo
<
Policy
>
[];
parkPolicy
:
ListInfo
<
Policy
>
[];
...
@@ -104,7 +107,9 @@ export interface IndustrialParkDetailResp {
...
@@ -104,7 +107,9 @@ export interface IndustrialParkDetailResp {
/** 用户解锁额度剩余次数 */
/** 用户解锁额度剩余次数 */
limitNum
:
number
;
limitNum
:
number
;
/** id */
/** id */
id
:
number
;
id
:
string
;
/** businessId */
businessId
:
string
;
/** 是否已解锁 */
/** 是否已解锁 */
isView
:
boolean
;
isView
:
boolean
;
/** 供电类型 */
/** 供电类型 */
...
...
src/types/api/industrialParkList.ts
View file @
beae7b2c
...
@@ -54,7 +54,9 @@ export interface IndustrialParkItem {
...
@@ -54,7 +54,9 @@ export interface IndustrialParkItem {
// coverArea: number;
// coverArea: number;
coverArea
:
number
;
coverArea
:
number
;
/** 主键id */
/** 主键id */
id
:
number
;
id
:
string
;
/** 业务id */
businessId
:
string
;
/** 图片链接 */
/** 图片链接 */
imgUrl
:
string
;
imgUrl
:
string
;
/** 招商方向 */
/** 招商方向 */
...
...
src/types/api/landDetail.ts
View file @
beae7b2c
...
@@ -54,7 +54,10 @@ export interface LandDetailResp {
...
@@ -54,7 +54,10 @@ export interface LandDetailResp {
regionName
:
string
;
regionName
:
string
;
/** 类型 */
/** 类型 */
type
:
string
;
type
:
string
;
id
:
number
;
/** 主键id */
id
:
string
;
/** 业务id */
businessId
:
string
;
/** 纬度 */
/** 纬度 */
latitude
:
number
;
latitude
:
number
;
/** 经度 */
/** 经度 */
...
...
src/types/api/landList.ts
View file @
beae7b2c
...
@@ -36,8 +36,10 @@ export interface LandListItem {
...
@@ -36,8 +36,10 @@ export interface LandListItem {
cityCode
:
string
;
cityCode
:
string
;
/** */
/** */
cityName
:
string
;
cityName
:
string
;
/** */
/** 主键id */
id
:
number
;
id
:
string
;
/** 业务id */
businessId
:
string
;
/** 首屏图片 */
/** 首屏图片 */
imgUrl
:
string
;
imgUrl
:
string
;
/** */
/** */
...
...
src/types/api/myParkDevelopDetail.ts
View file @
beae7b2c
...
@@ -44,7 +44,9 @@ export interface MyParkDevelopDetailResp {
...
@@ -44,7 +44,9 @@ export interface MyParkDevelopDetailResp {
/** 供暖单价(元/m³) */
/** 供暖单价(元/m³) */
heatingPrice
:
string
;
heatingPrice
:
string
;
/** 主键id */
/** 主键id */
id
:
number
;
id
:
string
;
/** 业务id */
businessId
?:
string
;
/** 轮播图 */
/** 轮播图 */
imgUrlList
:
string
[];
imgUrlList
:
string
[];
/** 工业用电(元/㎡/天) */
/** 工业用电(元/㎡/天) */
...
@@ -93,7 +95,9 @@ export interface MyParkDevelopDetailResp {
...
@@ -93,7 +95,9 @@ export interface MyParkDevelopDetailResp {
/** */
/** */
holderType
:
string
;
holderType
:
string
;
/** id */
/** id */
id
:
number
;
id
:
string
;
/** id */
businessId
:
string
;
/** 首屏图片 */
/** 首屏图片 */
imgUrl
:
string
;
imgUrl
:
string
;
/** 产业方向 */
/** 产业方向 */
...
...
src/types/api/myParkList.ts
View file @
beae7b2c
...
@@ -35,7 +35,9 @@ export interface MyParkItem {
...
@@ -35,7 +35,9 @@ export interface MyParkItem {
/** 录入时间 */
/** 录入时间 */
createTime
:
string
;
createTime
:
string
;
/** 主键id */
/** 主键id */
id
:
number
;
id
:
string
;
/** 业务id */
businessId
?:
string
;
/** 来源方式code */
/** 来源方式code */
isSystem
:
number
;
isSystem
:
number
;
/** 来源方式 */
/** 来源方式 */
...
...
src/types/api/policyList.ts
View file @
beae7b2c
...
@@ -2,7 +2,10 @@
...
@@ -2,7 +2,10 @@
export
interface
PolicyListItem
{
export
interface
PolicyListItem
{
content
:
string
;
content
:
string
;
publishTime
:
string
;
publishTime
:
string
;
id
:
number
;
/** 主键id */
id
:
string
;
/** 业务id */
businessId
:
string
;
industryList
:
string
;
industryList
:
string
;
publisher
:
string
;
publisher
:
string
;
title
:
string
;
title
:
string
;
...
...
src/views/carrier/CarrierDetail.vue
View file @
beae7b2c
...
@@ -152,7 +152,7 @@ const carrierInfo = computed(() => {
...
@@ -152,7 +152,7 @@ const carrierInfo = computed(() => {
const
toIndustrial
=
()
=>
{
const
toIndustrial
=
()
=>
{
open
({
open
({
query
:
{
query
:
{
id
:
detail
.
value
?.
carrierParkVo
.
i
d
,
id
:
detail
.
value
?.
carrierParkVo
.
businessI
d
,
},
},
path
:
RouteName
.
industrialParkDetail
,
path
:
RouteName
.
industrialParkDetail
,
});
});
...
...
src/views/develop/DevelopZoneDetail.vue
View file @
beae7b2c
...
@@ -386,20 +386,20 @@ const toLandList = () => {
...
@@ -386,20 +386,20 @@ const toLandList = () => {
});
});
};
};
const
toIndustrialDetail
=
({
id
}:
{
i
d
:
string
|
number
})
=>
{
const
toIndustrialDetail
=
({
businessId
}:
{
businessI
d
:
string
|
number
})
=>
{
open
({
open
({
name
:
RouteName
.
industrialParkDetail
,
name
:
RouteName
.
industrialParkDetail
,
query
:
{
query
:
{
id
,
id
:
businessId
,
},
},
});
});
};
};
const
toLandDetail
=
({
id
}:
{
i
d
:
string
|
number
})
=>
{
const
toLandDetail
=
({
businessId
}:
{
businessI
d
:
string
|
number
})
=>
{
open
({
open
({
name
:
RouteName
.
landDetail
,
name
:
RouteName
.
landDetail
,
query
:
{
query
:
{
id
,
id
:
businessId
,
},
},
});
});
};
};
...
...
src/views/home/HomeView.vue
View file @
beae7b2c
...
@@ -443,7 +443,7 @@ const handleDetail = (name: RouteName, item: any) => {
...
@@ -443,7 +443,7 @@ const handleDetail = (name: RouteName, item: any) => {
open
({
open
({
name
,
name
,
query
:
{
query
:
{
id
:
item
.
i
d
,
id
:
item
.
businessI
d
,
},
},
});
});
};
};
...
...
src/views/industrial-park/IndustrialParkDetail.vue
View file @
beae7b2c
...
@@ -270,13 +270,14 @@ const enterprises = computed(() => {
...
@@ -270,13 +270,14 @@ const enterprises = computed(() => {
const
carriers
=
computed
<
MiniDetail
[]
>
(()
=>
{
const
carriers
=
computed
<
MiniDetail
[]
>
(()
=>
{
if
(
detail
.
value
)
{
if
(
detail
.
value
)
{
return
detail
.
value
.
parkCarrier
.
map
((
item
)
=>
{
return
detail
.
value
.
parkCarrier
.
map
((
item
)
=>
{
const
{
imgUrl
,
type
,
area
,
name
,
id
}
=
item
;
const
{
imgUrl
,
type
,
area
,
name
,
id
,
businessId
}
=
item
;
return
{
return
{
...
item
,
...
item
,
imgUrl
,
imgUrl
,
name
,
name
,
info
:
[
area
?
`
${
area
}
㎡`
:
''
,
type
].
filter
(
haveValue
).
join
(
' | '
),
info
:
[
area
?
`
${
area
}
㎡`
:
''
,
type
].
filter
(
haveValue
).
join
(
' | '
),
id
,
id
,
businessId
,
};
};
});
});
}
else
{
}
else
{
...
@@ -298,11 +299,11 @@ const toCarrierList = () => {
...
@@ -298,11 +299,11 @@ const toCarrierList = () => {
/**
/**
* 载体详情
* 载体详情
*/
*/
const
toCarrierDetail
=
({
id
}:
{
i
d
:
number
})
=>
{
const
toCarrierDetail
=
({
businessId
}:
{
businessI
d
:
number
})
=>
{
open
({
open
({
name
:
RouteName
.
carrierDetail
,
name
:
RouteName
.
carrierDetail
,
query
:
{
query
:
{
id
,
id
:
businessId
,
},
},
});
});
};
};
...
...
src/views/industry/IndustryPolicyDetail.vue
View file @
beae7b2c
...
@@ -55,7 +55,8 @@ const detail = ref<PolicyListItem>({
...
@@ -55,7 +55,8 @@ const detail = ref<PolicyListItem>({
publishTime
:
''
,
publishTime
:
''
,
publisher
:
''
,
publisher
:
''
,
content
:
''
,
content
:
''
,
id
:
0
,
id
:
'0'
,
businessId
:
'0'
,
industryList
:
''
,
industryList
:
''
,
});
});
onMounted
(
async
()
=>
{
onMounted
(
async
()
=>
{
...
...
src/views/land/LandDetail.vue
View file @
beae7b2c
...
@@ -153,7 +153,7 @@ const toDevelop = () => {
...
@@ -153,7 +153,7 @@ const toDevelop = () => {
open
({
open
({
name
:
RouteName
.
developZoneDetail
,
name
:
RouteName
.
developZoneDetail
,
query
:
{
query
:
{
id
:
detail
.
value
?.
development
.
i
d
,
id
:
detail
.
value
?.
development
.
businessI
d
,
},
},
});
});
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment