Compare commits
2 Commits
636318536b
...
c5d7351809
| Author | SHA1 | Date |
|---|---|---|
 guoyue
|
c5d7351809 | |
|
guoyue
|
1ccd81cd66 |
|
|
@ -1,8 +1,8 @@
|
|||
<!--
|
||||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-03-29 16:45:25
|
||||
* @LastEditors: hisense.liangjunhua
|
||||
* @LastEditTime: 2022-08-01 11:15:53
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-07-28 14:42:55
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
|
|
@ -48,22 +48,22 @@
|
|||
// window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
|
||||
// window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
// 西海岸版本
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
|
||||
// window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
|
||||
window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
|
||||
window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
|
||||
window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
|
||||
// 开发
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
|
||||
// window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
|
||||
// window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
|
||||
window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
|
||||
// window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
|
||||
// window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
window.SITE_CONFIG['backUrl'] = 'http://192.168.124.236:9797';
|
||||
window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/';
|
||||
window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin';
|
||||
window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
// 穿透版本
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@
|
|||
<div class="description">
|
||||
{{
|
||||
val.description ||
|
||||
(val.note1 &&
|
||||
JSON.parse(val.note1)[0].channelName +
|
||||
((val.note1 || '') &&
|
||||
( JSON.parse(val.note1)[0].channelName || '--') +
|
||||
'等' +
|
||||
JSON.parse(val.note1).length +
|
||||
'个摄像头') ||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@
|
|||
disabled
|
||||
/>
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item
|
||||
style="margin: 0 22px"
|
||||
label="电话"
|
||||
|
|
@ -62,7 +61,6 @@
|
|||
v-model:value="formName.phone"
|
||||
/>
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item
|
||||
label="单位"
|
||||
name="unit"
|
||||
|
|
@ -138,7 +136,6 @@
|
|||
/>
|
||||
</a-form-item>
|
||||
</div>
|
||||
|
||||
<a-form-item
|
||||
style="color: #666; font-size: 16px"
|
||||
label="申请单附件"
|
||||
|
|
@ -179,7 +176,6 @@
|
|||
</div>
|
||||
</a-upload>
|
||||
</a-form-item>
|
||||
|
||||
<div class="bottom-btn">
|
||||
<a-button
|
||||
style="
|
||||
|
|
@ -232,7 +228,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import AbilityToApplyFor from './AbilityToApplyFor.vue'
|
||||
import HomeHeader from '@/views/home/components/header'
|
||||
|
|
@ -260,7 +255,6 @@
|
|||
import { pageWithAttrs } from '@/api/home'
|
||||
// import { baseURL } from '@/config'
|
||||
// import AsideMenu from './components/asideMenu.vue'
|
||||
|
||||
export default {
|
||||
name: '',
|
||||
props: {},
|
||||
|
|
@ -626,7 +620,6 @@
|
|||
})
|
||||
.catch(() => {})
|
||||
}
|
||||
|
||||
const options = ref([
|
||||
{
|
||||
value: '政法委',
|
||||
|
|
@ -655,12 +648,10 @@
|
|||
])
|
||||
const systemOptions = ref([])
|
||||
const systemOptions2 = ref([])
|
||||
|
||||
const handleChange = (info) => {
|
||||
if (info.file.status !== 'uploading') {
|
||||
// console.log(info.file, info.fileList)
|
||||
}
|
||||
|
||||
if (info.file.status === 'done') {
|
||||
message.success(`${info.file.name} 上传成功`)
|
||||
formName.enclosure = info.file.response.data
|
||||
|
|
@ -680,11 +671,9 @@
|
|||
'image/pdf' ||
|
||||
'image/xlxs' ||
|
||||
'image/ppt'
|
||||
|
||||
if (!isPNG) {
|
||||
message.error(`上传失败`)
|
||||
}
|
||||
|
||||
return isPNG || Upload.LIST_IGNORE
|
||||
}
|
||||
const fileList = ref([])
|
||||
|
|
@ -725,7 +714,6 @@
|
|||
const handleBlur = () => {
|
||||
console.log('blur')
|
||||
}
|
||||
|
||||
const handleFocus = () => {
|
||||
console.log('focus')
|
||||
// console.log(formName.applicationSystem)
|
||||
|
|
@ -733,11 +721,9 @@
|
|||
systemOptions.value = systemOptions2.value
|
||||
// systemOptions.value = []
|
||||
}
|
||||
|
||||
// const filterOption = (input, option) => {
|
||||
// return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
||||
// }
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
mybus.off('reomveOldData')
|
||||
})
|
||||
|
|
@ -773,7 +759,6 @@
|
|||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
#apply-container {
|
||||
// background-color: #f5f8fc;
|
||||
|
|
@ -824,7 +809,6 @@
|
|||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.ant-input) {
|
||||
border: 1px solid #e0e0e0;
|
||||
border-radius: 6px;
|
||||
|
|
@ -857,4 +841,4 @@
|
|||
justify-content: center;
|
||||
// position: fixed;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
@ -588,33 +588,88 @@ export default {
|
|||
}
|
||||
|
||||
// 融合服务--一键申请
|
||||
const handleAKeyApplication = (item) => {
|
||||
let _applyList = []
|
||||
; (item.fuseResourceList || []).map((v) => {
|
||||
let resource = v.resource || {}
|
||||
let obj = {
|
||||
arr: [
|
||||
{
|
||||
delFlag: resource.delFlag,
|
||||
description: resource.description,
|
||||
resourceId: resource.id,
|
||||
resourceName: resource.name,
|
||||
time: resource.createDate,
|
||||
type: resource.type,
|
||||
},
|
||||
],
|
||||
deptId: resource.deptId,
|
||||
deptName: resource.deptName,
|
||||
}
|
||||
_applyList.push(obj)
|
||||
})
|
||||
|
||||
// 一键申请
|
||||
const handleAKeyApplication = (item ) => {
|
||||
let _applyList = [];
|
||||
let fuseResourceList = item.fuseResourceList || []
|
||||
let jcssArray = fuseResourceList.filter(v => v.type === '基础设施')
|
||||
let otherArray = fuseResourceList.filter(v => v.type !== '基础设施')
|
||||
jcssArray = jcssArray.map(v => {
|
||||
v = Object.assign(v, v.resource)
|
||||
return v
|
||||
})
|
||||
let jcss = [
|
||||
{
|
||||
arr: [
|
||||
{
|
||||
description: '',
|
||||
note1: JSON.stringify(jcssArray),
|
||||
resourceId: '1522550195055828996',
|
||||
resourceName: '摄像头列表',
|
||||
type: '基础设施',
|
||||
},
|
||||
],
|
||||
deptId: '',
|
||||
deptName: '',
|
||||
},
|
||||
]
|
||||
if (infrastructure) {
|
||||
jcss[0].deptId = infrastructure.deptId
|
||||
jcss[0].deptName = infrastructure.deptName
|
||||
}
|
||||
otherArray.map((v) => {
|
||||
let resource = v.resource || {}
|
||||
console.log('resource------------>', resource);
|
||||
let obj = {
|
||||
arr: [
|
||||
{
|
||||
delFlag: resource.delFlag,
|
||||
description: resource.description,
|
||||
resourceId: resource.id,
|
||||
resourceName: resource.name,
|
||||
time: resource.createDate,
|
||||
type: resource.type,
|
||||
},
|
||||
],
|
||||
deptId: resource.deptId,
|
||||
deptName: resource.deptName,
|
||||
}
|
||||
_applyList.push(obj)
|
||||
})
|
||||
_applyList = jcss.concat(_applyList)
|
||||
localStorage.setItem('applyList', JSON.stringify(_applyList))
|
||||
router.push({
|
||||
path: '/apply',
|
||||
})
|
||||
}
|
||||
|
||||
// const handleAKeyApplication = (item) => {
|
||||
// let _applyList = []
|
||||
// ; (item.fuseResourceList || []).map((v) => {
|
||||
// let resource = v.resource || {}
|
||||
// let obj = {
|
||||
// arr: [
|
||||
// {
|
||||
// delFlag: resource.delFlag,
|
||||
// description: resource.description,
|
||||
// resourceId: resource.id,
|
||||
// resourceName: resource.name,
|
||||
// time: resource.createDate,
|
||||
// type: resource.type,
|
||||
// },
|
||||
// ],
|
||||
// deptId: resource.deptId,
|
||||
// deptName: resource.deptName,
|
||||
// }
|
||||
// _applyList.push(obj)
|
||||
// })
|
||||
|
||||
// localStorage.setItem('applyList', JSON.stringify(_applyList))
|
||||
// router.push({
|
||||
// path: '/apply',
|
||||
// })
|
||||
// }
|
||||
|
||||
mybus.on('chongzhi', (typeObj) => {
|
||||
console.log('typeObj------------>', typeObj)
|
||||
if (!typeObj) {
|
||||
|
|
|
|||
|
|
@ -23,13 +23,14 @@
|
|||
<div class="desc">描述：{{ detailInfoObj.description || '--' }}</div>
|
||||
</div>
|
||||
<div class="btn-box">
|
||||
<a-button size="big" class="btn-text" type="primary" @click="toView()">
|
||||
<a-button size="big" class="btn-text" type="primary" @click="handleAKeyApplication()">
|
||||
<template #icon>
|
||||
<form-outlined />
|
||||
</template>
|
||||
申请使用
|
||||
</a-button>
|
||||
<a-button size="big" class="btn-text" type="primary" @click="toView()">
|
||||
<a-button size="big" class="btn-text" :type="detailInfoObj.isCollect == 'true' ? 'primary' : ''"
|
||||
@click="addCollect()">
|
||||
<template #icon>
|
||||
<form-outlined />
|
||||
</template>
|
||||
|
|
@ -67,6 +68,7 @@ import packageAbilityList from '@/views/home/components/packageAbilityList.vue'
|
|||
import { message } from 'ant-design-vue'
|
||||
import { getIntegrationDetail } from '@/api/home'
|
||||
import HomeHeader from '@/views/home/components/header'
|
||||
import { scInsert, scDel } from '@/api/personalCenter'
|
||||
|
||||
const router = useRouter()
|
||||
const id = router.currentRoute.value.query.id
|
||||
|
|
@ -102,6 +104,8 @@ const getIntegrationServicesDeatil = (id) => {
|
|||
return message.error(res.data.msg)
|
||||
}
|
||||
detailInfoObj.value = res.data.data || {}
|
||||
console.log('detailInfoObj------------>', detailInfoObj);
|
||||
|
||||
let fuseResourceList = detailInfoObj.value.fuseResourceList || []
|
||||
abilityList.value.map(v => {
|
||||
let list = fuseResourceList.filter(x => x.type == v.name) || [];
|
||||
|
|
@ -116,6 +120,104 @@ const getIntegrationServicesDeatil = (id) => {
|
|||
}
|
||||
)
|
||||
}
|
||||
|
||||
// 一键申请
|
||||
const handleAKeyApplication = () => {
|
||||
let _applyList = [];
|
||||
let fuseResourceList = detailInfoObj.value.fuseResourceList || []
|
||||
let jcssArray = fuseResourceList.filter(v => v.type === '基础设施')
|
||||
let otherArray = fuseResourceList.filter(v => v.type !== '基础设施')
|
||||
jcssArray = jcssArray.map(v => {
|
||||
v = Object.assign(v, v.resource)
|
||||
return v
|
||||
})
|
||||
let jcss = [
|
||||
{
|
||||
arr: [
|
||||
{
|
||||
description: '',
|
||||
note1: JSON.stringify(jcssArray),
|
||||
resourceId: '1522550195055828996',
|
||||
resourceName: '摄像头列表',
|
||||
type: '基础设施',
|
||||
},
|
||||
],
|
||||
deptId: '',
|
||||
deptName: '',
|
||||
},
|
||||
]
|
||||
if (infrastructure) {
|
||||
jcss[0].deptId = infrastructure.deptId
|
||||
jcss[0].deptName = infrastructure.deptName
|
||||
}
|
||||
otherArray.map((v) => {
|
||||
let resource = v.resource || {}
|
||||
console.log('resource------------>', resource);
|
||||
let obj = {
|
||||
arr: [
|
||||
{
|
||||
delFlag: resource.delFlag,
|
||||
description: resource.description,
|
||||
resourceId: resource.id,
|
||||
resourceName: resource.name,
|
||||
time: resource.createDate,
|
||||
type: resource.type,
|
||||
},
|
||||
],
|
||||
deptId: resource.deptId,
|
||||
deptName: resource.deptName,
|
||||
}
|
||||
_applyList.push(obj)
|
||||
})
|
||||
_applyList = jcss.concat(_applyList)
|
||||
localStorage.setItem('applyList', JSON.stringify(_applyList))
|
||||
router.push({
|
||||
path: '/apply',
|
||||
})
|
||||
}
|
||||
|
||||
const dataPosting = ref(true)
|
||||
const addCollect = () => {
|
||||
if (dataPosting.value && detailInfoObj.value.id) {
|
||||
dataPosting.value = false
|
||||
if (detailInfoObj.value.isCollect == 'true') {
|
||||
scDel([detailInfoObj.value.id]).then((res) => {
|
||||
if (res.data.msg === 'success') {
|
||||
message.success('取消成功')
|
||||
detailInfoObj.value.isCollect = 'false'
|
||||
detailInfoObj.value.collectCount--
|
||||
dataPosting.value = true
|
||||
console.log('收藏2===============>', res.data, dataPosting.value)
|
||||
getIntegrationServicesDeatil(id)
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
console.log('err------------>', err);
|
||||
message.success(err)
|
||||
})
|
||||
} else {
|
||||
scInsert([
|
||||
{
|
||||
resourceId: detailInfoObj.value.id,
|
||||
},
|
||||
]).then((res) => {
|
||||
if (res.data.msg === 'success') {
|
||||
message.success('添加收藏成功！')
|
||||
detailInfoObj.value.isCollect = 'true'
|
||||
detailInfoObj.value.collectCount++
|
||||
dataPosting.value = true
|
||||
console.log('收藏2===============>', res.data, dataPosting.value)
|
||||
getIntegrationServicesDeatil(id)
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
console.log('err------------>', err);
|
||||
message.success(err)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
getIntegrationServicesDeatil(id)
|
||||
|
||||
|
||||
|
|
@ -239,4 +341,5 @@ getIntegrationServicesDeatil(id)
|
|||
.list-box {
|
||||
padding: 0.4rem;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue