diff --git a/.beagle.yml b/.beagle.yml
index 1b77e32a567e3e628bf614c980008666ccf41c0c..229ed3b4b7602b966605ab6afd67a65c620bd31b 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -51,7 +51,7 @@ pipeline:
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
- version: v3.0.5
+ version: v3.0.6
channel: alpha
args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数
registry: registry.cn-qingdao.aliyuncs.com
@@ -70,8 +70,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha
- target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5
+ source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-alpha
+ target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
@@ -88,7 +88,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5
+ source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0
registry: registry.cn-qingdao.aliyuncs.com
secrets:
@@ -108,7 +108,7 @@ pipeline:
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-arm64
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
- version: v3.0.5
+ version: v3.0.6
channel: alpha-arm64
args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com
@@ -127,8 +127,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-arm64
- target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-arm64
+ source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-alpha-arm64
+ target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-arm64
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
@@ -145,7 +145,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-arm64
+ source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-arm64
registry: registry.cn-qingdao.aliyuncs.com
secrets:
@@ -164,7 +164,7 @@ pipeline:
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-ppc64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
- version: v3.0.5
+ version: v3.0.6
channel: alpha-ppc64le
args: "TARGETOS=linux,TARGETARCH=ppc64le"
registry: registry.cn-qingdao.aliyuncs.com
@@ -182,8 +182,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-ppc64le
- target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-ppc64le
+ source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-alpha-ppc64le
+ target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
@@ -199,7 +199,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-ppc64le
+ source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
@@ -218,7 +218,7 @@ pipeline:
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-mips64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
- version: v3.0.5
+ version: v3.0.6
channel: alpha-mips64le
args: "TARGETOS=linux,TARGETARCH=mips64le"
registry: registry.cn-qingdao.aliyuncs.com
@@ -236,8 +236,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-mips64le
- target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-mips64le
+ source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-alpha-mips64le
+ target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-mips64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
@@ -253,7 +253,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-mips64le
+ source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-mips64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
@@ -270,7 +270,7 @@ pipeline:
namespace: apaas-v3
deployment: apaas-ui
container: apaas-ui
- registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha
+ registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.6-alpha
when:
branch:
- dev
diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue
index 80399642586c118b095bf3e725c00565fcf957f3..0ad3c3b615f08e32400d2b39933eb14420824b1f 100644
--- a/src/components/service-info/service-info.vue
+++ b/src/components/service-info/service-info.vue
@@ -63,7 +63,7 @@
- 服务领域:
+ 业务领域:
{{baseInfo.fwly}}
diff --git a/src/components/service-list/commodity-card-new.vue b/src/components/service-list/commodity-card-new.vue
index 5c1ad3bd4185a8080540c41035d1e79650fd74f6..907a79b6007536afe0bd396d03014ba09ec19ea4 100644
--- a/src/components/service-list/commodity-card-new.vue
+++ b/src/components/service-list/commodity-card-new.vue
@@ -77,9 +77,9 @@ export default {
watch: {},
methods: {
goUrl(parame) {
- if (this.url != "") {
- this.$router.push(this.url + "/" + parame);
- }
+ // if (this.url != "") {
+ // }
+ this.$router.push('/shop/yysdDetail/' + parame);
},
},
mounted() {},
diff --git a/src/components/service-list/commodity-cell-new.vue b/src/components/service-list/commodity-cell-new.vue
index 325f01702f446daff171eccec7cad630ebb19916..9353e16e9d003c9a4a85b391dac15c86054355dd 100644
--- a/src/components/service-list/commodity-cell-new.vue
+++ b/src/components/service-list/commodity-cell-new.vue
@@ -1,6 +1,6 @@
-
+
@@ -69,9 +69,9 @@
- {{ cellData.data_service_type1 != 36 ? '服务领域:' : '产品领域:' }}
+ {{ cellData.data_service_type1 != 36 ? '业务领域:' : '产品领域:' }}
{{ cellData.sectors_name }}
diff --git a/src/components/service-list/commodity-list_new.vue b/src/components/service-list/commodity-list_new.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7bf9f2ad3be63610929982474c789eb61eced513
--- /dev/null
+++ b/src/components/service-list/commodity-list_new.vue
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/service-list/service_list_new.vue b/src/components/service-list/service_list_new.vue
new file mode 100644
index 0000000000000000000000000000000000000000..6869bc7ee8d85454631888b99b0f3883bfed0f67
--- /dev/null
+++ b/src/components/service-list/service_list_new.vue
@@ -0,0 +1,872 @@
+
+
+
+
+
+
+ {{ urlFilter == 'app' ? "服务超市" : "服务商店"}}
+
+ {{ name }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ 共{{total}}条数据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/service-list/service_shop_menu_new.vue b/src/components/service-list/service_shop_menu_new.vue
new file mode 100644
index 0000000000000000000000000000000000000000..0ebd00ebface84061752ef9d5ef62996c37d6225
--- /dev/null
+++ b/src/components/service-list/service_shop_menu_new.vue
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue
index 93dd61d180c6bccb7081dcda960486119e5d6cd4..a3ae8cb3f33178a96e09049151e3b96056fee7bb 100644
--- a/src/components/table/table-um.vue
+++ b/src/components/table/table-um.vue
@@ -132,6 +132,27 @@
@click="deleteLocal(scope)"
>{{ btn.label }}
+ {{ btn.label }}
+
+ {{ btn.label }}
+
{{ btn.label }}
- {{ btn.line }}
+ {{ btn.line }}
+ {{ btn.line }}
diff --git a/src/components/topology.vue b/src/components/topology.vue
index c565c8a210d0120aabf910974f211f1d46c13a2b..1609acffa628271055a907de6bbbde29c594ef26 100644
--- a/src/components/topology.vue
+++ b/src/components/topology.vue
@@ -4,7 +4,7 @@
拓扑图图例
- 服务类型
+ 服务分类
调用状态
diff --git a/src/pages/message-management/recommended/recommended-eidt.vue b/src/pages/message-management/recommended/recommended-eidt.vue
index fc9d3c16bbf9da213d0cc50a11f110bd07a44769..6592db3ea901f892aff138bfb52943cef49b586d 100644
--- a/src/pages/message-management/recommended/recommended-eidt.vue
+++ b/src/pages/message-management/recommended/recommended-eidt.vue
@@ -63,8 +63,8 @@ export default {
filtdata: [],
filter_name_arr: {
organizations: "数据来源机构",
- serviceDomain: "数据领域",
- serviceTypeInfo: "数据服务类型",
+ serviceDomain: "业务领域",
+ serviceTypeInfo: "服务类型",
},
select_able_arr: [],
selected_arr: [],
@@ -166,22 +166,22 @@ export default {
var temp = 21
this.filter_name_arr = {
organizations: "服务来源组织",
- serviceDomain: "服务领域",
+ serviceDomain: "业务领域",
serviceTypeInfo: "服务类型",
}
}else if(this.$route.query.ad_type == 'hotdata'){
var temp = 5
this.filter_name_arr = {
organizations: "数据来源机构",
- serviceDomain: "数据领域",
- serviceTypeInfo: "数据服务类型",
+ serviceDomain: "业务领域",
+ serviceTypeInfo: "服务类型",
}
}else{
var temp = 6
this.filter_name_arr = {
organizations: "服务来源组织",
- serviceDomain: "服务领域",
- serviceTypeInfo: "时空服务类型",
+ serviceDomain: "业务领域",
+ serviceTypeInfo: "服务类型",
}
}
this.$http
diff --git a/src/pages/service_shop/shop_cloud-new.vue b/src/pages/service_shop/shop_cloud-new.vue
index d7ccfb1db842dfbb87f994fe601aaf839b6b01c6..03e8ed5bfeeda91a085d929b54a61b8734395760 100644
--- a/src/pages/service_shop/shop_cloud-new.vue
+++ b/src/pages/service_shop/shop_cloud-new.vue
@@ -12,7 +12,7 @@
+
+
\ No newline at end of file
diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue
index 3d1c9bcca3c7761fb1b17a0b98b5673a146f9c07..40f546620093d69d35173eb810a5ff506c59c059 100644
--- a/src/pages/service_shop/sjfwDetail.vue
+++ b/src/pages/service_shop/sjfwDetail.vue
@@ -3,8 +3,8 @@
服务超市
-
- 数据服务
+
+ {{ typeName }}
服务详情信息
@@ -36,6 +36,7 @@ export default {
detailData: [],
providerData: null,
commentsData: null,
+ typeName: ""
}),
computed: {
id() {
@@ -59,7 +60,8 @@ export default {
service_id: this.id,
app_id: 0,
name: datas.name,
- // type: "",
+ type:datas.data_service_type2_name=="流程类"?"workflow":"",
+ workflows_id:datas.data_service_type2_name=="流程类"?datas.workflows_id:"",
openness: datas.openness,
view_count: datas.view_count,
apply_count: datas.apply_count,
@@ -80,7 +82,7 @@ export default {
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
};
-
+
this.detailData = [
{
name: "获取流程",
@@ -185,6 +187,11 @@ export default {
},
},
];
+ this.typeName = datas.data_service_type1_name
+ let template = [2,3,4,5,8,9,10,11]
+ if (template.indexOf(datas.serv_template) > -1 ) {
+ this.detailData = this.detailData.slice(0,1)
+ }
let arr1 = datas.serviceRequestSpcs.spcs_type_1 || [];
let arr2 = datas.serviceRequestSpcs.spcs_type_2 || [];
let arr = arr1.concat(arr2);
diff --git a/src/pages/workbench/component-center/intelligent-drawing/intelligent_fwzc.vue b/src/pages/workbench/component-center/intelligent-drawing/intelligent_fwzc.vue
index 1be2d3f3bbadaaef5d5884193ee5082cf0b371a8..11b69c9d4fe155438296f30c3d997473a0b7de0c 100644
--- a/src/pages/workbench/component-center/intelligent-drawing/intelligent_fwzc.vue
+++ b/src/pages/workbench/component-center/intelligent-drawing/intelligent_fwzc.vue
@@ -57,7 +57,7 @@
>
- 服务领域:
+ 业务领域:
- 服务领域:
+ 业务领域:
+
+
+
+
+
+ 在线组件工具
+
+
+ 智能制图
+
+ 发布信息填写
+
+
+
+
+ 在线组件工具
+
+
+ 流程设计
+
+ 发布信息填写
+
+
+
+ 服务注册
+ 服务测试
+ 服务测试
+ 基础信息填写
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ 接口协议:
+
+
+ {{e.label}}
+
+
+
+
+
+
+
+
+ 说明:支持多个流程服务接口的注册,若流程服务包含多个接口,每个接口需分别注册为独立的服务地址才可使用。
+ 示例:http(s)://www.apaas.com(自有域名)/xxx,其中xxx为该流程服务的不同接口后缀,需分别进行单个接口的注册。
+ 比如:服务地址1:http(s)://www.apaas.com(自有域名)/create(用于新建流程实例)
+
+ 服务地址2:http(s)://www.apaas.com(自有域名)/query
+ (用于查询流程状态)
+
+
+
+
+
+ 上传接口文档
+ (请上传所有服务地址完整接口文档):
+
+
+
+
+
+ 返回数据格式
+
+ JSON
+ XML
+
+
+
+
+
+
+ 服务地址:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 服务测试
+
+
+
+
+
+
+ IP+端口号:
+
+
+
+
+
+
+ 服务测试
+
+
+
+
+ 服务地址:
+
+
+
+
+
+
+ 服务测试
+
+
+
+
+
+
+
+
+
+
+
+
+ JSON
+
+
+
+
+
+
+
+ 授权方式:
+
+
+
+
+ 注册说明:
+ 1、服务提供方按需填写服务的地址、请求参数和返回参数进行正常注册。
+ 2、服务被调用时,平台会提供一个动态token,由服务提供方访问身份认证地址,进行认证。由平台返回身份认证结果,由服务提供方依据结果判断是否可以提供服务。
+ 3、详细流程和接口说明,请点击下载 服务注册说明。
+
+
+
+
+
+
+
+ Token名称:
+
+ Token值:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ JSON
+ form-data
+ x-www-form-urlencoded
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请求参数信息填写:
+
+ 返回参数信息填写:
+
+
+
+ 测试服务信息:
+
+
+  测试成功
+
+
+
+
+ 测试服务信息:
+
+
+  测试失败
+
+
+
+
+
+
+
+
+
+
+ 服务接口名称:
+
+
+
+
+
+
+
+
+ 服务地址{{ indexOne + 1 }}:
+
+ {
+ getUrlOne(val, indexOne);
+ }
+ "
+ v-model="itemOne.serviceUrl"
+ class="input-with-select"
+ >
+
+
+
+
+ 服务测试
+
+
+
+ {
+ changeTableOne(val, indexOne);
+ }
+ "
+ >
+
+
+
+
+ JSON
+
+
+
+
+
+
+
+ 授权方式:
+
+
+
+
+ 注册说明:
+ 1、服务提供方按需填写服务的地址、请求参数和返回参数进行正常注册。
+ 2、服务被调用时,平台会提供一个动态token,由服务提供方访问身份认证地址,进行认证。由平台返回身份认证结果,由服务提供方依据结果判断是否可以提供服务。
+ 3、详细流程和接口说明,请点击下载 服务注册说明。
+
+
+
+
+
+
+
+ Token名称:
+
+ Token值:
+
+
+
+
+
+
+
+
+
+
+
+ 请求参数信息填写:
+
+ 返回参数信息填写:
+
+
+
+ 测试服务信息:
+
+
+  测试失败
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 服务名称:
+
+
+
+ 服务描述:
+
+
+
+ 业务领域:
+
+
+
+
+
+ 所属组织:
+
+
+
+ 服务封面:
+
+
+
+ 接口编码:
+
+
+
+ 开放程度:
+
+ 共享
+ 受限
+ 敏感
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/workbench/product-type/class_edit.vue b/src/pages/workbench/product-type/class_edit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f8dd134240150ebaa1bfefd70fcc60505c067812
--- /dev/null
+++ b/src/pages/workbench/product-type/class_edit.vue
@@ -0,0 +1,322 @@
+
+
+
+
+ 分类管理
+ 产品分类管理
+ {{isAdd? '新增' : '编辑'}}
+
+
+
+
+
+ 分类类别:
+
+
+
+
+
+ 分类名称:
+
+
+
+ 服务模版:
+
+
+
+
+
+ 上级分类名称:
+
+
+
+
+
+ 描述:
+
+
+
+ 状态:
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/workbench/product-type/class_list.vue b/src/pages/workbench/product-type/class_list.vue
new file mode 100644
index 0000000000000000000000000000000000000000..256884ddd4e3c9d2af99019e420e1b00e71f018b
--- /dev/null
+++ b/src/pages/workbench/product-type/class_list.vue
@@ -0,0 +1,413 @@
+
+
+
+
+ 分类管理
+ 服务分类
+
+
+
+
+ 分类名称:
+
+ 状态:
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 删除后无法恢复,请确认是否删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/workbench/product-type/domain_edit.vue b/src/pages/workbench/product-type/domain_edit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a0368e9a8d667ccd2c329b0e0fdcca52bcc4da6d
--- /dev/null
+++ b/src/pages/workbench/product-type/domain_edit.vue
@@ -0,0 +1,184 @@
+
+
+
+
+ 分类管理
+ 领域分类
+ {{isAdd? '新增' : '编辑'}}
+
+
+
+
+
+ 分类名称:
+
+
+
+ 描述:
+
+
+
+ 状态:
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/workbench/product-type/domain_list.vue b/src/pages/workbench/product-type/domain_list.vue
new file mode 100644
index 0000000000000000000000000000000000000000..31335120d8a64fc46c963312330b50d2c7dc845d
--- /dev/null
+++ b/src/pages/workbench/product-type/domain_list.vue
@@ -0,0 +1,390 @@
+
+
+
+
+ 分类管理
+ 领域分类
+
+
+
+
+ 分类名称:
+
+ 状态:
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 删除后无法恢复,请确认是否删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/workbench/product-type/index.vue b/src/pages/workbench/product-type/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..13f54a489399d3f962c29722209e7ab4b495da16
--- /dev/null
+++ b/src/pages/workbench/product-type/index.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue
index 93d3c8272871d46c88c6798b2ec1a34d3b259326..8600f75169b34b4e641b3cdfb05f5b0b29a93c99 100644
--- a/src/pages/workbench/yygl/deploy_app_detail.vue
+++ b/src/pages/workbench/yygl/deploy_app_detail.vue
@@ -203,9 +203,9 @@
- 服务领域:
+ 业务领域:
-
+
@@ -289,7 +289,7 @@ export default {
},
public_rules: {
area: [
- { required: true, message: "请选择服务领域", trigger: "change" }
+ { required: true, message: "请选择业务领域", trigger: "change" }
],
open: [{ required: true, message: "请选择开放程度", trigger: "change" }]
},
@@ -330,7 +330,7 @@ export default {
},
rules1: {
area: [
- { required: true, message: "请选择服务领域", trigger: "change" }
+ { required: true, message: "请选择业务领域", trigger: "change" }
],
resource: [
{ required: true, message: "请选择开放程度", trigger: "change" }
diff --git a/src/request/api.js b/src/request/api.js
index 79560debc1bfa26384b4369d7ec8de50b1e87f16..513dab912c5cba9efefd5a830901668c43335880 100644
--- a/src/request/api.js
+++ b/src/request/api.js
@@ -4,6 +4,7 @@ import user from '@/request/api/user';
import authority from '@/request/api/authority';
import general from '@/request/api/general';
import dataAnalysis from '@/request/api/data-analysis';
+import productType from '@/request/api/product-type'
export default {
workbench,
@@ -11,5 +12,6 @@ export default {
user,
authority,
general,
- dataAnalysis
+ dataAnalysis,
+ productType
}
\ No newline at end of file
diff --git a/src/request/api/product-type.js b/src/request/api/product-type.js
new file mode 100644
index 0000000000000000000000000000000000000000..4b1110e3ddcb18d40f8e30ec6ade3c714c1bf3a6
--- /dev/null
+++ b/src/request/api/product-type.js
@@ -0,0 +1,49 @@
+import axios from '@/request/http'; // 导入http中创建的axios实例
+import qs from 'qs'; // 根据需求是否导入qs模块
+
+const productType = {
+ // 分类相关接口
+ getClassTypeList(params) {
+ return axios.get(`/apaas/service/v3/service/manager/servtypeList`,{params})
+ }, // 服务分类/服务类型列表
+ changeClassState(params) {
+ return axios.put(`/apaas/service/v3/service/manager/servtype/state`,params)
+ }, // 服务分类/服务类型状态改变
+ deleteClass(id) {
+ return axios.delete(`/apaas/service/v3/service/manager/servtype/${id}`)
+ }, // 删除服务分类/服务类型
+ addNewClass(params) {
+ return axios.post(`/apaas/service/v3/service/manager/servtype`,params)
+ }, // 新增服务分类/服务类型
+ editClass(params) {
+ return axios.put(`/apaas/service/v3/service/manager/servtype`,params)
+ }, // 编辑服务分类/服务类型
+ getClassDetail(id) {
+ return axios.get(`/apaas/service/v3/service/manager/servtype/${id}`)
+ }, // 获取服务分类/服务类型详情
+ getClassTypes() {
+ return axios.get(`/apaas/service/v3/service/manager/allServtypes`)
+ }, // 获取所有的产品分类
+
+ // 领域相关接口
+ getDomainTypeList(params) {
+ return axios.get(`/apaas/service/v3/service/manager/servareaList`,{params})
+ }, // 领域分类列表
+ changeDomainState(params) {
+ return axios.put(`/apaas/service/v3/service/manager/servarea/state`,params)
+ }, // 领域分类状态改变
+ deleteDomain(id) {
+ return axios.delete(`/apaas/service/v3/service/manager/servarea/${id}`)
+ }, // 删除领域分类
+ addNewDomain(params) {
+ return axios.post(`/apaas/service/v3/service/manager/servarea`,params)
+ }, // 新增领域分类
+ editDomain(params) {
+ return axios.put(`/apaas/service/v3/service/manager/servarea`,params)
+ }, // 编辑领域分类
+ getDomainDetail(id) {
+ return axios.get(`/apaas/service/v3/service/manager/servarea/${id}`)
+ }, // 获取领域分类详情
+}
+
+export default productType;
diff --git a/src/router/index.js b/src/router/index.js
index 1d2432ee5257ca144f820b526b18bb8aa3e8fe1d..984014cb808af28ca2acf49692d630ea771065de 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -29,12 +29,12 @@ export default new Router({
path: "/fwzc", // 服务注册
name: "fwzc",
redirect: "/fwzc/fwcs",
- component: () => import("@/pages/workbench/fwzc_fwcs"),
+ component: () => import("@/pages/workbench/fwzc_fwcs_new"),
children: [
{
path: "/fwzc/fwcs", // 服务注册/服务测试
name: "fwcs",
- component: () => import("@/pages/workbench/fwzc_fwcs"),
+ component: () => import("@/pages/workbench/fwzc_fwcs_new"),
},
],
}, // 工作台 - 服务注册模块
@@ -147,6 +147,44 @@ export default new Router({
},
],
}, // 工作台 - 应用管理模块
+ {
+ path: "/productType",
+ name: "productType",
+ component: () => import("@/pages/workbench/product-type"),
+ redirect: "/productType/classList",
+ children: [
+ {
+ path: "/productType/classList",
+ name: "/productTypeClassList",
+ component: () => import("@/pages/workbench/product-type/class_list")
+ }, // 产品分类与产品类型
+ {
+ path: "/productType/classList/add",
+ name: "/productTypeClassListAdd",
+ component: () => import("@/pages/workbench/product-type/class_edit")
+ }, // 产品分类与产品类型新增
+ {
+ path: "/productType/classList/edit/:id",
+ name: "/productTypeClassListEdit",
+ component: () => import("@/pages/workbench/product-type/class_edit")
+ }, // 产品分类与产品类型编辑
+ {
+ path: "/productType/domainList",
+ name: "/productTypeDomainList",
+ component: () => import("@/pages/workbench/product-type/domain_list")
+ }, // 领域管理
+ {
+ path: "/productType/domainList/add",
+ name: "/productTypeDomainListAdd",
+ component: () => import("@/pages/workbench/product-type/domain_edit")
+ }, // 领域分类新增
+ {
+ path: "/productType/domainList/edit/:id",
+ name: "/productTypeDomainListEdit",
+ component: () => import("@/pages/workbench/product-type/domain_edit")
+ }, // 领域分类编辑
+ ],
+ }, // 分类管理
{
path: "/technical_support",
name: "technicalSupport",
@@ -278,55 +316,60 @@ export default new Router({
{
path: "/shop", // 服务超市
name: "shop",
- redirect: "/shop/data_service_list/5",
+ redirect: "/shop/data_service_list",
component: () => import("@/pages/service_shop/shop"),
children: [
{
- path: "/shop/data_service_list/:id", // 数据服务列表页
+ path: "/shop/data_service_list/:id", // 应用商店列表页
name: "shopDataList",
- component: () => import("@/pages/service_shop/shop_list-new"),
+ component: () => import("@/pages/service_shop/shop_list_new"),
},
{
- path: "/shop/space_time_service_list/:id", // 时空服务列表页
- name: "shopSpaceTimeList",
- component: () => import("@/pages/service_shop/shop_list-new"),
- },
- {
- path: "/shop/video_service_list/:id", // 视频服务列表页
- name: "shopVideoList",
- component: () => import("@/pages/service_shop/shop_list-new"),
- },
- {
- path: "/shop/perception_service_list/:id", // 感知服务列表页
- name: "shopPerceptionList",
- component: () => import("@/pages/service_shop/shop_list-new"),
- },
- {
- path: "/shop/comprehensive_app_list/:id", // 综合应用列表页
- name: "shopComAppList",
- component: () => import("@/pages/service_shop/shop_list-new"),
- },
- {
- path: "/shop/cloud", // 云资源服务
- name: "shopCloud",
- component: () => import("@/pages/service_shop/shop_cloud-new"),
- },
+ path: "/shop/data_service_list", // 服务商店列表页
+ name: "shopDataList",
+ component: () => import("@/pages/service_shop/shop_list_new"),
+ },
+ // {
+ // path: "/shop/space_time_service_list/:id", // 时空服务列表页
+ // name: "shopSpaceTimeList",
+ // component: () => import("@/pages/service_shop/shop_list-new"),
+ // },
+ // {
+ // path: "/shop/video_service_list/:id", // 视频服务列表页
+ // name: "shopVideoList",
+ // component: () => import("@/pages/service_shop/shop_list-new"),
+ // },
+ // {
+ // path: "/shop/perception_service_list/:id", // 感知服务列表页
+ // name: "shopPerceptionList",
+ // component: () => import("@/pages/service_shop/shop_list-new"),
+ // },
+ // {
+ // path: "/shop/comprehensive_app_list/:id", // 综合应用列表页
+ // name: "shopComAppList",
+ // component: () => import("@/pages/service_shop/shop_list-new"),
+ // },
+ // {
+ // path: "/shop/cloud", // 云资源服务
+ // name: "shopCloud",
+ // component: () => import("@/pages/service_shop/shop_cloud-new"),
+ // },
{
path: "/shop/service_application_successfully", // 申请服务成功
name: "shopSuccess",
component: () =>
import("@/pages/service_shop/service_application_successfully"),
},
- {
- path: "/shop/app_store_list/:id", // 应用商店列表页
- name: "shopAppStoreList",
- component: () => import("@/pages/service_shop/shop_list-new"),
- },
- {
- path: "/shop/products_list/:id", // 应用商店列表页
- name: "shopAppStoreList",
- component: () => import("@/pages/service_shop/shop_list-new"),
- },
+ // {
+ // path: "/shop/app_store_list/:id", // 应用商店列表页
+ // name: "shopAppStoreList",
+ // component: () => import("@/pages/service_shop/shop_list_new"),
+ // },
+ // {
+ // path: "/shop/products_list/:id", // 应用商店列表页
+ // name: "shopAppStoreList",
+ // component: () => import("@/pages/service_shop/shop_list-new"),
+ // },
{
path: "/shop/shopping_cart", // 购物车页
name: "shoppingCart",
@@ -343,37 +386,37 @@ export default new Router({
path: "/shop/sjfwDetail/:id",
name: "sjfwDetail",
component: () => import("@/pages/service_shop/sjfwDetail"),
- }, // 服务超市 - 数据服务详情
- {
- path: "/shop/skfwDetail/:id",
- name: "skfwDetail",
- component: () => import("@/pages/service_shop/skfwDetail"),
- }, // 服务超市 - 时空服务详情
- {
- path: "/shop/spfwDetail/:id",
- name: "spfwDetail",
- component: () => import("@/pages/service_shop/spfwDetail"),
- }, // 服务超市 - 视频服务详情
- {
- path: "/shop/gzfwDetail/:id",
- name: "sjfwDetail",
- component: () => import("@/pages/service_shop/gzfwDetail"),
- }, // 服务超市 - 感知服务详情
- {
- path: "/shop/zhfwDetail/:id",
- name: "zhfwDetail",
- component: () => import("@/pages/service_shop/zhfwDetail"),
- }, // 服务超市 - 综合应用详情
- {
- path: "/shop/yysdDetail/:id",
- name: "yysdDetail",
- component: () => import("@/pages/service_shop/yysdDetail"),
- }, // 服务超市 - 应用详情
- {
- path: "/shop/cpDetail/:id",
- name: "cpDetail",
- component: () => import("@/pages/service_shop/cpDetail"),
- }, // 服务超市 - 产品资源详情
+ }, // 服务超市 - 服务详情
+ // {
+ // path: "/shop/skfwDetail/:id",
+ // name: "skfwDetail",
+ // component: () => import("@/pages/service_shop/skfwDetail"),
+ // }, // 服务超市 - 时空服务详情
+ // {
+ // path: "/shop/spfwDetail/:id",
+ // name: "spfwDetail",
+ // component: () => import("@/pages/service_shop/spfwDetail"),
+ // }, // 服务超市 - 视频服务详情
+ // {
+ // path: "/shop/gzfwDetail/:id",
+ // name: "sjfwDetail",
+ // component: () => import("@/pages/service_shop/gzfwDetail"),
+ // }, // 服务超市 - 感知服务详情
+ // {
+ // path: "/shop/zhfwDetail/:id",
+ // name: "zhfwDetail",
+ // component: () => import("@/pages/service_shop/zhfwDetail"),
+ // }, // 服务超市 - 综合应用详情
+ // {
+ // path: "/shop/yysdDetail/:id",
+ // name: "yysdDetail",
+ // component: () => import("@/pages/service_shop/yysdDetail"),
+ // }, // 服务超市 - 应用详情
+ // {
+ // path: "/shop/cpDetail/:id",
+ // name: "cpDetail",
+ // component: () => import("@/pages/service_shop/cpDetail"),
+ // }, // 服务超市 - 产品资源详情
{
path: "/workplace",
name: "workPlace",
diff --git a/src/store/index.js b/src/store/index.js
index caa30e2239dbc87bb635634c45b45d45fc629740..c1c043a1d11d724cf0c5300d6c52b07627f196db 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -6,7 +6,8 @@ const store = new Vuex.Store({
state: {
role: 0, // 0:普通用户,1:组织管理员,2:超级管理员
userInfo: null, // 用户信息
- serviceShopMenu: "/shop/data_service_list/5", // 服务超市侧边栏
+ // serviceShopMenu: "/shop/data_service_list/5", // 服务超市侧边栏
+ serviceShopMenu: null, // 服务超市侧边栏
fwglNav: [
["注册发布的服务", "申请的服务", "云资源服务"], // 普通用户
["组织服务管理", "服务审批管理", "云资源管理"], // 组织管理员
|