Skip to content

A
apaas-ui
Commit 27269620 authored by 徐一鸣's avatar 徐一鸣
Browse files
Options

Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

parents 7f2da59d e88443b3
Hide whitespace changes
Inline Side-by-side
Showing with 311 additions and 173 deletions
src/components/table-um.vue
View file @ 27269620
...@@ -765,7 +765,7 @@ em { ...@@ -765,7 +765,7 @@ em {
width: 66px; width: 66px;
} }
.table_radius { .table_radius {
border-radius: 10px; border-radius: 8px;
} }
.overlit { .overlit {
overflow: hidden; overflow: hidden;
......
src/components/upload_file.vue
View file @ 27269620
<template> <template>
<div> <div>
<div v-if="type != 'copper'"> <div v-if="type != 'cropper'">
<el-upload <el-upload
action="ssurl" action="ssurl"
:file-list="fileArray" :file-list="fileArray"
......
src/pages/fwzc_fwcs.vue
View file @ 27269620
...@@ -6,167 +6,239 @@ ...@@ -6,167 +6,239 @@
<el-breadcrumb-item v-else :to="{ path: '/fwzc' }">服务测试</el-breadcrumb-item> <el-breadcrumb-item v-else :to="{ path: '/fwzc' }">服务测试</el-breadcrumb-item>
<el-breadcrumb-item v-if="jcxxtx">基础信息填写</el-breadcrumb-item> <el-breadcrumb-item v-if="jcxxtx">基础信息填写</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<block-radius> <div v-if="!jcxxtx">
<el-row> <block-radius>
<el-button <el-row>
v-for="item in btnList" <el-button
:key="item.id" v-for="item in btnList"
@click="clickBtn(item.id)" :key="item.id"
:class="activeBtn == item.id ? 'fwcs_btn_act':'fwcs_btn_dis'" @click="clickBtn(item.id)"
>{{ item.text }}</el-button> :class="activeBtn == item.id ? 'fwcs_btn_act':'fwcs_btn_dis'"
</el-row> >{{ item.text }}</el-button>
<div class="gray_line"></div> </el-row>
<div v-if="activeBtn == 4"> <div class="gray_line"></div>
<div class="sqxx_title">服务类型：</div> <div v-if="activeBtn == 4">
<el-select v-model="zhyyVal" placeholder="请选择" class="zhyy_select"> <div class="sqxx_title">服务类型：</div>
<el-option <el-select v-model="zhyyVal" placeholder="请选择" class="zhyy_select">
v-for="item in optionsZhyy"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</div>
<div class="fwcs_fwdz">服务地址：</div>
<div class="fwcs_fwdz_inner">
<el-input placeholder="请输入内容" v-model="input3" class="input-with-select">
<el-select v-model="select" slot="prepend" placeholder="请选择">
<el-option <el-option
v-for="item in optionType" v-for="item in optionsZhyy"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-input>
<el-button v-if="activeBtn == 0 || activeBtn == 4" @click="clickFwcs()" class="fwcs_btn_fwcs">服务测试</el-button>
</div>
<div v-if="activeBtn == 0">
<el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab">
<el-tab-pane label="请求参数" name="0">
<ces-table
ref="fwcs_sjfw_qq"
size="mini"
:border="true"
:headers="sjfw_qqcs"
url
:searchShow="false"
:addRowBtn="false"
:autoAdd="true"
:isDialog="false"
:isSelection="false"
:isIndex="true"
:radius="true"
:emptyText="emptyText"
:stripe="false"
:paginationShow="false"
:pageSizeShow="false"
headerCellClassName="th_pink"
></ces-table>
</el-tab-pane>
<el-tab-pane label="请求体" name="1">
<div class="sjfw_qqt">
<el-radio v-model="sjfwQqt" label="JSON">JSON</el-radio>
</div>
<v-apaas-code></v-apaas-code>
</el-tab-pane>
<el-tab-pane label="授权信息" name="2">
<el-row class="sqxx_row">
<el-col :span="6">
<div class="sqxx_title">授权方式：</div>
<el-select v-model="sqfsVal" placeholder="请选择" class="sqxx_select">
<el-option
v-for="item in optionsSq"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-col>
<el-col :span="2" class="center_line_c">
<div class="center_line"></div>
</el-col>
<el-col :span="16">
<div class="sqxx_title">Token：</div>
<el-input v-model="tokenVal" placeholder="请输入内容"></el-input>
</el-col>
</el-row>
</el-tab-pane>
</el-tabs>
</div>
<div v-if="activeBtn == 1">
<div class="skfw_fwlx">服务类型：</div>
<div class="skfw_fwlx_radios">
<el-radio
v-for="item in skfwRadios"
:key="item"
v-model="sjfwQqt"
:label="item"
>{{ item }}</el-radio>
<el-button v-if="activeBtn == 1" @click="clickFwcs()" class="fwcs_btn_fwcs">服务测试</el-button>
</div> </div>
</div> <div class="fwcs_fwdz">服务地址：</div>
</block-radius> <div class="fwcs_fwdz_inner">
<block-radius v-if="resultShow"> <el-input placeholder="请输入内容" v-model="input3" class="input-with-select">
<div v-if="activeBtn == 0"> <el-select v-model="select" slot="prepend" placeholder="请选择">
<div class="sjfw_qqcstx">请求参数信息填写：</div> <el-option
<ces-table v-for="item in optionType"
ref="fwcs_sjfw_qqcs" :key="item.value"
size="mini" :label="item.label"
:border="true" :value="item.value"
:headers="sjfw_qqcstx" ></el-option>
url="qqcstx" </el-select>
:searchShow="false" </el-input>
:addRowBtn="false" <el-button
:autoAdd="false" v-if="activeBtn == 0 || activeBtn == 4"
:isDialog="false" @click="clickFwcs()"
:isSelection="false" class="fwcs_btn_fwcs"
:isIndex="true" >服务测试</el-button>
:radius="true" </div>
:emptyText="emptyText" <div v-if="activeBtn == 0">
:stripe="false" <el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab">
:paginationShow="false" <el-tab-pane label="请求参数" name="0">
:pageSizeShow="false" <ces-table
headerCellClassName="th_pink" ref="fwcs_sjfw_qq"
></ces-table> size="mini"
<div class="sjfw_fhcstx">返回参数信息填写：</div> :border="true"
<ces-table :headers="sjfw_qqcs"
ref="fwcs_sjfw_fhcs" url
size="mini" :searchShow="false"
:border="true" :addRowBtn="false"
:headers="sjfw_fhcstx" :autoAdd="true"
url="fhcstx" :isDialog="false"
:searchShow="false" :isSelection="false"
:addRowBtn="false" :isIndex="true"
:autoAdd="false" :radius="true"
:isDialog="false" :emptyText="emptyText"
:isSelection="false" :stripe="false"
:isIndex="true" :paginationShow="false"
:radius="true" :pageSizeShow="false"
:emptyText="emptyText" headerCellClassName="th_pink"
:stripe="false" ></ces-table>
:paginationShow="false" </el-tab-pane>
:pageSizeShow="false" <el-tab-pane label="请求体" name="1">
headerCellClassName="th_pink" <div class="sjfw_qqt">
></ces-table> <el-radio v-model="sjfwQqt" label="JSON">JSON</el-radio>
</div> </div>
<div v-else-if="activeBtn == 1 || activeBtn == 4"> <v-apaas-code></v-apaas-code>
<div class="skfw_csfwxx">测试服务信息：</div> </el-tab-pane>
<div class="test_succ"> <el-tab-pane label="授权信息" name="2">
<div v-if="skfwResult" class="skcs_jg"> <el-row class="sqxx_row">
<img src="../assets/imgs/test_icon_success.png" class="skcs_jg_img" />&nbsp;测试成功 <el-col :span="6">
<div class="sqxx_title">授权方式：</div>
<el-select v-model="sqfsVal" placeholder="请选择" class="sqxx_select">
<el-option
v-for="item in optionsSq"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-col>
<el-col :span="2" class="center_line_c">
<div class="center_line"></div>
</el-col>
<el-col :span="16">
<div class="sqxx_title">Token：</div>
<el-input v-model="tokenVal" placeholder="请输入内容"></el-input>
</el-col>
</el-row>
</el-tab-pane>
</el-tabs>
</div>
<div v-if="activeBtn == 1">
<div class="skfw_fwlx">服务类型：</div>
<div class="skfw_fwlx_radios">
<el-radio
v-for="item in skfwRadios"
:key="item"
v-model="sjfwQqt"
:label="item"
>{{ item }}</el-radio>
<el-button v-if="activeBtn == 1" @click="clickFwcs()" class="fwcs_btn_fwcs">服务测试</el-button>
</div> </div>
<div v-else class="skcs_jg"> </div>
<img src="../assets/imgs/test_icon_error.png" class="skcs_jg_img" />&nbsp;测试失败 </block-radius>
<block-radius v-if="resultShow">
<div v-if="activeBtn == 0">
<div class="sjfw_qqcstx">请求参数信息填写：</div>
<ces-table
ref="fwcs_sjfw_qqcs"
size="mini"
:border="true"
:headers="sjfw_qqcstx"
url="qqcstx"
:searchShow="false"
:addRowBtn="false"
:autoAdd="false"
:isDialog="false"
:isSelection="false"
:isIndex="true"
:radius="true"
:emptyText="emptyText"
:stripe="false"
:paginationShow="false"
:pageSizeShow="false"
headerCellClassName="th_pink"
></ces-table>
<div class="sjfw_fhcstx">返回参数信息填写：</div>
<ces-table
ref="fwcs_sjfw_fhcs"
size="mini"
:border="true"
:headers="sjfw_fhcstx"
url="fhcstx"
:searchShow="false"
:addRowBtn="false"
:autoAdd="false"
:isDialog="false"
:isSelection="false"
:isIndex="true"
:radius="true"
:emptyText="emptyText"
:stripe="false"
:paginationShow="false"
:pageSizeShow="false"
headerCellClassName="th_pink"
></ces-table>
</div>
<div v-else-if="activeBtn == 1 || activeBtn == 4">
<div class="skfw_csfwxx">测试服务信息：</div>
<div class="test_succ">
<div v-if="skfwResult" class="skcs_jg">
<img src="../assets/imgs/test_icon_success.png" class="skcs_jg_img" />&nbsp;测试成功
</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> </div>
</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 class="next" @click="nextJcxx">下一步</el-button> </div>
</div> </block-radius>
</block-radius> </div>
<div v-else>
<block-radius>
<div class="fwcs_add">
<el-form ref="form" :model="form" label-width="0px">
<el-form-item>
<p class="formname">服务名称：</p>
<el-input v-model="form.name" placeholder="请输入服务名称，不超过15个字" class="form_in"></el-input>
</el-form-item>
<el-form-item>
<p class="formname">服务描述：</p>
<el-input type="textarea" v-model="form.desc" placeholder="请输入服务描述，不超过200个字"></el-input>
</el-form-item>
<el-form-item>
<p class="formname">服务领域：</p>
<el-select v-model="form.area" placeholder="请选择">
<el-option
v-for="item in optionsArea"
:key="'area' + item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<p class="formname">所属组织：</p>
<el-select v-model="form.origin" placeholder="请选择">
<el-option
v-for="item in optionsOrganization"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<p class="formname">服务封面：</p>
<upload-file
:multiple="false"
:max="1"
type="cropper"
:readOnly="false"
:list="imgList"
@getNewList="getNewList"
></upload-file>
</el-form-item>
<el-form-item>
<p class="formname">接口编码：</p>
<el-input v-model="form.code"></el-input>
</el-form-item>
<el-form-item>
<p class="formname">开放程度：</p>
<el-radio-group v-model="form.resource">
<el-radio label="共享"></el-radio>
<el-radio label="受限"></el-radio>
<el-radio label="敏感"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
<el-button>取消</el-button>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
</el-form>
</div>
</block-radius>
</div>
</div> </div>
</template> </template>
...@@ -174,11 +246,13 @@ ...@@ -174,11 +246,13 @@
import BlockRadius from "@/components/block-radius"; import BlockRadius from "@/components/block-radius";
import CesTable from "@/components/table-um"; import CesTable from "@/components/table-um";
import Codes from "@/components/codes"; import Codes from "@/components/codes";
import uploadFile from "../components/upload_file";
export default { export default {
components: { components: {
BlockRadius, BlockRadius,
CesTable, CesTable,
"v-apaas-code": Codes "v-apaas-code": Codes,
uploadFile
}, },
data: () => ({ data: () => ({
btnList: [ btnList: [
...@@ -246,10 +320,33 @@ export default { ...@@ -246,10 +320,33 @@ export default {
{ label: "模型算法类", value: 0 }, { label: "模型算法类", value: 0 },
{ label: "查询验证类", value: 1 }, { label: "查询验证类", value: 1 },
{ label: "流程类", value: 2 }, { label: "流程类", value: 2 },
{ label: "应用类", value: 3 }, { label: "应用类", value: 3 }
], ],
zhyyVal: 0, zhyyVal: 0,
jcxxtx: false jcxxtx: false,
form: {
name: "",
desc: "",
area: "",
origin: "",
code: "",
resource: ""
},
imgList: [],
optionsArea: [
{ 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 }
],
optionsOrganization: []
}), }),
computed: {}, computed: {},
watch: {}, watch: {},
...@@ -268,6 +365,13 @@ export default { ...@@ -268,6 +365,13 @@ export default {
resetSjfw() {}, resetSjfw() {},
nextJcxx() { nextJcxx() {
this.jcxxtx = true; this.jcxxtx = true;
},
// edit form
onSubmit() {
console.log("submit!");
},
getNewList(val) {
console.log(val);
} }
}, },
mounted() {} mounted() {}
...@@ -276,7 +380,10 @@ export default { ...@@ -276,7 +380,10 @@ export default {
<style scoped> <style scoped>
.fwcs { .fwcs {
width: 96vw; width: 1200px;
margin: 0 auto;
margin-top: -157px;
margin-bottom: 20px;
} }
.bread_crumb { .bread_crumb {
margin: 20px; margin: 20px;
...@@ -391,6 +498,11 @@ export default { ...@@ -391,6 +498,11 @@ export default {
.zhyy_select { .zhyy_select {
width: 70%; width: 70%;
} }
.fwcs_add .formname {
color: #58617a;
font-size: 14px;
margin-left: 10px;
}
</style> </style>
<style> <style>
.bread_crumb .el-breadcrumb__inner { .bread_crumb .el-breadcrumb__inner {
......
src/pages/index.vue
View file @ 27269620
<template> <template>
<div class="index_container"> <div class="index_container">
<div class="decor" v-if="$route.fullPath == '/workplace'"></div> <div class="decor" v-if="$route.fullPath == '/workplace' || $route.fullPath == '/fwzc/fwcs'"></div>
<router-view/> <router-view/>
</div> </div>
</template> </template>
...@@ -20,8 +20,8 @@ export default { ...@@ -20,8 +20,8 @@ export default {
.index_container { .index_container {
margin-top: 84px; margin-top: 84px;
min-height: 200px; min-height: 200px;
overflow-x: hidden; /* overflow-x: hidden;
overflow-y: auto; overflow-y: auto; */
} }
.decor{ .decor{
width: 100%; width: 100%;
......
src/pages/serviceEdit.vue
View file @ 27269620
...@@ -7,35 +7,43 @@ ...@@ -7,35 +7,43 @@
<div class="info_contain"> <div class="info_contain">
<el-form ref="form" :model="form" label-width="0px"> <el-form ref="form" :model="form" label-width="0px">
<el-form-item> <el-form-item>
<p>服务名称：</p> <p class="formname">服务名称：</p>
<el-input v-model="form.name"></el-input> <el-input v-model="form.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<p>服务描述：</p> <p class="formname">服务描述：</p>
<el-input v-model="form.desc"></el-input> <el-input v-model="form.desc"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<p>服务领域：</p> <p class="formname">服务领域：</p>
<el-input v-model="form.area"></el-input> <el-input v-model="form.area"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<p>所属组织：</p> <p class="formname">所属组织：</p>
<el-input v-model="form.origin"></el-input> <el-input v-model="form.origin"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<p>服务封面：</p> <p class="formname">服务封面：</p>
<el-input v-model="form.name"></el-input> <upload-file
:multiple="false"
:max="1"
type="picture"
:readOnly="false"
fit="fill"
:list="imgList"
@getNewList="getNewList"
></upload-file>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<p>接口编码：</p> <p class="formname">接口编码：</p>
<el-input v-model="form.code"></el-input> <el-input v-model="form.code"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<p>开放程度：</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="共享"></el-radio>
<el-radio label="线下场地免费"></el-radio> <el-radio label="受限"></el-radio>
<el-radio label="线下场地免费"></el-radio> <el-radio label="敏感"></el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
...@@ -49,9 +57,12 @@ ...@@ -49,9 +57,12 @@
</template> </template>
<script> <script>
import uploadFile from '../components/upload_file'
export default { export default {
props: {}, props: {},
components: {}, components: {
uploadFile
},
data() { data() {
return { return {
form: { form: {
...@@ -61,7 +72,8 @@ export default { ...@@ -61,7 +72,8 @@ export default {
origin:'', origin:'',
code:'', code:'',
resource: '', resource: '',
} },
imgList: [],
}; };
}, },
watch: {}, watch: {},
...@@ -71,11 +83,21 @@ export default { ...@@ -71,11 +83,21 @@ export default {
methods: { methods: {
onSubmit() { onSubmit() {
console.log('submit!'); console.log('submit!');
},
getNewList(val) {
console.log(val);
} }
} }
}; };
</script> </script>
<style>
.info_contain .el-input__inner{
background-color: #f7f8f9;
}
</style>
<style scoped> <style scoped>
.detail_contain { .detail_contain {
width: 100%; width: 100%;
...@@ -95,4 +117,7 @@ export default { ...@@ -95,4 +117,7 @@ export default {
.now_page_title span { .now_page_title span {
color: #242c43; color: #242c43;
} }
.formname{
color: #58617a;
}
</style> </style>
src/pages/workPlace.vue
View file @ 27269620
...@@ -1395,6 +1395,7 @@ export default { ...@@ -1395,6 +1395,7 @@ export default {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
margin-top: -157px; margin-top: -157px;
margin-bottom: 20px;
} }
.person_info { .person_info {
width: 1200px; width: 1200px;
......
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