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
533d35c7
Commit
533d35c7
authored
Dec 08, 2023
by
王玉鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 临时提交
parent
7f5f467b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
30 deletions
+43
-30
.eslintrc.cjs
.eslintrc.cjs
+1
-0
useListView.ts
src/composable/useListView.ts
+27
-11
useQueryList.ts
src/composable/useQueryList.ts
+6
-3
useRequest.ts
src/composable/useRequest.ts
+2
-2
IndustryCategory.vue
src/views/industry/IndustryCategory.vue
+7
-14
No files found.
.eslintrc.cjs
View file @
533d35c7
...
@@ -66,5 +66,6 @@ module.exports = {
...
@@ -66,5 +66,6 @@ module.exports = {
},
},
],
],
'vue-scoped-css/require-v-deep-argument': 'off',
'vue-scoped-css/require-v-deep-argument': 'off',
'vue/no-v-html': 'off',
},
},
};
};
src/composable/useListView.ts
View file @
533d35c7
import
{
useQueryList
}
from
'@/composable/useQueryList.ts'
;
import
{
useQueryList
}
from
'@/composable/useQueryList.ts'
;
import
{
ref
,
type
Ref
,
watchEffect
,
computed
}
from
'vue'
;
import
{
ref
,
type
Ref
,
watchEffect
,
computed
,
nextTick
,
}
from
'vue'
;
import
{
RequestUrl
}
from
'@/types/api.ts'
;
import
{
RequestUrl
}
from
'@/types/api.ts'
;
import
type
{
CommonListResp
,
CommonListParams
}
from
'@/types/common'
;
import
type
{
CommonListResp
,
CommonListParams
}
from
'@/types/common'
;
import
type
{
RouteName
}
from
'@/router/router.ts'
;
import
type
{
RouteName
}
from
'@/router/router.ts'
;
...
@@ -7,14 +7,25 @@ import { useRoute } from 'vue-router';
...
@@ -7,14 +7,25 @@ import { useRoute } from 'vue-router';
import
{
useRequest
}
from
'./useRequest.ts'
;
import
{
useRequest
}
from
'./useRequest.ts'
;
import
{
useJump
}
from
'./useJump.ts'
;
import
{
useJump
}
from
'./useJump.ts'
;
type
CurrentUrl
=
RequestUrl
|
{
target
:
RequestUrl
};
export
function
useListView
<
export
function
useListView
<
T
extends
{
id
:
number
;
[
index
:
string
]:
any
},
T
extends
{
id
:
number
;
[
index
:
string
]:
any
},
C
extends
Record
<
any
,
any
>
&
{
name
?:
string
},
C
extends
Record
<
any
,
any
>
&
{
name
?:
string
},
>
(
url
:
Reques
tUrl
)
{
>
(
url
:
Curren
tUrl
)
{
const
{
open
,
router
}
=
useJump
();
const
{
open
,
router
}
=
useJump
();
const
{
request
:
requestList
}
=
useRequest
<
CommonListResp
<
T
>
,
CommonListParams
<
C
>>
(
url
,
{
const
getCurrentUrl
=
()
=>
{
method
:
'POST'
,
if
(
typeof
url
===
'string'
)
{
});
return
url
;
}
else
{
return
url
.
target
;
}
};
const
{
request
:
requestList
}
=
useRequest
<
CommonListResp
<
T
>
,
CommonListParams
<
C
>>
(
getCurrentUrl
(),
{
method
:
'POST'
,
},
);
const
{
pageNum
,
pageSize
,
totalCount
,
queryList
,
initPagination
}
=
useQueryList
<
T
,
C
>
(
const
{
pageNum
,
pageSize
,
totalCount
,
queryList
,
initPagination
}
=
useQueryList
<
T
,
C
>
(
requestList
,
requestList
,
...
@@ -43,8 +54,7 @@ export function useListView<
...
@@ -43,8 +54,7 @@ export function useListView<
watchEffect
(
async
()
=>
{
watchEffect
(
async
()
=>
{
try
{
try
{
console
.
log
(
url
);
const
{
data
}
=
await
queryList
(
searchParams
.
value
||
{},
getCurrentUrl
());
const
{
data
}
=
await
queryList
(
searchParams
.
value
||
{});
handleUrlClear
();
handleUrlClear
();
datas
.
value
=
data
.
records
;
datas
.
value
=
data
.
records
;
}
catch
(
error
)
{
}
catch
(
error
)
{
...
@@ -72,7 +82,9 @@ export function useListView<
...
@@ -72,7 +82,9 @@ export function useListView<
for
(
const
item
of
selectList
.
value
)
{
for
(
const
item
of
selectList
.
value
)
{
temp
[
item
.
key
]
=
item
.
value
;
temp
[
item
.
key
]
=
item
.
value
;
}
}
temp
.
name
=
currentName
.
value
;
if
(
currentName
.
value
)
{
temp
.
name
=
currentName
.
value
;
}
initPagination
();
initPagination
();
searchParams
.
value
=
temp
;
searchParams
.
value
=
temp
;
};
};
...
@@ -81,9 +93,13 @@ export function useListView<
...
@@ -81,9 +93,13 @@ export function useListView<
* 名称搜索
* 名称搜索
*/
*/
const
handleNameSearch
=
(
params
:
{
value
:
{
key
:
string
;
value
:
string
}[]
})
=>
{
const
handleNameSearch
=
(
params
:
{
value
:
{
key
:
string
;
value
:
string
}[]
})
=>
{
currentName
.
value
=
params
.
value
[
0
].
value
;
nextTick
(()
=>
{
searchParams
.
value
.
name
=
currentName
.
value
;
currentName
.
value
=
params
.
value
[
0
].
value
;
initPagination
();
if
(
currentName
.
value
)
{
searchParams
.
value
.
name
=
currentName
.
value
;
}
initPagination
();
});
};
};
return
{
return
{
...
...
src/composable/useQueryList.ts
View file @
533d35c7
...
@@ -4,7 +4,10 @@ import type { CommonListParams, CommonListResp } from '@/types/common';
...
@@ -4,7 +4,10 @@ import type { CommonListParams, CommonListResp } from '@/types/common';
import
type
{
ResponseData
}
from
'./useRequest.ts'
;
import
type
{
ResponseData
}
from
'./useRequest.ts'
;
import
{
useMessage
}
from
'./useMessage.ts'
;
import
{
useMessage
}
from
'./useMessage.ts'
;
export
type
QueryFn
<
T
,
C
>
=
(
params
:
C
)
=>
Promise
<
ResponseData
<
CommonListResp
<
T
>>>
;
export
type
QueryFn
<
T
,
C
>
=
(
params
:
C
,
specialUrl
?:
string
,
)
=>
Promise
<
ResponseData
<
CommonListResp
<
T
>>>
;
interface
Pagination
{
interface
Pagination
{
size
?:
number
;
size
?:
number
;
...
@@ -55,12 +58,12 @@ export function useQueryList<T, C>(queryFn: QueryFn<T, CommonListParams<C>>) {
...
@@ -55,12 +58,12 @@ export function useQueryList<T, C>(queryFn: QueryFn<T, CommonListParams<C>>) {
};
};
};
};
const
queryList
=
(
params
:
C
,
reload
=
false
)
=>
{
const
queryList
=
(
params
:
C
,
specialUrl
=
''
,
reload
=
false
)
=>
{
if
(
reload
)
{
if
(
reload
)
{
initPagination
();
initPagination
();
}
}
return
queryFn
(
assignPageParams
(
params
)).
then
((
res
)
=>
{
return
queryFn
(
assignPageParams
(
params
)
,
specialUrl
).
then
((
res
)
=>
{
const
{
success
,
msg
,
data
}
=
res
;
const
{
success
,
msg
,
data
}
=
res
;
if
(
success
)
{
if
(
success
)
{
if
(
!
isUndefined
(
data
.
total
))
{
if
(
!
isUndefined
(
data
.
total
))
{
...
...
src/composable/useRequest.ts
View file @
533d35c7
...
@@ -83,7 +83,7 @@ export function useRequest<T = Record<any, any>, P = Record<any, any>>(
...
@@ -83,7 +83,7 @@ export function useRequest<T = Record<any, any>, P = Record<any, any>>(
)
{
)
{
const
appStore
=
useAppStore
();
const
appStore
=
useAppStore
();
const
request
=
(
params
:
P
=
{}
as
P
)
=>
{
const
request
=
(
params
:
P
=
{}
as
P
,
specialUrl
=
''
)
=>
{
const
publicKey
=
const
publicKey
=
'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDfGTt8qny6pipLYYhBVAIGZ6CgMdmYCVPy3bAi8AO1MvOD3Pba1OxLSEvtctOmcibO6NL5NZgQrsTjfu1RMSJkwv1vY/GsKH4c/fbmd3QPhuKUZNHQhTMicbeGFadMM2xRkBkZDjeakemqTdLQFnkRFSeE35GKRkBBimOm4YWBQwIDAQAB'
;
'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDfGTt8qny6pipLYYhBVAIGZ6CgMdmYCVPy3bAi8AO1MvOD3Pba1OxLSEvtctOmcibO6NL5NZgQrsTjfu1RMSJkwv1vY/GsKH4c/fbmd3QPhuKUZNHQhTMicbeGFadMM2xRkBkZDjeakemqTdLQFnkRFSeE35GKRkBBimOm4YWBQwIDAQAB'
;
const
uuid
=
generateRandomStr
(
16
);
const
uuid
=
generateRandomStr
(
16
);
...
@@ -94,7 +94,7 @@ export function useRequest<T = Record<any, any>, P = Record<any, any>>(
...
@@ -94,7 +94,7 @@ export function useRequest<T = Record<any, any>, P = Record<any, any>>(
const
paramsConfig
=
config
.
method
===
'GET'
?
{
params
}
:
{
data
:
params
};
const
paramsConfig
=
config
.
method
===
'GET'
?
{
params
}
:
{
data
:
params
};
return
requestInstance
.
request
<
T
,
ResponseData
<
T
>>
({
return
requestInstance
.
request
<
T
,
ResponseData
<
T
>>
({
url
:
`
${
url
}
/
${
path
}
`
,
url
:
`
${
specialUrl
||
url
}
/
${
path
}
`
,
...
paramsConfig
,
...
paramsConfig
,
...
config
,
...
config
,
headers
:
{
headers
:
{
...
...
src/views/industry/IndustryCategory.vue
View file @
533d35c7
...
@@ -83,7 +83,7 @@
...
@@ -83,7 +83,7 @@
</
template
>
</
template
>
<
script
lang=
"ts"
setup
>
<
script
lang=
"ts"
setup
>
import
{
r
ef
}
from
'vue'
;
import
{
computed
,
markRaw
,
ref
,
shallowR
ef
}
from
'vue'
;
// import { useRequest } from '@/composable/useRequest.ts';
// import { useRequest } from '@/composable/useRequest.ts';
import
{
RequestUrl
}
from
'@/types/api.ts'
;
import
{
RequestUrl
}
from
'@/types/api.ts'
;
import
{
useListView
}
from
'@/composable/useListView.ts'
;
import
{
useListView
}
from
'@/composable/useListView.ts'
;
...
@@ -148,6 +148,10 @@ const tabList = ref<tabItem[]>([
...
@@ -148,6 +148,10 @@ const tabList = ref<tabItem[]>([
const
activeTab
=
ref
<
number
>
(
0
);
const
activeTab
=
ref
<
number
>
(
0
);
const
currentUrl
=
computed
(()
=>
{
return
tabList
.
value
[
activeTab
.
value
].
apiURL
;
});
// let requestFn: any = null;
// let requestFn: any = null;
// const request = (url: any) => {
// const request = (url: any) => {
...
@@ -157,20 +161,9 @@ const activeTab = ref<number>(0);
...
@@ -157,20 +161,9 @@ const activeTab = ref<number>(0);
// requestFn = r.request;
// requestFn = r.request;
// };
// };
// const requestAPI:any = RequestUrl.developZoneList
// const requestAPI:any = RequestUrl.developZoneList
const
{
pageNum
,
pageSize
,
totalCount
,
datas
,
handleDetail
,
queryList
}
=
useListView
(
const
{
pageNum
,
pageSize
,
totalCount
,
datas
,
handleDetail
,
handleFilterChange
}
=
useListView
(
tabList
.
value
[
activeTab
.
value
].
apiURL
,
shallowRef
({
target
:
currentUrl
})
,
);
);
// 处理筛选条件
const
handleFilterChange
=
async
(
selectList
:
any
)
=>
{
const
temp
:
any
=
{};
for
(
const
item
of
selectList
.
value
)
{
temp
[
item
.
key
]
=
item
.
value
;
}
pageNum
.
value
=
1
;
const
{
data
}
=
await
queryList
(
temp
);
datas
.
value
=
data
.
records
;
};
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.container-left
p
{
.container-left
p
{
...
...
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