diff --git a/src/components/shop-car-apply/apply_service_state.vue b/src/components/shop-car-apply/apply_service_state.vue index 0831775cc641589fa7f1d3b380757b4a8c2e4d9f..0edefe28c9d96c0d3ad23eba01bb6f3ec0aad1a2 100644 --- a/src/components/shop-car-apply/apply_service_state.vue +++ b/src/components/shop-car-apply/apply_service_state.vue @@ -93,25 +93,25 @@ export default { headers: [ { label: "字段编码", - prop: "code", + prop: "name", align: "left", minWidth: "20%" }, { label: "字段名称", - prop: "name", + prop: "label", align: "left", minWidth: "20%" }, { label: "字段类型", - prop: "type", + prop: "show_type", align: "center", width: "150" }, { label: "字段描述", - prop: "desc", + prop: "descript", align: "left", minWidth: "50%" } diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue index 527cec942ccd4bf7c73f9f819e03792e45547a69..bcec062aed9d5908ff13ef3d16cc12bdbce8e771 100644 --- a/src/pages/workbench/fwgl/serviceDetail.vue +++ b/src/pages/workbench/fwgl/serviceDetail.vue @@ -219,14 +219,14 @@ export default { header_arr: [ { prop: "name", - label: "字段名称", + label: "字段编码", minWidth: "20%", align: "left" }, { - prop: "field_type", - label: "字段编码", - width: "100px", + prop: "label", + label: "字段名称", + minWidth: "20%", align: "center" }, { diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue index e714478708674d23855654a1709017199d6f3297..ea202cbb22d1062825c45d4067509fe1539f42fa 100644 --- a/src/pages/workbench/workPlace.vue +++ b/src/pages/workbench/workPlace.vue @@ -156,8 +156,8 @@

- 数据资产看板 - + 数据分析中心 +

@@ -197,8 +197,8 @@

- 数据资产看板 - + 数据分析中心 +

@@ -281,7 +281,7 @@ {{ now_user == 0||now_user == 4 ? "我的应用" : "平台应用" }} diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue index 2ac8e10f334a963ba9f74c238579dac800151af0..3bb58641decc12468d21410aea49bc48b005eaf3 100644 --- a/src/pages/workbench/yygl/deploy_app_detail.vue +++ b/src/pages/workbench/yygl/deploy_app_detail.vue @@ -98,10 +98,10 @@ @@ -144,10 +144,10 @@

服务状态

- +

{{ micor_state.state }}

+ >{{ micor_state.state=='running'?'运行中':'停止' }}

@@ -236,9 +236,9 @@ @@ -334,52 +334,7 @@ export default { public_flag:false, now_micor_service:0, image_arr: [], - area_arr: [ - { - label: "经济建设", - value: 0 - }, - { - label: "城市管理", - value: 1 - }, - { - label: "城市建设", - value: 2 - }, - { - label: "道路交通", - value: 3 - }, - { - label: "环境资源", - value: 4 - }, - { - label: "民生服务", - value: 5 - }, - { - label: "空间地理", - value: 6 - }, - { - label: "文化休闲", - value: 7 - }, - { - label: "社会团体", - value: 8 - }, - { - label: "教育机构", - value: 9 - }, - { - label: "其他", - value: 10 - } - ], + area_arr: [], now_image_version:[], form: { name: "", @@ -576,6 +531,7 @@ export default { this.getServiceBaseInfo(); this.get_service_list(); this.get_app_generl(); + this.get_service_arae(); if (this.$route.query.showstate) { this.now_service = 1; } @@ -584,6 +540,17 @@ export default { }, methods: { + get_service_arae(){ + this.$http + .get('/apaas/service/v3/service/manager/servarea') + .then(response => { + let data = response.data.data + this.area_arr = data + }) + .catch(function(response) { + + }); + }, public_service(){ this.$refs.actiondialog.show(); }, @@ -1217,6 +1184,7 @@ background:khaki; .imagebox { overflow: hidden; margin-bottom: 20px; + padding-left: 40px; } .imagebox span { width: 165px;