diff --git a/locale/en.json b/locale/en.json index 578480f..f54d7b0 100644 --- a/locale/en.json +++ b/locale/en.json @@ -62,6 +62,7 @@ "menu.fixedpoint-work": "定点作业", "menu.area-manage": "区域管制", "menu.agv-manage": "AGV管制", + "menu.zd-manage": "站点管理", "filter.area": "区域", "filter.point": "点位", "filter.type": "类型", diff --git a/locale/jp.json b/locale/jp.json index cb98f76..983f60c 100644 --- a/locale/jp.json +++ b/locale/jp.json @@ -62,6 +62,7 @@ "menu.fixedpoint-work": "ポインティングジョブ", "menu.area-manage": "入退場区域登録", "menu.agv-manage": "AGV せいぎょ", + "menu.zd-manage": "サイト管理", "filter.area": "領域", "filter.point": "ポイント", "filter.type": "を選択してオプションを設定します。", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 578480f..f54d7b0 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -62,6 +62,7 @@ "menu.fixedpoint-work": "定点作业", "menu.area-manage": "区域管制", "menu.agv-manage": "AGV管制", + "menu.zd-manage": "站点管理", "filter.area": "区域", "filter.point": "点位", "filter.type": "类型", diff --git a/pages.json b/pages.json index 7132d56..3b85511 100644 --- a/pages.json +++ b/pages.json @@ -519,6 +519,13 @@ "navigationStyle": "custom" } } + ,{ + "path" : "pages/ftdlDTY/zd-manage", + "style" : + { + "navigationStyle": "custom" + } + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/ftdlDTY/line-down-mater.vue b/pages/ftdlDTY/line-down-mater.vue index 4b9877e..a050351 100644 --- a/pages/ftdlDTY/line-down-mater.vue +++ b/pages/ftdlDTY/line-down-mater.vue @@ -12,6 +12,7 @@ @@ -108,9 +109,13 @@ // } }, created () { - this._getNextRegionsByPoint() }, methods: { + handleChange1 (e) { + if (e) { + this._getNextRegionsByPoint() + } + }, async _getNextRegionsByPoint () { try { let res = await getNextRegionsByPoint(this.val1) diff --git a/pages/ftdlDTY/zd-manage.vue b/pages/ftdlDTY/zd-manage.vue new file mode 100644 index 0000000..4505dbf --- /dev/null +++ b/pages/ftdlDTY/zd-manage.vue @@ -0,0 +1,335 @@ + + + + diff --git a/pages/home/home.vue b/pages/home/home.vue index a1da78d..cde0165 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -51,8 +51,8 @@ // {title: '区域管制', path: 'RF01', sonTree: [{title: '区域管制', path: '/pages/ftdlDTY/area-manage'}]} // ], menuList: [ - {title: this.$t('menu.kw-management'), path: 'RF03', sonTree: [{title: this.$t('menu.man-get-goods'), path: '/pages/ftdlDTY/man-get-goods'}, {title: this.$t('menu.man-load-goods'), path: '/pages/ftdlDTY/man-load-goods'}, {title: this.$t('menu.kc-manage'), path: '/pages/ftdlDTY/kc-manage'}]}, - {title: this.$t('menu.line-management'), path: 'RF04', sonTree: [{title: this.$t('menu.line-call-mater'), path: '/pages/ftdlDTY/line-call-mater'}, {title: this.$t('menu.line-down-mater'), path: '/pages/ftdlDTY/line-down-mater'}]}, + {title: this.$t('menu.kw-management'), path: 'RF03', sonTree: [{title: this.$t('menu.man-get-goods'), path: '/pages/ftdlDTY/man-get-goods'}, {title: this.$t('menu.man-load-goods'), path: '/pages/ftdlDTY/man-load-goods'}, {title: this.$t('menu.zd-manage'), path: '/pages/ftdlDTY/zd-manage'}]}, + {title: this.$t('menu.line-management'), path: 'RF04', sonTree: [{title: this.$t('menu.line-down-mater'), path: '/pages/ftdlDTY/line-down-mater'}]}, {title: this.$t('menu.task-management'), path: 'RF07', sonTree: [{title: this.$t('menu.work-manage'), path: '/pages/ftdlDTY/work-manage'}, {title: this.$t('menu.fixedpoint-work'), path: '/pages/ftdlDTY/fixedpoint-work'}]}, {title: this.$t('menu.area-manage'), path: 'RF01', sonTree: [{title: this.$t('menu.area-manage'), path: '/pages/ftdlDTY/area-manage'}, {title: this.$t('menu.agv-manage'), path: '/pages/ftdlDTY/agv-manage'}]} ], @@ -75,7 +75,7 @@ // } // }, mounted() { - this.initWebSocket() + // this.initWebSocket() }, methods: { initWebSocket() { diff --git a/utils/getData4.js b/utils/getData4.js index 309955b..4f5a26e 100644 --- a/utils/getData4.js +++ b/utils/getData4.js @@ -217,4 +217,16 @@ export const pause = (agvno, option) => request({ export const resume = (agvno, option) => request({ url:'api/hand/resume', data: {agv_no: agvno, option: option} -}) \ No newline at end of file +}) + +// 站点管理 +// 1.2查询区域 +export const selectRegions = () => request({ + url:'api/hand/selectRegions', + data: {} +}) +// 1.1根据区域查询进出区域信息 +export const selectPointInfo = (rcode) => request({ + url:'api/hand/selectPointInfo', + data: {region_code: rcode} +})