diff --git a/api/user.js b/api/user.js index bc641d5..4e81271 100644 --- a/api/user.js +++ b/api/user.js @@ -593,4 +593,29 @@ export function modeList(data) { method: "get", data }); -} \ No newline at end of file +} + +/** + * 线路列表 + * @param {Object} data + */ +export function lineList(data) { + console.log(data) + return request({ + url: `${functions.getDomain()}/api/line-lists`, + method: "get", + data + }); +} +/** + * 设备列表 + * @param {Object} data + */ +export function lineCheckDevice(data) { + console.log(data) + return request({ + url: `${functions.getDomain()}/api/line-check-device`, + method: "get", + data + }); +} diff --git a/pages.json b/pages.json index 921f373..07e3071 100644 --- a/pages.json +++ b/pages.json @@ -247,6 +247,33 @@ } } + ,{ + "path" : "pages/modeMaintainAdd/modeMaintainAdd", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/lineList/lineList", + "style" : + { + "navigationBarTitleText": "线路列表", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/deviceList/deviceList", + "style" : + { + "navigationBarTitleText": "设备列表", + "enablePullDownRefresh": false + } + + } ], "globalStyle": { "navigationBarTextStyle": "white", diff --git a/pages/deviceList/deviceList.vue b/pages/deviceList/deviceList.vue new file mode 100644 index 0000000..06c286c --- /dev/null +++ b/pages/deviceList/deviceList.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/pages/deviceList/index.scss b/pages/deviceList/index.scss new file mode 100644 index 0000000..31efc7f --- /dev/null +++ b/pages/deviceList/index.scss @@ -0,0 +1,55 @@ +.card{ + @include wh(710upx,auto); + margin: auto; + margin-top: 24upx; + background: white; + border-radius: 10upx; + padding-top: 20upx; + padding-bottom: 30upx; + @include flex(center,space-around); + .card-left{ + @include wh(660upx,auto); + .card-up-list{ + @include wh(660upx,auto); + margin-top: 24upx; + @include flex(center,space-between); + .card-right{ + image{ + @include wh(34upx,34upx) + } + } + .card-up-list-list{ + @include flex(center,flex-start); + view{ + @include fonts(26upx,#333,500); + } + text{ + @include fonts(24upx,#666,500); + } + } + + } + .card-dow-list{ + @include wh(660upx,auto); + margin-top: 24upx; + @include flex(center,space-between); + .card-right{ + image{ + @include wh(34upx,34upx) + } + } + .card-up-list-list{ + width: 330upx; + @include flex(center,flex-start); + view{ + @include fonts(26upx,#333,500); + } + text{ + @include fonts(24upx,#666,500); + } + } + + } + } + +} \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 5d1b4da..5957451 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -162,7 +162,7 @@ 模具保养 - + @@ -245,6 +245,11 @@ url: '../modeMaintainList/modeMaintainList' }); }, + LineList(){ + uni.navigateTo({ + url: '../lineList/lineList' + }); + }, kfz(){ this.$functions.error("功能开发中"); } diff --git a/pages/lineList/index.scss b/pages/lineList/index.scss new file mode 100644 index 0000000..62acfb3 --- /dev/null +++ b/pages/lineList/index.scss @@ -0,0 +1,76 @@ +.card{ + @include wh(710upx,auto); + margin: auto; + margin-top: 24upx; + background: white; + border-radius: 10upx; + padding-top: 20upx; + padding-bottom: 30upx; +// @include flex(center,space-around); + .card-left{ + @include wh(660upx,auto); + margin: auto; + .card-up-list{ + @include wh(660upx,auto); + margin-top: 24upx; + @include flex(center,space-between); + .card-up-list-list{ + @include flex(center,flex-start); + view{ + @include fonts(26upx,#333,500); + } + text{ + @include fonts(24upx,#666,500); + } + } + + } + + + } + .card-opreation{ + @include wh(660upx,auto); + margin: auto; + @include flex(center,space-between); + margin-top: 20upx; + .byj-btn{ + @include wh(140upx,60upx); + background: #007AFF; + line-height: 120upx; + @include flex(center,center); + border-radius: 10upx; + image{ + @include wh(40upx,40upx); + } + text{ + @include fonts(24upx,#ffffff) + } + } + .yj-btn{ + @include wh(120upx,60upx); + background: #F0AD4E; + line-height: 120upx; + @include flex(center,center); + border-radius: 10upx; + image{ + @include wh(40upx,40upx); + } + text{ + @include fonts(24upx,#ffffff) + } + } + .bnj-btn{ + @include wh(120upx,60upx); + background: #4CD964; + line-height: 120upx; + @include flex(center,center); + border-radius: 10upx; + image{ + @include wh(40upx,40upx); + } + text{ + @include fonts(24upx,#ffffff) + } + } + } +} \ No newline at end of file diff --git a/pages/lineList/lineList.vue b/pages/lineList/lineList.vue new file mode 100644 index 0000000..8413058 --- /dev/null +++ b/pages/lineList/lineList.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/pages/modeMaintainAdd/index.scss b/pages/modeMaintainAdd/index.scss new file mode 100644 index 0000000..e69de29 diff --git a/pages/modeMaintainAdd/modeMaintainAdd.vue b/pages/modeMaintainAdd/modeMaintainAdd.vue new file mode 100644 index 0000000..8c3b35f --- /dev/null +++ b/pages/modeMaintainAdd/modeMaintainAdd.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/static/bnj.png b/static/bnj.png new file mode 100644 index 0000000..6a88d80 Binary files /dev/null and b/static/bnj.png differ diff --git a/static/byj.png b/static/byj.png new file mode 100644 index 0000000..9e241e3 Binary files /dev/null and b/static/byj.png differ diff --git a/static/yj.png b/static/yj.png new file mode 100644 index 0000000..209f411 Binary files /dev/null and b/static/yj.png differ