Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
This commit is contained in:
commit
827d871e8d
|
@ -2,7 +2,7 @@
|
|||
* @Author: hisense.liangjunhua
|
||||
* @Date: 2022-06-29 15:59:51
|
||||
* @LastEditors: Light
|
||||
* @LastEditTime: 2022-11-24 20:45:45
|
||||
* @LastEditTime: 2022-11-28 11:28:43
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<!-- 流程业务表单 -->
|
||||
|
@ -531,7 +531,7 @@ export default {
|
|||
// 任务处理出错回调
|
||||
taskHandleErrorCallback (data) { },
|
||||
download (data) {
|
||||
this.downloadFile(data.attachment, '附件')
|
||||
this.downloadFile(data.attachment, '感知资源申请表')
|
||||
// const alink = document.createElement('a')
|
||||
// alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容
|
||||
// // alink.href = data.attachment // 创建 url地址
|
||||
|
|
|
@ -19,7 +19,15 @@
|
|||
:key="item.key"
|
||||
@click="jumpPage(item, 'headerClick')"
|
||||
class="nav"
|
||||
:class="[{'select':item.key == select},{'select-inner':(item.key == 'DetailsPageconetent' && item.innerKey && props.targetFlag)}]"
|
||||
:class="[
|
||||
{ select: item.key == select },
|
||||
{
|
||||
'select-inner':
|
||||
item.key == 'DetailsPageconetent' &&
|
||||
item.innerKey &&
|
||||
props.targetFlag,
|
||||
},
|
||||
]"
|
||||
>
|
||||
{{ item.name }}
|
||||
</div>
|
||||
|
@ -54,6 +62,7 @@
|
|||
p-id="2187"
|
||||
width="0.35rem"
|
||||
height="0.35rem"
|
||||
@click="goToView()"
|
||||
>
|
||||
<path
|
||||
d="M544 161.536a330.666667 330.666667 0 0 1 298.666667 329.130667h-0.341334c0.213333 1.493333 0.341333 2.986667 0.341334 4.565333v219.434667h39.68a32 32 0 0 1 0 64h-212.053334a160 160 0 0 1-316.586666 0H141.909333a32 32 0 1 1 0-64h39.424v-219.434667c0-1.578667 0.128-3.072 0.341334-4.565333H181.333333a330.666667 330.666667 0 0 1 298.666667-329.130667V128a32 32 0 1 1 64 0v33.536z m-298.666667 553.130667h533.333334v-219.434667c0-1.578667 0.128-3.072 0.341333-4.565333h-0.341333a266.666667 266.666667 0 1 0-533.333334 0h-0.341333c0.213333 1.493333 0.341333 2.986667 0.341333 4.565333v219.434667z m359.765334 64H418.901333a96 96 0 0 0 186.197334 0z"
|
||||
|
@ -90,14 +99,18 @@
|
|||
</template>
|
||||
<span
|
||||
class="name"
|
||||
@click="jumpPage({ name: '个人中心', key: 'personalCenter' },'headerClick')"
|
||||
@click="
|
||||
jumpPage({ name: '个人中心', key: 'personalCenter' }, 'headerClick')
|
||||
"
|
||||
>
|
||||
{{ user.realName }}
|
||||
</span>
|
||||
</a-tooltip>
|
||||
<span @click="logout" class="out">退出</span>
|
||||
<i
|
||||
@click="jumpPage({ name: '后台管理', key: 'houtaiguanli' },'headerClick')"
|
||||
@click="
|
||||
jumpPage({ name: '后台管理', key: 'houtaiguanli' }, 'headerClick')
|
||||
"
|
||||
class="iconTo"
|
||||
v-show="backFlag"
|
||||
></i>
|
||||
|
@ -203,7 +216,10 @@
|
|||
select.value = item.key
|
||||
switch (item.name) {
|
||||
case '个人中心':
|
||||
window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
|
||||
window.sessionStorage.setItem(
|
||||
'type',
|
||||
JSON.stringify('PurchaseVehicle')
|
||||
)
|
||||
router.push({
|
||||
path: '/personalCenter',
|
||||
})
|
||||
|
@ -279,7 +295,10 @@
|
|||
//select.value = item.key
|
||||
switch (item.name) {
|
||||
case '个人中心':
|
||||
window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
|
||||
window.sessionStorage.setItem(
|
||||
'type',
|
||||
JSON.stringify('PurchaseVehicle')
|
||||
)
|
||||
router.push({
|
||||
path: '/personalCenter',
|
||||
})
|
||||
|
@ -295,7 +314,7 @@
|
|||
query: {
|
||||
id: targetRouter.value.id,
|
||||
},
|
||||
});
|
||||
})
|
||||
break
|
||||
case '能力云图':
|
||||
router.push({
|
||||
|
@ -321,7 +340,6 @@
|
|||
router.push('/home')
|
||||
break
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
const scrollTop = ref(0)
|
||||
|
@ -403,24 +421,32 @@
|
|||
|
||||
mybus.on('changeMenuStyle', (data) => {
|
||||
debugger
|
||||
targetRouter.value = data;
|
||||
targetRouter.value = data
|
||||
if (data.path == '/algorithmCompare') {
|
||||
jumpPage({
|
||||
"name": "能力集市",
|
||||
"key": "DetailsPageconetent",
|
||||
"innerKey":"algorithmCompare"
|
||||
},'innerClick');
|
||||
jumpPage(
|
||||
{
|
||||
name: '能力集市',
|
||||
key: 'DetailsPageconetent',
|
||||
innerKey: 'algorithmCompare',
|
||||
},
|
||||
'innerClick'
|
||||
)
|
||||
} else if (data.path == '/DetailsPageconetent') {
|
||||
jumpPage({ name: '能力集市', key: 'DetailsPageconetent' },'headerClick')
|
||||
jumpPage(
|
||||
{ name: '能力集市', key: 'DetailsPageconetent' },
|
||||
'headerClick'
|
||||
)
|
||||
} else if (data.path == '/details') {
|
||||
jumpPage({
|
||||
"name": "能力集市",
|
||||
"key": "DetailsPageconetent",
|
||||
"innerKey":"details"
|
||||
},'innerClick');
|
||||
jumpPage(
|
||||
{
|
||||
name: '能力集市',
|
||||
key: 'DetailsPageconetent',
|
||||
innerKey: 'details',
|
||||
},
|
||||
'innerClick'
|
||||
)
|
||||
}
|
||||
})
|
||||
|
||||
})
|
||||
onBeforeUnmount(() => {
|
||||
mybus.off('getSgcNum')
|
||||
|
|
|
@ -484,6 +484,10 @@
|
|||
yaweiApproveDetails({ applyGuid: item.GUID })
|
||||
.then((res) => {
|
||||
console.log('详情===========>', res.data.data)
|
||||
if (res.data.code !== 0) {
|
||||
message.error('数据请求失败!')
|
||||
return
|
||||
}
|
||||
res.data.data.map((val) => {
|
||||
val.clsj = moment(val.clsj).format('YYYY-MM-DD HH:mm:ss')
|
||||
})
|
||||
|
@ -717,6 +721,14 @@
|
|||
} else if (typeName.value == '数据资源申请') {
|
||||
yaweiApproveStatus({ page: page.value, size: 4, title: '' }).then(
|
||||
(res) => {
|
||||
if (res.data.code !== 0) {
|
||||
num.value = []
|
||||
total.value = 0
|
||||
contentList.data = []
|
||||
contentList2.data = []
|
||||
showType.value = ''
|
||||
return
|
||||
}
|
||||
console.log('数据资源申请===============>', res.data.data)
|
||||
contentList.data = res.data.data.data
|
||||
num.value = []
|
||||
|
@ -727,6 +739,14 @@
|
|||
} else if (typeName.value == '云资源申请') {
|
||||
getResourceBusinessList({ userAccount: userName.value }).then((res) => {
|
||||
console.log('数据资源申请===============>', res.data.data)
|
||||
if (res.data.code !== 0) {
|
||||
num.value = []
|
||||
total.value = 0
|
||||
contentList.data = []
|
||||
contentList2.data = []
|
||||
showType.value = ''
|
||||
return
|
||||
}
|
||||
contentList.data = res.data.data
|
||||
contentList2.data = res.data.data
|
||||
num.value = []
|
||||
|
@ -735,6 +755,14 @@
|
|||
})
|
||||
} else if (typeName.value == '云视频申请') {
|
||||
getVideoBusinessList({ userAccount: userName.value }).then((res) => {
|
||||
if (res.data.code !== 0) {
|
||||
num.value = []
|
||||
total.value = 0
|
||||
contentList.data = []
|
||||
contentList2.data = []
|
||||
showType.value = ''
|
||||
return
|
||||
}
|
||||
console.log('数据资源申请===============>', res.data.data)
|
||||
contentList.data = res.data.data
|
||||
contentList2.data = res.data.data
|
||||
|
|
Loading…
Reference in New Issue