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 @@ + + \ 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 @@ > -

服务领域:

+

业务领域:

-

服务领域:

+

业务领域:

+ + + + + + 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 @@ + + + + \ 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 @@ + + + + \ 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 @@