bonus
/
SmartStorage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码优化

This commit is contained in:
BianLzhaoMin 2024-08-30 09:53:59 +08:00
parent d2d30ae968
commit e50001a5e1
6 changed files with 1011 additions and 993 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1582
apis/apis.js
View File

File diff suppressed because it is too large Load Diff

363
apis/http.js
View File

@ -1,179 +1,190 @@
const ENV = process.env.NODE_ENV;
const ENV = process.env.NODE_ENV
class HttpConfig { class HttpConfig {
// #ifdef H5 // #ifdef H5
// baseUrl = "/api" // baseUrl = "/api"
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
// baseUrl = "http://112.29.103.165:21624" // baseUrl = "http://112.29.103.165:21624"
// baseUrl = "http://192.168.0.14:21624" // baseUrl = "http://192.168.0.14:21624"
// baseUrl = "http://192.168.0.56:21626" // baseUrl = "http://192.168.0.56:21626"
// baseUrl = "http://192.168.0.14:18866" // baseUrl = "http://192.168.0.14:18866"
// baseUrl = "http://112.29.103.165:21626" // baseUrl = "http://112.29.103.165:21626"
// baseUrl = "http://172.20.10.3:8080" // baseUrl = "http://172.20.10.3:8080"
// baseUrl = "http://10.40.92.9:8080" // baseUrl = "http://10.40.92.9:8080"
// baseUrl = "http://10.40.92.60:28080" // baseUrl = "http://10.40.92.60:28080"
// baseUrl = "http://10.40.92.138:28080" // baseUrl = "http://10.40.92.138:28080"
// baseUrl = "http://10.40.92.52:28080" // baseUrl = "http://10.40.92.52:28080"
// baseUrl = "http://10.40.92.140:28080" // baseUrl = "http://10.40.92.140:28080"
// baseUrl = "https://z.csgmall.com.cn/gl" // baseUrl = "https://z.csgmall.com.cn/gl"
// baseUrl = "http://192.168.2.160:39080" // 梁超 // baseUrl = "http://192.168.2.160:39080" // 梁超
// baseUrl = "http://192.168.2.218:39080" // 福 // baseUrl = "http://192.168.2.218:39080" // 福
target = "http://192.168.0.56:21626" // 开发阶段后台ip target = "http://192.168.0.56:21627"; // 开发阶段后台ip
// #endif // #endif
// 基地址 （部署时使用 需要加 dev-api） // 基地址 （部署时使用 需要加 dev-api）
// authPath = `${this.baseUrl}/dev-api/auth` // authPath = `${this.baseUrl}/dev-api/auth`
// systemPath = `${this.baseUrl}/dev-api/system` // systemPath = `${this.baseUrl}/dev-api/system`
// basePath = `${this.baseUrl}/dev-api/base` // basePath = `${this.baseUrl}/dev-api/base`
// materialPath = `${this.baseUrl}/dev-api/material` // materialPath = `${this.baseUrl}/dev-api/material`
baseUrl = ENV === 'production' ? 'http://192.168.0.56:21626' : this.target baseUrl = ENV === "production" ? "http://192.168.1.102:1616" : this.target;
authPath = ENV === 'production' ? `${this.baseUrl}/dev-api/auth` : `${this.baseUrl}/auth` authPath =
systemPath = ENV === 'production' ? `${this.baseUrl}/dev-api/system` : `${this.baseUrl}/system` ENV === "production"
basePath = ENV === 'production' ? `${this.baseUrl}/dev-api/material/base` : `${this.baseUrl}/material/base` ? `${this.baseUrl}/dev-api/auth`
materialPath = ENV === 'production' ? `${this.baseUrl}/dev-api/material` : `${this.baseUrl}/material` : `${this.baseUrl}/auth`;
// 短链 systemPath =
serviceUrl = { ENV === "production"
login: { ? `${this.baseUrl}/dev-api/system`
code: '/sendCode', // 获取验证码 : `${this.baseUrl}/system`;
checkCode: '/checkCode', // 验证码登录 basePath =
log: '/loginApp', // 账户登录 ENV === "production"
}, ? `${this.baseUrl}/dev-api/material/base`
user: { : `${this.baseUrl}/material/base`;
logOut: '/logout', // 退出登录 materialPath =
}, ENV === "production"
index: { ? `${this.baseUrl}/dev-api/material`
noticeCont: '/sysNotice/getList', // 获取公告内容 : `${this.baseUrl}/material`;
singleNotice: '/notice/list', // 查看单个公告 // 短链
waitDo: '/app/getToDoList', // 获取待办事项 serviceUrl = {
keyData: '/app/getCriticalData', // 获取关键数据 login: {
getUserInfo: '/user/getInfo', // 获取用户信息 code: "/sendCode", // 获取验证码
fetchCompanyName: '/dept/getCompanyByAncestors', // 获取公司名称 checkCode: "/checkCode", // 验证码登录
}, log: "/loginApp", // 账户登录
fetchMaterial: { },
fetchMaterialList: '/type/selectMaTypeListByLevelIndex', // 获取设备列表 user: {
getDeptList: '/select/getUnitCbx', // 获取往来单位列表 logOut: "/logout", // 退出登录
getProjList: '/select/getSectionEngineeringCbx', // 获取工程列表 },
getDeviceDetail: '/type/selectMaTypeTreeByLevel', // 获取机具详情 index: {
getCartDetail: '/leaseUserBook', // 查询预约车内所有商品 noticeCont: "/sysNotice/getList", // 获取公告内容
addItemToCart: '/leaseUserBook', // 向预约车内添加商品 singleNotice: "/notice/list", // 查看单个公告
delCart: '/leaseUserBook', // 删除预约车商品 waitDo: "/app/getToDoList", // 获取待办事项
subCart: '/tm_task/submitLeaseApply', // 提交预约车 keyData: "/app/getCriticalData", // 获取关键数据
itemNumChange: '/leaseUserBook/update', // 预约车数量加减 getUserInfo: "/user/getInfo", // 获取用户信息
}, fetchCompanyName: "/dept/getCompanyByAncestors", // 获取公司名称
fetchExam: { },
fetchExamList: '/tm_task/getLeaseAuditList', // 获取领料审批清单 fetchMaterial: {
fetchExamListAll: '/tm_task/getLeaseAuditListAll', // 获取领料申请列表 fetchMaterialList: "/type/selectMaTypeListByLevelIndex", // 获取设备列表
fetchTrueExamList: '/tm_task/getLeaseManageListAll', // 获取领料审批列表 getDeptList: "/select/getUnitCbx", // 获取往来单位列表
fetchTrueExamListCq: '/tm_task/getLeaseManageListAllCq', // 获取重庆领料审批列表 getProjList: "/select/getSectionEngineeringCbx", // 获取工程列表
fetchDetailList: '/tm_task/getLeaseListAllCq', // 获取领料明细列表 getDeviceDetail: "/type/selectMaTypeTreeByLevel", // 获取机具详情
subExam: '/tm_task/auditLeaseByCompany', // 通过领料审批 getCartDetail: "/leaseUserBook", // 查询预约车内所有商品
subExamCq: '/tm_task/auditLeaseByCompanyCq', // 通过重庆领料审批 addItemToCart: "/leaseUserBook", // 向预约车内添加商品
rejectExam: '/tm_task/rejectLeaseByCompany', // 驳回领料审批 delCart: "/leaseUserBook", // 删除预约车商品
rejectExamCq: '/tm_task/rejectLeaseByCompanyCq', // 驳回重庆领料审批 subCart: "/tm_task/submitLeaseApply", // 提交预约车
}, itemNumChange: "/leaseUserBook/update", // 预约车数量加减
fetchMaterialOutStore: { },
fetchInfoByCode: '/leaseOutDetails/getMaMachineByCode', // 根据maId获取机具详情 fetchExam: {
fetchInfoByQrCode: '/leaseOutDetails/getMaMachineByQrCode', fetchExamList: "/tm_task/getLeaseAuditList", // 获取领料审批清单
subOutStore: '/leaseOutDetails/submitOut', // 领料出库提交-对象 fetchExamListAll: "/tm_task/getLeaseAuditListAll", // 获取领料申请列表
subOutStoreArr: '/leaseOutDetails/submitOutRfid', // 领料出库提交-数组 fetchTrueExamList: "/tm_task/getLeaseManageListAll", // 获取领料审批列表
fetchSingleDetail: '/tm_task/getLeaseAuditListDetail', // 根据领料id查询领料申请详情 fetchTrueExamListCq: "/tm_task/getLeaseManageListAllCq", // 获取重庆领料审批列表
searchRfid: '/backReceive/rfidCodeQuery', // 查询rfid fetchDetailList: "/tm_task/getLeaseListAllCq", // 获取领料明细列表
}, subExam: "/tm_task/auditLeaseByCompany", // 通过领料审批
exitMaterial: { subExamCq: "/tm_task/auditLeaseByCompanyCq", // 通过重庆领料审批
exitDeptList: '/back_apply/getbackUnit', // 获取退料单位，工程列表 rejectExam: "/tm_task/rejectLeaseByCompany", // 驳回领料审批
exitMaterialList: '/back_apply/getbackList', // 获取机具退料列表 rejectExamCq: "/tm_task/rejectLeaseByCompanyCq", // 驳回重庆领料审批
exitMaterialDetail: '/back_apply/view', // 获取退料设备详情 },
subExitMaterial: '/back_apply/upload', // 提交退料清单 fetchMaterialOutStore: {
delMaterial: '/back_apply/del', // 删除退料申请 fetchInfoByCode: "/leaseOutDetails/getMaMachineByCode", // 根据maId获取机具详情
newExitList: '/back_apply/addBackTask', // 新建退料任务单 fetchInfoByQrCode: "/leaseOutDetails/getMaMachineByQrCode",
selectMaterial: '/back_apply/materialList', // 退料物料选择 subOutStore: "/leaseOutDetails/submitOut", // 领料出库提交-对象
ifAgreement: '/select/getAgreementInfoById', // 单位id和工程id是否匹配 subOutStoreArr: "/leaseOutDetails/submitOutRfid", // 领料出库提交-数组
}, fetchSingleDetail: "/tm_task/getLeaseAuditListDetail", // 根据领料id查询领料申请详情
exitExam: { searchRfid: "/backReceive/rfidCodeQuery", // 查询rfid
exitExamList: '/back_apply/examineList', // 获取退料审核列表 },
exitExamDetail: '/back_apply/examineView', // 获取退料审核明细 exitMaterial: {
subExitExam: '/back_apply/audit', // 提交单个审核 exitDeptList: "/back_apply/getbackUnit", // 获取退料单位，工程列表
rejectExitExam: '/back_apply/refuse', // 拒绝单个审核 exitMaterialList: "/back_apply/getbackList", // 获取机具退料列表
}, exitMaterialDetail: "/back_apply/view", // 获取退料设备详情
newInStore: { subExitMaterial: "/back_apply/upload", // 提交退料清单
// fetchNewInStoreList: '/purchaseInput/list', // 获取新购入库列表 delMaterial: "/back_apply/del", // 删除退料申请
fetchNewInStoreList: '/purchaseCheckInfo/putInList', // 获取新购入库列表 newExitList: "/back_apply/addBackTask", // 新建退料任务单
fetchNewBuyDetail: '/purchaseMacode/putinDetails', // 获取新购入库详情 selectMaterial: "/back_apply/materialList", // 退料物料选择
subNewBuy: '/purchaseInput/manageStatus', // 新购明细提交审核 ifAgreement: "/select/getAgreementInfoById", // 单位id和工程id是否匹配
}, },
fix: { exitExam: {
fixList: '/repair/getAppRepairTaskList', // 获取维修列表 exitExamList: "/back_apply/examineList", // 获取退料审核列表
fixDetail: '/repair/getAppRepairMaTypeList', // 获取维修明细 exitExamDetail: "/back_apply/examineView", // 获取退料审核明细
fixExam: '/repair/endRepairTask', // 提交维修审核 subExitExam: "/back_apply/audit", // 提交单个审核
completeFix: '/repair/completeRepair', // 维修完成 rejectExitExam: "/back_apply/refuse", // 拒绝单个审核
submitFix: '/repair/submitRepairApply', // 提交维修申请 },
// fixCrew: '/repair/getUserSelect', // 获取维修人员 newInStore: {
fixCrew: '/user/getUserByRoleList', // 获取维修人员 // fetchNewInStoreList: '/purchaseInput/list', // 获取新购入库列表
maList: '/maPartType/list', // 获取配件树 fetchNewInStoreList: "/purchaseCheckInfo/putInList", // 获取新购入库列表
fixFactory: '/supplierInfo/getSupplierSelect', // 获取维修厂家 fetchNewBuyDetail: "/purchaseMacode/putinDetails", // 获取新购入库详情
uploadPic: '/sys/file/upload', // 图片上传接口 subNewBuy: "/purchaseInput/manageStatus", // 新购明细提交审核
}, },
repairTestInStore: { fix: {
repairTestInStoreList: '/RepairTestInput/getAppRepairedList', // 获取修试后入库列表 fixList: "/repair/getAppRepairTaskList", // 获取维修列表
repairTestInStoreDetail: '/RepairTestInput/getAppRepairedDetailList', // 获取修试后列表详情 fixDetail: "/repair/getAppRepairMaTypeList", // 获取维修明细
processOrReject: '/RepairTestInput/inputByType', // 修试审核通过或驳回 fixExam: "/repair/endRepairTask", // 提交维修审核
}, completeFix: "/repair/completeRepair", // 维修完成
backMaterialReceive: { submitFix: "/repair/submitRepairApply", // 提交维修申请
backMaterialReceiveList: '/backReceive/getbackReceiveList', // 获取退料接收列表 // fixCrew: '/repair/getUserSelect', // 获取维修人员
// backMaterialReceiveDetail: '/backReceive/receiveView', fixCrew: "/user/getUserByRoleList", // 获取维修人员
backMaterialReceiveDetail: '/backReceive/receiveViewWeb', maList: "/maPartType/list", // 获取配件树
backMaterialSetNumBack: '/backReceive/setNumBack', fixFactory: "/supplierInfo/getSupplierSelect", // 获取维修厂家
backMaterialQrcodeQuery: '/backReceive/qrcodeQuery', uploadPic: "/sys/file/upload", // 图片上传接口
backMaterialSetCodeBack: '/backReceive/setCodeBack', },
backReceiveCodeQuery: "/backReceive/codeQuery", repairTestInStore: {
backReceiveEndBack: "/backReceive/endBack", repairTestInStoreList: "/RepairTestInput/getAppRepairedList", // 获取修试后入库列表
seeBackMaterialDetail: '/backReceive/backReceiveRecord', // 查看退料明细 repairTestInStoreDetail:
searchRfid: '/backReceive/rfidCodeQuery', // 查询rfid "/RepairTestInput/getAppRepairedDetailList", // 获取修试后列表详情
subRfid: '/backReceive/setRfidCodeBack', // rfid接收 processOrReject: "/RepairTestInput/inputByType", // 修试审核通过或驳回
searchByCode: '/backReceive/getBackMachineApp', // 根据编码查询该工程下的设备 },
searchCodeDevice: '/backReceive/getBackMachine', // 根据编码查询该工程下的设备 backMaterialReceive: {
returnGetRecord: '/backReceive/getRecord', // 根据编码查询该工程下的设备 backMaterialReceiveList: "/backReceive/getbackReceiveList", // 获取退料接收列表
}, // backMaterialReceiveDetail: '/backReceive/receiveView',
// 报废审核接口 backMaterialReceiveDetail: "/backReceive/receiveViewWeb",
crashExam: { backMaterialSetNumBack: "/backReceive/setNumBack",
crashExamList: '/scrap/getScrapTaskList', backMaterialQrcodeQuery: "/backReceive/qrcodeQuery",
crashExamDetails: '/scrap/getScrapAuditList', backMaterialSetCodeBack: "/backReceive/setCodeBack",
crashExamAudit: '/scrap/audit', backReceiveCodeQuery: "/backReceive/codeQuery",
}, backReceiveEndBack: "/backReceive/endBack",
//试验检验接口 seeBackMaterialDetail: "/backReceive/backReceiveRecord", // 查看退料明细
testExam: { searchRfid: "/backReceive/rfidCodeQuery", // 查询rfid
testExamList: '/details/questList', subRfid: "/backReceive/setRfidCodeBack", // rfid接收
testExamDetails: '/details/getRepairAuditList', searchByCode: "/backReceive/getBackMachineApp", // 根据编码查询该工程下的设备
testExamAudit: '/details/audit', searchCodeDevice: "/backReceive/getBackMachine", // 根据编码查询该工程下的设备
}, returnGetRecord: "/backReceive/getRecord", // 根据编码查询该工程下的设备
authManage: { },
fetchAuthList: '/appMenu/getAllMenu', // 获取所有模块数据 // 报废审核接口
fetchIsUsing: '/appMenu/getMenuById', // 获取正在使用的模块 crashExam: {
subAdd: '/appMenu/addMenuById', // 提交新增模块 crashExamList: "/scrap/getScrapTaskList",
subDel: '/appMenu/delMenuById', // 提交删除模块 crashExamDetails: "/scrap/getScrapAuditList",
}, crashExamAudit: "/scrap/audit",
searchProjUsing: { },
fetchProjUsingList: '/leaseOutDetails/proUseRecord', // 获取工程在用列表 //试验检验接口
}, testExam: {
searchFetchRecord: { testExamList: "/details/questList",
fetchRecordList: '/leaseOutDetails/leaseOutRecord', // 获取领用记录列表 testExamDetails: "/details/getRepairAuditList",
}, testExamAudit: "/details/audit",
update: { },
fetchAppVer: '/app/getVersion', // 获取app当前版本号 authManage: {
}, fetchAuthList: "/appMenu/getAllMenu", // 获取所有模块数据
rfidBinding: { fetchIsUsing: "/appMenu/getMenuById", // 获取正在使用的模块
bindRfid: '/leaseOutDetails/bindMachineByRfid', // rifd绑定 subAdd: "/appMenu/addMenuById", // 提交新增模块
}, subDel: "/appMenu/delMenuById", // 提交删除模块
qrcodeBinding: { },
bindQrcode: '/leaseOutDetails/bindMachineByQrCode', // 二维码绑定 searchProjUsing: {
fetchDeviceType: '/returnOfMaterialsInfo/getMaTypeList', // 获取设备类型 fetchProjUsingList: "/leaseOutDetails/proUseRecord", // 获取工程在用列表
fetchDeviceSpec: '/returnOfMaterialsInfo/getInfoListByType', // 获取规格型号 },
}, searchFetchRecord: {
indexScan: { fetchRecordList: "/leaseOutDetails/leaseOutRecord", // 获取领用记录列表
infoByCode: '/machine/getMachineByQrCode', // 首页根据二维码查询设备信息 },
} update: {
} fetchAppVer: "/app/getVersion", // 获取app当前版本号
},
rfidBinding: {
bindRfid: "/leaseOutDetails/bindMachineByRfid", // rifd绑定
},
qrcodeBinding: {
bindQrcode: "/leaseOutDetails/bindMachineByQrCode", // 二维码绑定
fetchDeviceType: "/returnOfMaterialsInfo/getMaTypeList", // 获取设备类型
fetchDeviceSpec: "/returnOfMaterialsInfo/getInfoListByType", // 获取规格型号
},
indexScan: {
infoByCode: "/machine/getMachineByQrCode", // 首页根据二维码查询设备信息
},
};
} }
export default new HttpConfig() export default new HttpConfig();

