diff --git a/public/enm.ico b/public/enm.ico deleted file mode 100644 index 68e3d2ee..00000000 Binary files a/public/enm.ico and /dev/null differ diff --git a/public/favicon.ico b/public/favicon.ico index 4f3d75ee..68e3d2ee 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon0.ico b/public/favicon0.ico new file mode 100644 index 00000000..4f3d75ee Binary files /dev/null and b/public/favicon0.ico differ diff --git a/public/index.html b/public/index.html index ad21be8c..8fdc5259 100644 --- a/public/index.html +++ b/public/index.html @@ -4,7 +4,7 @@ - + <%= VUE_APP_TITLE %> diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js index 1d01a954..98ab12a2 100644 --- a/src/api/model/wpm.js +++ b/src/api/model/wpm.js @@ -87,24 +87,75 @@ export default { ); } }, - //值班停机关系 - stsflog: { + sflogexp: { list: { - name: "值班停机关系", + name: "值班记录列表", req: async function(data){ return await http.get( - `${config.API_URL}/wpm/stsflog/`, + `${config.API_URL}/wpm/sflogexp/`, data ); } }, + item: { + name: "获取详情", + req: async function(id){ + return await http.get( + `${config.API_URL}/wpm/sflogexp/${id}/` + ); + } + }, update: { - name: "值班停机关系更新", + name: "更新", req: async function(id, data){ return await http.put( - `${config.API_URL}/wpm/stsflog/${id}/`, + `${config.API_URL}/wpm/sflogexp/${id}/`, + data); + } + }, + create: { + name: "创建", + req: async function(data){ + return await http.post( + `${config.API_URL}/wpm/sflogexp/`, + data); + } + }, + delete: { + name: "删除", + req: async function(id){ + return await http.delete( + `${config.API_URL}/wpm/sflogexp/${id}/`); + } + }, + + cquery: { + name: "复杂查询", + req: async function(data){ + return await http.post( + `${config.API_URL}/wpm/sflogexp/cquery/`, data); } }, }, + // //值班停机关系 + // stsflog: { + // list: { + // name: "值班停机关系", + // req: async function(data){ + // return await http.get( + // `${config.API_URL}/wpm/stsflog/`, + // data + // ); + // } + // }, + // update: { + // name: "值班停机关系更新", + // req: async function(id, data){ + // return await http.put( + // `${config.API_URL}/wpm/stsflog/${id}/`, + // data); + // } + // }, + // }, } \ No newline at end of file diff --git a/src/config/route.js b/src/config/route.js index b1884e06..4513e2fd 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -238,6 +238,17 @@ const routes = [ }, "component": "enm_rm/handoverLog" }, + { + "name": "logDetail", + "path": "/enm_rm/logDetail", + "meta": { + "title": "日志详情", + "icon": "el-icon-document-copy", + "perms": ["enm"], + "hidden":true + }, + "component": "enm_rm/logDetail" + }, ] }, //回转窑 @@ -571,11 +582,20 @@ const routes = [ "name": "reportAll", "path": "/ungrouped/report", "meta": { - "title": "生产报表", + "title": "生产日报表", "icon": "el-icon-grid", "perms": ["enm"] }, "component": "ungrouped/report" + },{ + "name": "reportMonthAll", + "path": "/ungrouped/reportMonth", + "meta": { + "title": "生产月报表", + "icon": "el-icon-grid", + "perms": ["enm"] + }, + "component": "ungrouped/report_month" } // ,{ // "name": "echart", diff --git a/src/views/enm_coal/handoverLog.vue b/src/views/enm_coal/handoverLog.vue index 9feefcbf..da75e3eb 100644 --- a/src/views/enm_coal/handoverLog.vue +++ b/src/views/enm_coal/handoverLog.vue @@ -86,8 +86,9 @@ @@ -241,10 +242,20 @@ }, //编辑 sflog_edit(row) { - this.dialog.save = true; - this.$nextTick(() => { - this.$refs.saveDialog.open("edit").setData(row); + let jsonStr = JSON.stringify(row); + this.$TOOL.data.remove("sflogItem") + this.$TOOL.data.set('sflogItem',jsonStr) + this.$router.push({ + name: "logDetail", + query: { + mgroupId: row.mgroup, + deptId:this.deptId + }, }); + // this.dialog.save = true; + // this.$nextTick(() => { + // this.$refs.saveDialog.open("edit").setData(row); + // }); }, //质量检验 sflog_check(row){ diff --git a/src/views/enm_kiln/handoverLog.vue b/src/views/enm_kiln/handoverLog.vue index 8bc204c9..d179a304 100644 --- a/src/views/enm_kiln/handoverLog.vue +++ b/src/views/enm_kiln/handoverLog.vue @@ -74,10 +74,9 @@ {{ scope.row.end_time.slice(0,16)}} - - - - + + + - - - + + + - + @@ -210,10 +211,20 @@ import saveDialog from "./../enm_rm/handover_form.vue"; }, //编辑 sflog_edit(row) { - this.dialog.save = true; - this.$nextTick(() => { - this.$refs.saveDialog.open("edit").setData(row); + let jsonStr = JSON.stringify(row); + this.$TOOL.data.remove("sflogItem") + this.$TOOL.data.set('sflogItem',jsonStr) + this.$router.push({ + name: "logDetail", + query: { + mgroupId: row.mgroup, + deptId:this.deptId + }, }); + // this.dialog.save = true; + // this.$nextTick(() => { + // this.$refs.saveDialog.open("edit").setData(row); + // }); }, //删除 diff --git a/src/views/enm_rm/handoverLog.vue b/src/views/enm_rm/handoverLog.vue index 8b36f491..0ebdb2a1 100644 --- a/src/views/enm_rm/handoverLog.vue +++ b/src/views/enm_rm/handoverLog.vue @@ -63,7 +63,6 @@ @row-click="rowClick" > - - - - - + + +