+
+
检查标准: {{ item.checkStandard }}
+
+
+
+ {{ n.name }}
+
+
+
+
+
+
检查标准: {{ item.checkStandard }}
+
+ 实际值:
+
+ 单位:mm
+
+
+
-
- 确认
-
+
+ 确认
+
-
+
+
diff --git a/src/pages/quality/model.ts b/src/pages/quality/model.ts
new file mode 100644
index 0000000..9ece1ae
--- /dev/null
+++ b/src/pages/quality/model.ts
@@ -0,0 +1,31 @@
+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.equipment.quality',
+})
+export class quality extends VuexModule {
+ orderNoItemList: any = [];
+ getTaskRecordList: any = [];
+ @MutationAction
+ // 点检：spotInspection
+ // 巡检：inspection
+ // 保养：maintenance
+ async getTopTaskInfo() {
+ const result: any = await http.get(url.lanjuquality.getTopTaskInfo, {
+ //loginName: session.loginName,
+ params: {
+ factoryCode: session.PoolName,
+ },
+ });
+ const orderNoItemList = result.data;
+ return { orderNoItemList };
+ }
+}
+
+export default getModule(quality);
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index 809a6aa..f787869 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
model = model;
src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
today = dayjs().format('YYYY-MM-DD dddd');
- version = '0.0.14';
+ version = '0.0.15';
checkversion: any = {};
sessiondata: any = '';
onLoad() {
diff --git a/src/store/modules/session.ts b/src/store/modules/session.ts
index 98e1b53..5ce8569 100644
--- a/src/store/modules/session.ts
+++ b/src/store/modules/session.ts
@@ -66,14 +66,20 @@ class SessionService extends VuexModule {
/**
* 当前用户ID
*/
- // get userId(): any {
- // if (this.user === null) {
- // return null;
- // } else {
- // return this.user.userId;
- // }
- // }
-
+ get userId(): any {
+ if (this.user === null) {
+ return null;
+ } else {
+ return this.user.userId;
+ }
+ }
+ get userName(): any {
+ if (this.user === null) {
+ return null;
+ } else {
+ return this.user.userName;
+ }
+ }
/**
* 当前选择语言
*/
@@ -91,6 +97,7 @@ class SessionService extends VuexModule {
if (this.user === null) {
return null;
} else {
+ console.log(this.user, '1111111');
return this.user.loginName;
}
}
@@ -157,6 +164,7 @@ class SessionService extends VuexModule {
if (this.user === null) {
throw new Error('当前无登录用户');
} else {
+ console.log(this.user);
return this.user;
}
}
@@ -191,6 +199,7 @@ class SessionService extends VuexModule {
const requestData = {
userName: username,
};
+ console.log(request.post(url.wmspda.system.getInfo, requestData), this.user);
return request.post(url.wmspda.system.getInfo, requestData);
}
// get parkName(): any {
diff --git a/src/utils/url.ts b/src/utils/url.ts
index aae41bd..c7dac57 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
-const qianzhuione = '/prod-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
+const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
// const qianzhuione = '/prod-api';
export const url = {
wmspda: {
@@ -133,47 +133,48 @@ export const url = {
},
// 质量管理
lanjuquality: {
- product: {
- // 巡检
- Inspection: {
- // 获取今日任务 获取历史记录
- getTodayTask: qianzhuione + '/device/devicePDA/getTodayTask',
- // 获取历史记录
- getTaskRecord: qianzhuione + '/device/devicePDA/getTaskRecord',
- // 获取巡检工单详情信息
- getInspectionOrderInfo: qianzhuione + '/device/devicePDA/getInspectionOrderInfo',
- // 提交巡检工单详情信息
- updateInspectionRecord: qianzhuione + '/device/devicePDA/updateInspectionRecord',
- },
- // 报修
- Repairbx: {
- // 根据交货单号查询下面的产品编码
- getInfoRepair: qianzhuione + '/device/devicePDA/queryEquipment/',
- // 根据订单号和产品编码查询
- addRepairRecord: qianzhuione + '/device/devicePDA/addRepairRecord',
- // 备件list
- getEquipmentList: qianzhuione + '/device/devicePDA/getEquipmentList',
- },
- // 维修
- Repair: {
- // 获取今日任务 获取历史记录
- getTodayTask: qianzhuione + '/device/devicePDA/getMaintenancePendRecords',
- // 获取历史记录
- getTaskRecord: qianzhuione + '/device/devicePDA/getMaintenanceRecords',
- // 获取维修工单信息
- selectPdaRepairWorkOrderDetails: qianzhuione + '/device/devicePDA/selectPdaRepairWorkOrderDetails',
- // 是否维修
- updateDowntime: qianzhuione + '/device/devicePDA/updateDowntime',
- // 维修提交
- updateMaintenanceRecords: qianzhuione + '/device/devicePDA/updateMaintenanceRecords',
- // 备件list
- list: qianzhuione + '/device/sparePartsLedger/list',
- },
- // 保养
- Upkeep: {
- // 是否开机保养
- startMaintenanceTask: qianzhuione + '/device/devicePDA/startMaintenanceTask',
- },
+ // 任务数量管理
+ getTopTaskInfo: qianzhuione + '/quality/handCheck/getTopTaskInfo',
+ // 质量检验
+ Materialinspection: {
+ // 获取检验节点下拉列表
+ getCheckType: qianzhuione + '/quality/handCheck/getCheckType',
+ // 获取待检验信息列表
+ getCheckTaskListall: qianzhuione + '/quality/handCheck/getCheckTaskList',
+ // 获取待检验信息列表--点处理后获取检测项
+ getCheckTaskList: qianzhuione + '/quality/handCheck/getCheckTaskDetailList',
+ // 获取待检验信息列表--点处理后获取检测项--提交
+ commitCheckTaskList: qianzhuione + '/quality/handCheck/commitCheckResults',
+ },
+ // 历史记录
+ Records: {
+ // 获取待检验信息列表
+ getCheckTaskListall: qianzhuione + '/quality/handCheck/getCheckTaskList',
+ // 获取待检验信息列表--点处理后获取检测项
+ getCheckTaskList: qianzhuione + '/quality/handCheck/getCheckTaskDetailList',
+ },
+ Belowstandard: {
+ // 获取待检验信息列表
+ getCheckTaskListall: qianzhuione + '/quality/handCheck/getCheckTaskList',
+ // 获取待检验信息列表--点处理后获取检测项
+ getCheckTaskList: qianzhuione + '/quality/handCheck/getCheckTaskDetailList',
+ // 获取待检验信息列表--点处理后获取检测项--提交
+ commitCheckTaskList: qianzhuione + '/quality/handCheck/commitCheckResults',
+ },
+ // 维修
+ Inspection: {
+ // 检验项目--下拉树
+ pdaMaterialTree: qianzhuione + '/quality/handCheck/pdaMaterialTree',
+ // 检验项目--下拉树---获取检测项内容列表
+ getCheckTypeProjectList: qianzhuione + '/quality/handCheck/getCheckTypeProjectList',
+ // 检验单位
+ getQcUnitList: qianzhuione + '/quality/handCheck/getQcUnitList',
+ // 领料单列表
+ getLLWorkOrder: qianzhuione + '/quality/handCheck/getLLWorkOrder',
+ // 工单列表
+ getWorkOrder: qianzhuione + '/quality/handCheck/getWorkOrder',
+ // 根据工单获取批次下拉
+ getBatchList: qianzhuione + '/quality/handCheck/getBatchList',
},
},
};