Skip to content

A
apaas-ui
Commit ef5e14e7 authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

Merge branch 'ldx' into dev

parents 5ab84df2 52cedb6b
Hide whitespace changes
Inline Side-by-side
Showing with 278 additions and 156 deletions
src/assets/css/index.css
View file @ ef5e14e7
...@@ -420,6 +420,11 @@ width: 620px!important; ...@@ -420,6 +420,11 @@ width: 620px!important;
.el-select-dropdown { .el-select-dropdown {
border-radius: 8px; border-radius: 8px;
} }
.el-select-dropdown__empty {
background-color: #0f2683;
color: #f4f7fc;
border-radius: 8px;
}
.el-select-dropdown__list { .el-select-dropdown__list {
padding: 0; padding: 0;
background-color: #0f2683; background-color: #0f2683;
......
src/components/cropper.vue
View file @ ef5e14e7
...@@ -123,7 +123,8 @@ export default { ...@@ -123,7 +123,8 @@ export default {
this.$refs.cropper.getCropBlob(res => { this.$refs.cropper.getCropBlob(res => {
//res是裁剪后图片的bolb对象 //res是裁剪后图片的bolb对象
formData.append("file", res, this.userId); formData.append("file", res, this.userId);
let url = "ssurl"; formData.append("directory", "image");
let url = "/awecloud/static/image/upload";
this.$http this.$http
.post(url, formData, { .post(url, formData, {
contentType: false, contentType: false,
...@@ -132,7 +133,8 @@ export default { ...@@ -132,7 +133,8 @@ export default {
}) })
.then(res => { .then(res => {
// 上传图片后服务器返回访问路径 // 上传图片后服务器返回访问路径
this.$emit("getNewUrl", res.data.visitUrl); this.$emit("getNewUrl", res.data.data);
this.handleClose();
}); });
}); });
} }
......
src/components/menu.vue
View file @ ef5e14e7
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
{{ item.name }} {{ item.name }}
<div class="user_menu" v-if="item.children && item.children.length" style="left: 30px;"> <div class="user_menu" v-if="item.children && item.children.length" style="left: 30px;">
<div <div
v-for="(v, index) in item.children" v-for="(v, indexs) in item.children"
:key="index + 700" :key="indexs + 700"
@click.stop="gotoChildPage(v)" @click.stop="gotoChildPage(v, index)"
>{{ v.name }}</div> >{{ v.name }}</div>
</div> </div>
<div class="sj" v-if="item.children && item.children.length" style="left: 60px;"></div> <div class="sj" v-if="item.children && item.children.length" style="left: 60px;"></div>
...@@ -190,13 +190,14 @@ export default { ...@@ -190,13 +190,14 @@ export default {
this.$router.push(path); this.$router.push(path);
this.now_menu = index; this.now_menu = index;
}, },
gotoChildPage(v) { gotoChildPage(v, parent) {
if (v.path) { if (v.path) {
if (v.path == "/fwgl/" || v.path == "/yygl/") { if (v.path == "/fwgl/" || v.path == "/yygl/") {
this.$router.push(v.path + this.$store.state.role); this.$router.push(v.path + this.$store.state.role);
} else { } else {
this.$router.push(v.path); this.$router.push(v.path);
} }
this.now_menu = parent;
} }
} }
} }
......
src/components/shop-cloud/shop-cloud.vue
View file @ ef5e14e7
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
</el-form> </el-form>
</block-radius> </block-radius>
<block-radius> <block-radius>
<el-tabs v-model="activeName" @tab-click="tabClick"> <el-tabs v-model="activeName" class="cloud_form" @tab-click="tabClick">
<el-tab-pane label="申请新的工作区域" name="0"> <el-tab-pane label="申请新的工作区域" name="0">
<el-form ref="formNew" :model="formNew" label-width="100px"> <el-form ref="formNew" :model="formNew" label-width="120px">
<div>基本信息</div> <div>基本信息</div>
<el-form-item label="工作区域名称"> <el-form-item label="工作区域名称">
<el-input v-model="formNew.workAreaName"></el-input> <el-input v-model="formNew.workAreaName"></el-input>
...@@ -43,10 +43,138 @@ ...@@ -43,10 +43,138 @@
</el-form-item> </el-form-item>
<el-form-item label="数据盘（可选）"> <el-form-item label="数据盘（可选）">
<el-input-number v-model="formNew.dataDisk" @change="handleChange" :min="1" :max="10"></el-input-number>块，每块 <el-input-number v-model="formNew.dataDisk" @change="handleChange" :min="1" :max="10"></el-input-number>块，每块
<el-input-number
v-model="formNew.perDataDisk"
@change="handleChange"
:min="1"
:max="10"
></el-input-number>GB
</el-form-item>
<div>单个容器组规格</div>
<div>CPU</div>
<el-form-item label="最高">
<el-input v-model="formNew.perCPUs"></el-input>核
</el-form-item>
<el-form-item label="默认">
<el-input v-model="formNew.perCPU"></el-input>核
</el-form-item>
<div>内存</div>
<el-form-item label="最高">
<el-input v-model="formNew.perRAMs"></el-input>GB
</el-form-item>
<el-form-item label="默认">
<el-input v-model="formNew.perRAM"></el-input>GB
</el-form-item>
<div>其他信息</div>
<el-form-item label="申请时长">
<el-input v-model="formNew.appDuration"></el-input>
<el-select v-model="formNew.durType" placeholder="请选择">
<el-option
v-for="item in durationOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="申请文件">
<upload-file
:multiple="false"
:max="1"
type="zip"
:readOnly="false"
:drag="true"
@getNewList="getNewList"
></upload-file>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="升级现有工作区域" name="1">升级现有工作区域</el-tab-pane> <el-tab-pane label="升级现有工作区域" name="1">
选择要进行升级的工作区域
<el-select v-model="workSpace" @change="getForm" placeholder="请选择">
<el-option
v-for="item in workSpaceOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
<div v-if="formShow">
<el-form ref="formNew" :model="formNew" label-width="120px">
<div>基本信息</div>
<el-form-item label="工作区域名称">
<el-input v-model="formNew.workAreaName"></el-input>
</el-form-item>
<el-form-item label="中文名称">
<el-input v-model="formNew.cnName"></el-input>
</el-form-item>
<el-form-item label="描述信息">
<el-input type="textarea" v-model="formNew.description"></el-input>
</el-form-item>
<div>工作区域申请规格</div>
<el-form-item label="CPU">
<el-input v-model="formNew.CPUs"></el-input>
</el-form-item>
<el-form-item label="内存">
<el-input v-model="formNew.RAMs"></el-input>
</el-form-item>
<el-form-item label="容器组">
<el-input type="textarea" v-model="formNew.containerGroup"></el-input>
</el-form-item>
<el-form-item label="数据盘（可选）">
<el-input-number
v-model="formNew.dataDisk"
@change="handleChange"
:min="1"
:max="10"
></el-input-number>块，每块
<el-input-number
v-model="formNew.perDataDisk"
@change="handleChange"
:min="1"
:max="10"
></el-input-number>GB
</el-form-item>
<div>单个容器组规格</div>
<div>CPU</div>
<el-form-item label="最高">
<el-input v-model="formNew.perCPUs"></el-input>核
</el-form-item>
<el-form-item label="默认">
<el-input v-model="formNew.perCPU"></el-input>核
</el-form-item>
<div>内存</div>
<el-form-item label="最高">
<el-input v-model="formNew.perRAMs"></el-input>GB
</el-form-item>
<el-form-item label="默认">
<el-input v-model="formNew.perRAM"></el-input>GB
</el-form-item>
<div>其他信息</div>
<el-form-item label="申请时长">
<el-input v-model="formNew.appDuration"></el-input>
<el-select v-model="formNew.durType" placeholder="请选择">
<el-option
v-for="item in durationOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="申请文件">
<upload-file
:multiple="false"
:max="1"
type="zip"
:readOnly="false"
:drag="true"
@getNewList="getNewList"
></upload-file>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
</el-tabs> </el-tabs>
</block-radius> </block-radius>
</div> </div>
...@@ -54,9 +182,11 @@ ...@@ -54,9 +182,11 @@
<script> <script>
import BlockRadius from "@/components/block-radius"; import BlockRadius from "@/components/block-radius";
import uploadFile from "@/components/upload_file";
export default { export default {
components: { components: {
BlockRadius BlockRadius,
uploadFile
}, },
props: { props: {
name: { type: String, default: "" } name: { type: String, default: "" }
...@@ -75,14 +205,53 @@ export default { ...@@ -75,14 +205,53 @@ export default {
CPUs: "", CPUs: "",
RAMs: "", RAMs: "",
containerGroup: "", containerGroup: "",
dataDisk: "" dataDisk: "",
} perDataDisk: "",
perCPUs: "",
perCPU: "",
perRAMs: "",
perRAM: "",
appDuration: "",
durType: ""
},
durationOptions: [
{ value: "月", label: "月" },
{ value: "年", label: "年" }
],
workSpace: "",
workSpaceOptions: [
{ value: "aaaaaaaaaa工作空间", label: "aaaaaaaaaa工作空间" },
{ value: "wwwwwwwwww工作空间", label: "wwwwwwwwww工作空间" }
],
formShow: false
}), }),
methods: { methods: {
tabClick() {} tabClick() {},
getNewList() {},
handleChange() {},
getForm(val) {
if (val != "") {
this.formShow = true;
} else {
this.formShow = false;
}
}
} }
}; };
</script> </script>
<style scoped> <style scoped>
.cloud_form {
}
</style> </style>
<style>
.cloud_form .el-input {
width: 400px;
}
.cloud_form .el-input-number .el-input {
width: 180px;
}
.cloud_form .el-textarea {
width: 400px;
}
</style>
\ No newline at end of file
src/components/table-um.vue
View file @ ef5e14e7
...@@ -404,6 +404,12 @@ export default { ...@@ -404,6 +404,12 @@ export default {
}, },
deep: true deep: true
}, },
datas: {
handler(val) {
this.getDataFromApiSync();
},
deep: true
},
}, },
methods: { methods: {
//本地删除 //本地删除
...@@ -420,7 +426,7 @@ export default { ...@@ -420,7 +426,7 @@ export default {
if (this.autoAdd) { if (this.autoAdd) {
this.addRow(); this.addRow();
} }
if (this.selectedTabsPage[0].id) { if (this.selectedTabsPage[0] && this.selectedTabsPage[0].id) {
} else { } else {
let arrs = this.selectedTabsPage; let arrs = this.selectedTabsPage;
this.addId(arrs, "00000000"); this.addId(arrs, "00000000");
......
src/components/upload_file.vue
View file @ ef5e14e7
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<div v-else> <div v-else>
<el-upload <el-upload
action="ssurl" action="/awecloud/static/image/upload"
:file-list="fileArray" :file-list="fileArray"
:list-type="type=='picture'?'picture-card':''" :list-type="type=='picture'?'picture-card':''"
:limit="max" :limit="max"
...@@ -170,6 +170,7 @@ export default { ...@@ -170,6 +170,7 @@ export default {
getNewUrl(val) { getNewUrl(val) {
this.fileArray.push({ name: val, url: val }); this.fileArray.push({ name: val, url: val });
this.$emit("getNewList", this.fileArray); this.$emit("getNewList", this.fileArray);
console.log(this.fileArray)
}, },
deleteImg(item, index) { deleteImg(item, index) {
this.fileArray.splice(index, 1); this.fileArray.splice(index, 1);
......
src/pages/fwzc_fwcs.vue
View file @ ef5e14e7
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
</div> </div>
</block-radius> </block-radius>
<block-radius v-if="resultShow"> <block-radius v-if="resultShow">
<div v-if="activeBtn == 0"> <div v-if="activeBtn == 0 && resSuccess">
<div class="sjfw_qqcstx">请求参数信息填写：</div> <div class="sjfw_qqcstx">请求参数信息填写：</div>
<ces-table <ces-table
ref="fwcs_sjfw_qqcs" ref="fwcs_sjfw_qqcs"
...@@ -157,21 +157,20 @@ ...@@ -157,21 +157,20 @@
headerCellClassName="th_pink" headerCellClassName="th_pink"
></ces-table> ></ces-table>
</div> </div>
<div v-else-if="activeBtn == 1 || activeBtn == 4"> <div v-else-if="(activeBtn == 1 || activeBtn == 4) && resSuccess">
<div class="skfw_csfwxx">测试服务信息：</div> <div class="skfw_csfwxx">测试服务信息：</div>
<div class="test_succ"> <div class="test_succ">
<div v-if="skfwResult" class="skcs_jg"> <div v-if="skfwResult" class="skcs_jg">
<img src="../assets/imgs/test_icon_success.png" class="skcs_jg_img" />&nbsp;测试成功 <img src="../assets/imgs/test_icon_success.png" class="skcs_jg_img" />&nbsp;测试成功
</div> </div>
<div v-else class="skcs_jg">
<img src="../assets/imgs/test_icon_error.png" class="skcs_jg_img" />&nbsp;测试失败
</div>
<div></div>
</div> </div>
</div> </div>
<div v-else class="skcs_jg">
<img src="../assets/imgs/test_icon_error.png" class="skcs_jg_img" />&nbsp;测试失败
</div>
<div class="btn_footer"> <div class="btn_footer">
<el-button class="reset" v-if="activeBtn == 0" @click="resetSjfw">重置</el-button> <el-button class="reset" v-if="activeBtn == 0" @click="resetSjfw">重置</el-button>
<el-button class="next" @click="nextJcxx">下一步</el-button> <el-button :disabled="!resSuccess" class="next" @click="nextJcxx">下一步</el-button>
</div> </div>
</block-radius> </block-radius>
</div> </div>
...@@ -232,9 +231,9 @@ ...@@ -232,9 +231,9 @@
<el-form-item> <el-form-item>
<p class="formname">开放程度：</p> <p class="formname">开放程度：</p>
<el-radio-group v-model="form.resource"> <el-radio-group v-model="form.resource">
<el-radio label="共享"></el-radio> <el-radio label="1">共享</el-radio>
<el-radio label="受限"></el-radio> <el-radio label="2">受限</el-radio>
<el-radio label="敏感"></el-radio> <el-radio label="3">敏感</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
...@@ -302,13 +301,14 @@ export default { ...@@ -302,13 +301,14 @@ export default {
], ],
sjfw_fhcstx: [ sjfw_fhcstx: [
{ label: "字段编码", prop: "name", type: "", align: "left" }, { 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: "label", type: "input", align: "left" },
{ label: "字段说明", prop: "descript", type: "input", align: "left" } { label: "字段说明", prop: "descript", type: "input", align: "left" }
], ],
url: "", url: "",
emptyText: "暂时没数据", emptyText: "暂无数据",
resultShow: false, resultShow: false,
resSuccess: false,
optionsSq: [{ label: "Bearer Token", value: "Bearer" }], optionsSq: [{ label: "Bearer Token", value: "Bearer" }],
sqfsVal: "", sqfsVal: "",
tokenVal: "", tokenVal: "",
...@@ -354,110 +354,11 @@ export default { ...@@ -354,110 +354,11 @@ export default {
{ label: "其他", value: 10 } { label: "其他", value: 10 }
], ],
optionsOrganization: [], optionsOrganization: [],
datasQqcs: [ datasQqcs: [],
{ datasFhcs: [],
name: "name", request_fields: [],
field_type: "string", response_fields: [],
label: "", cover: ""
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
}
]
}
]
}
]
}), }),
computed: {}, computed: {},
watch: {}, watch: {},
...@@ -469,33 +370,33 @@ export default { ...@@ -469,33 +370,33 @@ export default {
this.serviceUrl = ""; this.serviceUrl = "";
}, },
clickFwcs() { clickFwcs() {
this.resultShow = true;
let headers = {}; 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 = {}; let requestData = {};
for (let i = 0; i < request.length; i++) { if (this.activeBtn == 0) {
if ( if (this.sqfsVal != "") {
request[i] && headers.Authorization = [];
request[i].requestEncoding && headers.Authorization[0] = this.sqfsVal + " " + this.tokenVal;
request[i].requestValue && }
request[i].requestEncoding != "" && let request = this.$refs.fwcs_sjfw_qq.getTableData();
request[i].requestValue != "" for (let i = 0; i < request.length; i++) {
) {
if ( 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] = []; if (
requestData[request[i].requestEncoding][0] = Object.keys(requestData).indexOf(request[i].requestEncoding) == -1
request[i].requestValue; ) {
} else { requestData[request[i].requestEncoding] = [];
requestData[request[i].requestEncoding].push( requestData[request[i].requestEncoding][0] =
request[i].requestValue request[i].requestValue;
); } else {
requestData[request[i].requestEncoding].push(
request[i].requestValue
);
}
} }
} }
} }
...@@ -518,7 +419,11 @@ export default { ...@@ -518,7 +419,11 @@ export default {
this.datasQqcs = data.param_fields; this.datasQqcs = data.param_fields;
} }
this.datasFhcs = data.response_fields; this.datasFhcs = data.response_fields;
this.resSuccess = true;
this.resultShow = true;
} else { } else {
this.resSuccess = false;
this.resultShow = true;
console.log(response.data.console.error); console.log(response.data.console.error);
} }
}) })
...@@ -532,17 +437,50 @@ export default { ...@@ -532,17 +437,50 @@ export default {
}, },
resetSjfw() {}, resetSjfw() {},
nextJcxx() { nextJcxx() {
this.request_fields = this.$refs.fwcs_sjfw_qqcs.getTableData();
this.response_fields = this.$refs.fwcs_sjfw_fhcs.getTableData();
this.jcxxtx = true; this.jcxxtx = true;
}, },
// edit form // edit form
getNewList(val) { getNewList(val) {
console.log(val); this.cover = val;
}, },
previous() { previous() {
this.jcxxtx = false; this.jcxxtx = false;
}, },
registe() { 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() {} mounted() {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment