Commit 92e5d88e authored by 张俊's avatar 张俊

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

parents 38e9e084 27269620
<template> <template>
<div class="side_nav_bar"> <div class="side_nav_bar">
<h3 class="side_nav_bar_title"> <h3 class="side_nav_bar_title" @click="titleAction">
<img :src="require('../assets/imgs/tool_fuwu.png')" width="20" style="margin-right: 10px;" /> <img
:src="require('../assets/imgs/tool_fuwu.png')"
width="20"
style="margin-right: 10px;"
/>
<span v-text="title"></span> <span v-text="title"></span>
</h3> </h3>
<ul class="side_nav_bar_list"> <ul class="side_nav_bar_list">
...@@ -25,6 +29,10 @@ export default { ...@@ -25,6 +29,10 @@ export default {
type: String, type: String,
default: () => "我的服务", default: () => "我的服务",
}, },
titlePath: {
type: String,
default: () => "",
},
navList: { navList: {
type: Array, type: Array,
default: () => [], default: () => [],
...@@ -34,6 +42,11 @@ export default { ...@@ -34,6 +42,11 @@ export default {
navAction(nav) { navAction(nav) {
this.$router.push(nav.path); this.$router.push(nav.path);
}, },
titleAction() {
if (this.titlePath) {
this.$router.push(this.titlePath);
}
},
}, },
}; };
</script> </script>
...@@ -51,6 +64,7 @@ export default { ...@@ -51,6 +64,7 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
cursor: pointer;
} }
.side_nav_bar_title > span { .side_nav_bar_title > span {
font-size: 16px; font-size: 16px;
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<li <li
v-for="(v, i) in item.data" v-for="(v, i) in item.data"
:key="'f_l_d_' + index + '_' + i" :key="'f_l_d_' + index + '_' + i"
v-show="filterToggle[item.prop] || i <= filterLength" v-show="filterToggle[item.prop] || i < filterLength"
> >
<a <a
:class="{ current: isCurrentFilter(item.prop, v) }" :class="{ current: isCurrentFilter(item.prop, v) }"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
v-if="item.data.length > filterLength" v-if="item.data.length > filterLength"
@click="filterToggleAction(item.prop)" @click="filterToggleAction(item.prop)"
> >
<span>{{ filterToggle[item.prop] ? "收起" : "展开" }} {{item.data.length + "-" + filterLength}}</span> <span>{{ filterToggle[item.prop] ? "收起" : "展开" }}</span>
<i <i
:class=" :class="
filterToggle[item.prop] filterToggle[item.prop]
...@@ -403,6 +403,11 @@ export default { ...@@ -403,6 +403,11 @@ export default {
mounted() { mounted() {
this.getDataFromApiSync(); this.getDataFromApiSync();
this.initFilterData(); this.initFilterData();
window.addEventListener("resize", this.getFilterLength);
},
destroyed() {
window.removeEventListener("resize", this.getFilterLength);
}, },
watch: { watch: {
refreshInit: { refreshInit: {
...@@ -556,7 +561,9 @@ export default { ...@@ -556,7 +561,9 @@ export default {
}, },
filterAction() { filterAction() {
this.showFliterList = !this.showFliterList; this.showFliterList = !this.showFliterList;
this.getFilterLength();
},
getFilterLength() {
if (this.showFliterList) { if (this.showFliterList) {
this.$nextTick(() => { this.$nextTick(() => {
let width = let width =
...@@ -566,8 +573,8 @@ export default { ...@@ -566,8 +573,8 @@ export default {
20 - // 距左侧标题的边距 20 - // 距左侧标题的边距
110; // 折叠按钮的宽度 110; // 折叠按钮的宽度
this.filterLength = Math.floor(width / 110) - 1; this.filterLength = Math.floor(width / 110);
console.log("每行最多可容纳" + this.filterLength + "个filter"); // console.log("每行最多可容纳" + this.filterLength + "个filter");
}); });
} }
}, },
...@@ -758,7 +765,7 @@ em { ...@@ -758,7 +765,7 @@ em {
width: 66px; width: 66px;
} }
.table_radius { .table_radius {
border-radius: 10px; border-radius: 8px;
} }
.overlit { .overlit {
overflow: hidden; overflow: hidden;
......
<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"
......
<template> <template>
<div class="fwgl_container"> <div class="fwgl_container">
<side-nav-bar :nav-list="navList"></side-nav-bar> <side-nav-bar :nav-list="navList" title-path="/fwgl"></side-nav-bar>
<div class="main_container"> <div class="main_container">
<router-view <router-view
:key="'type_' + $route.params && $route.params.type" :key="'type_' + $route.params && $route.params.type"
...@@ -20,8 +20,6 @@ export default { ...@@ -20,8 +20,6 @@ export default {
navList: [], navList: [],
userLevel: 0, userLevel: 0,
}), }),
computed: {},
methods: {},
mounted() { mounted() {
this.navList = [ this.navList = [
// 普通用户 // 普通用户
...@@ -81,11 +79,6 @@ export default { ...@@ -81,11 +79,6 @@ export default {
this.$router.push(this.navList[0].path); this.$router.push(this.navList[0].path);
}, },
/* updated() {
if (this.$route.params && this.$route.params.type === undefined) {
this.$router.push(this.navList[0].path);
}
}, */
}; };
</script> </script>
......
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
}, },
methods: { methods: {
editItem(item) { editItem(item) {
this.$router.push("/serviceEdit"); this.$router.push("/fwgl/serviceedit/" + item.id);
}, },
soldOutItem(item) { soldOutItem(item) {
console.log(item); console.log(item);
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<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>
<div v-if="!jcxxtx">
<block-radius> <block-radius>
<el-row> <el-row>
<el-button <el-button
...@@ -39,7 +40,11 @@ ...@@ -39,7 +40,11 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-input> </el-input>
<el-button v-if="activeBtn == 0 || activeBtn == 4" @click="clickFwcs()" class="fwcs_btn_fwcs">服务测试</el-button> <el-button
v-if="activeBtn == 0 || activeBtn == 4"
@click="clickFwcs()"
class="fwcs_btn_fwcs"
>服务测试</el-button>
</div> </div>
<div v-if="activeBtn == 0"> <div v-if="activeBtn == 0">
<el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab"> <el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab">
...@@ -168,17 +173,86 @@ ...@@ -168,17 +173,86 @@
</div> </div>
</block-radius> </block-radius>
</div> </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>
</template> </template>
<script> <script>
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 {
......
<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>
......
...@@ -59,7 +59,7 @@ export default new Router({ ...@@ -59,7 +59,7 @@ export default new Router({
component: () => import("@/pages/serviceDetail"), component: () => import("@/pages/serviceDetail"),
}, },
{ {
path: "/fwgl/serviceedit", path: "/fwgl/serviceedit/:id",
name: "serviceedit", name: "serviceedit",
component: () => import("@/pages/serviceEdit"), component: () => import("@/pages/serviceEdit"),
}, },
......
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