From eb14d451dd8fe1d2084d1a7cc332a4548b35a623 Mon Sep 17 00:00:00 2001 From: zhangjun1 Date: Wed, 3 Jun 2020 14:41:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/codes.vue | 5 +- src/components/service-header.vue | 5 +- src/components/table-input.vue | 2 +- src/components/table-select.vue | 6 +- src/components/table-um.vue | 1 + src/pages/workbench/fwgl/serviceDetail.vue | 225 ++++++++++++--------- src/utils/common.js | 22 +- 7 files changed, 156 insertions(+), 110 deletions(-) diff --git a/src/components/codes.vue b/src/components/codes.vue index f03b435..e9d5ec7 100644 --- a/src/components/codes.vue +++ b/src/components/codes.vue @@ -17,7 +17,7 @@ import ace from "ace-builds"; import "ace-builds/webpack-resolver"; // 在 webpack 环境中使用必须要导入 import "ace-builds/src-noconflict/mode-json"; // 默认设置的语言模式 export default { - props: ["url"], + props: ["url","datas"], data() { return { aceEditor: null, @@ -39,6 +39,9 @@ export default { if (this.url) { this.getValue(); } + if (this.datas) { + this.aceEditor.setValue(this.datas); + } }, watch: {}, methods: { diff --git a/src/components/service-header.vue b/src/components/service-header.vue index 366895e..958ef6b 100644 --- a/src/components/service-header.vue +++ b/src/components/service-header.vue @@ -10,7 +10,7 @@ 申请下线 申请下架 申请密钥 - 我要修改 + 我要修改

