Skip to content

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

Merge branch 'ldx' into dev

parents b6ceacf9 0ccbc4e1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1580 additions and 556 deletions
src/App.vue
View file @ d90cb6d6
<template>
<div id="app">
<bd-menu class="outmenu"></bd-menu>
<bd-menu v-if="this.$route.path != '/login'" class="outmenu"></bd-menu>
<router-view />
</div>
</template>
......
src/components/order-list/order-list-cell.vue
View file @ d90cb6d6
<template>
<div class="order_cell">
<div class="order_cell_head">
<div class="application_time">申请时间：{{ cellItem.applicationTime }}</div>
<div class="application_time">申请时间：{{ helper.dateFormat(cellItem.add_time) }}</div>
<div class="order_number">订单编号：{{ cellItem.orderNumber }}</div>
<div class="cell_del_btn">删除</div>
</div>
......@@ -107,6 +107,7 @@
</template>
<script>
import helper from "@/services/helper";
export default {
props: {
cellItem: {
......
src/components/order-list/order-list-com.vue
View file @ d90cb6d6
......@@ -4,8 +4,8 @@
<el-tab-pane
v-for="(item, index) in stateList"
:key="'state' + index"
:label="item"
:name="item"
:label="item.label"
:name="item.value"
></el-tab-pane>
</el-tabs>
<div class="list_options">
......@@ -85,17 +85,24 @@ export default {
OrderList
},
data: () => ({
stateList: ["全部订单", "待审核", "审核中", "已获取", "未通过", "已取消"],
activeName: "全部订单",
stateList: [
{ value: "0", label: "全部订单" },
{ value: "1", label: "待审核" },
{ value: "2", label: "审核中" },
{ value: "3", label: "已获取" },
{ value: "4", label: "未通过" },
{ value: "5", label: "已取消" }
],
activeName: "0",
buttonList: [
{ label: "全部", state: false },
{ label: "数据服务", state: false },
{ label: "时空服务", state: false },
{ label: "视频服务", state: false },
{ label: "感知服务", state: false },
{ label: "综合服务", state: false },
{ label: "云资源", state: false },
{ label: "应用镜像", state: false }
{ value: 0, label: "全部", state: false },
{ value: 1, label: "数据服务", state: false },
{ value: 2, label: "时空服务", state: false },
{ value: 3, label: "视频服务", state: false },
{ value: 4, label: "感知服务", state: false },
{ value: 5, label: "综合服务", state: false },
{ value: 6, label: "云资源", state: false },
{ value: 7, label: "应用镜像", state: false }
],
search: "",
pagination: {
......@@ -117,64 +124,15 @@ export default {
label: "50"
}
],
datas: [
{
id: 0,
name: "水路货物周转量情况",
type: "基础数据服务",
creator: "贵州省交通运输厅0",
state: 1,
mapService: 1,
num: 2,
checkedSubscription: false,
specification: 1,
specificationApplication: 2,
evaluationText: "这条服条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。",
evaluationRate: 4.7,
applicationTime: "2021-04-24 15:02:00",
orderNumber: "2020042422222222000001",
getStatus: 2
},
{
id: 1,
name: "水路货物周转量情况水路货物周水路货物周转量情况水路货物周",
type: "基础数据服务",
creator: "贵州省交通运输厅1",
state: 1,
num: 2,
checkedSubscription: false,
specification: 1,
specificationApplication: 2,
evaluationText: "这条服务非常好务非常好非常实用这非常实用这条服务非常好非常实用。",
evaluationRate: 3.7,
applicationTime: "2020-04-24 15:02:00",
orderNumber: "202004241502000001",
getStatus: 3
},
{
id: 2,
name: "水路货物周转量情况水路货物周转量情况路货物周转量情况",
type: "基础数据服务",
creator: "贵州省交通运输厅2",
state: 1,
mapService: 1,
num: 2,
checkedSubscription: true,
specification: 1,
specificationApplication: 2,
evaluationText: "这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用这条服务非常好非常实用。",
evaluationRate: 3.7,
applicationTime: "2020-04-24 15:02:00",
orderNumber: "202004241502000001",
getStatus: 1
}
]
datas: []
}),
mounted() {
this.getTotal();
this.getData();
},
methods: {
tabClick() {},
tabClick() {
this.getData();
},
btnClick(index) {
if (index != 0) {
this.buttonList[0].state = false;
......@@ -185,24 +143,42 @@ export default {
}
this.buttonList[0].state = !this.buttonList[0].state;
}
this.getData();
},
// search debonce 500ms
searchVal() {
if (this.times !== null) clearTimeout(this.times);
this.times = setTimeout(() => {
this.getShopList();
this.getData();
}, 500);
},
getTotal() {
this.pagination.total = this.datas.length;
getData() {
let arr = [];
this.buttonList.forEach(item => {
if (item.state == true) {
arr.push(item.value);
}
});
let params = {
select: this.search,
page: this.pagination.page,
limit: this.pagination.rowsPerPage,
status: this.activeName,
types: arr
};
this.$api.user.orderList(params).then(response => {
console.log(response);
this.datas = response.data.data;
this.pagination.total = response.data.total;
});
},
handleSizeChange(val) {
this.pagination.rowsPerPage = val;
this.$emit("refresh", this.pagination);
this.getData();
},
handleCurrentChange(val) {
this.pagination.page += val;
this.$emit("refresh", this.pagination);
this.getData();
}
}
};
......
src/components/service_list.vue
View file @ d90cb6d6
This diff is collapsed.
src/components/shop-cloud/shop-cloud.vue
View file @ d90cb6d6
......@@ -91,7 +91,7 @@
<el-input-number
v-model="formNew.containerGroup"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="取值范围[0，24]"
></el-input-number>
......@@ -104,7 +104,7 @@
<el-input-number
v-model="formNew.dataDisk"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="请选择数量"
></el-input-number>
......@@ -117,7 +117,7 @@
<el-input-number
v-model="formNew.perDataDisk"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="请选择容量"
></el-input-number>
......@@ -136,7 +136,7 @@
<el-input-number
v-model="formNew.perCPUs"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="请选择CPU最高使用量"
></el-input-number>
......@@ -149,7 +149,7 @@
<el-input-number
v-model="formNew.perCPU"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="请选择CPU默认使用量"
></el-input-number>
......@@ -165,7 +165,7 @@
<el-input-number
v-model="formNew.perRAMs"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="请选择内存最高使用量"
></el-input-number>
......@@ -178,7 +178,7 @@
<el-input-number
v-model="formNew.perRAM"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="请选择内存默认使用量"
></el-input-number>
......@@ -194,7 +194,7 @@
<el-input-number
v-model="formNew.appDuration"
controls-position="right"
:min="1"
:min="0"
:max="10"
></el-input-number>
<el-select
......@@ -302,7 +302,7 @@
<el-input-number
v-model="formOld.containerGroup"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="取值范围[0，24]"
></el-input-number>
......@@ -315,7 +315,7 @@
<el-input-number
v-model="formOld.dataDisk"
controls-position="right"
:min="1"
:min="0"
:max="10"
></el-input-number>
<div class="input_right">块</div>
......@@ -327,7 +327,7 @@
<el-input-number
v-model="formOld.perDataDisk"
controls-position="right"
:min="1"
:min="0"
:max="10"
></el-input-number>
<div class="input_right">GB</div>
......@@ -366,7 +366,7 @@
<el-input-number
v-model="formOld.perCPUs"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="请设置CPU最高使用量"
></el-input-number>
......@@ -379,7 +379,7 @@
<el-input-number
v-model="formOld.perCPU"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="请设置CPU默认使用量"
></el-input-number>
......@@ -395,7 +395,7 @@
<el-input-number
v-model="formOld.perRAMs"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="请设置内存最高使用量"
></el-input-number>
......@@ -408,7 +408,7 @@
<el-input-number
v-model="formOld.perRAM"
controls-position="right"
:min="1"
:min="0"
:max="10"
placeholder="请设置内存默认使用量"
></el-input-number>
......@@ -437,7 +437,7 @@
<el-input-number
v-model="formOld.appDuration"
controls-position="right"
:min="1"
:min="0"
:max="10"
></el-input-number>
<el-select
......@@ -675,6 +675,9 @@ export default {
getForm(val) {
if (val != "") {
this.formShow = true;
Object.keys(this.formOld).forEach(item => {
this.formOld[item] = "";
});
} else {
this.formShow = false;
}
......@@ -916,6 +919,7 @@ export default {
<style>
.form_block .el-input .el-input__inner {
background-color: #f7f8f9;
color: #242c43;
}
.cloud_form .el-input {
width: 100%;
......@@ -929,12 +933,14 @@ export default {
}
.cloud_form .input_has_left_right .el-input__inner {
border-radius: 0;
color: #242c43;
}
.cloud_form .el-select {
width: 100%;
}
.cloud_form .el-input .el-input__inner {
background-color: #f7f8f9;
color: #242c43;
}
.cloud_form .el-input-number {
width: calc(100% - 60px);
......@@ -948,6 +954,7 @@ export default {
}
.cloud_form .el-input-number .el-input__inner {
text-align: left;
color: #242c43;
}
.cloud_form .el-textarea {
width: 100%;
......@@ -955,6 +962,7 @@ export default {
.cloud_form .el-textarea .el-textarea__inner {
background-color: #f7f8f9;
border-radius: 8px;
color: #242c43;
}
.form_item .el-form-item__content {
width: 100%;
......@@ -964,6 +972,7 @@ export default {
}
.input_has_right .el-input__inner {
border-radius: 8px 0 0 8px;
color: #242c43;
}
.cloud_form .input_has_right_select .el-input-number {
width: calc(100% - 100px);
......@@ -979,6 +988,7 @@ export default {
}
.input_has_right_select .el-input__inner {
border-radius: 8px 0 0 8px;
color: #242c43;
}
.input_has_right_select .input_right_select.el-select .el-input {
width: 100px;
......@@ -995,6 +1005,7 @@ export default {
}
.input_right_select .el-input .el-input__inner {
background-color: #0f2683;
color: #242c43;
}
.cloud_form .el-input-number .el-input-number__increase,
.cloud_form .el-input-number .el-input-number__decrease {
......
src/components/shopping-cart/shopping-cart-list.vue
View file @ d90cb6d6
......@@ -42,7 +42,6 @@ export default {
checkList: {
immediate: true, // 这句重要
handler(val) {
console.log("ss")
this.checkLists = val;
}
}
......
src/pages/authority/menus.vue
View file @ d90cb6d6
This diff is collapsed.
src/pages/login.vue 0 → 100644
View file @ d90cb6d6
This diff is collapsed.
src/pages/service_shop/shop_list.vue 0 → 100644
View file @ d90cb6d6
<template>
<div>
<el-container>
<el-aside width="180px">
<service-shop-menu></service-shop-menu>
</el-aside>
<el-main>
<service-list :name="name" :url="url" :urlList="urlList" :urlFilter="urlFilter"></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: () => ({
urlFilter: "",
url: "",
urlList: "2222",
name: ""
}),
mounted() {
this.getVal(this.$route.path);
},
methods: {
getVal(val) {
switch (val) {
case "/shop/data_service_list":
this.name = "数据服务";
this.urlFilter = "5";
break;
case "/shop/space_time_service_list":
this.name = "时空服务";
this.urlFilter = "6";
break;
case "/shop/video_service_list":
this.name = "视频服务";
this.urlFilter = "7";
break;
case "/shop/perception_service_list":
this.name = "感知服务";
this.urlFilter = "10";
break;
case "/shop/comprehensive_app_list":
this.name = "综合服务";
this.urlFilter = "";
break;
case "/shop/app_store_list":
this.name = "应用商店";
this.urlFilter = "";
break;
default:
this.name = "";
this.urlFilter = "";
break;
}
}
},
watch: {
"$route.path": {
handler(val) {
this.getVal(val);
}
}
}
};
</script>
<style scoped>
</style>
\ No newline at end of file
src/pages/service_shop/shop_list_app_store.vue deleted 100644 → 0
View file @ b6ceacf9
<template>
<div>
<el-container>
<el-aside width="180px">
<service-shop-menu></service-shop-menu>
</el-aside>
<el-main>
<service-list name="应用商店" url="yysdDetail" 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
src/pages/service_shop/shop_list_comprehensive_app.vue deleted 100644 → 0
View file @ b6ceacf9
<template>
<div>
<el-container>
<el-aside width="180px">
<service-shop-menu></service-shop-menu>
</el-aside>
<el-main>
<service-list name="综合应用" url="zhfwDetail" 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
src/pages/service_shop/shop_list_data.vue deleted 100644 → 0
View file @ b6ceacf9
<template>
<div>
<el-container>
<el-aside width="180px">
<service-shop-menu></service-shop-menu>
</el-aside>
<el-main>
<service-list name="数据服务" url="sjfwDetail" 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
src/pages/service_shop/shop_list_perception.vue deleted 100644 → 0
View file @ b6ceacf9
<template>
<div>
<el-container>
<el-aside width="180px">
<service-shop-menu></service-shop-menu>
</el-aside>
<el-main>
<service-list name="感知服务"></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
src/pages/service_shop/shop_list_space_time.vue deleted 100644 → 0
View file @ b6ceacf9
<template>
<div>
<el-container>
<el-aside width="180px">
<service-shop-menu></service-shop-menu>
</el-aside>
<el-main>
<service-list name="时空服务" url="skfwDetail" 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
src/pages/service_shop/shop_list_video.vue deleted 100644 → 0
View file @ b6ceacf9
<template>
<div>
<el-container>
<el-aside width="180px">
<service-shop-menu></service-shop-menu>
</el-aside>
<el-main>
<service-list name="视频服务"></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
src/pages/service_shop/shopping_cart.vue
View file @ d90cb6d6
......@@ -25,7 +25,7 @@ export default {
margin: 0 auto;
}
.shopping_title {
height: 40px;
line-height: 40px;
height: 45px;
line-height: 45px;
}
</style>
\ No newline at end of file
src/request/api.js
View file @ d90cb6d6
import workbench from '@/request/api/workbench';
import serviceShop from '@/request/api/service_shop';
import user from '@/request/api/user';
import authority from '@/request/api/authority';
export default {
workbench,
serviceShop,
user
user,
authority
}
\ No newline at end of file
src/request/api/authority.js 0 → 100644
View file @ d90cb6d6
import axios from '@/request/http'; // 导入http中创建的axios实例
import qs from 'qs'; // 根据需求是否导入qs模块
const authority = {
// Menu
getMenuList() {
return axios.get(`/apaas/backmgt/menu/list`);
},
addMenu(params) {
return axios.post(`/apaas/backmgt/menu`, params);
},
delMenu(params) {
return axios.delete(`/apaas/backmgt/menu/id/${params.id}`);
},
getMenu(params) {
return axios.get(`/apaas/backmgt/menu/id/${params.id}`);
},
positionMenu(params) {
return axios.post(`/apaas/backmgt/menu/menuOrder`, params);
},
editMenu(params) {
return axios.put(`/apaas/backmgt/menu`, params);
}
}
export default authority;
src/request/api/service_shop.js
View file @ d90cb6d6
......@@ -3,6 +3,42 @@ import qs from 'qs'; // 根据需求是否导入qs模块
const serviceShop = {
// service list
getServiceShopFilter(params) {
// 5:数据 6:时空 7:视频 10:感知
return axios.get(`/apaas/serviceapp/v3/servicemarket/profileInfo?serviceType=${params.type}`);
},
getServiceShopList(params) {
return axios.get(`/apaas/serviceapp/v3/servicemarket/list?
serviceName=${params.serviceName}&serviceType1=${params.serviceType1}&
serviceType2s=${params.serviceType2s}&dataDomains=${params.dataDomains}&
organizeIds=${params.organizeIds}&orderBy=${params.orderBy}&
Page=${params.Page}&Size=${params.Size}`);
},
getServiceShopDetail(params) {
return axios.get(`/apaas/serviceapp/v3/servicemarket/detail?serviceId=`)
},
// shopping cart
addShoppingCart(params) {
return axios.post(`/apaas/serviceapp/v3/shopcart/add`, params);
},
delShoppingCart(params) {
// note: if parans is empty, it will delete all data.
return axios.post(`/apaas/serviceapp/v3/shopcart/del`, params);
},
getShoppingCart() {
return axios.get(`/apaas/serviceapp/v3/shopcart/list`);
},
updateShoppingCart(params) {
return axios.post(`/apaas/serviceapp/v3/shopcart/update`, params);
},
getSystemList() {
return axios.get(`/apaas/serviceapp/v3/shopcart/systems`);
},
submitShoppingCart() {
return axios.post(`/apaas/serviceapp/v3/shopcart/apply`, params);
},
}
export default serviceShop;
src/request/api/user.js
View file @ d90cb6d6
......@@ -2,7 +2,9 @@ import axios from '@/request/http'; // 导入http中创建的axios实例
import qs from 'qs'; // 根据需求是否导入qs模块
const user = {
orderList(params) {
return axios.get(`/apaas/serviceapp/v3/order/list?serviceName=${params.select}&orderStatus=${params.status}&serviceTypes=${params.types.join(',')}&Page=${params.page}&Size=${params.limit}`);
},
}
export default user;
src/request/http.js
View file @ d90cb6d6
......@@ -5,9 +5,11 @@
import axios from 'axios';
import router from '../router';
import store from '../store/index';
import ElementUI from 'element-ui';
const tip = msg => {
console.log(msg)
console.log(msg);
ElementUI.Message.error(msg);
}
/**
......@@ -67,8 +69,8 @@ instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlenco
*/
instance.interceptors.request.use(
config => {
const token = store.state.token;
token && (config.headers.Authorization = token);
// const token = store.state.token;
// token && (config.headers.Authorization = token);
return config;
},
error => Promise.error(error))
......
src/router/index.js
View file @ d90cb6d6
......@@ -16,6 +16,11 @@ export default new Router({
path: "/",
redirect: "/index",
},
{
path: "/login", // 登录注册
name: "login",
component: () => import("@/pages/login"),
},
{
path: "/index",
name: "index",
......@@ -120,30 +125,27 @@ export default new Router({
{
path: "/shop/data_service_list", // 数据服务列表页
name: "shopDataList",
component: () => import("@/pages/service_shop/shop_list_data"),
component: () => import("@/pages/service_shop/shop_list"),
},
{
path: "/shop/space_time_service_list", // 时空服务列表页
name: "shopSpaceTimeList",
component: () =>
import("@/pages/service_shop/shop_list_space_time"),
component: () => import("@/pages/service_shop/shop_list"),
},
{
path: "/shop/video_service_list", // 视频服务列表页
name: "shopVideoList",
component: () => import("@/pages/service_shop/shop_list_video"),
component: () => import("@/pages/service_shop/shop_list"),
},
{
path: "/shop/perception_service_list", // 感知服务列表页
name: "shopPerceptionList",
component: () =>
import("@/pages/service_shop/shop_list_perception"),
component: () => import("@/pages/service_shop/shop_list"),
},
{
path: "/shop/comprehensive_app_list", // 综合应用列表页
name: "shopComAppList",
component: () =>
import("@/pages/service_shop/shop_list_comprehensive_app"),
component: () => import("@/pages/service_shop/shop_list"),
},
{
path: "/shop/cloud", // 云资源服务
......@@ -159,8 +161,7 @@ export default new Router({
{
path: "/shop/app_store_list", // 应用商店列表页
name: "shopAppStoreList",
component: () =>
import("@/pages/service_shop/shop_list_app_store"),
component: () => import("@/pages/service_shop/shop_list"),
},
{
path: "/shop/shopping_cart", // 购物车页
......
src/services/cookie.js 0 → 100644
View file @ d90cb6d6
// 取得cookie
function getCookie(name) {
var nameEQ = name + '='
var ca = document.cookie.split(';') // 把cookie分割成组
for (var i = 0; i < ca.length; i++) {
var c = ca[i] // 取得字符串
while (c.charAt(0) == ' ') { // 判断一下字符串有没有前导空格
c = c.substring(1, c.length) // 有的话，从第二位开始取
}
if (c.indexOf(nameEQ) == 0) { // 如果含有我们要的name
return unescape(c.substring(nameEQ.length, c.length)) // 解码并截取我们要值
}
}
return false
}
// 清除cookie
function clearCookie(name) {
setCookie(name, "", -1);
}
// 设置cookie
function setCookie(name, value, seconds) {
seconds = seconds || 0; //seconds有值就直接赋值，没有为0，这个根php不一样。
var expires = "";
if (seconds != 0 ) { //设置cookie生存时间
var date = new Date();
date.setTime(date.getTime()+(seconds*1000));
expires = "; expires="+date.toGMTString();
}
document.cookie = name+"="+escape(value)+expires+"; path=/"; //转码并赋值
}
export {
getCookie,
clearCookie,
setCookie,
}
src/services/helper.js
View file @ d90cb6d6
......@@ -14,28 +14,6 @@ module.exports.GetProperty = function (obj, prop) {
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;
......@@ -55,4 +33,4 @@ module.exports.dateFormat = function (fmt, timestamp) {
};
};
return fmt;
}
\ No newline at end of file
}
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