From e1cadf9a74fe021289846ba39962cf6f094d0c27 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Aug 2023 08:58:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=BC=BA=E5=BA=A6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/enm.ico | Bin 11862 -> 0 bytes public/favicon.ico | Bin 4286 -> 11862 bytes public/favicon0.ico | Bin 0 -> 4286 bytes public/index.html | 2 +- src/api/model/wpm.js | 63 ++- src/config/route.js | 22 +- src/views/enm_coal/handoverLog.vue | 21 +- src/views/enm_kiln/handoverLog.vue | 30 +- src/views/enm_mill/handoverLog.vue | 27 +- src/views/enm_pack/handoverLog.vue | 19 +- src/views/enm_rm/handoverLog.vue | 40 +- src/views/enm_rm/logDetail.vue | 555 +++++++++++++++------ src/views/enm_slag/handoverLog.vue | 19 +- src/views/enm_slag/power.vue | 43 +- src/views/login/resetPassword.vue | 15 +- src/views/ungrouped/electric.vue | 198 +++++--- src/views/ungrouped/report.vue | 196 ++++++-- src/views/ungrouped/report_month.vue | 469 +++++++++++++++++ src/views/userCenter/user/pushSettings.vue | 60 ++- 19 files changed, 1404 insertions(+), 375 deletions(-) delete mode 100644 public/enm.ico create mode 100644 public/favicon0.ico create mode 100644 src/views/ungrouped/report_month.vue diff --git a/public/enm.ico b/public/enm.ico deleted file mode 100644 index 68e3d2ee91d7c2c0f64abe7bca56db3afd5965fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11862 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 RBzf%MB1@?w&0xM;{vY!?C3gS- diff --git a/public/favicon.ico b/public/favicon.ico index 4f3d75eeeee7538d562a909cb400a11fec194264..68e3d2ee91d7c2c0f64abe7bca56db3afd5965fe 100644 GIT binary patch literal 11862 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 RBzf%MB1@?w&0xM;{vY!?C3gS- literal 4286 zcmeHJeP|PB7|*)U6%i>S{xOCtQndMME|*-sznagr$@-8l}J`gB$5UQ_(ao6u&H%EMqLr*QBUB)s=|n=mUQNSp@sJ@e>V9z-%9j5+;P1OD*}aP zq6~ZjDDfgtY4iN9-Bf)gI2MZ${j?xeYMCh+HUZ=)2gt9|qFjo=+nU+Fm~W-}G)8(5 z@yi4a(Abd%6Ts|bE>wzRu{Z`tvQvI<{3r*+jphI&a?|febITU6}yKQW(Cz#moYK{+h0*Qg(#`LEB2eY-;#!6Lz_ISh_AP4*b za(n9rvVX@rv{G%%UL>saFkzuiH|n^O&O#l>bTnmgQhOHi_x7fp9)IqTKgb-4?4%!= zo24n$x=vF7>mg7r$)L5lnJd?C-jS-c+>8>N1afr|A`jFCrsNCI$AcZ2a9i7`++fbd z5GP@#4_IC4w?%$$knC1!iagS#0j(J=2Uz6T#|f5H;f47?km|Af zV=ZzmcT4Z!$c4P(HR4|nYe;9Kqut%3>(t0s%gziA<(CWmdXC-PceP$`rlSh10DOUT zPydclSFm+d?(i|YzP%J*-q9XgYi-I3{9F63tyEz}-r``dp1&|H^#`ay6~X;saB`H$ zxzJjgNP)irYS4h@0O#i2&57{vNLhb{dJ+h0PCWsPHu~J*ed(IZSIFwt_ECALJLBrw z65I0g@NH@Hi#Nk4uHQdWr^J2-CMS39?AL!+YY2Kqj3iCwmp;bMWKqD^Cn%)_idIw-xCA!6x!+ZS+xpd%~)~*%EGMVj@3o$QJ{l zWFtnfKgwZUgnF)_PaVnSi{rI_-r}n;f|=adP3ph@Zmc%4b9hxph}@dui>b}xO_>K=!4%FZj{+$ja$A|L9>bc%ip?S`%!YaPBs z#O_T*Y@S5F&6nJ?``uLam0#zoy#DcUlZT8r-DJProqoBqC%#7XZQYpA>ulNc3Rt^@ zg-u#rnUhuzbsB1S`_jmCO`z?j(PX3do9)bjj_%Y8qF<$K*XHJVf2hq7LAX=)Q9fUYGS2ybhfO`dEFNC9vzn~THJa|O=2QX$61poj5 diff --git a/public/favicon0.ico b/public/favicon0.ico new file mode 100644 index 0000000000000000000000000000000000000000..4f3d75eeeee7538d562a909cb400a11fec194264 GIT binary patch literal 4286 zcmeHJeP|PB7|*)U6%i>S{xOCtQndMME|*-sznagr$@-8l}J`gB$5UQ_(ao6u&H%EMqLr*QBUB)s=|n=mUQNSp@sJ@e>V9z-%9j5+;P1OD*}aP zq6~ZjDDfgtY4iN9-Bf)gI2MZ${j?xeYMCh+HUZ=)2gt9|qFjo=+nU+Fm~W-}G)8(5 z@yi4a(Abd%6Ts|bE>wzRu{Z`tvQvI<{3r*+jphI&a?|febITU6}yKQW(Cz#moYK{+h0*Qg(#`LEB2eY-;#!6Lz_ISh_AP4*b za(n9rvVX@rv{G%%UL>saFkzuiH|n^O&O#l>bTnmgQhOHi_x7fp9)IqTKgb-4?4%!= zo24n$x=vF7>mg7r$)L5lnJd?C-jS-c+>8>N1afr|A`jFCrsNCI$AcZ2a9i7`++fbd z5GP@#4_IC4w?%$$knC1!iagS#0j(J=2Uz6T#|f5H;f47?km|Af zV=ZzmcT4Z!$c4P(HR4|nYe;9Kqut%3>(t0s%gziA<(CWmdXC-PceP$`rlSh10DOUT zPydclSFm+d?(i|YzP%J*-q9XgYi-I3{9F63tyEz}-r``dp1&|H^#`ay6~X;saB`H$ zxzJjgNP)irYS4h@0O#i2&57{vNLhb{dJ+h0PCWsPHu~J*ed(IZSIFwt_ECALJLBrw z65I0g@NH@Hi#Nk4uHQdWr^J2-CMS39?AL!+YY2Kqj3iCwmp;bMWKqD^Cn%)_idIw-xCA!6x!+ZS+xpd%~)~*%EGMVj@3o$QJ{l zWFtnfKgwZUgnF)_PaVnSi{rI_-r}n;f|=adP3ph@Zmc%4b9hxph}@dui>b}xO_>K=!4%FZj{+$ja$A|L9>bc%ip?S`%!YaPBs z#O_T*Y@S5F&6nJ?``uLam0#zoy#DcUlZT8r-DJProqoBqC%#7XZQYpA>ulNc3Rt^@ zg-u#rnUhuzbsB1S`_jmCO`z?j(PX3do9)bjj_%Y8qF<$K*XHJVf2hq7LAX=)Q9fUYGS2ybhfO`dEFNC9vzn~THJa|O=2QX$61poj5 literal 0 HcmV?d00001 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" > - - - - - + + +