diff --git a/components/header/headers.vue b/components/header/headers.vue new file mode 100644 index 0000000..41e5a61 --- /dev/null +++ b/components/header/headers.vue @@ -0,0 +1,63 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 3851b94..fb64984 100644 --- a/pages.json +++ b/pages.json @@ -36,6 +36,13 @@ "navigationStyle": "custom" } }, + { + "path": "pages/manage/NewdeviceManage", + "style": { + "navigationBarTitleText": "设备管理", + "navigationStyle": "custom" + } + }, { "path": "pages/authority/authority", "style": { @@ -92,6 +99,13 @@ "navigationStyle": "custom" } }, + { + "path": "pages/manage/internalManagement", + "style": { + "navigationBarTitleText": "内部管理", + "navigationStyle": "custom" + } + }, { "path": "pages/manage/deviceAdd", "style": { @@ -113,6 +127,20 @@ "navigationStyle": "custom" } }, + { + "path": "pages/index/newindex", + "style": { + "navigationBarTitleText": "新首页", + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/addStaff", + "style": { + "navigationBarTitleText": "添加员工", + "navigationStyle": "custom" + } + }, { "path": "pages/xiaoxi/xiaoxi", "style": { @@ -190,6 +218,13 @@ "navigationStyle": "custom" } }, + { + "path": "pages/index/NewstaffManagement", + "style": { + "navigationBarTitleText": "新员工列表", + "navigationStyle": "custom" + } + }, { "path": "pages/index/homecar", "style": { @@ -410,6 +445,22 @@ "navigationStyle": "custom" } }, + { + "path": "pages/manage/workReport/reportList", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true, + "navigationStyle": "custom" + } + }, + { + "path": "pages/manage/workReport/reportDetals", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true, + "navigationStyle": "custom" + } + }, { "path": "pages/manage/workReport/workReportAdd", "style": { diff --git a/pages/Login/login.vue b/pages/Login/login.vue index deb7381..13f7971 100644 --- a/pages/Login/login.vue +++ b/pages/Login/login.vue @@ -274,7 +274,7 @@ }, goselect(){ uni.reLaunch({ - url:'/pages/index/synthesis' + url:'/pages/index/newindex' }) }, // 验证码方法 diff --git a/pages/index/NewstaffManagement.vue b/pages/index/NewstaffManagement.vue new file mode 100644 index 0000000..df77703 --- /dev/null +++ b/pages/index/NewstaffManagement.vue @@ -0,0 +1,492 @@ + + + + + diff --git a/pages/index/addStaff.vue b/pages/index/addStaff.vue new file mode 100644 index 0000000..9d4f01b --- /dev/null +++ b/pages/index/addStaff.vue @@ -0,0 +1,598 @@ + + + + + diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue new file mode 100644 index 0000000..379ce3c --- /dev/null +++ b/pages/index/newindex.vue @@ -0,0 +1,575 @@ + + + + + diff --git a/pages/manage/NewdeviceManage.vue b/pages/manage/NewdeviceManage.vue new file mode 100644 index 0000000..0161de7 --- /dev/null +++ b/pages/manage/NewdeviceManage.vue @@ -0,0 +1,102 @@ + + + + + + diff --git a/pages/manage/internalManagement.vue b/pages/manage/internalManagement.vue new file mode 100644 index 0000000..60ba06b --- /dev/null +++ b/pages/manage/internalManagement.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/pages/manage/workReport/reportDetals.vue b/pages/manage/workReport/reportDetals.vue new file mode 100644 index 0000000..738a814 --- /dev/null +++ b/pages/manage/workReport/reportDetals.vue @@ -0,0 +1,434 @@ + + + + + diff --git a/pages/manage/workReport/reportList.vue b/pages/manage/workReport/reportList.vue new file mode 100644 index 0000000..bc75a83 --- /dev/null +++ b/pages/manage/workReport/reportList.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/static/imgs/add.png b/static/imgs/add.png new file mode 100644 index 0000000..daa229d Binary files /dev/null and b/static/imgs/add.png differ diff --git a/static/imgs/box_.png b/static/imgs/box_.png new file mode 100644 index 0000000..a123483 Binary files /dev/null and b/static/imgs/box_.png differ diff --git a/static/imgs/car.png b/static/imgs/car.png new file mode 100644 index 0000000..d34a134 Binary files /dev/null and b/static/imgs/car.png differ diff --git a/static/imgs/gengduo.png b/static/imgs/gengduo.png new file mode 100644 index 0000000..00f01ec Binary files /dev/null and b/static/imgs/gengduo.png differ diff --git a/static/imgs/jg1.png b/static/imgs/jg1.png new file mode 100644 index 0000000..13a30c9 Binary files /dev/null and b/static/imgs/jg1.png differ diff --git a/static/imgs/jg10.png b/static/imgs/jg10.png new file mode 100644 index 0000000..512e925 Binary files /dev/null and b/static/imgs/jg10.png differ diff --git a/static/imgs/jg2.png b/static/imgs/jg2.png new file mode 100644 index 0000000..a08c22b Binary files /dev/null and b/static/imgs/jg2.png differ diff --git a/static/imgs/jg3.png b/static/imgs/jg3.png new file mode 100644 index 0000000..825e6df Binary files /dev/null and b/static/imgs/jg3.png differ diff --git a/static/imgs/jg4.png b/static/imgs/jg4.png new file mode 100644 index 0000000..a321273 Binary files /dev/null and b/static/imgs/jg4.png differ diff --git a/static/imgs/jg5.png b/static/imgs/jg5.png new file mode 100644 index 0000000..3a46146 Binary files /dev/null and b/static/imgs/jg5.png differ diff --git a/static/imgs/jg6.png b/static/imgs/jg6.png new file mode 100644 index 0000000..d726ddd Binary files /dev/null and b/static/imgs/jg6.png differ diff --git a/static/imgs/jg7.png b/static/imgs/jg7.png new file mode 100644 index 0000000..842620a Binary files /dev/null and b/static/imgs/jg7.png differ diff --git a/static/imgs/jg8.png b/static/imgs/jg8.png new file mode 100644 index 0000000..34e49c4 Binary files /dev/null and b/static/imgs/jg8.png differ diff --git a/static/imgs/jg9.png b/static/imgs/jg9.png new file mode 100644 index 0000000..699ce2e Binary files /dev/null and b/static/imgs/jg9.png differ diff --git a/static/imgs/logo.png b/static/imgs/logo.png new file mode 100644 index 0000000..a85c090 Binary files /dev/null and b/static/imgs/logo.png differ diff --git a/static/imgs/nb1.png b/static/imgs/nb1.png new file mode 100644 index 0000000..8630b0f Binary files /dev/null and b/static/imgs/nb1.png differ diff --git a/static/imgs/nb2.png b/static/imgs/nb2.png new file mode 100644 index 0000000..a6e47fc Binary files /dev/null and b/static/imgs/nb2.png differ diff --git a/static/imgs/nb3.png b/static/imgs/nb3.png new file mode 100644 index 0000000..fbab9e2 Binary files /dev/null and b/static/imgs/nb3.png differ diff --git a/static/imgs/nb4.png b/static/imgs/nb4.png new file mode 100644 index 0000000..3e3a7e9 Binary files /dev/null and b/static/imgs/nb4.png differ diff --git a/static/imgs/ns.png b/static/imgs/ns.png new file mode 100644 index 0000000..84cb509 Binary files /dev/null and b/static/imgs/ns.png differ diff --git a/static/imgs/num1.png b/static/imgs/num1.png new file mode 100644 index 0000000..4798766 Binary files /dev/null and b/static/imgs/num1.png differ diff --git a/static/imgs/num2.png b/static/imgs/num2.png new file mode 100644 index 0000000..b6533e9 Binary files /dev/null and b/static/imgs/num2.png differ diff --git a/static/imgs/num3.png b/static/imgs/num3.png new file mode 100644 index 0000000..8a91a08 Binary files /dev/null and b/static/imgs/num3.png differ diff --git a/static/imgs/s1.png b/static/imgs/s1.png new file mode 100644 index 0000000..c0b002b Binary files /dev/null and b/static/imgs/s1.png differ diff --git a/static/imgs/s2.png b/static/imgs/s2.png new file mode 100644 index 0000000..df00a26 Binary files /dev/null and b/static/imgs/s2.png differ diff --git a/static/imgs/s3.png b/static/imgs/s3.png new file mode 100644 index 0000000..3fa5c9f Binary files /dev/null and b/static/imgs/s3.png differ diff --git a/static/imgs/s4.png b/static/imgs/s4.png new file mode 100644 index 0000000..41817f7 Binary files /dev/null and b/static/imgs/s4.png differ diff --git a/static/imgs/t1.png b/static/imgs/t1.png new file mode 100644 index 0000000..ee3d654 Binary files /dev/null and b/static/imgs/t1.png differ diff --git a/static/imgs/t2.png b/static/imgs/t2.png new file mode 100644 index 0000000..67003bd Binary files /dev/null and b/static/imgs/t2.png differ diff --git a/static/imgs/t3.png b/static/imgs/t3.png new file mode 100644 index 0000000..8095f7a Binary files /dev/null and b/static/imgs/t3.png differ diff --git a/static/imgs/tel.png b/static/imgs/tel.png new file mode 100644 index 0000000..2b0a807 Binary files /dev/null and b/static/imgs/tel.png differ diff --git a/static/imgs/touxiang.png b/static/imgs/touxiang.png new file mode 100644 index 0000000..6f8e427 Binary files /dev/null and b/static/imgs/touxiang.png differ diff --git a/static/imgs/wod.png b/static/imgs/wod.png new file mode 100644 index 0000000..c8d422d Binary files /dev/null and b/static/imgs/wod.png differ diff --git a/static/imgs/xiaoxi.png b/static/imgs/xiaoxi.png new file mode 100644 index 0000000..70ce86b Binary files /dev/null and b/static/imgs/xiaoxi.png differ diff --git a/static/imgs/yh.png b/static/imgs/yh.png new file mode 100644 index 0000000..810d537 Binary files /dev/null and b/static/imgs/yh.png differ diff --git a/utils/utils.js b/utils/utils.js index 0ad4584..e902ad4 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -33,6 +33,16 @@ export function formatDate(timestamp) { // 组合成日期时间字符串 return `${year}-${month}-${day}`; } +export function formatDateChinese(timestamp) { + // 将时间戳转换为Date对象 + const date = new Date(timestamp); + // 获取年月日时分秒 + const year = date.getFullYear(); + const month = (date.getMonth() + 1).toString().padStart(2, '0'); + const day = date.getDate().toString().padStart(2, '0'); + // 组合成日期时间字符串 + return `${year}年${month}月${day}日`; +} export function formatDateTimeToMinute(timestamp) { // 将时间戳转换为 Date 对象