diff --git a/src/assets/css/index.css b/src/assets/css/index.css index dfc85dbfa250a594f12ed5142c7396a5c5485233..449dea62b0134ffacefd29a31078238d59544fcf 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -420,6 +420,11 @@ width: 620px!important; .el-select-dropdown { border-radius: 8px; } +.el-select-dropdown__empty { + background-color: #0f2683; + color: #f4f7fc; + border-radius: 8px; +} .el-select-dropdown__list { padding: 0; background-color: #0f2683; diff --git a/src/components/cropper.vue b/src/components/cropper.vue index 10958a797b3da1518a7cfe65a43a33dd21772eac..a9378f1f9e010524c747d5d24ebf06ffa19aa2e5 100644 --- a/src/components/cropper.vue +++ b/src/components/cropper.vue @@ -123,7 +123,8 @@ export default { this.$refs.cropper.getCropBlob(res => { //res是裁剪后图片的bolb对象 formData.append("file", res, this.userId); - let url = "ssurl"; + formData.append("directory", "image"); + let url = "/awecloud/static/image/upload"; this.$http .post(url, formData, { contentType: false, @@ -132,7 +133,8 @@ export default { }) .then(res => { // 上传图片后服务器返回访问路径 - this.$emit("getNewUrl", res.data.visitUrl); + this.$emit("getNewUrl", res.data.data); + this.handleClose(); }); }); } diff --git a/src/components/menu.vue b/src/components/menu.vue index b0ae0580e117e63bfdcaf4179ec1a1d28088bd45..ac27da33881c105a055d7b5b7e63bf991b2dc6f0 100644 --- a/src/components/menu.vue +++ b/src/components/menu.vue @@ -54,9 +54,9 @@ {{ item.name }}
{{ v.name }}
@@ -190,13 +190,14 @@ export default { this.$router.push(path); this.now_menu = index; }, - gotoChildPage(v) { + gotoChildPage(v, parent) { if (v.path) { if (v.path == "/fwgl/" || v.path == "/yygl/") { this.$router.push(v.path + this.$store.state.role); } else { this.$router.push(v.path); } + this.now_menu = parent; } } } diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue index dec1e2b857e0f3b68ac8bb5173104b50bf3d0570..cd26e7f817d16bb6a44a607dd583bacc77f331fd 100644 --- a/src/components/shop-cloud/shop-cloud.vue +++ b/src/components/shop-cloud/shop-cloud.vue @@ -18,9 +18,9 @@ - + - +
基本信息
@@ -43,10 +43,138 @@ 块,每块 + GB + +
单个容器组规格
+
CPU
+ + 核 + + + 核 + +
内存
+ + GB + + + GB + +
其他信息
+ + + + + + + +
- 升级现有工作区域 + + 选择要进行升级的工作区域 + + + +
+ +
基本信息
+ + + + + + + + + +
工作区域申请规格
+ + + + + + + + + + + 块,每块 + GB + +
单个容器组规格
+
CPU
+ + 核 + + + 核 + +
内存
+ + GB + + + GB + +
其他信息
+ + + + + + + + + +
+
+
@@ -54,9 +182,11 @@ + \ No newline at end of file diff --git a/src/components/table-um.vue b/src/components/table-um.vue index ae4a718cc0e92bfecdd1483ab483ade4b78a33e2..8a7aeab090b853fa1ea9271f782aa6288b50453c 100644 --- a/src/components/table-um.vue +++ b/src/components/table-um.vue @@ -404,6 +404,12 @@ export default { }, deep: true }, + datas: { + handler(val) { + this.getDataFromApiSync(); + }, + deep: true + }, }, methods: { //本地删除 @@ -420,7 +426,7 @@ export default { if (this.autoAdd) { this.addRow(); } - if (this.selectedTabsPage[0].id) { + if (this.selectedTabsPage[0] && this.selectedTabsPage[0].id) { } else { let arrs = this.selectedTabsPage; this.addId(arrs, "00000000"); diff --git a/src/components/upload_file.vue b/src/components/upload_file.vue index eb23f6045b70e568845fb56859b745bcac4a8e27..94f2d35fa27d2bcbe913cadbac35a60aa45bd34e 100644 --- a/src/components/upload_file.vue +++ b/src/components/upload_file.vue @@ -11,7 +11,7 @@
-
+
请求参数信息填写:
-
+
测试服务信息:
 测试成功
-
-  测试失败 -
-
+
+  测试失败 +
@@ -232,9 +231,9 @@

开放程度:

- - - + 共享 + 受限 + 敏感
@@ -302,13 +301,14 @@ export default { ], sjfw_fhcstx: [ { label: "字段编码", prop: "name", type: "", align: "left" }, - { label: "字段类型", prop: "field_type", type: "popover", align: "left" }, + { label: "字段类型", prop: "field_type", type: "", align: "left" }, { label: "字段名称", prop: "label", type: "input", align: "left" }, { label: "字段说明", prop: "descript", type: "input", align: "left" } ], url: "", - emptyText: "暂时没数据", + emptyText: "暂无数据", resultShow: false, + resSuccess: false, optionsSq: [{ label: "Bearer Token", value: "Bearer" }], sqfsVal: "", tokenVal: "", @@ -354,110 +354,11 @@ export default { { label: "其他", value: 10 } ], optionsOrganization: [], - datasQqcs: [ - { - name: "name", - field_type: "string", - label: "", - descript: "", - example: "lisi", - children: null - }, - { - name: "age", - field_type: "float", - label: "", - descript: "", - example: "22.00", - children: null - }, - { - name: "childs", - field_type: "array", - label: "", - descript: "", - example: "", - children: [ - { - name: "", - field_type: "object", - label: "", - descript: "", - example: "", - children: [ - { - name: "name", - field_type: "string", - label: "", - descript: "", - example: "lili", - children: null - }, - { - name: "age", - field_type: "float", - label: "", - descript: "", - example: "2.00", - children: null - } - ] - } - ] - } - ], - datasFhcs: [ - { - name: "name", - field_type: "string", - label: "", - descript: "", - example: "lisi", - children: null - }, - { - name: "age", - field_type: "float", - label: "", - descript: "", - example: "22.00", - children: null - }, - { - name: "childs", - field_type: "array", - label: "", - descript: "", - example: "", - children: [ - { - name: "", - field_type: "object", - label: "", - descript: "", - example: "", - children: [ - { - name: "name", - field_type: "string", - label: "", - descript: "", - example: "lili", - children: null - }, - { - name: "age", - field_type: "float", - label: "", - descript: "", - example: "2.00", - children: null - } - ] - } - ] - } - ] + datasQqcs: [], + datasFhcs: [], + request_fields: [], + response_fields: [], + cover: "" }), computed: {}, watch: {}, @@ -469,33 +370,33 @@ export default { this.serviceUrl = ""; }, clickFwcs() { - this.resultShow = true; let headers = {}; - if (this.sqfsVal != "") { - headers.Authorization = []; - headers.Authorization[0] = this.sqfsVal + " " + this.tokenVal; - } - let request = this.$refs.fwcs_sjfw_qq.getTableData(); - console.log(request); let requestData = {}; - for (let i = 0; i < request.length; i++) { - if ( - request[i] && - request[i].requestEncoding && - request[i].requestValue && - request[i].requestEncoding != "" && - request[i].requestValue != "" - ) { + if (this.activeBtn == 0) { + if (this.sqfsVal != "") { + headers.Authorization = []; + headers.Authorization[0] = this.sqfsVal + " " + this.tokenVal; + } + let request = this.$refs.fwcs_sjfw_qq.getTableData(); + for (let i = 0; i < request.length; i++) { if ( - Object.keys(requestData).indexOf(request[i].requestEncoding) == -1 + request[i] && + request[i].requestEncoding && + request[i].requestValue && + request[i].requestEncoding != "" && + request[i].requestValue != "" ) { - requestData[request[i].requestEncoding] = []; - requestData[request[i].requestEncoding][0] = - request[i].requestValue; - } else { - requestData[request[i].requestEncoding].push( - request[i].requestValue - ); + if ( + Object.keys(requestData).indexOf(request[i].requestEncoding) == -1 + ) { + requestData[request[i].requestEncoding] = []; + requestData[request[i].requestEncoding][0] = + request[i].requestValue; + } else { + requestData[request[i].requestEncoding].push( + request[i].requestValue + ); + } } } } @@ -518,7 +419,11 @@ export default { this.datasQqcs = data.param_fields; } this.datasFhcs = data.response_fields; + this.resSuccess = true; + this.resultShow = true; } else { + this.resSuccess = false; + this.resultShow = true; console.log(response.data.console.error); } }) @@ -532,17 +437,50 @@ export default { }, resetSjfw() {}, nextJcxx() { + this.request_fields = this.$refs.fwcs_sjfw_qqcs.getTableData(); + this.response_fields = this.$refs.fwcs_sjfw_fhcs.getTableData(); this.jcxxtx = true; }, // edit form getNewList(val) { - console.log(val); + this.cover = val; }, previous() { this.jcxxtx = false; }, registe() { - console.log("submit!"); + let query = { + name: this.form.name, + sectors: this.form.area, + organization: this.form.origin, + cover: this.cover, + openness: this.form.resource, + descript: this.form.desc, + data_service_type1: this.activeBtn, + data_service_type2: + this.activeBtn == 1 + ? this.skfwRadios + : this.activeBtn == 4 + ? this.zhyyVal + : 0, + encode_method: this.form.code, + method: this.select, + url: this.serviceUrl, + request_fields: this.request_fields, + response_fields: this.response_fields + }; + let url = `/apaas/service/v3/service/manager`; + this.$http + .post(url, query) + .then(response => { + if (response.data.success == 1) { + } else { + console.log(response.data.console.error); + } + }) + .catch(function(response) { + console.log("unkonw error"); + }); } }, mounted() {}