diff --git a/src/api/mes/attached.js b/src/api/mes/attached.js new file mode 100644 index 0000000..62b9c79 --- /dev/null +++ b/src/api/mes/attached.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' +// import request from '@/api/attached' + +// 查询物料附属信息列表 +export function listAttached(query) { + return request({ + url: '/mes/attached/list', + method: 'get', + params: query + }) +} + +// 查询物料附属信息详细 +export function getAttached(id) { + return request({ + url: '/mes/attached/' + id, + method: 'get' + }) +} + +// 新增物料附属信息 +export function addAttached(data) { + return request({ + url: '/mes/attached', + method: 'post', + data: data + }) +} + +// 修改物料附属信息 +export function updateAttached(data) { + return request({ + url: '/mes/attached', + method: 'put', + data: data + }) +} + +// 删除物料附属信息 +export function delAttached(id) { + return request({ + url: '/mes/attached/' + id, + method: 'delete' + }) +} diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js index 89bd89f..da998cb 100644 --- a/src/api/quality/qcTable.js +++ b/src/api/quality/qcTable.js @@ -92,4 +92,12 @@ export function getProjectOptionList(checkType) { url: '/quality/staticTable/getProjectOptionList/' + checkType, method: 'get' }); +} + +export function getDLTableCPKInfo(query) { + return request({ + url: '/quality/staticTable/getDLTableCPKInfo', + method: 'get', + params: query + }); } \ No newline at end of file diff --git a/src/api/wms/outorderfc.js b/src/api/wms/outorderfc.js new file mode 100644 index 0000000..0c6fa13 --- /dev/null +++ b/src/api/wms/outorderfc.js @@ -0,0 +1,102 @@ +import request from '@/utils/request' + +// 查询包材出库单列表 +export function listOutorder(query) { + return request({ + url: '/wms/outorder/list', + method: 'get', + params: query + }); +} +// 查询包材出库单列表 +export function listOutorderZU(query) { + return request({ + url: '/wms/outorder/listZUFC', + method: 'post', + params: query + }); +} +// 查询包材出库单详细 +export function getOutorder(ID) { + return request({ + url: '/wms/outorder/' + ID, + method: 'get' + }); +} + +// 新增包材出库单 +export function addOutorder(data) { + return request({ + url: '/wms/outorder', + method: 'post', + data: data + }); +} +// 用于出库任务页面－－查询 +export function getOutorderOUT(data) { + return request({ + url: '/wms/order/PurchaseOrderOutboundPdafc', + method: 'post', + data: data + }); +} + +// 修改包材出库单 +export function updateOutorder(data) { + return request({ + url: '/wms/outorder', + method: 'put', + data: data + }); +} + +// 删除包材出库单 +export function delOutorder(ID) { + return request({ + url: '/wms/outorder/' + ID, + method: 'delete' + }); +} +// 仓库列表 +export function getlistCK(data) { + return request({ + url: '/wms/order/listCK', + method: 'post', + data: data + }); +} +// 列表 +export function PurchaseOrderOutboundPda(data) { + return request({ + url: '/wms/order/PurchaseOrderOutboundPdafc', + method: 'post', + data: data + }); +} +// 新增 +export function addPurchaseOrderOutbound(data) { + return request({ + url: '/wms/order/addPurchaseOrderOutboundfc', + method: 'post', + data: data + }); +} +// 根据工厂获取产线 +export function getDictData(data) { + return request({ + url: '/mes/mesborad/getLineList', + method: 'get', + params: data + }); +} +// 新增 +export function OutboundPostingSAP(data) { + return request({ + url: '/wms/order/OutboundPostingSAPfc', + method: 'post', + data: data + }); + + + +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index a438160..ef12da5 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -313,14 +313,14 @@ export default { setInterval(() => this.getAlarmData(), 1000 * 60); this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); - /** + //先执行一次 this.getUnReadList(); // 实现轮询 this.timer = setInterval(() => { setTimeout(this.getUnReadList(), 30000); }, 30000); - **/ + }, components: { Breadcrumb, diff --git a/src/utils/request.js b/src/utils/request.js index 8f90d55..c46b968 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -105,7 +105,9 @@ service.interceptors.response.use(res => { } else if (code === 601) { Message({ message: msg, type: 'warning' }) return Promise.reject('error') - } else if (code !== 200) { + } else if (code === 642) { + return res.data + }else if (code !== 200) { Notification.error({ title: msg }) return Promise.reject('error') } else { diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index 2448bba..12152de 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -60,7 +60,7 @@ /> - + - + @@ -330,7 +330,7 @@ > - + + - - + + {{ workVO.order.orderEnd }} - {{ + {{ workVO.order.planPerson }} + {{ + workVO.order.planPersonName + }} {{ workVO.order.repairCode }} @@ -924,6 +927,7 @@ export default { orderStart: null, orderEnd: null, planPerson: null, + planPersonName: null, }, equ: { equipmentCode: null, @@ -1013,6 +1017,7 @@ export default { orderStatus: null, orderCost: null, planPerson: null, + planPersonName: null, orderCostTime: null, orderSignPerson: null, factoryCode: null, @@ -1101,6 +1106,7 @@ export default { orderStatus: null, orderCost: null, planPerson: null, + planPersonName: null, orderCostTime: null, orderSignPerson: null, factoryCode: null, diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue index 8271e28..60d1cc3 100644 --- a/src/views/device/inspectionPlan/index.vue +++ b/src/views/device/inspectionPlan/index.vue @@ -442,7 +442,25 @@
- + + + + + 重置 !this.equipmentItemSearch || data.equipmentCode.toLowerCase().includes(this.equipmentItemSearch.toLowerCase()) + ) + }, + + equipmentItemReset() { + this.form.equipmentItem = this.equipmentItemList; + this.equipmentItemSearch = ''; + }, // 选择工作中心 changeCenter() { - }, // 改变巡检周期事件 changeArray(e) { @@ -1007,6 +1038,7 @@ export default { if (this.form.equipmentItem[i].equipmentCode == e.equipmentCode) { this.form.equipmentItem.splice(i, 1); } + this.equipmentItemList = this.form.equipmentItem;//用equipmentItemList当暂时的存储表 } }, // 选择设备确认按钮 @@ -1036,7 +1068,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.form.equipmentItem.push(response.data[i]); } - + this.equipmentItemList = this.form.equipmentItem;//用equipmentItemList当暂时的存储表 this.selectEqu = false; }) @@ -1241,7 +1273,11 @@ export default { // this.form.equipmentItem[i].itemTempName = this.form.equipmentItem[i].itemTempName + this.form.equipmentItem[i].equPlanDetailList[j].itemName + "," // } // } - + //把数组放入 + this.equipmentItemList = []; + for (let i = 0; i < response.data.equipmentItem.length; i++) { + this.equipmentItemList.push(response.data.equipmentItem[i]); + }; this.loading = false; this.open = true; this.title = "修改计划"; @@ -1252,6 +1288,7 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { + this.form.equipmentItem = this.equipmentItemList;//整个表重新赋值 if (this.selectPersonList.length == 0) { this.$message({ message: "请请选择人员！", diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue index 038ee01..f78281c 100644 --- a/src/views/device/inspectionWork/index.vue +++ b/src/views/device/inspectionWork/index.vue @@ -54,7 +54,7 @@ /> - + - + + + + @@ -435,7 +443,12 @@ prop="workCenterName" /> + - - + + {{ workVO.order.orderEnd }} - {{ + {{ workVO.order.planPerson }} + {{ + workVO.order.planPersonName + }} {{ workVO.order.repairCode }} @@ -826,6 +837,7 @@ export default { orderStart: null, orderEnd: null, planPerson: null, + planPersonName: null, }, equ: { equipmentCode: null, @@ -879,6 +891,7 @@ export default { orderStatus: "1", orderCost: null, planPerson: null, + planPersonName: null, orderCostTime: null, orderSignPerson: null, factoryCode: null, @@ -968,6 +981,7 @@ export default { orderStatus: "1", orderCost: null, planPerson: null, + planPersonName: null, orderCostTime: null, orderSignPerson: null, factoryCode: null, diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue index cb41d48..4d5c807 100644 --- a/src/views/device/maintenanceWork/index.vue +++ b/src/views/device/maintenanceWork/index.vue @@ -84,7 +84,7 @@ @keyup.enter.native="handleQuery" /> - + - + + + + @@ -468,7 +476,12 @@ prop="workCenterName" /> + - - + + {{ workVO.order.shutDown }} - {{ + {{ workVO.order.planPerson }} + {{ + workVO.order.planPersonName + }}
@@ -922,6 +933,7 @@ export default { orderStart: null, orderEnd: null, planPerson: null, + planPersonName: null, upkeepPictures: [], }, equ: { @@ -978,6 +990,7 @@ export default { orderStatus: "1", orderCost: null, planPerson: null, + planPersonName: null, orderCostTime: null, orderSignPerson: null, factoryCode: null, @@ -1083,6 +1096,7 @@ export default { orderStatus: "1", orderCost: null, planPerson: null, + planPersonName: null, orderCostTime: null, orderSignPerson: null, factoryCode: null, diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 80ccf89..3182bce 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -52,10 +52,10 @@ > - + {{ parseTime(scope.row.workPlanDownTime) }} - + + - + + + + - + + + + - + - + + + + + + + - - - - 元 - - - + - + + + - - @@ -1164,6 +1180,8 @@ + + - - + + + + 元 + + @@ -1455,7 +1482,7 @@ - + + + + + + + - - - - 元 - - @@ -1564,8 +1589,6 @@ - - @@ -1627,6 +1650,18 @@ + + + + 元 + + @@ -1774,6 +1809,7 @@ export default { workPlanDownTime: null, orderRelevance: null, workPerson: null, + workPersonName: null, workTeam: null, workOutsource: null, workDownMachine: null, @@ -2084,6 +2120,7 @@ export default { workPlanDownTime: null, orderRelevance: null, workPerson: null, + workPersonName: null, workTeam: null, workOutsource: null, workDownMachine: null, @@ -2410,6 +2447,7 @@ export default { onItemSelectedPerson(obj) { console.log(obj); this.form.workPerson = obj[0].userName; + this.form.workPersonName = obj[0].nickName; }, //设备选择 onItemSelectedEquipment(obj) { diff --git a/src/views/device/repairOrderReport/index.vue b/src/views/device/repairOrderReport/index.vue index 738db6c..b942ea2 100644 --- a/src/views/device/repairOrderReport/index.vue +++ b/src/views/device/repairOrderReport/index.vue @@ -52,10 +52,10 @@ > - + {{ parseTime(scope.row.workPlanDownTime) }} - + + - {{ - form.workPerson + {{ + form.workPersonName }} {{ form.workConnection @@ -668,6 +669,7 @@ export default { workPlanDownTime: null, orderRelevance: null, workPerson: null, + workPersonName: null, workTeam: null, workOutsource: null, workDownMachine: null, @@ -780,6 +782,7 @@ export default { workPlanDownTime: null, orderRelevance: null, workPerson: null, + workPersonName: null, workTeam: null, workOutsource: null, workDownMachine: null, diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue index b03dd94..5c6cdf7 100644 --- a/src/views/device/sparePartsLedger/index.vue +++ b/src/views/device/sparePartsLedger/index.vue @@ -161,7 +161,7 @@ label="备品备件号" align="center" prop="materialCode" - width="120" + width="150" /> { - this.$modal.msgSuccess("新增成功"); - this.open = false; - this.getList(); + if(response.code == 500){ + this.$modal.msg(response.msg); + }else{ + this.$modal.msgSuccess("新增成功"); + this.open = false; + this.getList(); + } }); } } diff --git a/src/views/device/sparepartsInOutStorage/index.vue b/src/views/device/sparepartsInOutStorage/index.vue index 0e9e1aa..9102d34 100644 --- a/src/views/device/sparepartsInOutStorage/index.vue +++ b/src/views/device/sparepartsInOutStorage/index.vue @@ -1,446 +1,518 @@ diff --git a/src/views/device/sparepartsInOutStorage/selectSparePartsLedger.vue b/src/views/device/sparepartsInOutStorage/selectSparePartsLedger.vue new file mode 100644 index 0000000..310e839 --- /dev/null +++ b/src/views/device/sparepartsInOutStorage/selectSparePartsLedger.vue @@ -0,0 +1,332 @@ + + + diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue index 47b5d03..d6ddb2f 100644 --- a/src/views/device/spotCheckPlan/index.vue +++ b/src/views/device/spotCheckPlan/index.vue @@ -461,7 +461,25 @@
- + + + + + 重置 - + !this.equipmentItemSearch || data.equipmentCode.toLowerCase().includes(this.equipmentItemSearch.toLowerCase()) + ) + }, + + equipmentItemReset() { + this.form.equipmentItem = this.equipmentItemList; + this.equipmentItemSearch = ''; + }, // 获取工作中心 setWorkCenter() { getWorkCenter().then(response => { @@ -1052,6 +1084,7 @@ export default { if (this.form.equipmentItem[i].equipmentCode == e.equipmentCode) { this.form.equipmentItem.splice(i, 1); } + this.equipmentItemList = this.form.equipmentItem;//用equipmentItemList当暂时的存储表 } }, // 选择设备确认按钮 @@ -1081,7 +1114,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.form.equipmentItem.push(response.data[i]); } - + this.equipmentItemList = this.form.equipmentItem;//用equipmentItemList当暂时的存储表 this.selectEqu = false; }) @@ -1277,6 +1310,11 @@ export default { // } // } + //把数组放入 + this.equipmentItemList = []; + for (let i = 0; i < response.data.equipmentItem.length; i++) { + this.equipmentItemList.push(response.data.equipmentItem[i]); + }; this.loading = false; this.open = true; this.title = "修改计划"; diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue index 2adb332..9a8bb79 100644 --- a/src/views/device/spotInspectionOrder/index.vue +++ b/src/views/device/spotInspectionOrder/index.vue @@ -68,7 +68,7 @@ /> - + + - - + + {{ workVO.order.orderEnd }} - {{ + {{ workVO.order.planPerson }} + {{ + workVO.order.planPersonName + }} {{ workVO.order.repairCode }} @@ -928,6 +931,7 @@ export default { orderStart: null, orderEnd: null, planPerson: null, + planPersonName: null, }, equ: { equipmentCode: null, @@ -1019,6 +1023,7 @@ export default { orderStatus: null, orderCost: null, planPerson: null, + planPersonName: null, orderCostTime: null, orderSignPerson: null, factoryCode: null, @@ -1124,6 +1129,7 @@ export default { orderStatus: null, orderCost: null, planPerson: null, + planPersonName: null, orderCostTime: null, orderSignPerson: null, factoryCode: null, diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue index 0bee4ab..028643a 100644 --- a/src/views/device/spotInspectionWork/index.vue +++ b/src/views/device/spotInspectionWork/index.vue @@ -43,7 +43,7 @@ /> - + - + + + + @@ -340,11 +348,12 @@ - + + - - + + @@ -211,16 +273,21 @@ import { treeDat, dnbCountingData, listUser2, - deptTreeSelect, -} from "@/api/energy/powerUse/WholePointData"; -import { getToken } from "@/utils/auth"; -import Treeselect from "@riophae/vue-treeselect"; -import "@riophae/vue-treeselect/dist/vue-treeselect.css"; -import * as echarts from "echarts"; + deptTreeSelect +} from '@/api/energy/powerUse/WholePointData' +import { getToken } from '@/utils/auth' +import Treeselect from '@riophae/vue-treeselect' +import '@riophae/vue-treeselect/dist/vue-treeselect.css' +import * as echarts from 'echarts' +import { + addShuiMeasurement, + listShuiMeasurement, + updateShuiMeasurement +} from '@/api/energy/energy/waterManagement/shuiMeasurement' export default { - name: "User", - dicts: ["sys_normal_disable", "sys_user_sex", "public_share_type"], + name: 'WholePointData', + dicts: ['sys_normal_disable', 'sys_user_sex', 'public_share_type'], components: { Treeselect }, data() { return { @@ -239,9 +306,9 @@ export default { // 用户表格数据 userList: null, // 弹出层标题 - title: "", + title: '', // 部门树选项 - deptOptions: undefined, + deptOptions: [{ id: 2 }], // 是否显示弹出层 open: false, // 部门名称 @@ -250,45 +317,49 @@ export default { initPassword: undefined, // 日期范围 dateRange: [], - dateRangeone: "", - dateRangetwo: "", + dateRangeone: '', + dateRangetwo: '', // 岗位选项 postOptions: [], // 角色选项 roleOptions: [], + //光伏list + photovoltaicList: [], // 表单参数 form: {}, defaultProps: { - children: "children", - label: "lable", + children: 'children', + label: 'lable' }, // 用户导入参数 upload: { // 是否显示弹出层（用户导入） open: false, // 弹出层标题（用户导入） - title: "", + title: '', // 是否禁用上传 isUploading: false, // 是否更新已经存在的用户数据 updateSupport: 0, // 设置上传的请求头部 - headers: { Authorization: "Bearer " + getToken() }, + headers: { Authorization: 'Bearer ' + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + "/system/user/importData", + url: process.env.VUE_APP_BASE_API + '/system/user/importData' }, // 查询参数 queryParams: { pageNum: 1, pageSize: 10, - dateType: "hour", - isAsc: "asc", - monitorSubset: "", - publicShareType:'', + dateType: 'hour', + isAsc: 'asc', + monitorSubset: '', + publicShareType: '', + monitorCode: null, + instrumentValue: null, params: { - beginCollectTime: "", - endCollectTime: "", - }, + beginCollectTime: '', + endCollectTime: '' + } }, // 列信息 columns: [ @@ -298,265 +369,261 @@ export default { { key: 3, label: `耗量(kW·h)`, visible: true }, { key: 4, label: `开始时间`, visible: true }, { key: 5, label: `结束时间`, visible: true }, - { key: 6, label: `仪表值(kW·h)`, visible: true }, + { key: 6, label: `仪表值(kW·h)`, visible: true } ], // 表单校验 rules: { - userName: [ - { required: true, message: "用户名称不能为空", trigger: "blur" }, - { - min: 2, - max: 20, - message: "用户名称长度必须介于 2 和 20 之间", - trigger: "blur", - }, + monitorId: [ + { required: true, message: '计量设备名称不能为空', trigger: 'blur' } ], - nickName: [ - { required: true, message: "用户昵称不能为空", trigger: "blur" }, + expend: [ + { required: true, message: '耗量不能为空', trigger: 'blur' } ], - password: [ - { required: true, message: "用户密码不能为空", trigger: "blur" }, - { - min: 5, - max: 20, - message: "用户密码长度必须介于 5 和 20 之间", - trigger: "blur", - }, + beginTime: [ + { required: true, message: '开始日期不能为空', trigger: 'blur' } ], - email: [ - { - type: "email", - message: "请输入正确的邮箱地址", - trigger: ["blur", "change"], - }, - ], - phonenumber: [ - { - pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, - message: "请输入正确的手机号码", - trigger: "blur", - }, + endTime: [ + { required: true, message: '结束日期不能为空', trigger: 'blur' } ], }, - baoliudateRangeone: "", - baoliudateRangetwo: "", + baoliudateRangeone: '', + baoliudateRangetwo: '', //采集方式 dict1: [ - { label: "时", value: "hour" }, - { label: "天", value: "day" }, - { label: "月", value: "month" }, - { label: "年", value: "year" }, + { label: '时', value: 'hour' }, + { label: '天', value: 'day' }, + { label: '月', value: 'month' }, + { label: '年', value: 'year' } ], //柱状图 option: { tooltip: { - trigger: "axis", - formatter: function (params) { + trigger: 'axis', + formatter: function(params) { return ( params[0].name + - "
" + + '
' + params[0].marker + - " " + - "电耗量(kW·h):" + + ' ' + + '电耗量(kW·h):' + params[0].data - ); + ) }, axisPointer: { - type: "cross", + type: 'cross', crossStyle: { - color: "#999", - }, - }, + color: '#999' + } + } }, xAxis: { - type: "category", - data: [], + type: 'category', + data: [] }, yAxis: { - type: "value", - axisLine: { show: true }, + type: 'value', + axisLine: { show: true } }, series: [ { tooltip: { - valueFormatter: function (value) { - return value; - }, + valueFormatter: function(value) { + return value + } }, data: [], - type: "bar", - }, - ], - }, - }; + type: 'bar' + } + ] + } + } }, watch: { // 根据名称筛选部门树 deptName(val) { - this.$refs.tree.filter(val); - }, + this.$refs.tree.filter(val) + } }, created() { - this.dateRangeone = new Date(new Date().setHours(0, 0, 0, 0)); - var d = new Date(this.dateRangeone); - let m = ("0" + (d.getMonth() + 1)).slice(-2); - let tian = ("0" + d.getDate()).slice(-2); - let h = ("0" + d.getHours()).slice(-2); - let M = ("0" + d.getMinutes()).slice(-2); - let s = ("0" + d.getSeconds()).slice(-2); + this.dateRangeone = new Date(new Date().setHours(0, 0, 0, 0)) + var d = new Date(this.dateRangeone) + let m = ('0' + (d.getMonth() + 1)).slice(-2) + let tian = ('0' + d.getDate()).slice(-2) + let h = ('0' + d.getHours()).slice(-2) + let M = ('0' + d.getMinutes()).slice(-2) + let s = ('0' + d.getSeconds()).slice(-2) - console.log("d", d); this.dateRangeone = - d.getFullYear() + "-" + m + "-" + tian + " " + h + ":" + M + ":" + s; - this.baoliudateRangeone = this.dateRangeone; + d.getFullYear() + '-' + m + '-' + tian + ' ' + h + ':' + M + ':' + s + this.baoliudateRangeone = this.dateRangeone this.dateRangetwo = new Date( new Date().setHours(0, 0, 0, 0) + 24 * 60 * 60 * 1000 - 1 - ); - var d1 = new Date(this.dateRangetwo); - let m1 = ("0" + (d1.getMonth() + 1)).slice(-2); - let tian1 = ("0" + d1.getDate()).slice(-2); - let h1 = ("0" + d1.getHours()).slice(-2); - let M1 = ("0" + d1.getMinutes()).slice(-2); - let s1 = ("0" + d1.getSeconds()).slice(-2); - console.log("tian1.length", tian1); + ) + var d1 = new Date(this.dateRangetwo) + let m1 = ('0' + (d1.getMonth() + 1)).slice(-2) + let tian1 = ('0' + d1.getDate()).slice(-2) + let h1 = ('0' + d1.getHours()).slice(-2) + let M1 = ('0' + d1.getMinutes()).slice(-2) + let s1 = ('0' + d1.getSeconds()).slice(-2) this.dateRangetwo = d1.getFullYear() + - "-" + + '-' + m1 + - "-" + + '-' + tian1 + - " " + + ' ' + h1 + - ":" + + ':' + M1 + - ":" + - s1; + ':' + + s1 //this.dateRangetwo = d1.getFullYear()+ '-'+m1+ '-'+tian1+ ' '+ h1+ ':'+M1+':'+s1; - this.baoliudateRangetwo = this.dateRangetwo; - this.getList(); - this.getDeptTree(); + this.baoliudateRangetwo = this.dateRangetwo + this.getList() + this.getDeptTree() }, mounted() { - var chartDom = document.getElementById("card"); - var myChart = echarts.init(chartDom); - this.option && myChart.setOption(this.option); + var chartDom = document.getElementById('card') + var myChart = echarts.init(chartDom) + this.option && myChart.setOption(this.option) }, methods: { /** 查询用户列表 */ getList() { - this.loading = true; - this.queryParams.params.beginCollectTime = this.dateRangeone; - this.queryParams.params.endCollectTime = this.dateRangetwo; - console.log("this.datatimeone", this.queryParams); - if (this.queryParams.dateType === "hour") { + this.loading = true + this.queryParams.params.beginCollectTime = this.dateRangeone + this.queryParams.params.endCollectTime = this.dateRangetwo + if (this.queryParams.dateType === 'hour') { listUser(this.queryParams).then((response) => { - this.userList = response.rows; - this.total = response.total; - this.loading = false; - }); + this.userList = response.rows + this.total = response.total + this.loading = false + }) } else { listUser2(this.queryParams).then((response) => { - this.userList = response.rows; - this.total = response.total; - this.loading = false; - }); + this.userList = response.rows + this.total = response.total + this.loading = false + }) } }, + //数组转树形结构 tranListToTreeData(list) { // 最终要产出的树状数据的数组 - const treeList = []; + const treeList = [] // 所有项都使用对象存储起来 - const map = {}; + const map = {} // 建立一个映射关系：通过id快速找到对应的元素 list.forEach((item) => { if (!item.children) { - item.children = []; + item.children = [] } - map[item.id] = item; - }); + map[item.id] = item + }) list.forEach((item) => { // 对于每一个元素来说，先找它的上级 // 如果能找到，说明它有上级，则要把它添加到上级的children中去 // 如果找不到，说明它没有上级，直接添加到 treeList - const parent = map[item.pId]; + const parent = map[item.pId] // 如果存在则表示item不是最顶层的数据 if (parent) { - parent.children.push(item); + parent.children.push(item) } else { // 如果不存在 则是顶层数据 - treeList.push(item); + treeList.push(item) } - }); + }) // 返回出去 - return treeList; + return treeList + }, + /** 添加光伏整点数据 */ + // submitForm: function() { + // this.$refs["form"].validate((valid) => { + // if (valid) { + // addReportPointDnb(this.form).then((response) => { + // this.$modal.msgSuccess('新增成功') + // this.open = false + // this.getList() + // }) + // } + // }); + // }, + /** 新增按钮操作 */ + handleAdd() { + this.reset() + listShuiMeasurement({publicShareType: 4}).then((response) => { + this.photovoltaicList = response.data + }) + this.open = true + this.title = '添加光伏发电数据' }, /** 真查询部门下拉树结构 */ getDeptTree() { treeDat().then((response) => { response.map((item, index) => { - item, (item.oid = item.id), (item.lable = item.name); - }); - this.deptOptions = this.tranListToTreeData(response); - console.log(this.deptOptions); - //this.deptOptions = response.data; - }); + item, (item.oid = item.id), (item.lable = item.name) + }) + this.deptOptions = this.tranListToTreeData(response) + }) }, // 筛选节点 filterNode(value, data) { - if (!value) return true; - return data.lable.indexOf(value) !== -1; + if (!value) return true + return data.lable.indexOf(value) !== -1 }, // 节点单击事件 handleNodeClick(data) { - this.queryParams.monitorSubset = data.monitorId; - this.getList(); - this.dnbCountingData(); + this.queryParams.monitorSubset = data.monitorId + this.getList() + this.dnbCountingData() }, // 取消按钮 cancel() { - this.open = false; - this.reset(); + this.open = false + this.reset() }, // 表单重置 reset() { this.form = { - userId: undefined, - deptId: undefined, - userName: undefined, - nickName: undefined, - password: undefined, - phonenumber: undefined, - email: undefined, - sex: undefined, - status: "0", - remark: undefined, - postIds: [], - roleIds: [], - }; - this.resetForm("form"); + objid: null, + monitorId: null, + instrumentValue: null, + monitorName: null, + pMonitorId: null, + address: null, + expend: null, + price: null, + pointTime: null, + beginTime: null, + endTime: null, + recordTime: null, + meterValue: null, + collectType: null + } + this.resetForm('form') }, /** 搜索按钮操作 */ handleQuery() { - this.queryParams.pageNum = 1; - this.getList(); - this.dnbCountingData(); + this.queryParams.pageNum = 1 + this.getList() + this.dnbCountingData() }, //****柱状图请求 */ dnbCountingData() { - this.loading = true; + this.loading = true dnbCountingData({ beginCollectTime: this.queryParams.params.beginCollectTime, endCollectTime: this.queryParams.params.endCollectTime, type: this.queryParams.dateType, publicShareType: this.queryParams.publicShareType, monitorSubset: this.queryParams.monitorSubset, - energyType: 2, + energyType: 2 }).then((response) => { - this.option.xAxis.data = response.data.dateList; - this.option.series[0].data = response.data.valueList; + this.option.xAxis.data = response.data.dateList + this.option.series[0].data = response.data.valueList // this.total = response.total; // this.loading = false; // var chartDom = document.getElementById('card'); @@ -578,56 +645,56 @@ export default { // ] // }; // this.option = option; - var chartDom = document.getElementById("card"); - var myChart = echarts.init(chartDom); - this.option && myChart.setOption(this.option); - }); + var chartDom = document.getElementById('card') + var myChart = echarts.init(chartDom) + this.option && myChart.setOption(this.option) + }) }, /** 重置按钮操作 */ resetQuery() { // this.dateRange = []; - this.resetForm("queryForm"); - this.dateRangeone = this.baoliudateRangeone; - this.dateRangetwo = this.baoliudateRangetwo; + this.resetForm('queryForm') + this.dateRangeone = this.baoliudateRangeone + this.dateRangetwo = this.baoliudateRangetwo //this.queryParams.deptId = undefined; //this.$refs.tree.setCurrentKey(null); - this.getList(); + this.getList() //this.handleQuery(); }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map((item) => item.userId); - this.single = selection.length != 1; - this.multiple = !selection.length; + this.ids = selection.map((item) => item.userId) + this.single = selection.length != 1 + this.multiple = !selection.length }, // 更多操作触发 handleCommand(command, row) { switch (command) { - case "handleResetPwd": - this.handleResetPwd(row); - break; - case "handleAuthRole": - this.handleAuthRole(row); - break; + case 'handleResetPwd': + this.handleResetPwd(row) + break + case 'handleAuthRole': + this.handleAuthRole(row) + break default: - break; + break } }, /** 导出按钮操作 */ handleExport() { - let paramsexport = JSON.parse(JSON.stringify(this.queryParams)); - delete paramsexport.pageNum; - delete paramsexport.pageSize; + let paramsexport = JSON.parse(JSON.stringify(this.queryParams)) + delete paramsexport.pageNum + delete paramsexport.pageSize this.download( - "/energy/report/pointDnb/export", + '/energy/report/pointDnb/export', { ...paramsexport, - orderByColumn: null, + orderByColumn: null }, `user_${new Date().getTime()}.xlsx` - ); - }, - }, -}; + ) + } + } +} diff --git a/src/views/mes/attached/index.vue b/src/views/mes/attached/index.vue new file mode 100644 index 0000000..11d78c1 --- /dev/null +++ b/src/views/mes/attached/index.vue @@ -0,0 +1,498 @@ + + + diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 35db624..1696377 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -448,6 +448,8 @@ + + @@ -722,6 +722,11 @@ export default { this.$refs.itemSelectProject.showFlag = true; this.$refs.itemSelectProject.init(row,'material'); }, + //检验项目弹窗(二次编辑) + handleCheckProjectM(row){ + this.$refs.itemSelectProject.showFlag = true; + this.$refs.itemSelectProject.init(row,'material'); + }, //查看检验项目弹窗 handleView(row){ this.$refs.itemSelectProject.showFlag = true; diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue index 23ac2c4..9bf3a4a 100644 --- a/src/views/quality/qcInventory/index.vue +++ b/src/views/quality/qcInventory/index.vue @@ -9,63 +9,8 @@ @keyup.enter.native="handleQuery" /> - - - - - - - - - - - - - - - - - - - - - - + + 导出 + + 审核编辑 + @@ -131,20 +87,18 @@ - - - - - - - - - + + + + + + + + - @@ -802,6 +802,11 @@ export default { this.$refs.itemSelectProject.showFlag = true; this.$refs.itemSelectProject.init(row,'produce'); }, + //检验项目弹窗(二次编辑) + handleCheckProjectM(row){ + this.$refs.itemSelectProject.showFlag = true; + this.$refs.itemSelectProject.init(row,'material'); + }, //查看检验项目弹窗 handleView(row){ this.$refs.itemSelectProject.showFlag = true; diff --git a/src/views/quality/qcTableDL/index.vue b/src/views/quality/qcTableDL/index.vue index d352c43..3ca3399 100644 --- a/src/views/quality/qcTableDL/index.vue +++ b/src/views/quality/qcTableDL/index.vue @@ -151,17 +151,16 @@ >折线图表分析 - + import { - getDLTableAvgInfo, + getDLTableAvgInfo,getDLTableCPKInfo, getDLDetailList, getCheckTypeList, getSupplierList, @@ -884,8 +883,8 @@ export default { myChart1.setOption(option1); }, // 图表分析 - handleAnalysis3() { - this.title = "综合图表分析"; + handleCPK() { + this.title = "CPK分析"; if ( this.queryParams.projectNoArray.length > 0 && this.queryParams.projectNoArray.length < 2 @@ -909,7 +908,7 @@ export default { ).format("YYYY-MM-DD"); } - getDLTableAvgInfo(this.queryParams).then((response) => { + getDLTableCPKInfo(this.queryParams).then((response) => { this.detailechartslist = []; this.seriesdata = []; this.legenddata = []; @@ -1001,7 +1000,7 @@ export default { var myChart1 = echarts.init(document.querySelector("#echart1")); var option3 = { title: { - text: '综合图表分析' + text: 'CPK分析' }, tooltip: { trigger: 'axis' @@ -1029,41 +1028,6 @@ export default { type: 'value' }, series: this.seriesdata - /**[ - { - name: 'Email', - type: 'line', - stack: 'Total', - data: [120, 132, 101, 134, 90, 230, 210], - markLine: { - symbolSize: 0,//不展示上下限两边的图标 - data: [ - { - lineStyle: { - color: '#ffc000', - width: 3 - }, - yAxis: 200,//控制限制刻度 - label: { show: true, position: 'end', formatter: '上限' } - }, - { - lineStyle: { - color: '#4f81bd', - width: 3 - }, - yAxis: 100, - label: { show: true, position: 'end', formatter: '下限' } - } - ] - } - }, - { - name: 'Union Ads', - type: 'line', - stack: 'Total', - data: [220, 182, 191, 234, 290, 330, 310] - } - ]**/ }; myChart1.setOption(option3); }, diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue index 6611288..efd35b5 100644 --- a/src/views/quality/qcWarehousing/index.vue +++ b/src/views/quality/qcWarehousing/index.vue @@ -218,6 +218,14 @@ @click="handleCheckProject(scope.row)" v-hasPermi="['quality:qcWarehousing:edit']" >检验 + + 审核编辑 @@ -756,6 +764,12 @@ export default { this.$refs.itemSelectProject.showFlag = true; this.$refs.itemSelectProject.init(row,'product'); }, + //检验项目弹窗(二次编辑) + handleCheckProjectM(row){ + this.$refs.itemSelectProject.showFlag = true; + this.$refs.itemSelectProject.init(row,'material'); + }, + //查看检验项目弹窗 handleView(row){ this.$refs.itemSelectProject.showFlag = true; diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index 98484f0..27e31bb 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -17,6 +17,15 @@ @keyup.enter.native="handleQuery" /> + + + + - + + + + + + @@ -912,6 +936,9 @@ {{ form.equipmentCode }} + {{ + form.sapAsset + }} {{ form.equipmentName }} @@ -1327,6 +1354,7 @@ export default { hourlyUnitPrice: null, equipmentCategory: null, factoryWorkshop: null, + sapAsset: null, }, queryEquipmentHeadParams: { pageNum: 1, @@ -1552,6 +1580,7 @@ export default { sapCode: null, sapName: null, factoryWorkshop: null, + sapAsset: null, }; this.resetForm("form"); }, @@ -1608,7 +1637,7 @@ export default { getWorkCenterList().then((response) => { this.options1 = response.data; }); - + this.repairRecordSteps = 0; this.rightList = []; this.auxiliaryEquipmentLeftList = []; @@ -1710,7 +1739,7 @@ export default { this.rules.sapName.push({ required: true, }); - } + } this.form.workCenter = this.form.workshopCode; this.repairRecordSteps = 0; this.queryAuxiliaryEquipmentParams.equipmentCode = null; diff --git a/src/views/wms/outorderfc/index.vue b/src/views/wms/outorderfc/index.vue new file mode 100644 index 0000000..85b7140 --- /dev/null +++ b/src/views/wms/outorderfc/index.vue @@ -0,0 +1,705 @@ + + + diff --git a/src/views/wms/put/index.vue b/src/views/wms/put/index.vue index 3d9e1ae..c45b00d 100644 --- a/src/views/wms/put/index.vue +++ b/src/views/wms/put/index.vue @@ -276,7 +276,8 @@ - + + @@ -319,24 +320,24 @@ - - - + + + + + + + + + + + + + + + + + +