diff --git a/back/src/views/modules/ability/IntegratedServices-add.vue b/back/src/views/modules/ability/IntegratedServices-add.vue
index da6482f6..6eb8ea73 100644
--- a/back/src/views/modules/ability/IntegratedServices-add.vue
+++ b/back/src/views/modules/ability/IntegratedServices-add.vue
@@ -2,12 +2,7 @@
-
+
填写字段
@@ -369,4 +364,12 @@ export default {
.input-box {
width: 90%;
}
+
+
+.first-title {
+ text-align: center;
+ font-weight: 600;
+ font-size: 18px;
+ margin-bottom: 10px;
+}
diff --git a/back/src/views/modules/ability/assignedScene/add-update-scene.vue b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
index ece53975..68ab8772 100644
--- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue
+++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
@@ -2,12 +2,7 @@
-
+
填写字段
@@ -36,6 +31,11 @@
+
+
+
+
+
@@ -55,8 +55,10 @@
组合能力
-
+
+
{
return {
methods: 'get',
@@ -117,18 +123,13 @@ export const getDescJson = (text) => {
}
}
+// 弹框的方法
export const getListParams = {
- '基础设施': {
- methods: 'get',
- url: '',
- postData: {
-
- }
- },
'数据资源': getJson('数据资源'),
'组件服务': getJson('组件服务'),
}
+// 模态框标题
export const modalTypeText = {
add: '挂接',
update: '修改'
@@ -157,10 +158,11 @@ export const getFuseResourceList = (abilityListObj) => {
export default {
components: {
SceneUseStep,
- IntegratedCombineAbility,
- CommonQuestion,
CombineAbility,
SceneOneInput,
+ upload,
+ CommonQuestion,
+ InfrastructureModal,
},
data() {
return {
@@ -175,6 +177,7 @@ export default {
painKeyTextObj: getDescJson('痛点'),
solutionKeyTextObj: getDescJson('方案'),
dataForm: {
+ "name": "",
"applicationArea": "",
"description": "",
"fuseAttrList": [
@@ -201,12 +204,6 @@ export default {
"sequence": ""
}
],
- "mobile": "",
- "name": "",
- "provider": "",
- "providerMobile": "",
- "providerUser": "",
- "deptUser": "",
},
rules: {
name: [
@@ -242,7 +239,8 @@ export default {
'jcssDom': '基础设施',
},
getListParams: getListParams,
- abilityListObj: {}
+ abilityListObj: {},
+ imgData: []
};
},
props: {
@@ -362,6 +360,9 @@ export default {
console.log('this.dataForm----详情-------->', this.dataForm);
})
},
+ changeInfoList() {
+
+ },
},
beforeDestroy() {
this.clearForm()
@@ -403,7 +404,7 @@ export default {
}
-
diff --git a/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue
new file mode 100644
index 00000000..f0960ab8
--- /dev/null
+++ b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue
@@ -0,0 +1,436 @@
+
+
+
+
+
+
+
+
+
{{ showText[activeBtn] }}
+
+
清空
+
+
+
+ {{ item.labelName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("cancel") }}
+ {{
+ $t("confirm")
+ }}
+
+
+
+
+
+
+
+
+
diff --git a/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue b/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue
new file mode 100644
index 00000000..8b977a47
--- /dev/null
+++ b/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue
@@ -0,0 +1,314 @@
+
+
+
+
+
+ {{ item.name }}
+ ({{ item.channelCount }})
+
+
+
+
+
+
+
+
+
{{ val.name }}({{ val.channelCount }})
+
+
{{ val.total }}
+
+
+
+
+
+
+
+
+
+
+ {{ child.name }}
+
+
+
{{ child.channelCount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/back/src/views/modules/ability/assignedScene/index.vue b/back/src/views/modules/ability/assignedScene/index.vue
index 8ad45a6d..ba8ad18c 100644
--- a/back/src/views/modules/ability/assignedScene/index.vue
+++ b/back/src/views/modules/ability/assignedScene/index.vue
@@ -21,12 +21,9 @@
-
-
-
-
+
{{ $t("update") }}
diff --git a/back/src/views/modules/ability/components/combine-ability.vue b/back/src/views/modules/ability/components/combine-ability.vue
index 4d0693d7..8dff9066 100644
--- a/back/src/views/modules/ability/components/combine-ability.vue
+++ b/back/src/views/modules/ability/components/combine-ability.vue
@@ -5,14 +5,15 @@
添加
-
+ }" :data="transferData">
+
{{ $t("cancel") }}
@@ -38,6 +39,8 @@