wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

修改所有个人中心新建窗口跳转详情

This commit is contained in:
wuhongjian 2022-12-12 16:27:34 +08:00
parent efba4dc7ba
commit 8906f1f60a
12 changed files with 1421 additions and 1293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/views/demandCenter/demandDetails.vue
View File

@ -238,7 +238,7 @@
</a-list> </a-list>
</div> </div>
<!-- 关闭需求申请 --> <!-- 关闭需求申请 -->
<div class="closeMain" @click="closeMain">X</div> <div class="closeMain" @click="closeMain" v-show="!hiddenBackFlag">X</div>
</div> </div>
</div> </div>
</template> </template>
@ -286,6 +286,7 @@
const evaluateData = ref([]) const evaluateData = ref([])
const myComment = ref('') const myComment = ref('')
const hiddenBackFlag = router.currentRoute.value.query.hiddenBackFlag
const evaluateSubmit = () => { const evaluateSubmit = () => {
if (myComment.value === '') { if (myComment.value === '') {
message.error('请填写评价！') message.error('请填写评价！')
@ -388,6 +389,7 @@
// const formData = computed(() => store.getters['home/demandDetailsData']) // const formData = computed(() => store.getters['home/demandDetailsData'])
// formName.value = formData.value // formName.value = formData.value
const id = router.currentRoute.value.query.id const id = router.currentRoute.value.query.id
getDemandForm(id).then((res) => { getDemandForm(id).then((res) => {
console.log(res, 'res') console.log(res, 'res')
const { data } = res.data const { data } = res.data

7
front/src/views/home/details.vue
View File

@ -2,14 +2,14 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-14 09:43:49 * @Date: 2022-06-14 09:43:49
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-12-09 17:31:52 * @LastEditTime: 2022-12-12 15:36:59
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
<div> <div>
<div id="apply-container"> <div id="apply-container">
<home-header :showView="showView" :target-flag="targetFlag"></home-header> <home-header :showView="showView" :target-flag="targetFlag"></home-header>
<detail-back></detail-back> <detail-back v-show="!hiddenBackFlag"></detail-back>
<div class="detail-content"> <div class="detail-content">
<details-view v-if="showView === 'details-view'"></details-view> <details-view v-if="showView === 'details-view'"></details-view>
<algorithm-details <algorithm-details
@ -93,6 +93,8 @@
]) ])
const router = useRouter() const router = useRouter()
const id = router.currentRoute.value.query.id const id = router.currentRoute.value.query.id
// 是否隐藏回退按钮
const hiddenBackFlag = router.currentRoute.value.query.hiddenBackFlag
const obj = JSON.parse(window.sessionStorage.getItem('preview')) const obj = JSON.parse(window.sessionStorage.getItem('preview'))
let showView = ref('') let showView = ref('')
const targetFlag = ref(true) const targetFlag = ref(true)
@ -176,6 +178,7 @@
init, init,
router, router,
id, id,
hiddenBackFlag,
} }
}, },
}) })

9
front/src/views/home/integrationServicesDetails.vue
View File

@ -2,7 +2,7 @@
<template> <template>
<div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }"> <div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }">
<home-header></home-header> <home-header></home-header>
<detail-back></detail-back> <detail-back v-show="!hiddenBackFlag"></detail-back>
<!-- 头部基本信息 --> <!-- 头部基本信息 -->
<application-top-details <application-top-details
:dataList="detailInfoObj" :dataList="detailInfoObj"
@ -190,6 +190,7 @@
const infrastructureCount = ref(0) const infrastructureCount = ref(0)
const componentCount = ref(0) const componentCount = ref(0)
const id = router.currentRoute.value.query.id const id = router.currentRoute.value.query.id
const hiddenBackFlag = router.currentRoute.value.query.hiddenBackFlag
document.documentElement.style.transition = 'all 0.3s ease' document.documentElement.style.transition = 'all 0.3s ease'
document.documentElement.scrollTop = 0 document.documentElement.scrollTop = 0
document.body.style.transition = 'all 0.3s ease' document.body.style.transition = 'all 0.3s ease'
@ -562,9 +563,9 @@
background: url('~@/assets/home/fn/cjtd.png') no-repeat; background: url('~@/assets/home/fn/cjtd.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.cjtd img{ .cjtd img {
width:100%; width: 100%;
height:100% height: 100%;
} }
.content { .content {

3
front/src/views/personalCenter/components/AbilityApplication.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-07-12 09:42:44 * @Date: 2022-07-12 09:42:44
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-26 14:47:12 * @LastEditTime: 2022-12-12 15:37:17
* @Description:我的申请 能力申请 查看详情 * @Description:我的申请 能力申请 查看详情
--> -->
<template> <template>
@ -503,6 +503,7 @@
path: '/details', // 跳转的页面路由 path: '/details', // 跳转的页面路由
query: { query: {
id: id, id: id,
hiddenBackFlag: true,
}, },
}) })
window.open(applypage.href, '_blank') window.open(applypage.href, '_blank')

31
front/src/views/personalCenter/components/Collection.vue
View File

@ -171,7 +171,11 @@
console.log('编目一级=============>', res.data) console.log('编目一级=============>', res.data)
res.data.data.forEach((val) => { res.data.data.forEach((val) => {
// tabList.value.push(val.name) // tabList.value.push(val.name)
if (val.name == '应用资源' || val.name == '组件服务' || val.name == '融合服务') { if (
val.name == '应用资源' ||
val.name == '组件服务' ||
val.name == '融合服务'
) {
tabList.value.push(val.name) tabList.value.push(val.name)
} }
}) })
@ -349,22 +353,39 @@
if (delFlag == 0) { if (delFlag == 0) {
console.log('进入详情') console.log('进入详情')
mybus.emit('tabsChange', { flag: id }) mybus.emit('tabsChange', { flag: id })
router.push({ // router.push({
path: '/details', // path: '/details',
// query: {
// id: id,
// },
// })
const detailPage = router.resolve({
path: '/details', // 跳转的页面路由
query: { query: {
id: id, id: id,
hiddenBackFlag: true,
}, },
}) })
window.open(detailPage.href, '_blank')
} else if (delFlag === undefined) { } else if (delFlag === undefined) {
// 融合服务 // 融合服务
// mybus.emit('tabsChange', { flag: item.resourceId }) // mybus.emit('tabsChange', { flag: item.resourceId })
mybus.emit('tabsChange', { flag: id }) mybus.emit('tabsChange', { flag: id })
router.push({
path: `/integrationServicesDetails`, // router.push({
// path: `/integrationServicesDetails`,
// query: {
// id: id,
// },
// })
const detailPage = router.resolve({
path: '/integrationServicesDetails', // 跳转的页面路由
query: { query: {
id: id, id: id,
hiddenBackFlag: true,
}, },
}) })
window.open(detailPage.href, '_blank')
} }
} }
</script> </script>

