+
-
-
+
{
+ res.data.data.list.map((val) => {
+ applicationSceneOpthion.value.push({
+ value: val.dictLabel,
+ label: val.dictLabel,
+ })
+ })
+ // console.log('字典值========>', applicationSceneOpthion.value)
+ })
getUser().then((res) => {
formName.applyUserName = res.data.data.realName
formName.applyUserId = res.data.data.id
@@ -349,6 +374,7 @@
processStartHandle,
upLoadUrl,
// baseURL,
+ applicationSceneOpthion,
}
},
}
@@ -75,7 +75,7 @@
/>
-
+
{
+ item.arr.map((val) => {
+ console.log(item, '组件===========================')
+ let obj = item.children
+ ? item.children.filter((type) => type.id == val.id)[0]
+ : val.type !== '应用资源'
+ if (obj) {
+ console.log('11111111111111111111111111111', obj, flag.value)
+ if (obj.type !== '应用资源') {
+ flag.value = true
+ }
+ }
+ })
+ if (item.checkedList) {
+ console.log(item)
+ num.value += Number(item.checkedList.length)
+ }
+ })
+ }
const num = ref(0)
- list.value.map((item) => {
- if (item.checkedList) {
- console.log(item)
- num.value += Number(item.checkedList.length)
- }
- })
console.log(
'list',
list.value
@@ -286,17 +303,17 @@
let record = ref('1')
const text = ref('')
const formName = reactive({
- title: list.value[0].children
+ title: applyAll
+ ? '全部应用资源申请'
+ : list.value[0].children
? list.value[0].children
.filter((val) => val.id == list.value[0].checkedList[0])[0]
.resourceName.concat(
- list.value[0].checkedList.length > 1
- ? '等能力申请' + num.value + '个'
- : '能力申请'
+ num.value > 1 ? '等能力申请' + num.value + '个' : '能力申请'
)
: list.value[0].arr[0].resourceName.concat('能力申请'), // 标题
applicationSystem: [], // 应用系统
- applicationScene: [], // 应用场景
+ applicationScene: [], // 应用领域
applicationBackground: '', // 应用背景
effectWish: '', // 期望效果
user: '',
@@ -401,73 +418,89 @@
if (!formName) {
return message.error('请设置表单名称')
}
- let ids = []
- formName.system = []
- console.log('list==================', list.value)
- list.value.map((val) => {
- val.arr.map((item) => {
- if (item.type !== '基础设施') {
- formName.system.push({
- resourceId: item.resourceId,
- resourceName: item.resourceName,
- })
- console.log(item.id)
- if (item.id) {
- ids.push(item.id)
- }
- } else {
- let obj = {}
- Object.assign(obj, formName)
- console.log('摄像头===============>', obj, item)
- obj.system = []
- item.note1 = JSON.parse(item.note1)
- item.note1.map((sxt) => {
- obj.system.push({
- resourceId: sxt.idtCameraChannel + '',
- resourceName: sxt.channelName,
- cameraId: sxt.channelId,
+ if (!applyAll) {
+ let ids = []
+ formName.system = []
+ console.log('list==================', list.value)
+ list.value.map((val) => {
+ val.arr.map((item) => {
+ if (item.type !== '基础设施') {
+ formName.system.push({
+ resourceId: item.resourceId,
+ resourceName: item.resourceName,
})
- })
- submitApply(obj).then((res) => {
- applySuccess.value = false
- console.log('摄像头申请================>', res)
+ console.log(item.id)
if (item.id) {
- sgcDel({ ids: [item.id] }).then((res) => {
- if (res.data.msg === 'success') {
- mybus.emit('getSgcNum')
- }
- })
+ ids.push(item.id)
}
- })
- }
+ } else {
+ let obj = {}
+ Object.assign(obj, formName)
+ console.log('摄像头===============>', obj, item)
+ obj.system = []
+ item.note1 = JSON.parse(item.note1)
+ item.note1.map((sxt) => {
+ obj.system.push({
+ resourceId: sxt.idtCameraChannel + '',
+ resourceName: sxt.channelName,
+ cameraId: sxt.channelId,
+ })
+ })
+ submitApply(obj).then((res) => {
+ applySuccess.value = false
+ console.log('摄像头申请================>', res)
+ if (item.id) {
+ sgcDel({ ids: [item.id] }).then((res) => {
+ if (res.data.msg === 'success') {
+ mybus.emit('getSgcNum')
+ }
+ })
+ }
+ })
+ }
+ })
})
- })
- console.log('提交数据==========================>', formName, ids)
- if (formName.system.length !== 0) {
- submitApply(formName).then((res) => {
- applySuccess.value = false
- message.success('操作成功！')
- console.log('能力申请================>', res)
- if (ids && ids.length > 0) {
- sgcDel({ ids: ids }).then((res) => {
- if (res.data.msg === 'success') {
- mybus.emit('getSgcNum')
-
- router.push({
- path: '/DetailsPageconetent',
- query: {
- select: '组件服务',
- },
- })
- }
- })
- } else {
+ console.log('提交数据==========================>', formName, ids)
+ if (formName.system.length !== 0) {
+ submitApply(formName).then((res) => {
+ // applySuccess.value = false
+ message.success('申请提交成功，请到消息中心查看！')
+ console.log('能力申请================>', res)
+ if (ids && ids.length > 0) {
+ sgcDel({ ids: ids }).then((res) => {
+ if (res.data.msg === 'success') {
+ mybus.emit('getSgcNum')
+ router.push({
+ path: '/DetailsPageconetent',
+ query: {
+ select: '组件服务',
+ },
+ })
+ }
+ })
+ } else {
+ router.push({
+ path: '/DetailsPageconetent',
+ query: {
+ select: '组件服务',
+ },
+ })
+ }
+ })
+ }
+ } else {
+ formName.applicationSystem = ''
+ applyAllApplication(formName).then((res) => {
+ if (res.data.code == 0) {
+ message.success('申请提交成功，请到消息中心查看！')
router.push({
path: '/DetailsPageconetent',
query: {
select: '组件服务',
},
})
+ } else {
+ message.error('申请失败！')
}
})
}
@@ -656,6 +689,8 @@
handleFocus,
systemOptions,
applicationSceneOpthion,
+ flag,
+ applyAll,
}
},
}
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 98d01d4a..2747ebff 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -7,7 +7,8 @@
]"
>
-
@@ -139,6 +139,13 @@
const props = defineProps({
refObj: { type: Object, default: null },
})
+ const showThis = () => {
+ window.open(
+ window.SITE_CONFIG.previewUrl +
+ 'hisense_office/onlinePreview?url=' +
+ btoa(encodeURI(props.refObj.enclosure))
+ )
+ }
const showArr = ref([])
console.log(props.refObj, '=====================================')
if (props.refObj.resourceApplication) {
@@ -286,6 +293,13 @@
justify-content: space-between;
align-items: center;
.name {
+ width: 6rem;
+ height: 0.2rem;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 1;
+ -webkit-box-orient: vertical;
.type {
background: #0087ff;
color: #fff;
diff --git a/front/src/views/personalCenter/components/MyBrowse.vue b/front/src/views/personalCenter/components/MyBrowse.vue
index eb3bab46..006b740a 100644
--- a/front/src/views/personalCenter/components/MyBrowse.vue
+++ b/front/src/views/personalCenter/components/MyBrowse.vue
@@ -396,6 +396,7 @@
margin-left: 30px;
font-size: 12px;
color: #ccc;
+ white-space: nowrap;
}
:deep(.ant-list-item-meta-description) {
max-height: 44px;
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 44ccfa72..819c1a7b 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -198,6 +198,8 @@
:class="
item.type == '基础设施'
? 'sxt'
+ : item.type == '应用资源'
+ ? 'yyzy'
: item.componentType == '智能算法'
? 'znsf'
: item.componentType == '图层服务'
@@ -1015,6 +1017,10 @@
background: url('~@/assets/home/sxt_square.png') no-repeat;
background-size: 100%;
}
+ .yyzy {
+ background: url('~@/assets/home/yyzy_square.png') no-repeat;
+ background-size: 100%;
+ }
.znsf {
background: url('~@/assets/home/znsf_square.png') no-repeat;
background-size: 100%;
diff --git a/front/src/views/personalCenter/components/addApplication.vue b/front/src/views/personalCenter/components/addApplication.vue
index 53797b62..b334b1bd 100644
--- a/front/src/views/personalCenter/components/addApplication.vue
+++ b/front/src/views/personalCenter/components/addApplication.vue
@@ -97,15 +97,24 @@
-
+
+
城市云脑通用能力服务平台
申请量：{{ item.applyCount || 0 }}次
@@ -221,7 +220,12 @@
-
+
{{
- item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
+ item.shareCondition == '免批申请' ? '立即申请' : '立即申请'
}}
@@ -508,6 +515,7 @@
console.log('or use this.value', searchValue.value)
}
function toView(type, item) {
+ debugger
if (props.selectCardsname == '数据资源') {
if (whoShow1.itShowQingDao) {
window.open(
@@ -515,7 +523,9 @@
item.guid
)
} else {
- window.open('http://10.134.135.24:30090/#/home')
+ window.open(
+ 'http://10.134.135.24:30090/#/home?id=' + item.serviceId
+ )
}
} else if (props.selectCardsname === '融合服务') {
router.push({
@@ -539,9 +549,14 @@
resourceName: item.name,
time: item.createDate,
type: item.type,
- componentType: item.infoList.filter(
- (val) => val.attrType == '组件类型'
- )[0].attrValue,
+ componentType:
+ (item.infoList.filter(
+ (val) => val.attrType == '组件类型'
+ )[0] &&
+ item.infoList.filter(
+ (val) => val.attrType == '组件类型'
+ )[0].attrValue) ||
+ '',
},
],
deptId: item.deptId,
@@ -897,6 +912,10 @@
background: url('~@/assets/home/rhfw_square.png') no-repeat;
background-size: 100%;
}
+ .jcss {
+ background: url('~@/assets/home/sxt_square.png') no-repeat;
+ background-size: 100%;
+ }
.header {
display: flex;
justify-content: space-between;
diff --git a/front/src/views/personalCenter/VueTemplateDemo.vue b/front/src/views/personalCenter/VueTemplateDemo.vue
index 88753664..46658761 100644
--- a/front/src/views/personalCenter/VueTemplateDemo.vue
+++ b/front/src/views/personalCenter/VueTemplateDemo.vue
@@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-04-19 17:18:48
* @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-16 15:01:48
+ * @LastEditTime: 2022-07-18 16:40:21
* @Description: markdown编辑器
-->
@@ -95,12 +95,12 @@
if (this.uuidSnum === '') {
this.uuidSplice()
}
- let myfile = new File([blob], this.uuidSnum)
+ let myfile = new File([blob], this.uuidSnum + '.md')
var formData = new FormData()
const type = pinyin(this.dataFrom.type, {
pattern: 'initial',
}).replace(/\s*/g, '')
- formData.append('fileName', this.uuidSnum)
+ formData.append('fileName', this.uuidSnum + '.md')
formData.append('type', type)
formData.append('file', myfile) // 'file' 为HTTP Post里的字段名, file 对浏览器里的File对象
// formData.append('name', this.route.currentRoute.query.id + '.md')
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 2afbf921..9b1da485 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-07-12 09:42:44
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-13 15:56:51
+ * @LastEditTime: 2022-07-18 17:54:55
* @Description:我的申请 能力申请 查看详情
-->
@@ -34,7 +34,7 @@
申请单附件：
{{ props.refObj.enclosureName || '--' }}
- 预览
+ 预览
@@ -104,11 +104,11 @@
}}
技术文档
+ 技术文档
资源描述：{{ val.description }}
- 申请结果：{{ val.content || '--' }}
+ 申请结果：{{ val.applyState }}