From e325366d5b238112f7c09ad5e90905c5747df206 Mon Sep 17 00:00:00 2001 From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com> Date: Fri, 20 Oct 2023 11:13:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=A1=B5=E9=9D=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 64 ++ src/pages/equipment/Inspection/details.vue | 590 +++++++++++++++++ .../equipment/Inspection/detailsview.vue | 611 ++++++++++++++++++ src/pages/equipment/Inspection/index.vue | 248 +++++++ src/pages/equipment/Inspection/model.ts | 73 +++ src/pages/equipment/Repair/index.vue | 290 +++++++++ src/pages/equipment/Repair/model.ts | 73 +++ src/pages/equipment/Spotcheck/index.vue | 290 +++++++++ src/pages/equipment/Spotcheck/model.ts | 73 +++ src/pages/equipment/Upkeep/index.vue | 290 +++++++++ src/pages/equipment/Upkeep/model.ts | 73 +++ src/pages/equipment/index.vue | 124 ++++ src/pages/shouye/index.vue | 2 +- src/static/images/iconCloseGray.svg | 12 + src/utils/url.ts | 3 +- 15 files changed, 2814 insertions(+), 2 deletions(-) create mode 100644 src/pages/equipment/Inspection/details.vue create mode 100644 src/pages/equipment/Inspection/detailsview.vue create mode 100644 src/pages/equipment/Inspection/index.vue create mode 100644 src/pages/equipment/Inspection/model.ts create mode 100644 src/pages/equipment/Repair/index.vue create mode 100644 src/pages/equipment/Repair/model.ts create mode 100644 src/pages/equipment/Spotcheck/index.vue create mode 100644 src/pages/equipment/Spotcheck/model.ts create mode 100644 src/pages/equipment/Upkeep/index.vue create mode 100644 src/pages/equipment/Upkeep/model.ts create mode 100644 src/pages/equipment/index.vue create mode 100644 src/static/images/iconCloseGray.svg diff --git a/src/pages.json b/src/pages.json index 0e0e3fd..bae1b96 100644 --- a/src/pages.json +++ b/src/pages.json @@ -44,6 +44,70 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/equipment/index", + "style": { + "navigationBarTitleText": "设备管理", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/equipment/Inspection/index", + "style": { + "navigationBarTitleText": "巡检", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/equipment/Inspection/details", + "style": { + "navigationBarTitleText": "巡检详情", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/equipment/Inspection/detailsview", + "style": { + "navigationBarTitleText": "巡检查看", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/equipment/Spotcheck/index", + "style": { + "navigationBarTitleText": "点检", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/equipment/Upkeep/index", + "style": { + "navigationBarTitleText": "保养", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/equipment/Repair/index", + "style": { + "navigationBarTitleText": "维修", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + // { + // "path": "pages/equipment/repair/index", + // "style": { + // "navigationBarTitleText": "报修", + // "navigationStyle": "custom", // 隐藏系统导航栏 + // "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + // } + // }, { "path": "pages/index/index", "style": { diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue new file mode 100644 index 0000000..c292a5c --- /dev/null +++ b/src/pages/equipment/Inspection/details.vue @@ -0,0 +1,590 @@ + + + + diff --git a/src/pages/equipment/Inspection/detailsview.vue b/src/pages/equipment/Inspection/detailsview.vue new file mode 100644 index 0000000..bb5a277 --- /dev/null +++ b/src/pages/equipment/Inspection/detailsview.vue @@ -0,0 +1,611 @@ + + + + diff --git a/src/pages/equipment/Inspection/index.vue b/src/pages/equipment/Inspection/index.vue new file mode 100644 index 0000000..5a10c10 --- /dev/null +++ b/src/pages/equipment/Inspection/index.vue @@ -0,0 +1,248 @@ + + + + diff --git a/src/pages/equipment/Inspection/model.ts b/src/pages/equipment/Inspection/model.ts new file mode 100644 index 0000000..bc9ef01 --- /dev/null +++ b/src/pages/equipment/Inspection/model.ts @@ -0,0 +1,73 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.mes.PalletChange', +}) +export class ChangePalletNew extends VuexModule { + orderNoItemList: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.get(url.lanjumes.product.getInfoByRfid, { + //loginName: session.loginName, + params: { + factoryCode: session.FactoryCode, + rfid: orderNo, + }, + }); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + @MutationAction + async empty() { + const orderNoItemList = []; + return { orderNoItemList }; + } + SubmitCode: any = ''; + //托盘信息变更x + @MutationAction + async palletInforUpdate(params: any) { + const result: any = await http.post(url.lanjumes.product.palletInforUpdate, params); + const SubmitCode = result.code; + return { SubmitCode }; + } + //库位下拉列表 + DictList: any = []; + @MutationAction + async getpalletLocation(params) { + const result: any = await http.post(url.lanjumes.product.getpalletLocation, { + productionState: params, + }); + const DictListoild: [] = result; + if (DictListoild) { + const DictList = DictListoild.map((item: any) => ({ + label: item.location, + value: item.location, + })); + return { DictList }; + } + } + //缓存区下拉列表 + locList: any = []; + @MutationAction + async getDictList() { + const result: any = await http.get(url.lanjumes.product.getDictList, { + params: { + equipmentTypeCode: 'cache', + }, + }); + const DictListoild: [] = result.data; + const locList = DictListoild.map((item: any) => ({ + label: item.itemName, + value: item.itemCode, + })); + return { locList }; + } +} + +export default getModule(ChangePalletNew); diff --git a/src/pages/equipment/Repair/index.vue b/src/pages/equipment/Repair/index.vue new file mode 100644 index 0000000..cb41751 --- /dev/null +++ b/src/pages/equipment/Repair/index.vue @@ -0,0 +1,290 @@ + + + + diff --git a/src/pages/equipment/Repair/model.ts b/src/pages/equipment/Repair/model.ts new file mode 100644 index 0000000..bc9ef01 --- /dev/null +++ b/src/pages/equipment/Repair/model.ts @@ -0,0 +1,73 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.mes.PalletChange', +}) +export class ChangePalletNew extends VuexModule { + orderNoItemList: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.get(url.lanjumes.product.getInfoByRfid, { + //loginName: session.loginName, + params: { + factoryCode: session.FactoryCode, + rfid: orderNo, + }, + }); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + @MutationAction + async empty() { + const orderNoItemList = []; + return { orderNoItemList }; + } + SubmitCode: any = ''; + //托盘信息变更x + @MutationAction + async palletInforUpdate(params: any) { + const result: any = await http.post(url.lanjumes.product.palletInforUpdate, params); + const SubmitCode = result.code; + return { SubmitCode }; + } + //库位下拉列表 + DictList: any = []; + @MutationAction + async getpalletLocation(params) { + const result: any = await http.post(url.lanjumes.product.getpalletLocation, { + productionState: params, + }); + const DictListoild: [] = result; + if (DictListoild) { + const DictList = DictListoild.map((item: any) => ({ + label: item.location, + value: item.location, + })); + return { DictList }; + } + } + //缓存区下拉列表 + locList: any = []; + @MutationAction + async getDictList() { + const result: any = await http.get(url.lanjumes.product.getDictList, { + params: { + equipmentTypeCode: 'cache', + }, + }); + const DictListoild: [] = result.data; + const locList = DictListoild.map((item: any) => ({ + label: item.itemName, + value: item.itemCode, + })); + return { locList }; + } +} + +export default getModule(ChangePalletNew); diff --git a/src/pages/equipment/Spotcheck/index.vue b/src/pages/equipment/Spotcheck/index.vue new file mode 100644 index 0000000..cb41751 --- /dev/null +++ b/src/pages/equipment/Spotcheck/index.vue @@ -0,0 +1,290 @@ + + + + diff --git a/src/pages/equipment/Spotcheck/model.ts b/src/pages/equipment/Spotcheck/model.ts new file mode 100644 index 0000000..bc9ef01 --- /dev/null +++ b/src/pages/equipment/Spotcheck/model.ts @@ -0,0 +1,73 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.mes.PalletChange', +}) +export class ChangePalletNew extends VuexModule { + orderNoItemList: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.get(url.lanjumes.product.getInfoByRfid, { + //loginName: session.loginName, + params: { + factoryCode: session.FactoryCode, + rfid: orderNo, + }, + }); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + @MutationAction + async empty() { + const orderNoItemList = []; + return { orderNoItemList }; + } + SubmitCode: any = ''; + //托盘信息变更x + @MutationAction + async palletInforUpdate(params: any) { + const result: any = await http.post(url.lanjumes.product.palletInforUpdate, params); + const SubmitCode = result.code; + return { SubmitCode }; + } + //库位下拉列表 + DictList: any = []; + @MutationAction + async getpalletLocation(params) { + const result: any = await http.post(url.lanjumes.product.getpalletLocation, { + productionState: params, + }); + const DictListoild: [] = result; + if (DictListoild) { + const DictList = DictListoild.map((item: any) => ({ + label: item.location, + value: item.location, + })); + return { DictList }; + } + } + //缓存区下拉列表 + locList: any = []; + @MutationAction + async getDictList() { + const result: any = await http.get(url.lanjumes.product.getDictList, { + params: { + equipmentTypeCode: 'cache', + }, + }); + const DictListoild: [] = result.data; + const locList = DictListoild.map((item: any) => ({ + label: item.itemName, + value: item.itemCode, + })); + return { locList }; + } +} + +export default getModule(ChangePalletNew); diff --git a/src/pages/equipment/Upkeep/index.vue b/src/pages/equipment/Upkeep/index.vue new file mode 100644 index 0000000..cb41751 --- /dev/null +++ b/src/pages/equipment/Upkeep/index.vue @@ -0,0 +1,290 @@ + + + + diff --git a/src/pages/equipment/Upkeep/model.ts b/src/pages/equipment/Upkeep/model.ts new file mode 100644 index 0000000..bc9ef01 --- /dev/null +++ b/src/pages/equipment/Upkeep/model.ts @@ -0,0 +1,73 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.mes.PalletChange', +}) +export class ChangePalletNew extends VuexModule { + orderNoItemList: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.get(url.lanjumes.product.getInfoByRfid, { + //loginName: session.loginName, + params: { + factoryCode: session.FactoryCode, + rfid: orderNo, + }, + }); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + @MutationAction + async empty() { + const orderNoItemList = []; + return { orderNoItemList }; + } + SubmitCode: any = ''; + //托盘信息变更x + @MutationAction + async palletInforUpdate(params: any) { + const result: any = await http.post(url.lanjumes.product.palletInforUpdate, params); + const SubmitCode = result.code; + return { SubmitCode }; + } + //库位下拉列表 + DictList: any = []; + @MutationAction + async getpalletLocation(params) { + const result: any = await http.post(url.lanjumes.product.getpalletLocation, { + productionState: params, + }); + const DictListoild: [] = result; + if (DictListoild) { + const DictList = DictListoild.map((item: any) => ({ + label: item.location, + value: item.location, + })); + return { DictList }; + } + } + //缓存区下拉列表 + locList: any = []; + @MutationAction + async getDictList() { + const result: any = await http.get(url.lanjumes.product.getDictList, { + params: { + equipmentTypeCode: 'cache', + }, + }); + const DictListoild: [] = result.data; + const locList = DictListoild.map((item: any) => ({ + label: item.itemName, + value: item.itemCode, + })); + return { locList }; + } +} + +export default getModule(ChangePalletNew); diff --git a/src/pages/equipment/index.vue b/src/pages/equipment/index.vue new file mode 100644 index 0000000..b1b3a43 --- /dev/null +++ b/src/pages/equipment/index.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/pages/shouye/index.vue b/src/pages/shouye/index.vue index 1322603..817343b 100644 --- a/src/pages/shouye/index.vue +++ b/src/pages/shouye/index.vue @@ -77,7 +77,7 @@ export default class RawHome extends BasePage { if (session.FactoryCode != undefined) { this.factoryList.value = session.FactoryCode; } - this.newmenuList = this.menuList.filter((item) => item.perms == 'wms' || item.perms == 'mes'); + this.newmenuList = this.menuList.filter((item) => item.perms == 'wms' || item.perms == 'mes' || item.perms == 'equipment'); console.log('1234', this.menuList); } onLoad() { diff --git a/src/static/images/iconCloseGray.svg b/src/static/images/iconCloseGray.svg new file mode 100644 index 0000000..f9f472f --- /dev/null +++ b/src/static/images/iconCloseGray.svg @@ -0,0 +1,12 @@ + + + icon-shanchu + + + + + + + + + \ No newline at end of file diff --git a/src/utils/url.ts b/src/utils/url.ts index 7f4d745..c76b9e0 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用 +// const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用 +const qianzhuione = '/prod-api'; export const url = { wmspda: { system: {