@@ -63,6 +63,9 @@ export default { }else if(val == 4){ this.$emit('applymy',1) } + }, + goto_page(url){ + this.$router.push(url) } }, }; diff --git a/src/components/table-input.vue b/src/components/table-input.vue index 9779b4e..98fd657 100644 --- a/src/components/table-input.vue +++ b/src/components/table-input.vue @@ -55,7 +55,7 @@ export default { default: "" }, id: { - type: String, + type: [String,Number], default: "" }, name: { diff --git a/src/components/table-select.vue b/src/components/table-select.vue index 04c5a32..fb19c33 100644 --- a/src/components/table-select.vue +++ b/src/components/table-select.vue @@ -32,7 +32,6 @@ export default { } }, item: { - type: String, default: "" }, header: { @@ -40,7 +39,7 @@ export default { default: "" }, id: { - type: String, + type: [String,Number], default: "" }, name: { @@ -61,7 +60,8 @@ export default { this.selectValue = this.item; if (this.selectValue == null || !this.selectValue || this.selectValue == "") { if (this.selectArr && this.selectArr.length != 0) { - this.selectValue = this.selectArr[0].value; + this.selectValue = "" + // this.selectValue = this.selectArr[0].value;//去掉默认值 } else { this.selectValue = ""; } diff --git a/src/components/table-um.vue b/src/components/table-um.vue index f89bef2..7a759c8 100644 --- a/src/components/table-um.vue +++ b/src/components/table-um.vue @@ -653,6 +653,7 @@ export default { arr.forEach(item => { newRow[item.prop] = "" }) + newRow.flag = true //新增标记 newRow.id = parseInt(Math.random() * 100000, 10) + "" + diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue index 41564f3..a03f9b9 100644 --- a/src/pages/workbench/fwgl/serviceDetail.vue +++ b/src/pages/workbench/fwgl/serviceDetail.vue @@ -26,11 +26,10 @@ > - +

服务运行概况

@@ -89,16 +88,16 @@

购买方式：

-

按月购买&按年购买

-
编辑
-

+

{{buy_type==1?'按月购买':buy_type==2?'按年购买':'按月购买&按年购买'}}

+
编辑
+

规格设置：

-

+

购买方式：

按月购买 按年购买 -
- 保存 - 取消 +
+ 保存 + 取消
@@ -145,7 +145,7 @@ import exampleIcon from "@/pages/example/example_icon"; import Topology from "@/components/topology.vue"; import serviceHeader from "@/components/service-header"; import dialogAction from "@/components/dialog-action"; -import { getRole } from "@/utils/common"; +import { getRole,formatDateTime_date } from "@/utils/common"; export default { components: { infoList, @@ -160,7 +160,7 @@ export default { data() { return { now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员 - buy_style: 0, + buy_style: 1, responseParamUrl: "", codeExampleUrl: "", yx_state: { @@ -171,11 +171,16 @@ export default { maxTraffic: "", memory: "", }, + res_data:[],//响应参数 + buy_type:'', + sizeset_flag:false,//规格设置是否显示 + code_arr:'', service_arr: [ ["服务基本信息", "接口详细信息", "服务运行状态"], ["服务基本信息", "接口详细信息", "服务运行状态", "服务计费规则"], ["服务基本信息", "接口详细信息", "服务运行状态", "服务规格"], ], + service_size_data:[],//服务规格数组 service_header_arr: { url:'', name: "", @@ -204,36 +209,37 @@ export default { } ], fixed: true, + fixedurl:'' }, now_service: 0, datas: {}, header_arr: [ { - prop: "zdmc", + prop: "name", label: "字段名称", minWidth: "20%", align: "left", }, { - prop: "zdbm", + prop: "field_type", label: "字段编码", width: "100px", align: "center", }, { - prop: "zdlx", + prop: "show_type", label: "字段类型", width: "100px", align: "center", }, { - prop: "zdsm", + prop: "descript", label: "字段说明", minWidth: "30%", align: "left", }, { - prop: "zdsl", + prop: "example", label: "字段示例数值", width: "120px", align: "left", @@ -279,19 +285,19 @@ export default { ], service_size_arr: [ { - prop: "fwcs", + prop: "count", label: "访问次数（次/日）", minWidth: "33.33%", align: "center", }, { - prop: "fwl", + prop: "pv", label: "访问量（PV/日）", minWidth: "33.33%", align: "center", }, { - prop: "ggsm", + prop: "des", label: "规格说明", minWidth: "33.33%", align: "left", @@ -299,137 +305,137 @@ export default { ], edit_size_arr: [ { - prop: "fwcs", + prop: "count", label: "访问次数（次/日）", minWidth: "33.33%", align: "center", type: "select", selectArr: [ { - label: 10, + label: '10', value: 10, }, { - label: 20, + label: '20', value: 20, }, { - label: 30, + label: '30', value: 30, }, { - label: 40, + label: '40', value: 40, }, { - label: 50, + label: '50', value: 50, }, { - label: 60, + label: '60', value: 60, }, { - label: 70, + label: '70', value: 70, }, { - label: 80, + label: '80', value: 80, }, { - label: 90, + label: '90', value: 90, }, { - label: 100, + label: '100', value: 100, }, { - label: 200, + label: '200', value: 200, }, { - label: 300, + label: '300', value: 300, }, { - label: 400, + label: '400', value: 400, }, { - label: 500, + label: '500', value: 500, }, ], }, { - prop: "fwl", + prop: "pv", label: "访问量（PV/日）", minWidth: "33.33%", align: "center", type: "select", selectArr: [ { - label: 100, + label: '100', value: 100, }, { - label: 200, + label: '200', value: 200, }, { - label: 300, + label: '300', value: 300, }, { - label: 400, + label: '400', value: 400, }, { - label: 500, + label: '500', value: 500, }, { - label: 600, + label: '600', value: 600, }, { - label: 700, + label: '700', value: 700, }, { - label: 800, + label: '800', value: 800, }, { - label: 900, + label: '900', value: 900, }, { - label: 1000, + label: '1000', value: 1000, }, { - label: 2000, + label: '2000', value: 2000, }, { - label: 3000, + label: '3000', value: 3000, }, { - label: 4000, + label: '4000', value: 4000, }, { - label: 5000, + label: '5000', value: 5000, }, ], }, { - prop: "ggsm", + prop: "des", label: "规格说明", minWidth: "33.33%", align: "left", @@ -449,6 +455,7 @@ export default { ], }, ], + size_arr_down:[], servicead_arr: [ { title: "请求方式：", @@ -479,6 +486,11 @@ export default { solt_name: "zd_code", }, ], + service_type_arr:['数据服务','时空服务','视频服务','感知服务','综合服务'], + scrvice_area_arr:['经济建设','城市建设','道路交通','环境资源','服务民生','空间地理','文化休闲','社会团体','教育机构','其他'], + open_arr:['共享','受限','敏感'], + service_state_arr:['已下架','上架中'], + request_arr:['GET','POST','PUT','DELETE'], list_arr: [ { "title": "服务描述：", @@ -520,8 +532,6 @@ export default { this.now_user = data; this.$store.commit("rolefun", data); this.getServiceInfo(); - this.getInterfaceInfo(); - this.getServiceBaseInfo(); this.getServiceyxztInfo(); }); }, @@ -538,70 +548,83 @@ export default { }, getServiceInfo() { this.$http - .get("/apaas/service/v3/service/manager?service_id=10") + .get("/apaas/service/v3/service/manager?service_id="+this.$route.params.id) .then((response) => { let data = response.data.data; console.log(data); this.$set(this.service_header_arr, "name", data.name); - this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1); + this.$set(this.service_header_arr['first'][0], 'text', this.service_type_arr[data.data_service_type1-1]); this.$set(this.service_header_arr['first'][1], 'text', data.apply_num); this.$set(this.service_header_arr['first'][2], 'text', data.request_count); - this.$set(this.service_header_arr['first'][3], 'text', data.state); + this.$set(this.service_header_arr['first'][3], 'text', this.service_state_arr[data.state]); this.$set(this.service_header_arr['second'][0], "text", data.req_url); this.$set(this.service_header_arr, "url", data.cover); + this.$set(this.service_header_arr, "fixedurl", this.$route.path.replace('servicedetail','serviceedit')); this.$set(this.list_arr[0], "info", data.descript); - this.$set(this.list_arr[1], "info", data.sectors); + this.$set(this.list_arr[1], "info", this.scrvice_area_arr[data.sectors-1]); this.$set(this.list_arr[2], "info", data.organization); - this.$set(this.list_arr[3], "info", data.data_service_type3); + this.$set(this.list_arr[3], "info", data.openness_name); this.$set(this.list_arr[4], "info", data.encode_method); - this.$set(this.list_arr[5], "info", data.create_time); - this.$set(this.servicead_arr[0], "info", data.req_type); - this.$set(this.servicead_arr[1], "info", data.req_query); - this.$set(this.servicead_arr[2], "info", data.create_time); - this.$set(this.servicead_arr[3], "info", data.create_time); + this.$set(this.list_arr[5], "info", data.create_time.replace('T'," ").split('+')[0]); + this.$set(this.servicead_arr[0], "info", this.request_arr[data.req_type-1]); + this.$set(this.servicead_arr[1], "info", data.req_query?data.req_query:'无'); + this.$set(this.servicead_arr[2], "info", data.req_fields); + this.$set(this.servicead_arr[3], "info", data.encode_method); + this.code_arr = data.res_fields + this.res_data = JSON.parse(data.res_fields) + this.service_size_data = data.request_spcs_info + this.size_arr_down = data.request_spcs_info + this.buy_type = data.request_spcs_info[0].type + }) .catch(function(response) {}); }, - getInterfaceInfo() { + now_size_data(val){ + console.log(val); + this.size_arr_down = val + }, + getsize_arr(){ this.$http - .get("/static/servicedetail1.json") + .get("/apaas/service/v3/service/manager/request/spcs/list?service_id="+this.$route.params.id) .then((response) => { let data = response.data.data; - this.$set( - this.servicead_arr[0], - "info", - data.serviceinterfaceinfo.type - ); - this.$set( - this.servicead_arr[1], - "info", - data.serviceinterfaceinfo.requestParam - ); - this.$set( - this.servicead_arr[2], - "info", - data.serviceinterfaceinfo.example - ); - this.$set( - this.servicead_arr[3], - "info", - data.serviceinterfaceinfo.format - ); - this.responseParamUrl = data.serviceinterfaceinfo.responseParamUrl; - this.codeExampleUrl = data.serviceinterfaceinfo.codeExampleUrl; + console.log(data); + this.service_size_data = data.data + this.buy_type = data.data[0].type }) .catch(function(response) {}); }, - getServiceBaseInfo() { + change_service_size(){ + let temp = [] + this.size_arr_down.forEach(e => { + if(e.pv&&e.count){ + if(e.flag){ + e.id = 0 + } + e.type = this.buy_style + delete e.undefined + delete e.flag + temp.push(e) + } + }); this.$http - .get("/static/servicedetail1.json") + .post("/apaas/service/v3/service/manager/request/spcs/save",{ + service_id:parseInt(this.$route.params.id), + data:temp + }) .then((response) => { - let data = response.data.data; - this.list_arr = data.servicebaseinfo; + console.log(response); + if(response.data.success){ + this.$message.success('保存成功') + this.sizeset_flag = false + this.getsize_arr() + }else{ + this.$message.success('保存失败') + } }) - .catch(function(response) {}); }, + getServiceyxztInfo() { this.$http .get("/static/servicedetail1.json") diff --git a/src/utils/common.js b/src/utils/common.js index 8a7ce5a..66354f3 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -1,15 +1,31 @@ function getRole(){ return new Promise((resolve,reject)=>{ if(true){ - resolve(2) + resolve(1) }else{ reject('error') } }) } - + //时间戳转时间格式 + var formatDateTime_date = function (date) { + debugger + var y = date.getFullYear(); + var M = date.getMonth() + 1; + M = M < 10 ? ('0' + M) : M; + var d = date.getDate(); + d = d < 10 ? ('0' + d) : d; + var h = date.getHours(); + h = h < 10 ? ('0' + h) : h; + var m = date.getMinutes(); + m = m < 10 ? ('0' + m) : m; + var s = date.getSeconds(); + s = s < 10 ? ('0' + s) : s; + return y + '-' + M + '-' + d+' '+h + ':' + m + ':' + s; +}; export{ - getRole + getRole, + formatDateTime_date } \ No newline at end of file -- 2.26.0