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
dd9986bd
Commit
dd9986bd
authored
Dec 07, 2023
by
王玉鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 我的园区,产业园载体列表
parent
9396cc82
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
61 additions
and
35 deletions
+61
-35
reset.scss
src/assets/styles/reset.scss
+24
-0
DetailInfo.vue
src/components/detail/DetailInfo.vue
+1
-1
MyParkList.vue
src/components/user/MyParkList.vue
+1
-1
myParkIndustrialDetail.ts
src/types/api/myParkIndustrialDetail.ts
+1
-1
DevelopZoneList.vue
src/views/develop/DevelopZoneList.vue
+0
-1
MyIndustrialDetail.vue
src/views/user/MyIndustrialDetail.vue
+32
-3
MyPark.vue
src/views/user/MyPark.vue
+1
-27
UserCenter.vue
src/views/user/UserCenter.vue
+1
-1
No files found.
src/assets/styles/reset.scss
View file @
dd9986bd
...
...
@@ -38,3 +38,27 @@ body {
-moz-appearance
:
textfield
;
}
}
.park-tabs
{
.
el-tabs__nav-wrap
:
:
after
{
display
:
none
;
}
.el-tabs__active-bar
{
background-color
:
#c0322b
;
}
.el-tabs__item
{
@apply
font-yahei
;
padding
:
0
;
height
:
38px
;
padding
:
0
12px
!
important
;
font-size
:
14px
;
line-height
:
22px
;
color
:
rgba
(
0
,
0
,
0
,
0
.65
);
&
.is-active
{
color
:
#c0322b
;
}
&
:hover
{
color
:
#c0322b
;
}
}
}
src/components/detail/DetailInfo.vue
View file @
dd9986bd
...
...
@@ -4,7 +4,7 @@
<div
v-for=
"col in line"
:key=
"col.name"
class=
"flex flex-1 text-xs text-[#1A1A1A]"
>
<div
class=
"flex w-[160px] items-center bg-[#FAFAFC] px-[30px] py-[10px] leading-5"
:class=
"
{ 'w-[130px] !px-5': col.smallMode }"
:class=
"
{ '
!
w-[130px] !px-5': col.smallMode }"
>
{{
col
.
name
}}
</div>
...
...
src/components/user/MyParkList.vue
View file @
dd9986bd
...
...
@@ -23,7 +23,6 @@
v-model:current-page=
"pageNum"
v-model:page-size=
"pageSize"
class=
"mt-5"
layout=
"prev, pager, next"
:total=
"totalCount"
></ListPagination>
</div>
...
...
@@ -36,6 +35,7 @@ import { RequestUrl } from '@/types/api.ts';
import
type
{
MyParkCondition
,
MyParkItem
}
from
'@/types/api/myParkList'
;
import
{
ParkItemType
}
from
'@/types/enum.ts'
;
import
{
computed
}
from
'vue'
;
import
ListPagination
from
'@/components/list/ListPagination.vue'
;
const
props
=
withDefaults
(
defineProps
<
{
...
...
src/types/api/myParkIndustrialDetail.ts
View file @
dd9986bd
...
...
@@ -8,7 +8,7 @@ export interface MyParkIndustrialDetailResp {
averageOutputValue
:
string
;
/** 建设周期(月) */
buildingPeriod
:
number
;
/** */
/**
载体信息
*/
carrierInfoList
:
{
/** 面积 */
area
:
number
;
...
...
src/views/develop/DevelopZoneList.vue
View file @
dd9986bd
...
...
@@ -19,7 +19,6 @@
<ListPagination
v-model:current-page=
"pageNum"
v-model:page-size=
"pageSize"
layout=
"prev, pager, next"
:total=
"totalCount"
></ListPagination>
</div>
...
...
src/views/user/MyIndustrialDetail.vue
View file @
dd9986bd
...
...
@@ -23,8 +23,8 @@
</div>
</div>
</div>
<div
class=
"mt-5"
>
<ElTabs
v-model=
"currentTab"
>
<div
class=
"
park-tabs
mt-5"
>
<ElTabs
v-model=
"currentTab"
class=
"bg-white"
>
<ElTabPane
label=
"产业园信息"
:name=
"DetailType.industrial"
>
<div
class=
"space-y-8 bg-white py-3"
>
<DetailInfoCell
title=
"基本信息"
:show-title-icon=
"false"
>
...
...
@@ -62,7 +62,27 @@
</div>
</ElTabPane>
<ElTabPane
label=
"载体信息"
:name=
"DetailType.carrier"
>
<div
class=
"px-[9px] pb-[10px]"
></div>
<div
class=
"bg-[#F8F8F8]"
>
<ElTable
:data=
"carrierList"
>
<ElTableColumn
prop=
"buildingNumber"
label=
"楼号"
></ElTableColumn>
<ElTableColumn
prop=
"structure"
label=
"建筑结构"
></ElTableColumn>
<ElTableColumn
prop=
"area"
label=
"建筑面积"
></ElTableColumn>
<ElTableColumn
prop=
"floorNumber"
label=
"层数"
></ElTableColumn>
<ElTableColumn
prop=
"floorHigh"
label=
"层高"
></ElTableColumn>
<ElTableColumn
prop=
"singleArea"
label=
"单层面积"
></ElTableColumn>
<ElTableColumn
prop=
"distance"
label=
"柱距"
></ElTableColumn>
<ElTableColumn
prop=
"elevatorType"
label=
"电梯类型"
></ElTableColumn>
<ElTableColumn
prop=
"fireProtectionLevel"
label=
"消防等级"
></ElTableColumn>
<ElTableColumn
prop=
"fireResistant"
label=
"耐火等级"
></ElTableColumn>
</ElTable>
<ListPagination
v-model:current-page=
"currentPage"
v-model:page-size=
"pageSize"
class=
"mt-5"
:total=
"detail.carrierInfoList.length"
></ListPagination>
</div>
</ElTabPane>
</ElTabs>
</div>
...
...
@@ -77,11 +97,15 @@ import { DetailType } from '@/types/enum.ts';
import
{
computed
,
ref
}
from
'vue'
;
import
DetailInfoCell
from
'@/components/detail/DetailInfoCell.vue'
;
import
type
{
Info
,
Infos
}
from
'@/components/detail/DetailInfo.vue'
;
import
ListPagination
from
'@/components/list/ListPagination.vue'
;
const
{
detail
,
initDetail
}
=
useDetail
<
MyParkIndustrialDetailResp
>
(
RequestUrl
.
myParkIndustrialDetail
,
);
const
pageSize
=
ref
(
10
);
const
currentPage
=
ref
(
1
);
const
currentTab
=
ref
(
DetailType
.
industrial
);
/** 基本信息 */
...
...
@@ -409,6 +433,11 @@ const industrySupports = computed(() => {
}
});
const
carrierList
=
computed
(()
=>
{
const
startIndex
=
(
currentPage
.
value
-
1
)
*
pageSize
.
value
;
return
detail
.
value
?.
carrierInfoList
.
slice
(
startIndex
,
startIndex
+
pageSize
.
value
)
||
[];
});
const
handleInfos
=
(
infos
:
Infos
)
=>
{
return
infos
.
map
((
list
)
=>
{
return
list
.
map
((
i
)
=>
{
...
...
src/views/user/MyPark.vue
View file @
dd9986bd
<!-- 我的园区 -->
<
template
>
<div
class=
"
my-park
"
>
<div
class=
"
park-tabs bg-white
"
>
<ElTabs
v-model=
"currentTab"
>
<ElTabPane
label=
"开发区"
:name=
"ParkItemType.develop"
>
<div
class=
"px-[9px] pb-[10px]"
>
...
...
@@ -31,29 +31,3 @@ const isIndustrial = computed(() => {
return
currentTab
.
value
===
ParkItemType
.
industrial
;
});
</
script
>
<
style
lang=
"scss"
>
.my-park
{
.
el-tabs__nav-wrap
:
:
after
{
display
:
none
;
}
.el-tabs__active-bar
{
background-color
:
#c0322b
;
}
.el-tabs__item
{
@apply
font-yahei
;
padding
:
0
;
width
:
66px
;
height
:
38px
;
font-size
:
14px
;
line-height
:
22px
;
color
:
rgba
(
0
,
0
,
0
,
0
.65
);
&
.is-active
{
color
:
#c0322b
;
}
&
:hover
{
color
:
#c0322b
;
}
}
}
</
style
>
src/views/user/UserCenter.vue
View file @
dd9986bd
...
...
@@ -34,7 +34,7 @@
</div>
</div>
</div>
<div
class=
"ml-4 min-w-0 flex-1
bg-white
"
>
<div
class=
"ml-4 min-w-0 flex-1"
>
<RouterView
/>
</div>
</div>
...
...
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