12
front/src/views/personalCenter/components/MyApplication.vue
View File

@ -90,12 +90,20 @@
const showDetail = (item) => { const showDetail = (item) => {
// console.log('demandDetails', item) // console.log('demandDetails', item)
// store.commit('home/demandDetailsData', item) // store.commit('home/demandDetailsData', item)
router.push({ // router.push({
path: '/demandDetails', // path: '/demandDetails',
// query: {
// id: item.id,
// },
// })
const detailPage = router.resolve({
path: '/demandDetails', // 跳转的页面路由
query: { query: {
id: item.id, id: item.id,
hiddenBackFlag: true,
}, },
}) })
window.open(detailPage.href, '_blank')
} }
const creator = ref('') const creator = ref('')

193
front/src/views/personalCenter/components/MyApply.vue
View File

@ -9,10 +9,10 @@
:key="index" :key="index"
@click="handleTab(index)" @click="handleTab(index)"
> >
{{item}} {{ item }}
</div> </div>
</div> </div>
<div class="tab" style="margin-bottom: 0.1rem" v-show="(chooseTab==0)"> <div class="tab" style="margin-bottom: 0.1rem" v-show="chooseTab == 0">
<span>类型</span> <span>类型</span>
<div <div
:class="typeIndex == index ? 'tabclass' : ' '" :class="typeIndex == index ? 'tabclass' : ' '"
@ -23,10 +23,7 @@
{{ item }} {{ item }}
</div> </div>
</div> </div>
<div <div class="tab" v-if="chooseTab != 1 && chooseTab != 2 && chooseTab != 3">
class="tab"
v-if="(chooseTab != 1 && chooseTab != 2 && chooseTab != 3)"
>
<span>申请状态</span> <span>申请状态</span>
<div <div
:class="tabIndex == index ? 'tabclass' : ' '" :class="tabIndex == index ? 'tabclass' : ' '"
@ -46,16 +43,16 @@
</div> </div>
</div> </div>
<!--政务云资源--> <!--政务云资源-->
<template v-if="chooseTab==2"> <template v-if="chooseTab == 2">
<a-form <a-form
:label-col="{ style: { width: '80px' } }" :label-col="{ style: { width: '80px' } }"
:wrapper-col="{ style: { width: '200px' } }" :wrapper-col="{ style: { width: '200px' } }"
labelAlign="center" labelAlign="center"
> >
<a-row> <a-row>
<a-form-item <a-form-item label="业务名称">
label="业务名称"> <a-input
<a-input placeholder="请输入业务名称" placeholder="请输入业务名称"
v-model:value="yunForm.busineessName" v-model:value="yunForm.busineessName"
style="width: 200px" style="width: 200px"
/> />
@ -67,14 +64,19 @@
placeholder="请选择状态" placeholder="请选择状态"
style="width: 200px" style="width: 200px"
> >
<a-select-option v-for="(item,index) in cloudResourceStatusList" <a-select-option
:key="index" :value="item.dictValue"> v-for="(item, index) in cloudResourceStatusList"
{{ item.dictLabel}} :key="index"
:value="item.dictValue"
>
{{ item.dictLabel }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<button class="queryButton" @click="getCloudList()">查询</button> <button class="queryButton" @click="getCloudList()">查询</button>
<button class="queryButton" @click="cloudSearchReserve()"> 重置</button> <button class="queryButton" @click="cloudSearchReserve()">
重置
</button>
</a-row> </a-row>
</a-form> </a-form>
@ -87,20 +89,18 @@
> >
<div class="content-body-left"> <div class="content-body-left">
<div class="content-body-left-one"> <div class="content-body-left-one">
<div style="font-size:16px">{{item.BUSINESS_NAME}}</div> <div style="font-size: 16px">{{ item.BUSINESS_NAME }}</div>
<div>单号: {{item.BSNUM}}</div> <div>单号: {{ item.BSNUM }}</div>
</div> </div>
<div class="content-body-left-two"> <div class="content-body-left-two">
<!-- <div>申请类型: {{item.type}}</div> --> <!-- <div>申请类型: {{item.type}}</div> -->
<div>状态: {{item.STATUS}}</div> <div>状态: {{ item.STATUS }}</div>
<div>申请时间: {{item.CREATE_TIME}}</div> <div>申请时间: {{ item.CREATE_TIME }}</div>
</div> </div>
</div> </div>
<div class="content-body-right"> <div class="content-body-right">
<div class="button" @click="showCloudDetail(item)">查看详情</div> <div class="button" @click="showCloudDetail(item)">查看详情</div>
</div> </div>
</div> </div>
</div> </div>
<div class="bottom"> <div class="bottom">
@ -119,7 +119,7 @@
<a-empty v-else /> <a-empty v-else />
</template> </template>
<!--数据资源和视频资源--> <!--数据资源和视频资源-->
<template v-else-if="(chooseTab==1||chooseTab==3)"> <template v-else-if="chooseTab == 1 || chooseTab == 3">
<a-empty></a-empty> <a-empty></a-empty>
</template> </template>
<!--UCS内部资源--> <!--UCS内部资源-->
@ -145,7 +145,10 @@
{{ {{
item.cameraList item.cameraList
? item.system ? item.system
: item.title || item.name || item.title || item.BUSINESS_NAME : item.title ||
item.name ||
item.title ||
item.BUSINESS_NAME
}} }}
</template> </template>
<div class="content-body-title"> <div class="content-body-title">
@ -216,9 +219,13 @@
联系方式 联系方式
</div> </div>
<div class="button" @click="showDetail(item)">查看详情</div> <div class="button" @click="showDetail(item)">查看详情</div>
<div class="button" @click="showAdd(item)" v-if="item.backToFirst"> <!-- <div
class="button"
@click="showAdd(item)"
v-if="item.backToFirst"
>
修改 修改
</div> </div> -->
<svg <svg
t="1652233950228" t="1652233950228"
class="icon" class="icon"
@ -279,8 +286,6 @@
</div> </div>
<a-empty v-else /> <a-empty v-else />
</template> </template>
</div> </div>
<!-- 政务云资源详情--> <!-- 政务云资源详情-->
<a-modal <a-modal
@ -291,14 +296,8 @@
destroyOnClose="true" destroyOnClose="true"
:maskClosable="false" :maskClosable="false"
> >
<template v-slot:title> <template v-slot:title>申请详情</template>
申请详情 <cloud-details :BSNUM="BSNUM" :baseInfo="baseInfo"></cloud-details>
</template>
<cloud-details
:BSNUM="BSNUM"
:baseInfo="baseInfo"
></cloud-details>
</a-modal> </a-modal>
<a-modal <a-modal
bodyStyle="padding:0.1rem 0" bodyStyle="padding:0.1rem 0"
@ -385,7 +384,7 @@
getResourceBusinessList, getResourceBusinessList,
getVideoBusinessList, getVideoBusinessList,
getCategoryTreePage, getCategoryTreePage,
getZwyBusinessList getZwyBusinessList,
} from '@/api/personalCenter' } from '@/api/personalCenter'
import { import {
updateRes, updateRes,
@ -408,7 +407,7 @@
const router = useRouter() const router = useRouter()
const userName = ref('') const userName = ref('')
//云资源下拉框 //云资源下拉框
let cloudResourceStatusList=ref([]) let cloudResourceStatusList = ref([])
getUserInfo().then((res) => { getUserInfo().then((res) => {
userName.value = res.data.data.username userName.value = res.data.data.username
}) })
@ -416,14 +415,14 @@
// 西海岸-设备申请 // 西海岸-设备申请
let isXiHaiAn = whoShow.itShowXiHaiAn let isXiHaiAn = whoShow.itShowXiHaiAn
//选择展示的Tab页 //选择展示的Tab页
let chooseTab=ref(0) let chooseTab = ref(0)
//云资源查询条件 //云资源查询条件
let yunForm=reactive({ let yunForm = reactive({
status:'', status: '',
busineesName:'', busineesName: '',
}) })
let chooseList=ref(['UCS内部资源','数据资源','政务云资源','视频资源']) let chooseList = ref(['UCS内部资源', '数据资源', '政务云资源', '视频资源'])
let typeList = ref( [ let typeList = ref([
'能力申请', '能力申请',
'能力上架', '能力上架',
'能力下架', '能力下架',
@ -432,7 +431,6 @@
// '数据资源申请', // '数据资源申请',
// '云资源申请', // '云资源申请',
// '云视频申请', // '云视频申请',
]) ])
const itShowXiHaiAn = ref(isXiHaiAn) const itShowXiHaiAn = ref(isXiHaiAn)
@ -450,9 +448,7 @@
const contentList = reactive({ data: [] }) const contentList = reactive({ data: [] })
const contentList2 = reactive({ data: [] }) // 云资源 云视频前端过滤使用 const contentList2 = reactive({ data: [] }) // 云资源 云视频前端过滤使用
//政务云资源 //政务云资源
const cloudList = reactive({ data: [ const cloudList = reactive({ data: [] })
]})
let tabIndex = ref(0) let tabIndex = ref(0)
let typeIndex = ref(0) let typeIndex = ref(0)
let typeName = ref(typeList.value[0]) let typeName = ref(typeList.value[0])
@ -474,7 +470,7 @@
const detailsVisible = ref(false) const detailsVisible = ref(false)
const detailsVisible2 = ref(false) const detailsVisible2 = ref(false)
//政务云资源详情 //政务云资源详情
const cloudVisible=ref(false) const cloudVisible = ref(false)
const businessKey = ref('') const businessKey = ref('')
const processInstanceId = ref('') const processInstanceId = ref('')
const processDefinitionName = ref('') const processDefinitionName = ref('')
@ -515,16 +511,16 @@
getApplyList() getApplyList()
} }
//选择tab //选择tab
const handleTab=(index)=>{ const handleTab = (index) => {
chooseTab.value=index chooseTab.value = index
if(index==2){ if (index == 2) {
//查询政务云状态 //查询政务云状态
getCloudResource() getCloudResource()
getCloudList() getCloudList()
} }
} }
const cloudSearchReserve = () =>{ const cloudSearchReserve = () => {
Object.keys(yunForm).map(key => { Object.keys(yunForm).map((key) => {
delete yunForm[key] delete yunForm[key]
}) })
getCloudList() getCloudList()
@ -532,19 +528,17 @@
//查询政务云数据 //查询政务云数据
const getCloudList = () => { const getCloudList = () => {
const params = { const params = {
pageNum : page.value, pageNum: page.value,
pageSize : 5, pageSize: 5,
status:yunForm.status, status: yunForm.status,
name :yunForm.busineesName name: yunForm.busineesName,
} }
total.value = 5 total.value = 5
getZwyBusinessList(params).then( getZwyBusinessList(params).then((res) => {
(res) => {
cloudList.data = res.data.data.list cloudList.data = res.data.data.list
num.value = [] num.value = []
total.value = res.data.data.total total.value = res.data.data.total
} })
)
} }
//查询政务云状态 //查询政务云状态
const getCloudResource = () => { const getCloudResource = () => {
@ -556,8 +550,7 @@
}).then((res) => { }).then((res) => {
cloudResourceStatusList.value = res.data.data.list cloudResourceStatusList.value = res.data.data.list
}) })
} }
// 申请状态切换 // 申请状态切换
function changeApplyState(item, index) { function changeApplyState(item, index) {
@ -622,12 +615,11 @@
} }
const cilckRowData = ref({}) const cilckRowData = ref({})
//查看政务云详情 //查看政务云详情
const showCloudDetail=(item)=>{ const showCloudDetail = (item) => {
//待完成 //待完成
cloudVisible.value = true cloudVisible.value = true
BSNUM.value=item.BSNUM BSNUM.value = item.BSNUM
baseInfo.value=item baseInfo.value = item
} }
const showDetail = (item) => { const showDetail = (item) => {
cilckRowData.value = item cilckRowData.value = item
@ -757,6 +749,7 @@
oInput.remove() oInput.remove()
} }
const showAdd = (item) => { const showAdd = (item) => {
console.log('item', item)
if (item.processDefinitionKey == 'resourcemountapply') { if (item.processDefinitionKey == 'resourcemountapply') {
const data = { const data = {
id: item.resourceId, id: item.resourceId,
@ -980,7 +973,6 @@
case 1: case 1:
contentList.data.map((val) => { contentList.data.map((val) => {
nengliziyuanshangjiaapply(val.businessKey).then((res1) => { nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
val.title = res1.data.data.resourceDTO.name val.title = res1.data.data.resourceDTO.name
val.dto = res1.data.data.resourceDTO val.dto = res1.data.data.resourceDTO
showType.value = '能力上架' showType.value = '能力上架'
@ -1034,23 +1026,20 @@
} }
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
page.value = val page.value = val
if(chooseTab==2){ if (chooseTab.value == 2) {
getCloudList() getCloudList()
}else{ } else {
getApplyList() getApplyList()
} }
} }
const handlePageSizeChange = (val) => { const handlePageSizeChange = (val) => {
page.value = val page.value = val
if(chooseTab==2){ if (chooseTab.value == 2) {
getCloudList() getCloudList()
}else{ } else {
getApplyList() getApplyList()
} }
} }
const viewDetail = (processDefinitionName, id, ended, businessKey) => { const viewDetail = (processDefinitionName, id, ended, businessKey) => {
@ -1164,7 +1153,6 @@
phoneVisible.value = true phoneVisible.value = true
} }
mybus.on('closeModal', (obj) => { mybus.on('closeModal', (obj) => {
detailsVisible.value = false detailsVisible.value = false
changeType(obj.type, obj.index) changeType(obj.type, obj.index)
@ -1183,15 +1171,15 @@
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.queryButton{ .queryButton {
background: #0058e1; background: #0058e1;
width: 80px; width: 80px;
height: 32px; height: 32px;
margin-left: 20px; margin-left: 20px;
border:1px solid #0058e1; border: 1px solid #0058e1;
border-radius: 2px; border-radius: 2px;
color:#fff; color: #fff;
} }
.on-the-right-side-of-the-list { .on-the-right-side-of-the-list {
background: #ffffff; background: #ffffff;
padding: 20px 0px 30px 20px; padding: 20px 0px 30px 20px;
@ -1216,20 +1204,19 @@
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
display: table; display: table;
}
} .chooseStyle {
.chooseStyle {
display: table-cell; display: table-cell;
width: 25%; width: 25%;
color: #fff; color: #fff;
background-color: #0058e1; background-color: #0058e1;
font-weight: bolder; font-weight: bolder;
} }
.noChooseStyle{ .noChooseStyle {
display: table-cell; display: table-cell;
width: 25%; width: 25%;
} }
.title { .title {
font-size: 20px; font-size: 20px;
color: #000000; color: #000000;
@ -1288,56 +1275,46 @@
color: #0087ff; color: #0087ff;
} }
} }
.content-cloud{ .content-cloud {
padding: 0px 10px; padding: 0px 10px;
overflow-y: scroll; overflow-y: scroll;
height: 610px; height: 610px;
.content-cloud-body{ .content-cloud-body {
height: 100px; height: 100px;
height: 100px; height: 100px;
margin-bottom: 10px; margin-bottom: 10px;
border-bottom: 1px solid #cccccc; border-bottom: 1px solid #cccccc;
.content-body-left{ .content-body-left {
width:85%; width: 85%;
float: left; float: left;
.content-body-left-one {
.content-body-left-one{
display: table; display: table;
height: 50px; height: 50px;
width: 80%; width: 80%;
div{ div {
display: table-cell; display: table-cell;
width: 50%; width: 50%;
font-size:14px; font-size: 14px;
} }
} }
.content-body-left-two{ .content-body-left-two {
width: 80%; width: 80%;
height: 50px; height: 50px;
display: table; display: table;
div{ div {
display: table-cell; display: table-cell;
width: 30%; width: 30%;
font-size:14px; font-size: 14px;
} }
} }
} }
.content-body-right{ .content-body-right {
width:15%; width: 15%;
float: left; float: left;
} }
} }
}
}
.content { .content {
padding-right: 10px; padding-right: 10px;
height: 610px; height: 610px;

12
front/src/views/personalCenter/components/MyBrowse.vue
View File

@ -377,12 +377,20 @@
openHref(item) openHref(item)
} else { } else {
mybus.emit('tabsChange', { flag: id }) mybus.emit('tabsChange', { flag: id })
router.push({ // router.push({
path: '/details', // path: '/details',
// query: {
// id: id,
// },
// })
const detailPage = router.resolve({
path: '/details', // 跳转的页面路由
query: { query: {
id: id, id: id,
hiddenBackFlag: true,
}, },
}) })
window.open(detailPage.href, '_blank')
} }
} }
} }

12
front/src/views/personalCenter/components/MyComments.vue
View File

@ -71,12 +71,20 @@
const showDetail = (item) => { const showDetail = (item) => {
console.log('demandDetails', item) console.log('demandDetails', item)
// store.commit('home/demandDetailsData', item) // store.commit('home/demandDetailsData', item)
router.push({ // router.push({
path: '/demandDetails', // path: '/demandDetails',
// query: {
// id: item.demandDataDTO.id,
// },
// })
const detailPage = router.resolve({
path: '/demandDetails', // 跳转的页面路由
query: { query: {
id: item.demandDataDTO.id, id: item.demandDataDTO.id,
hiddenBackFlag: true,
}, },
}) })
window.open(detailPage.href, '_blank')
} }
const total = ref() const total = ref()

14
front/src/views/personalCenter/components/MyPublish.vue
View File

@ -395,13 +395,15 @@
const showDetail = (item) => { const showDetail = (item) => {
console.log('showDetail', item, item.id) console.log('showDetail', item, item.id)
if (item.delFlag == 0) { if (item.delFlag == 0) {
router.push({ const detailPage = router.resolve({
path: '/details', path: '/details', // 跳转的页面路由
query: { query: {
id: item.id, id: item.id,
hiddenBackFlag: true,
}, },
}) })
newpage window.open(detailPage.href, '_blank')
// newpage
} }
// getProcDefBizRoute(item.processDefinitionId) // getProcDefBizRoute(item.processDefinitionId)
// detailsVisible.value = true // detailsVisible.value = true
@ -445,9 +447,9 @@
limt.value = size limt.value = size
getApplyList(tabname.value) getApplyList(tabname.value)
} }
const newpage = router.resolve({ // const newpage = router.resolve({
path: '/nenglishangjia', // 跳转的页面路由 // path: '/nenglishangjia', // 跳转的页面路由
}) // })
// const nenglishangjia = () => { // const nenglishangjia = () => {
// window.open(newpage.href, '_blank') // window.open(newpage.href, '_blank')
// // router.resolve('/nenglishangjia') // // router.resolve('/nenglishangjia')

461
front/src/views/personalCenter/components/PurchaseVehicle.vue
View File

@ -12,19 +12,40 @@
</div> </div>
<div class="right"> <div class="right">
<div class="sousuokuang"> <div class="sousuokuang">
<a-input-search v-model:value="name" placeholder="请输入关键词" enter-button="搜索" size="large" <a-input-search
@search="getList('init')" /> v-model:value="name"
placeholder="请输入关键词"
enter-button="搜索"
size="large"
@search="getList('init')"
/>
</div> </div>
<a-popconfirm v-if="checkedListAbility.length != 0" title="是否进行批量删除?" ok-text="是" cancel-text="否" <a-popconfirm
@confirm="handleDelete" @cancel="cancel"> v-if="checkedListAbility.length != 0"
title="是否进行批量删除?"
ok-text="是"
cancel-text="否"
@confirm="handleDelete"
@cancel="cancel"
>
<a-button type="primary" class="collect-btn" @click="ceshiFunction()"> <a-button type="primary" class="collect-btn" @click="ceshiFunction()">
批量删除 批量删除
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
<a-button v-else type="primary" class="collect-btn" @click="ceshiFunction()"> <a-button
v-else
type="primary"
class="collect-btn"
@click="ceshiFunction()"
>
批量删除 批量删除
</a-button> </a-button>
<a-button type="primary" v-if="!itShowXiHaiAn" class="collect-btn" @click="collection"> <a-button
type="primary"
v-if="!itShowXiHaiAn"
class="collect-btn"
@click="collection"
>
批量收藏 批量收藏
</a-button> </a-button>
<a-button type="primary" class="apply-btn" @click="apply"> <a-button type="primary" class="apply-btn" @click="apply">
@ -36,9 +57,12 @@
<div class="item" v-for="(val, valIndex) in list" :key="val.id"> <div class="item" v-for="(val, valIndex) in list" :key="val.id">
<div class="item-top" @click="showBottom(val)"> <div class="item-top" @click="showBottom(val)">
<div> <div>
<a-checkbox :checked="val.checked" @click.stop="checkedDept(val)"></a-checkbox> <a-checkbox
:checked="val.checked"
@click.stop="checkedDept(val)"
></a-checkbox>
<span style="margin-left: 0.2rem" v-if="itShowXiHaiAn"> <span style="margin-left: 0.2rem" v-if="itShowXiHaiAn">
{{ val.deptName}} {{ val.deptName }}
</span> </span>
<span style="margin-left: 0.2rem" v-else> <span style="margin-left: 0.2rem" v-else>
{{ val.deptName + '(' + val.count + ')' }} {{ val.deptName + '(' + val.count + ')' }}
@ -48,33 +72,45 @@
<UpOutlined v-show="val.show" /> <UpOutlined v-show="val.show" />
</div> </div>
<div class="item-bottom" v-show="val.show"> <div class="item-bottom" v-show="val.show">
<a-list class="demo-loadmore-list" :loading="val.initLoading" item-layout="horizontal" <a-list
:data-source="val.children"> class="demo-loadmore-list"
:loading="val.initLoading"
item-layout="horizontal"
:data-source="val.children"
>
<template #renderItem="{ item }"> <template #renderItem="{ item }">
<a-list-item> <a-list-item>
<a-skeleton avatar :title="false" :loading="item.loading" active> <a-skeleton avatar :title="false" :loading="item.loading" active>
<a-list-item-meta :description=" <a-list-item-meta
:description="
item.description || item.description ||
(item.note1 && JSON.parse(item.note1) && (item.note1 &&
JSON.parse(item.note1) &&
JSON.parse(item.note1)[0] && JSON.parse(item.note1)[0] &&
JSON.parse(item.note1)[0].channelName + JSON.parse(item.note1)[0].channelName +
'等' + '等' +
JSON.parse(item.note1).length + JSON.parse(item.note1).length +
'个摄像头') || '个摄像头') ||
'' ''
" style="position: relative"> "
style="position: relative"
>
<template #title> <template #title>
<div> <div>
<a-tooltip> <a-tooltip>
<template #title>{{ item.resourceName }}</template> <template #title>{{ item.resourceName }}</template>
<span @click=" <span
@click="
showItem( showItem(
item.resourceId, item.resourceId,
item.type, item.type,
item.delFlag, item.delFlag,
item.note1 item.note1
) )
" style="cursor: pointer" class="name"> "
style="cursor: pointer"
class="name"
>
{{ item.resourceName }} {{ item.resourceName }}
</span> </span>
</a-tooltip> </a-tooltip>
@ -82,42 +118,80 @@
</div> </div>
<!-- // todo --> <!-- // todo -->
<span class="time"> <span class="time">
<span v-if="!itShowXiHaiAn">加购时间:{{ item.time }}</span> <span v-if="!itShowXiHaiAn">
<a-popconfirm title="是否删除该记录?" ok-text="是" cancel-text="否" @confirm="handleDelete(item, valIndex)" 加购时间:{{ item.time }}
@cancel="cancel"> </span>
<a-button type="primary" style=" <a-popconfirm
title="是否删除该记录?"
ok-text="是"
cancel-text="否"
@confirm="handleDelete(item, valIndex)"
@cancel="cancel"
>
<a-button
type="primary"
style="
width: 0.7rem; width: 0.7rem;
height: 0.3rem; height: 0.3rem;
margin-left: 0.12rem; margin-left: 0.12rem;
border-radius: 2px; border-radius: 2px;
background: #fff; background: #fff;
color: #0558e1; color: #0558e1;
" @click="del"> "
@click="del"
>
删除 删除
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
</span> </span>
<svg t="1652233950228" class="icon" viewBox="0 0 1024 1024" version="1.1" <svg
xmlns="http://www.w3.org/2000/svg" p-id="5970" data-spm-anchor-id="a313x.7781069.0.i8" width="50" t="1652233950228"
height="50" v-if="item.delFlag == 4 || item.delFlag == 5" class="icon"
style="position: absolute; top: 0; left: 1rem"> viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="5970"
data-spm-anchor-id="a313x.7781069.0.i8"
width="50"
height="50"
v-if="item.delFlag == 4 || item.delFlag == 5"
style="position: absolute; top: 0; left: 1rem"
>
<path <path
d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z" d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
fill="#515151" opacity=".5" p-id="5971"></path> fill="#515151"
opacity=".5"
p-id="5971"
></path>
<path <path
d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z" d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z"
fill="#515151" opacity=".5" p-id="5972"></path> fill="#515151"
opacity=".5"
p-id="5972"
></path>
<path <path
d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z" d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z"
fill="#515151" opacity=".5" p-id="5973"></path> fill="#515151"
opacity=".5"
p-id="5973"
></path>
<path <path
d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z" d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z"
fill="#515151" opacity=".5" p-id="5974"></path> fill="#515151"
opacity=".5"
p-id="5974"
></path>
</svg> </svg>
</template> </template>
<template #avatar> <template #avatar>
<a-checkbox :checked="item.checked" @click.stop="checkedItem(val, item)"></a-checkbox> <a-checkbox
<div class="tx" v-if="!itShowXiHaiAn" :class=" :checked="item.checked"
@click.stop="checkedItem(val, item)"
></a-checkbox>
<div
class="tx"
v-if="!itShowXiHaiAn"
:class="
item.type == '基础设施' item.type == '基础设施'
? 'sxt' ? 'sxt'
: item.type == '应用资源' : item.type == '应用资源'
@ -131,19 +205,28 @@
: item.componentType == '业务组件' : item.componentType == '业务组件'
? 'ywzj' ? 'ywzj'
: '' : ''
"></div> "
></div>
</template> </template>
</a-list-item-meta> </a-list-item-meta>
</a-skeleton> </a-skeleton>
</a-list-item> </a-list-item>
</template> </template>
</a-list> </a-list>
</div> </div>
</div> </div>
</div> </div>
<a-modal v-model:visible="videoVisible" title="已申请摄像头列表" @ok="videoVisible = false"> <a-modal
<a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{ defaultPageSize: 6 }"> v-model:visible="videoVisible"
title="已申请摄像头列表"
@ok="videoVisible = false"
>
<a-table
:columns="columns"
:data-source="xVideoList"
bordered
:pagination="{ defaultPageSize: 6 }"
>
<template #bodyCell="{ column, text }"> <template #bodyCell="{ column, text }">
<!-- <template> <!-- <template>
<a>{{ text }}</a> <a>{{ text }}</a>
@ -151,53 +234,52 @@
</template> </template>
</a-table> </a-table>
</a-modal> </a-modal>
</template> </template>
<script setup> <script setup>
import { onMounted, ref } from 'vue' import { onMounted, ref } from 'vue'
import { UpOutlined, DownOutlined } from '@ant-design/icons-vue' import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { message } from 'ant-design-vue' import { message } from 'ant-design-vue'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import { import {
sgcDel, sgcDel,
scInsert, scInsert,
selectResourceCarGroupByDept, selectResourceCarGroupByDept,
selectResourceListByDept, selectResourceListByDept,
selectResourceListByDeptName, selectResourceListByDeptName,
} from '@/api/personalCenter' } from '@/api/personalCenter'
const router = useRouter() const router = useRouter()
// 分页 // 分页
const pageNum = ref('1') const pageNum = ref('1')
const pageSize = ref('99999') const pageSize = ref('99999')
const videoVisible = ref(false) const videoVisible = ref(false)
const xVideoList = ref([]) const xVideoList = ref([])
const total = ref(0) const total = ref(0)
const load = ref(0) const load = ref(0)
// 多选框 // 多选框
const checkedList = ref([]) const checkedList = ref([])
const checkedListAll = ref([]) const checkedListAll = ref([])
const checkedListAbility = ref([]) const checkedListAbility = ref([])
const checkAll = ref(false) const checkAll = ref(false)
const checkNum = ref(0) const checkNum = ref(0)
const showKey = ref(0) const showKey = ref(0)
const columns = ref([ const columns = ref([
{ {
title: '摄像头名称', title: '摄像头名称',
dataIndex: 'name', dataIndex: 'name',
}, },
]) ])
// 筛选条件 // 筛选条件
const name = ref('') const name = ref('')
const type = ref('') const type = ref('')
const list = ref([]) const list = ref([])
const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn); const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn)
// 初始化 // 初始化
onMounted(() => { onMounted(() => {
getList('init') getList('init')
}) })
// 收藏 // 收藏
const collection = () => { const collection = () => {
let scArr = [] let scArr = []
if (checkedListAbility.value.length === 0) { if (checkedListAbility.value.length === 0) {
message.warning('请选择需要收藏的数据') message.warning('请选择需要收藏的数据')
@ -229,9 +311,9 @@ const collection = () => {
message.warning('下架的数据无法收藏') message.warning('下架的数据无法收藏')
} }
} }
} }
// 全选按钮 // 全选按钮
const onCheckAllChange = () => { const onCheckAllChange = () => {
if (checkAll.value) { if (checkAll.value) {
list.value.forEach((val) => { list.value.forEach((val) => {
if (checkedList.value.indexOf(val.deptId) == -1) { if (checkedList.value.indexOf(val.deptId) == -1) {
@ -268,9 +350,9 @@ const onCheckAllChange = () => {
}) })
// console.log(checkAll.value, checkedList.value) // console.log(checkAll.value, checkedList.value)
} }
} }
// 处理child // 处理child
const handleChild = (val) => { const handleChild = (val) => {
if (val.children.length > 0) { if (val.children.length > 0) {
val.children.map((item) => { val.children.map((item) => {
// console.log('child=============>', checkedListAbility.value, item) // console.log('child=============>', checkedListAbility.value, item)
@ -284,10 +366,10 @@ const handleChild = (val) => {
} }
}) })
} }
} }
// 反选 // 反选
const reverseSelectionFalg = ref(false) const reverseSelectionFalg = ref(false)
const reverseSelection = () => { const reverseSelection = () => {
// console.log( // console.log(
// '点击反选==============>', // '点击反选==============>',
// checkedList.value, // checkedList.value,
@ -340,9 +422,9 @@ const reverseSelection = () => {
}) })
} }
reverseSelectionFalg.value = !reverseSelectionFalg.value reverseSelectionFalg.value = !reverseSelectionFalg.value
} }
// 重置 // 重置
const clean = (index) => { const clean = (index) => {
name.value = '' name.value = ''
type.value = '' type.value = ''
pageNum.value = '1' pageNum.value = '1'
@ -353,9 +435,9 @@ const clean = (index) => {
checkAll.value = false checkAll.value = false
showKey.value++ showKey.value++
getList('', index) getList('', index)
} }
// 获取信息 // 获取信息
const getList = (type, index) => { const getList = (type, index) => {
console.log(type, index) console.log(type, index)
if (type == 'init') { if (type == 'init') {
pageNum.value = 1 pageNum.value = 1
@ -366,7 +448,7 @@ const getList = (type, index) => {
pageSize: pageSize.value, pageSize: pageSize.value,
name: name.value, name: name.value,
}).then((res) => { }).then((res) => {
console.log('res---获取信息--------->', res); console.log('res---获取信息--------->', res)
if (res.data.code !== 0) { if (res.data.code !== 0) {
return message.error(res.data.msg) return message.error(res.data.msg)
} }
@ -397,7 +479,7 @@ const getList = (type, index) => {
// console.log('整体页面加载次数===============>', load.value) // console.log('整体页面加载次数===============>', load.value)
// 判断是否有已打开项，如果有重新载入之后自动打开 // 判断是否有已打开项，如果有重新载入之后自动打开
list.value = res.data.data.list || [] list.value = res.data.data.list || []
console.log('list.value------------>', list.value); console.log('list.value------------>', list.value)
if (index || index === 0) { if (index || index === 0) {
list.value[index].show = true list.value[index].show = true
@ -409,31 +491,31 @@ const getList = (type, index) => {
getListByDeptId(list.value[0]) getListByDeptId(list.value[0])
} }
}) })
} }
// 通过deptid查询列表 // 通过deptid查询列表
const getListByDeptId = async (item) => { const getListByDeptId = async (item) => {
console.log('通过deptid或者deptName查询列表------------>', item); console.log('通过deptid或者deptName查询列表------------>', item)
if (item.children.length == 0) { if (item.children.length == 0) {
let _obj = { let _obj = {
pageNum: item.pageNum, pageNum: item.pageNum,
pageSize: item.pageSize, pageSize: item.pageSize,
name: name.value, name: name.value,
} }
let res; let res
// 西海岸 todo // 西海岸 todo
if (whoShow.itShowXiHaiAn) { if (whoShow.itShowXiHaiAn) {
_obj.deptName = item.deptName; _obj.deptName = item.deptName
res = await selectResourceListByDeptName(_obj) res = await selectResourceListByDeptName(_obj)
} else { } else {
_obj.deptId = item.deptId || ''; _obj.deptId = item.deptId || ''
res = await selectResourceListByDept(_obj) res = await selectResourceListByDept(_obj)
} }
console.log('res----根据部门查询-------->', res); console.log('res----根据部门查询-------->', res)
item.initLoading = false item.initLoading = false
if (res.data.code !== 0) { if (res.data.code !== 0) {
return message.error(res.data.msg) return message.error(res.data.msg)
} }
(res.data.data || []).map((val) => { ;(res.data.data || []).map((val) => {
if ( if (
(!item.load || item.load < Number(item.pageNum)) && (!item.load || item.load < Number(item.pageNum)) &&
load.value <= Number(pageNum.value) load.value <= Number(pageNum.value)
@ -473,30 +555,30 @@ const getListByDeptId = async (item) => {
item.children = res.data.data item.children = res.data.data
item.show = true item.show = true
} }
} }
// 显示资源信息 // 显示资源信息
const showBottom = (item) => { const showBottom = (item) => {
debugger debugger
item.show = !item.show item.show = !item.show
if (item.show) { if (item.show) {
getListByDeptId(item) getListByDeptId(item)
} }
} }
const showNew = (item) => { const showNew = (item) => {
getListByDeptId(item) getListByDeptId(item)
} }
// 切换页数 // 切换页数
const pageChange = (val) => { const pageChange = (val) => {
checkAll.value = false checkAll.value = false
pageNum.value = val pageNum.value = val
getList('changePage') getList('changePage')
} }
// 能力内分页 // 能力内分页
const pageChange2 = (item) => { const pageChange2 = (item) => {
getListByDeptId(item) getListByDeptId(item)
} }
// 点击部门多选框 // 点击部门多选框
const checkedDept = (item) => { const checkedDept = (item) => {
console.log( console.log(
'点击部门多选框==================>', '点击部门多选框==================>',
item, item,
@ -507,7 +589,7 @@ const checkedDept = (item) => {
if (item.checked) { if (item.checked) {
if (item.children.length > 0) { if (item.children.length > 0) {
item.children.map((val) => { item.children.map((val) => {
console.log('val.id------------>', val.id); console.log('val.id------------>', val.id)
if (checkedListAbility.value.indexOf(val.id) == -1) { if (checkedListAbility.value.indexOf(val.id) == -1) {
checkedListAbility.value.push(val.id) checkedListAbility.value.push(val.id)
item.checkedList.push(val.id) item.checkedList.push(val.id)
@ -547,9 +629,9 @@ const checkedDept = (item) => {
} }
checkNum.value -= Number(item.count) checkNum.value -= Number(item.count)
} }
} }
// 判断是否全选 // 判断是否全选
const judgeAll = (item, val) => { const judgeAll = (item, val) => {
console.log( console.log(
'判断是否全选============>', '判断是否全选============>',
item, item,
@ -582,9 +664,9 @@ const judgeAll = (item, val) => {
item.checked = false item.checked = false
} }
} }
} }
// 点击能力 // 点击能力
const checkedItem = (val, item) => { const checkedItem = (val, item) => {
// console.log('点击能力===========>', val, item, checkedListAbility.value) // console.log('点击能力===========>', val, item, checkedListAbility.value)
item.checked = !item.checked item.checked = !item.checked
if (item.checked) { if (item.checked) {
@ -623,9 +705,9 @@ const checkedItem = (val, item) => {
checkAll.value = false checkAll.value = false
} }
} }
} }
// 删除按钮 // 删除按钮
const delList = () => { const delList = () => {
if (checkedListAbility.value.length == 0) { if (checkedListAbility.value.length == 0) {
message.warning('请先选择需要操作的数据！') message.warning('请先选择需要操作的数据！')
} else { } else {
@ -640,20 +722,20 @@ const delList = () => {
} }
}) })
} }
} }
//ceshiFunction //ceshiFunction
const ceshiFunction = () => { const ceshiFunction = () => {
// debugger // debugger
if (checkedListAbility.value.length == 0) { if (checkedListAbility.value.length == 0) {
message.warning('请先选择需要操作的数据！') message.warning('请先选择需要操作的数据！')
} }
} }
// delOne delList handleDelete // delOne delList handleDelete
const handleDelete = (item, index) => { const handleDelete = (item, index) => {
console.log('item, index------------>', item, index); console.log('item, index------------>', item, index)
console.log('item------------>', item); console.log('item------------>', item)
let delArr = []; let delArr = []
// 单个删除 // 单个删除
if (index) { if (index) {
delArr = [item.id] delArr = [item.id]
@ -666,7 +748,7 @@ const handleDelete = (item, index) => {
} }
} }
sgcDel({ sgcDel({
ids: delArr ids: delArr,
}).then((res) => { }).then((res) => {
if (res.data.msg === 'success') { if (res.data.msg === 'success') {
message.success('删除成功') message.success('删除成功')
@ -676,12 +758,12 @@ const handleDelete = (item, index) => {
// val.show = true // val.show = true
} }
}) })
} }
const cancel = (e) => { const cancel = (e) => {
// console.log(e) // console.log(e)
} }
// 详情 // 详情
const showItem = (id, type, delFlag, note1) => { const showItem = (id, type, delFlag, note1) => {
if (type == '基础设施') { if (type == '基础设施') {
// console.log() // console.log()
let arr = JSON.parse(note1) let arr = JSON.parse(note1)
@ -694,30 +776,38 @@ const showItem = (id, type, delFlag, note1) => {
if (delFlag == 0) { if (delFlag == 0) {
window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle')) window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
mybus.emit('tabsChange', { flag: id }) mybus.emit('tabsChange', { flag: id })
router.push({ // router.push({
path: '/details', // path: '/details',
// query: {
// id: id,
// },
// })
const detailPage = router.resolve({
path: '/details', // 跳转的页面路由
query: { query: {
id: id, id: id,
hiddenBackFlag: true,
}, },
}) })
window.open(detailPage.href, '_blank')
} }
} }
} }
// 一键申请 // 一键申请
const apply = () => { const apply = () => {
if (checkedListAbility.value.length == 0) { if (checkedListAbility.value.length == 0) {
message.warning('请先选择需要申请的数据！') message.warning('请先选择需要申请的数据！')
} else { } else {
let arr = [] let arr = []
let delArr = [] let delArr = []
console.log('list.value------------>', list.value); console.log('list.value------------>', list.value)
list.value.map((val) => { list.value.map((val) => {
val.arr = val.children.filter((item) => { val.arr = val.children.filter((item) => {
if (whoShow.itShowXiHaiAn) { if (whoShow.itShowXiHaiAn) {
item.type = '基础设施'; item.type = '基础设施'
item.resourceName = '摄像头列表'; item.resourceName = '摄像头列表'
item.resourceId = '1522550195055828996'; item.resourceId = '1522550195055828996'
} }
console.log('选择的数据=============>', item) console.log('选择的数据=============>', item)
if (checkedListAbility.value.indexOf(item.id) > -1) { if (checkedListAbility.value.indexOf(item.id) > -1) {
@ -741,11 +831,10 @@ const apply = () => {
}) })
} }
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.ant-list { .ant-list {
// max-height: 5.3rem; // max-height: 5.3rem;
.ant-list-item { .ant-list-item {
width: 100%; width: 100%;
@ -785,13 +874,13 @@ const apply = () => {
} }
} }
} }
} }
.ant-list::-webkit-scrollbar { .ant-list::-webkit-scrollbar {
width: 0 !important; width: 0 !important;
} }
.top { .top {
margin: 0.1rem; margin: 0.1rem;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -868,18 +957,18 @@ const apply = () => {
} }
} }
} }
} }
.title { .title {
font-size: 0.2rem; font-size: 0.2rem;
color: #000000; color: #000000;
font-family: 'Alibaba PuHuiTi'; font-family: 'Alibaba PuHuiTi';
font-weight: 500; font-weight: 500;
margin-top: 0.2rem; margin-top: 0.2rem;
margin-left: 0.2rem; margin-left: 0.2rem;
} }
.tab { .tab {
margin-top: 0.1rem; margin-top: 0.1rem;
margin-left: 0.2rem; margin-left: 0.2rem;
margin-bottom: 0.1rem; margin-bottom: 0.1rem;
@ -902,22 +991,22 @@ const apply = () => {
border: 0.01rem solid #0087ff; border: 0.01rem solid #0087ff;
color: #0087ff; color: #0087ff;
} }
} }
.name { .name {
max-width: 4.15rem; max-width: 4.15rem;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
-o-text-overflow: ellipsis; -o-text-overflow: ellipsis;
word-break: break-all; word-break: break-all;
} }
.name:hover { .name:hover {
color: #0087ff; color: #0087ff;
} }
.items { .items {
height: 7.25rem; height: 7.25rem;
padding: 0 0.3rem; padding: 0 0.3rem;
overflow-y: scroll; overflow-y: scroll;
@ -952,55 +1041,55 @@ const apply = () => {
border: 1px solid rgba(0, 135, 225, 0.1); border: 1px solid rgba(0, 135, 225, 0.1);
} }
} }
} }
:deep(.ant-list-item-meta-avatar) { :deep(.ant-list-item-meta-avatar) {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.ant-pagination { .ant-pagination {
margin-bottom: 0.2rem; margin-bottom: 0.2rem;
} }
.tx { .tx {
display: inline-block; display: inline-block;
width: 0.8rem; width: 0.8rem;
height: 0.8rem; height: 0.8rem;
margin-left: 0.1rem; margin-left: 0.1rem;
} }
.sxt { .sxt {
background: url('~@/assets/home/sxt_square.png') no-repeat; background: url('~@/assets/home/sxt_square.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.yyzy { .yyzy {
background: url('~@/assets/home/yyzy_square.png') no-repeat; background: url('~@/assets/home/yyzy_square.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.znsf { .znsf {
background: url('~@/assets/home/znsf_square.png') no-repeat; background: url('~@/assets/home/znsf_square.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.tcfw { .tcfw {
background: url('~@/assets/home/tcfw_square.png') no-repeat; background: url('~@/assets/home/tcfw_square.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.kfzj { .kfzj {
background: url('~@/assets/home/kfzj_square.png') no-repeat; background: url('~@/assets/home/kfzj_square.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.ywzj { .ywzj {
background: url('~@/assets/home/ywzj_square.png') no-repeat; background: url('~@/assets/home/ywzj_square.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
:deep(.ant-list-item-meta-title) { :deep(.ant-list-item-meta-title) {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
@ -1009,20 +1098,20 @@ const apply = () => {
display: flex; display: flex;
align-items: center; align-items: center;
} }
} }
.collect-btn { .collect-btn {
width: 1rem; width: 1rem;
height: 0.36rem; height: 0.36rem;
border-radius: 2px; border-radius: 2px;
background: #fff; background: #fff;
color: #0558e1; color: #0558e1;
} }
.apply-btn { .apply-btn {
width: 1rem; width: 1rem;
height: 0.36rem; height: 0.36rem;
margin-left: 0.12rem; margin-left: 0.12rem;
border-radius: 2px; border-radius: 2px;
} }
</style> </style>

26
front/src/views/personalCenter/index.vue
View File

@ -6,20 +6,28 @@
<aside-menu></aside-menu> <aside-menu></aside-menu>
</aside> </aside>
<article> <article>
<!-- 我的申请 -->
<div class="form-container"> <div class="form-container">
<template v-if="showFlag === 'apply'"> <template v-if="showFlag === 'apply'">
<my-apply-xha v-if="xinhaian" :tabTypeName="tabTypeName"></my-apply-xha> <my-apply-xha
v-if="xinhaian"
:tabTypeName="tabTypeName"
></my-apply-xha>
<my-apply v-else :tabTypeName="tabTypeName"></my-apply> <my-apply v-else :tabTypeName="tabTypeName"></my-apply>
</template> </template>
<!-- 我的发布 -->
<my-publish v-if="showFlag === 'push'"></my-publish> <my-publish v-if="showFlag === 'push'"></my-publish>
<!-- 申购车 -->
<purchase-vehicle <purchase-vehicle
v-if="showFlag === 'PurchaseVehicle'" v-if="showFlag === 'PurchaseVehicle'"
></purchase-vehicle> ></purchase-vehicle>
<!-- 我的收藏 -->
<collection v-else-if="showFlag === 'collect'"></collection> <collection v-else-if="showFlag === 'collect'"></collection>
<!-- 我的需求 -->
<my-application v-else-if="showFlag === 'demand'"></my-application> <my-application v-else-if="showFlag === 'demand'"></my-application>
<!-- 我的评论 -->
<my-comments v-else-if="showFlag === 'remark'"></my-comments> <my-comments v-else-if="showFlag === 'remark'"></my-comments>
<!-- 我的浏览 -->
<my-browse v-else-if="showFlag === 'recent'"></my-browse> <my-browse v-else-if="showFlag === 'recent'"></my-browse>
</div> </div>
</article> </article>
@ -76,30 +84,30 @@
background-color: #f5f8fc; background-color: #f5f8fc;
height: 100%; height: 100%;
width: 100%; width: 100%;
margin: 64px auto 0; margin: 0.64rem auto 0;
display: flex; display: flex;
justify-content: center; justify-content: center;
position: relative; position: relative;
aside { aside {
width: 282px; width: 2.82rem;
height: 96%; height: 96%;
overflow-y: auto; overflow-y: auto;
background-color: #fff; background-color: #fff;
margin: 1% 0 3%; margin: 1% 0 3%;
} }
article { article {
width: 1090px; width: 10.9rem;
height: 99%; height: 99%;
// overflow-y: auto; // overflow-y: auto;
background-color: #fff; background-color: #fff;
margin: 1% 0 1% 14px; margin: 1% 0 1% 0.14rem;
} }
.form-container { .form-container {
.title { .title {
font-size: 20px; font-size: 0.2rem;
color: #000; color: #000;
font-weight: bold; font-weight: bold;
margin-bottom: 20px; margin-bottom: 0.2rem;
} }
} }
} }