47
pages/exitMaterial/exitMaterial.vue
View File

@ -401,7 +401,7 @@
that.fetchedList = res.data.data; that.fetchedList = res.data.data;
that.deptRange = res.data.data.map((item) => { that.deptRange = res.data.data.map((item) => {
return { return {
text: item["unitName"], text: item["name"],
value: item["id"], value: item["id"],
}; };
}); });
@ -460,25 +460,32 @@
// console.log(err); // console.log(err);
// }); // });
}, },
onload() {
that.$api.fetchMaterial // async created() {
.getDeptList() // console.log("页面被创建----");
.then((res) => {
if (res.data.code == 200) { // const res = await this.$api.fetchMaterial.getDeptList();
console.log(res, "获取单位和工程---"); // console.log("获取的单位核工程", res);
that.fetchedList = res.data.data; // },
that.deptRange = res.data.data.map((item) => { // onload() {
return { // that.$api.fetchMaterial
text: item["name"], // .getDeptList()
value: item["id"], // .then((res) => {
}; // if (res.data.code == 200) {
}); // console.log(res, "获取单位和工程---");
} // that.fetchedList = res.data.data;
}) // that.deptRange = res.data.data.map((item) => {
.catch((err) => { // return {
console.log(err); // text: item["name"],
}); // value: item["id"],
}, // };
// });
// }
// })
// .catch((err) => {
// console.log(err);
// });
// },
}; };
</script> </script>

4
unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long