Commit 49de291e authored by 刘殿昕's avatar 刘殿昕

Merge branch 'ldx' into dev

parents f5149102 46b37b8a
...@@ -67,6 +67,13 @@ const devWebpackConfig = merge(baseWebpackConfig, { ...@@ -67,6 +67,13 @@ const devWebpackConfig = merge(baseWebpackConfig, {
to: config.dev.assetsSubDirectory, to: config.dev.assetsSubDirectory,
ignore: ['.*'] ignore: ['.*']
} }
]),
new CopyWebpackPlugin([
{
from: path.resolve(__dirname, '../docs'),
to: config.dev.assetsSubDirectory,
ignore: ['.*']
}
]) ])
], ],
optimization: { optimization: {
......
This diff is collapsed.
This diff is collapsed.
{
"data": {
"data": [
{
"id": 0,
"title": "水路货物周转量情况",
"state": 0,
"resourceSummary": "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
"provider": "提供机构提供机构提供机构",
"dataField": "经济建设",
"serviceType": "数据服务 专题数据服务 企业专题数据服务",
"updateTime": "2020-03-12 18:31:12",
"numberOfMonth": "2698755",
"rate": 3
},
{
"id": 1,
"title": "水路货物周转量情况",
"state": 2,
"resourceSummary": "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
"provider": "提供机构提供机构提供机构",
"dataField": "经济建设",
"serviceType": "数据服务 专题数据服务 企业专题数据服务",
"updateTime": "2020-03-12 18:31:12",
"numberOfMonth": "2698745",
"rate": 3.4
},
{
"id": 2,
"title": "水路货物周转量情况",
"state": 1,
"resourceSummary": "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
"provider": "提供机构提供机构提供机构",
"dataField": "经济建设",
"serviceType": "数据服务 专题数据服务 企业专题数据服务",
"updateTime": "2020-03-12 18:31:12",
"numberOfMonth": "2698455",
"rate": 2.5
},
{
"id": 3,
"title": "水路货物周转量情况",
"state": 0,
"resourceSummary": "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
"provider": "提供机构提供机构提供机构",
"dataField": "经济建设",
"serviceType": "数据服务 专题数据服务 企业专题数据服务",
"updateTime": "2020-03-12 18:31:12",
"numberOfMonth": "267455",
"rate": 3.7
}
]
}
}
\ No newline at end of file
{
"data": {
"filterList": [
{
"id": 1283,
"name": "数据服务类型",
"children": [
{
"id": 1233,
"name": "诶哦尬舞",
"children": [
{
"id": 18273,
"name": "那我空间服务"
},
{
"id": 12378343,
"name": "诶哦尬舞"
},
{
"id": 123533,
"name": "诶哦尬舞"
}
]
},
{
"id": 121833,
"name": "诶哦尬舞"
},
{
"id": 1234573,
"name": "诶哦尬舞"
},
{
"id": 134534233,
"name": "诶哦尬舞"
},
{
"id": 1234533,
"name": "诶哦尬舞"
},
{
"id": 123533,
"name": "诶哦尬舞",
"children": [
{
"id": 1824573,
"name": "那我空间服务"
},
{
"id": 123378343,
"name": "诶哦尬舞"
},
{
"id": 1235333,
"name": "诶哦尬舞"
}
]
},
{
"id": 12112833,
"name": "诶哦尬舞"
},
{
"id": 12341573,
"name": "诶哦尬舞"
},
{
"id": 1345434233,
"name": "诶哦尬舞"
},
{
"id": 12345533,
"name": "诶哦尬舞"
}
]
},
{
"id": 128133,
"name": "数据服务类型",
"children": [
{
"id": 123313,
"name": "诶哦尬舞",
"children": [
{
"id": 1821373,
"name": "那我个社工师空间服务"
},
{
"id": 123728343,
"name": "诶哦甲方推荐尬舞"
},
{
"id": 12312533,
"name": "诶哦库空调尬舞"
}
]
},
{
"id": 121123833,
"name": "诶哦尬舞"
},
{
"id": 1231234573,
"name": "诶哦达瓦大尬舞"
},
{
"id": 13453334233,
"name": "诶哦达瓦大尬舞"
},
{
"id": 1234123533,
"name": "诶哦尬舞"
},
{
"id": 123512333,
"name": "诶哦尬舞",
"children": [
{
"id": 1824123573,
"name": "那我空间服务"
},
{
"id": 1233738343,
"name": "诶哦尬舞"
},
{
"id": 123125333,
"name": "诶哦尬舞"
}
]
},
{
"id": 1211312833,
"name": "诶哦挖到尬舞"
},
{
"id": 12341231573,
"name": "诶哦尬舞"
},
{
"id": 13454314233,
"name": "诶哦色粉尬舞"
},
{
"id": 123452533,
"name": "诶环境日哦尬舞"
}
]
}
]
}
}
\ No newline at end of file
This diff is collapsed.
...@@ -453,4 +453,15 @@ width: 620px!important; ...@@ -453,4 +453,15 @@ width: 620px!important;
} }
.el-radio__input.is-checked .el-radio__inner::after { .el-radio__input.is-checked .el-radio__inner::after {
background-color: #e56600; background-color: #e56600;
}
/* 面包屑样式 */
.bread_crumb {
margin: 20px;
font-size: 14px;
}
.bread_crumb .el-breadcrumb__inner {
color: #b4c0f5 !important;
}
.bread_crumb .is-link {
color: #626de9 !important;
} }
\ No newline at end of file
...@@ -7,29 +7,48 @@ ...@@ -7,29 +7,48 @@
/> />
</div> </div>
<div class="com_cell_message"> <div class="com_cell_message">
<div class="com_cell_msg_title" @click="goUrl('ssurl')">水路货物周转量情况</div> <div class="com_cell_msg_title">
{{ cellData.title }}
<span v-if="cellData.state == 1" class="tags shared">共享</span>
<span v-else-if="cellData.state == 2" class="tags restricted">受限</span>
<span v-else class="tags sensitive">敏感</span>
</div>
<div class="com_cell_item"> <div class="com_cell_item">
<span class="com_cell_item_title">资源摘要:</span> <span class="com_cell_item_title">资源摘要:</span>
<span <span
class="com_cell_data" class="com_cell_data"
>提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务</span> >{{ cellData.resourceSummary }}</span>
</div> </div>
<div class="com_cell_item"> <div class="com_cell_item">
<span class="com_cell_item_title">提供机构:</span> <span class="com_cell_item_title">提供机构:</span>
<span class="com_cell_data">贵州省交通运输厅</span> <span class="com_cell_data">{{ cellData.provider }}</span>
</div> </div>
<div class="com_cell_item"> <div class="com_cell_item">
<span class="com_cell_item_title">数据领域:</span> <span class="com_cell_item_title">数据领域:</span>
<span class="com_cell_data">经济建设</span> <span class="com_cell_data">{{ cellData.dataField }}</span>
</div> </div>
<div class="com_cell_item"> <div class="com_cell_item">
<span class="com_cell_item_title">服务类型:</span> <span class="com_cell_item_title">服务类型:</span>
<span class="com_cell_data">数据服务 专题数据服务 企业专题数据服务</span> <span class="com_cell_data">{{ cellData.serviceType }}</span>
</div> </div>
<div class="com_cell_item"> <div class="com_cell_item">
<span class="com_cell_item_title">更新时间:</span> <span class="com_cell_item_title">更新时间:</span>
<span class="com_cell_data">2020-03-12 18:31:12</span> <span class="com_cell_data">{{ cellData.updateTime }}</span>
</div>
</div>
<div class="com_cell_right">
<el-rate
v-model="cellData.rate"
disabled
show-score
text-color="#58617a"
score-template="{value}"
></el-rate>
<div class="com_cell_right_text">
<span class="com_cell_right_time_tit">本月获取次数:</span>
<span class="com_cell_right_time">{{ cellData.numberOfMonth }}</span>
</div> </div>
<el-button class="com_cell_right_btn" @click="goUrl('ssurl')">查看详情</el-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -38,7 +57,8 @@ ...@@ -38,7 +57,8 @@
export default { export default {
components: {}, components: {},
props: { props: {
url: { type: String, default: "" } url: { type: String, default: "" },
cellData: { type: Object, default: {} }
}, },
data: () => ({}), data: () => ({}),
computed: {}, computed: {},
...@@ -58,7 +78,7 @@ export default { ...@@ -58,7 +78,7 @@ export default {
.com_cell { .com_cell {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
padding: 10px; padding: 20px 10px;
border-bottom: 2px #f4f7fc solid; border-bottom: 2px #f4f7fc solid;
} }
.com_cell_img_box { .com_cell_img_box {
...@@ -73,20 +93,19 @@ export default { ...@@ -73,20 +93,19 @@ export default {
} }
.com_cell_message { .com_cell_message {
padding-left: 20px; padding-left: 20px;
width: calc(100% - 190px); width: calc(100% - 420px);
} }
.com_cell_msg_title { .com_cell_msg_title {
color: #0d1847; color: #0d1847;
font-size: 22px; font-size: 22px;
font-weight: 700; font-weight: 700;
margin-bottom: 6px; margin-bottom: 6px;
cursor: pointer;
} }
.com_cell_item { .com_cell_item {
font-size: 16px; font-size: 16px;
line-height: 26px; line-height: 26px;
margin-top: 1px; margin-top: 1px;
color: #51ac14; color: #8890a7;
display: flex; display: flex;
align-self: start; align-self: start;
} }
...@@ -96,10 +115,67 @@ export default { ...@@ -96,10 +115,67 @@ export default {
.com_cell_data { .com_cell_data {
display: inline-block; display: inline-block;
width: calc(100% - 90px); width: calc(100% - 90px);
color: #f1ac14; color: #242c43;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.com_cell_right {
width: 250px;
padding: 25px 0 0 50px;
}
.com_cell_right_text {
font-size: 14px;
margin-top: 15px;
}
.com_cell_right_time_tit {
color: #8890a7;
}
.com_cell_right_time {
color: #242c43;
}
.com_cell_right_btn {
background-color: #0f2683;
color: #f8f9fd;
width: 160px;
height: 40px;
border-radius: 20px;
margin-top: 35px;
}
.tags {
display: inline-block;
margin-left: 10px;
padding: 1px 8px;
font-size: 12px;
font-weight: 500;
border-radius: 15px;
position: relative;
top: -2px;
}
.shared {
background-color: #e7fdfc;
border: solid 1px #8bd6d0;
color: #25bdb1;
}
.restricted {
background-color: #fffee8;
border: solid 1px #e4c884;
color: #ef9433;
}
.sensitive {
background-color: #ffefef;
border: solid 1px #d7a4a9;
color: #e15260;
}
</style> </style>
<style>
.com_cell_right .el-rate__text {
display: inline-block;
margin-left: 10px;
font-size: 22px;
font-weight: 700;
}
.com_cell_right .el-rate__icon {
font-size: 20px;
}
</style>
\ No newline at end of file
<template> <template>
<div> <div>
<commodity-cell v-for="item in datas" :url="url" :key="item"></commodity-cell> <commodity-cell v-for="item in datas" :cellData="item" :url="url" :key="item.id"></commodity-cell>
<!-- 分页 --> <!-- 分页 -->
<section class="com-pagination" v-if="paginationShow"> <section class="com-pagination" v-if="paginationShow">
<div class="com_page_total">{{ pagination.total }} 个条目</div> <div class="com_page_total">{{ pagination.total }} 个条目</div>
<div class="com_page_num" v-if="pageSizeShow"> <div class="com_page_item">
<div class="com_page_num_sel"> <div class="com_page_num" v-if="pageSizeShow">
<el-select <div>每页行数:</div>
v-model="pagination.rowsPerPage" <div class="com_page_num_sel">
placeholder="请选择" <el-select
size="mini" v-model="pagination.rowsPerPage"
@change="handleSizeChange" placeholder="请选择"
> size="small"
<el-option @change="handleSizeChange"
v-for="item in pageOptions" >
:key="item.value" <el-option
:label="item.label" v-for="item in pageOptions"
:value="item.value" :key="item.value"
></el-option> :label="item.label"
</el-select> :value="item.value"
></el-option>
</el-select>
</div>
</div> </div>
<div>条 / 页</div> <div class="com_page_control">
</div> <el-button
<div class="com_page_control"> icon="el-icon-arrow-left"
<el-button circle
icon="el-icon-arrow-left" size="mini"
circle @click="handleCurrentChange(-1)"
size="mini" :disabled="pagination.page == 1"
@click="handleCurrentChange(-1)" ></el-button>
:disabled="pagination.page == 1" &nbsp;&nbsp;{{ pagination.page }}页 / 共{{
></el-button> Math.ceil(pagination.total / pagination.rowsPerPage)
&nbsp;&nbsp;{{ pagination.page }}页 / 共{{ }}
Math.ceil(pagination.total / pagination.rowsPerPage) <el-button
}} icon="el-icon-arrow-right"
<el-button circle
icon="el-icon-arrow-right" size="mini"
circle @click="handleCurrentChange(1)"
size="mini" :disabled="
@click="handleCurrentChange(1)"
:disabled="
pagination.page >= pagination.page >=
Math.ceil(pagination.total / pagination.rowsPerPage) Math.ceil(pagination.total / pagination.rowsPerPage)
" "
></el-button> ></el-button>
</div>
</div> </div>
</section> </section>
</div> </div>
...@@ -92,14 +94,14 @@ export default { ...@@ -92,14 +94,14 @@ export default {
methods: { methods: {
handleSizeChange(val) { handleSizeChange(val) {
this.pagination.rowsPerPage = val; this.pagination.rowsPerPage = val;
this.$emit("refresh"); this.$emit("refresh", this.pagination);
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.pagination.page += val; this.pagination.page += val;
this.$emit("refresh"); this.$emit("refresh", this.pagination);
}, },
getTotal() { getTotal() {
this.total = this.datas.length; this.pagination.total = this.datas.length;
} }
}, },
mounted() { mounted() {
...@@ -119,17 +121,30 @@ export default { ...@@ -119,17 +121,30 @@ export default {
align-items: center; align-items: center;
} }
.com_page_num { .com_page_num {
width: 120px; width: 140px;
margin-right: 20px;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
} }
.com_page_num_sel { .com_page_num_sel {
width: 66px; width: 50px;
font-size: 14px;
position: relative;
top: 1px;
}
.com_page_item {
display: flex;
justify-content: flex-end;
align-items: center;
} }
</style> </style>
<style> <style>
.com_page_control .el-button { .com_page_control .el-button {
border: 0; border: 0;
} }
.com_page_num .el-input__inner {
border: 0;
padding: 0;
}
</style> </style>
\ No newline at end of file
This diff is collapsed.
<template>
<div class="service_shop_menu">
<ul class="service_shop_menu_list">
<li v-for="(item, index) in menuList" :key="index" @click="active(item.id)">
<img
v-if="item.id == actives"
:src="require('../assets/imgs/' + item.active + '.png')"
class="menu_img"
/>
<img v-else :src="require('../assets/imgs/' + item.default + '.png')" class="menu_img" />
<span :class="item.id == actives ? 'menu_item_active':'menu_item'">{{ item.label }}</span>
</li>
</ul>
</div>
</template>
<script>
export default {
props: {},
data() {
return {
actives: 0,
menuList: [
{
id: 0,
label: "数据服务",
active: "tool_ic_shujufw_sel",
default: "tool_ic_shujufw"
},
{
id: 1,
label: "时空服务",
active: "tool_ic_shikongfw_sel",
default: "tool_ic_shikongfw"
},
{
id: 2,
label: "视频服务",
active: "tool_ic_shipinfw_sel",
default: "tool_ic_shipinfw"
},
{
id: 3,
label: "感知服务",
active: "tool_ic_ganzhifw_sel",
default: "tool_ic_ganzhifw"
},
{
id: 4,
label: "综合应用服务",
active: "tool_ic_zongheyyfw_sel",
default: "tool_ic_zongheyyfw"
},
{
id: 5,
label: "云资源服务",
active: "tool_ic_yunziyuanfw_sel",
default: "tool_ic_yunziyuanfw"
},
{
id: 6,
label: "应用商店",
active: "tool_ic_yingyongsd_sel",
default: "tool_ic_yingyongsd"
}
]
};
},
computed: {
getActive() {
return this.$store.state.serviceShopMenu;
}
},
watch: {
getActive(newVal) {
this.getActiveMenu(newVal);
}
},
methods: {
active(id) {
this.$store.commit("serviceShopMenuAct", id);
},
getActiveMenu(val) {
this.actives = val;
}
}
};
</script>
<style scoped>
.service_shop_menu {
background-color: #0d1847;
position: fixed;
top: 84px;
left: 0;
width: 200px;
height: 100%;
padding-top: 30px;
}
.service_shop_menu_list > li {
padding: 16px 10px 8px 22px;
border-left: 5px solid #0d1847;
font-size: 16px;
line-height: 24px;
cursor: pointer;
}
.service_shop_menu_list > li:hover,
.service_shop_menu_list > li.current {
border-left: 5px solid #e56600;
background-color: #182665;
color: #e6ebfe;
}
.menu_img {
width: 25px;
margin-right: 6px;
}
.menu_item {
position: relative;
color: #6573ae;
top: -6px;
}
.menu_item_active {
position: relative;
color: #e6ebfe;
top: -6px;
}
</style>
...@@ -174,45 +174,47 @@ ...@@ -174,45 +174,47 @@
<!-- 分页 --> <!-- 分页 -->
<section class="ces-pagination" v-if="paginationShow"> <section class="ces-pagination" v-if="paginationShow">
<div class="ces_page_total">共 {{ pagination.total }} 个条目</div> <div class="ces_page_total">共 {{ pagination.total }} 个条目</div>
<div class="ces_page_num" v-if="pageSizeShow"> <div class="ces_page_item">
<div class="ces_page_num_sel"> <div class="ces_page_num" v-if="pageSizeShow">
<el-select <div>每页行数:</div>
v-model="pagination.rowsPerPage" <div class="ces_page_num_sel">
placeholder="请选择" <el-select
size="mini" v-model="pagination.rowsPerPage"
@change="handleSizeChange" placeholder="请选择"
> size="small"
<el-option @change="handleSizeChange"
v-for="item in pageOptions" >
:key="item.value" <el-option
:label="item.label" v-for="item in pageOptions"
:value="item.value" :key="item.value"
></el-option> :label="item.label"
</el-select> :value="item.value"
></el-option>
</el-select>
</div>
</div> </div>
<div>条 / 页</div> <div class="ces_page_control">
</div> <el-button
<div class="ces_page_control"> icon="el-icon-arrow-left"
<el-button circle
icon="el-icon-arrow-left" size="mini"
circle @click="handleCurrentChange(-1)"
size="mini" :disabled="pagination.page == 1"
@click="handleCurrentChange(-1)" ></el-button>
:disabled="pagination.page == 1" &nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
></el-button> Math.ceil(pagination.total / pagination.rowsPerPage)
&nbsp;&nbsp;第{{ pagination.page }}页 / 共{{ }}页
Math.ceil(pagination.total / pagination.rowsPerPage) <el-button
}}页 icon="el-icon-arrow-right"
<el-button circle
icon="el-icon-arrow-right" size="mini"
circle @click="handleCurrentChange(1)"
size="mini" :disabled="
@click="handleCurrentChange(1)"
:disabled="
pagination.page >= pagination.page >=
Math.ceil(pagination.total / pagination.rowsPerPage) Math.ceil(pagination.total / pagination.rowsPerPage)
" "
></el-button> ></el-button>
</div>
</div> </div>
</section> </section>
</section> </section>
...@@ -455,10 +457,12 @@ export default { ...@@ -455,10 +457,12 @@ export default {
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.pagination.page += val; this.pagination.page += val;
this.getDataFromApiSync();
this.$emit("refresh"); this.$emit("refresh");
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.pagination.rowsPerPage = val; this.pagination.rowsPerPage = val;
this.getDataFromApiSync();
this.$emit("refresh"); this.$emit("refresh");
}, },
renderHeader(h, obj) { renderHeader(h, obj) {
...@@ -686,6 +690,13 @@ em.action { ...@@ -686,6 +690,13 @@ em.action {
.th_pink { .th_pink {
background-color: #faf2e2 !important; background-color: #faf2e2 !important;
} }
.ces_page_control .el-button {
border: 0;
}
.ces_page_num .el-input__inner {
border: 0;
padding: 0;
}
</style> </style>
<style scoped> <style scoped>
.ces-table { .ces-table {
...@@ -716,13 +727,17 @@ em.action { ...@@ -716,13 +727,17 @@ em.action {
/* .ces_page_total { /* .ces_page_total {
} */ } */
.ces_page_num { .ces_page_num {
width: 120px; width: 140px;
margin-right: 20px;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
} }
.ces_page_num_sel { .ces_page_num_sel {
width: 66px; width: 50px;
font-size: 14px;
position: relative;
top: 1px;
} }
.table_radius { .table_radius {
border-radius: 8px; border-radius: 8px;
...@@ -801,7 +816,9 @@ em.action { ...@@ -801,7 +816,9 @@ em.action {
background-color: #515fe7; background-color: #515fe7;
color: #f4f7fc; color: #f4f7fc;
} }
.ces_page_control .el-button { .ces_page_item {
border: 0; display: flex;
justify-content: flex-end;
align-items: center;
} }
</style> </style>
<template>
<div class="service_list">
<el-container>
<el-aside width="200px">
<service-shop-menu></service-shop-menu>
</el-aside>
<el-main>
<service-list urlList="url1sss" urlFilter="urldwad2222"></service-list>
</el-main>
</el-container>
</div>
</template>
<script>
import ServiceShopMenu from "@/components/service_shop_menu";
import ServiceList from "@/components/service_list";
export default {
components: {
ServiceShopMenu,
ServiceList
},
data: () => ({}),
mounted() {},
methods: {
}
};
</script>
<style scoped>
</style>
\ No newline at end of file
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
BlockRadius BlockRadius
}, },
data: () => ({ data: () => ({
list: [1, 2, 3, 4, 5, 6] list: [{ id: 0 }, { id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }, { id: 5 }]
}), }),
mounted() {}, mounted() {},
methods: {} methods: {}
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
@primary-del="delItem" @primary-del="delItem"
:emptyText="emptyText" :emptyText="emptyText"
:stripe="true" :stripe="true"
:paginationShow="true"
:pageSizeShow="true" :pageSizeShow="true"
:filterList="filterList" :filterList="filterList"
cellClassName="cell_width" cellClassName="cell_width"
......
...@@ -183,7 +183,12 @@ ...@@ -183,7 +183,12 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<p class="formname">服务描述:</p> <p class="formname">服务描述:</p>
<el-input type="textarea" v-model="form.desc" placeholder="请输入服务描述,不超过200个字" class="form_in"></el-input> <el-input
type="textarea"
v-model="form.desc"
placeholder="请输入服务描述,不超过200个字"
class="form_in"
></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<p class="formname">服务领域:</p> <p class="formname">服务领域:</p>
...@@ -232,8 +237,8 @@ ...@@ -232,8 +237,8 @@
</el-form-item> </el-form-item>
<el-form-item class="btn_footer"> <el-form-item class="btn_footer">
<el-button class="previous" @click="previous">上一步</el-button> <el-button class="previous" @click="previous">上一步</el-button>
<el-button class="registe" @click="registe">服务注册</el-button> <el-button class="registe" @click="registe">服务注册</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -388,10 +393,6 @@ export default { ...@@ -388,10 +393,6 @@ export default {
margin-top: -157px; margin-top: -157px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.bread_crumb {
margin: 20px;
font-size: 14px;
}
.fwcs_btn_act { .fwcs_btn_act {
width: 100px; width: 100px;
background-color: #e56600; background-color: #e56600;
...@@ -521,12 +522,6 @@ export default { ...@@ -521,12 +522,6 @@ export default {
} }
</style> </style>
<style> <style>
.bread_crumb .el-breadcrumb__inner {
color: #b4c0f5 !important;
}
.bread_crumb .is-link {
color: #626de9 !important;
}
.fwcs_fwdz_inner .el-select .el-input { .fwcs_fwdz_inner .el-select .el-input {
width: 130px; width: 130px;
background-color: #0f2683; background-color: #0f2683;
......
...@@ -90,6 +90,18 @@ export default new Router({ ...@@ -90,6 +90,18 @@ export default new Router({
}, },
], ],
}, },
{
path: "/fwcs", // 服务超市
name: "fwcs",
component: () => import("@/pages/data_service_list"),
children: [
{
path: "/data_service_list", // 服务超市列表页
name: "fwcsDataList",
component: () => import("@/pages/data_service_list"),
},
],
},
], ],
}, },
{ {
......
...@@ -13,3 +13,46 @@ module.exports.GetProperty = function (obj, prop) { ...@@ -13,3 +13,46 @@ module.exports.GetProperty = function (obj, prop) {
} }
return res; return res;
} }
module.exports.ymhdateFormat = function (timestamp) {
let date = new Date(timestamp);
let ret;
const opt = {
"Y+": date.getFullYear().toString(), // 年
"m+": (date.getMonth() + 1).toString(), // 月
"d+": date.getDate().toString(), // 日
"H+": date.getHours().toString(), // 时
"M+": date.getMinutes().toString(), // 分
"S+": date.getSeconds().toString() // 秒
// 有其他格式化字符需求可以继续添加,必须转化成字符串
};
var fmt="YYYY-mm-dd HH:MM:SS"
for (let k in opt) {
ret = new RegExp("(" + k + ")").exec(fmt);
if (ret) {
fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
};
};
return fmt;
}
module.exports.dateFormat = function (fmt, timestamp) {
let date = new Date(timestamp);
let ret;
const opt = {
"Y+": date.getFullYear().toString(), // 年
"m+": (date.getMonth() + 1).toString(), // 月
"d+": date.getDate().toString(), // 日
"H+": date.getHours().toString(), // 时
"M+": date.getMinutes().toString(), // 分
"S+": date.getSeconds().toString() // 秒
// 有其他格式化字符需求可以继续添加,必须转化成字符串
};
for (let k in opt) {
ret = new RegExp("(" + k + ")").exec(fmt);
if (ret) {
fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
};
};
return fmt;
}
\ No newline at end of file
...@@ -5,7 +5,8 @@ Vue.use(Vuex); ...@@ -5,7 +5,8 @@ Vue.use(Vuex);
const store = new Vuex.Store({ const store = new Vuex.Store({
state: { state: {
role:1,//0:普通用户,1:组织管理员,2:超级管理员 role: 1,//0:普通用户,1:组织管理员,2:超级管理员
serviceShopMenu: 0, // 服务超市侧边栏
}, },
modules: { modules: {
}, },
...@@ -13,6 +14,9 @@ const store = new Vuex.Store({ ...@@ -13,6 +14,9 @@ const store = new Vuex.Store({
rolefun(state, newValue) { rolefun(state, newValue) {
state.role = newValue; state.role = newValue;
}, },
serviceShopMenuAct(state, newValue) {
state.serviceShopMenu = newValue;
},
}, },
}); });
......
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