From e5f3d242054cae8d96cf1d823909f9520f16c40b Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 24 Oct 2023 14:55:11 +0800 Subject: [PATCH] worktask --- .env.production | 4 +- public/img/gz_login_img.png | Bin 0 -> 10618 bytes public/img/gz_logo.png | Bin 0 -> 1670 bytes public/index.html | 3 +- src/api/model/pm.js | 19 +- src/api/model/wpm.js | 24 +- src/components/ehsSelect/userselect.vue | 9 + src/components/scTable/index.vue | 2 +- src/config/route.js | 35 +- src/layout/index.vue | 11 +- src/utils/baseJson.json | 7 +- src/views/bigScreen/index_photon.vue | 18 +- src/views/em/equipment.vue | 4 +- src/views/em/equipmentc.vue | 8 +- src/views/home/widgets/index_photon.vue | 2 +- src/views/login/components/passwordForm.vue | 54 +- src/views/login/index.vue | 8 +- src/views/pm/mtask2.vue | 18 +- src/views/sam/orderitem.vue | 13 +- src/views/wpm/flog_form.vue | 40 +- src/views/wpm/worktask.vue | 558 +++++++++++--------- src/views/wpm/worktask2.vue | 472 ++++++----------- src/views/wpm/worktaskFlog.vue | 15 +- vue.config.js | 2 +- 24 files changed, 662 insertions(+), 664 deletions(-) create mode 100644 public/img/gz_login_img.png create mode 100644 public/img/gz_logo.png diff --git a/.env.production b/.env.production index 604c6f24..deb57ef0 100644 --- a/.env.production +++ b/.env.production @@ -2,9 +2,9 @@ NODE_ENV = production # 标题 -VUE_APP_TITLE = '曲阳金隅安全智能管控平台' +# VUE_APP_TITLE = '曲阳金隅安全智能管控平台' # VUE_APP_TITLE = '托克逊能源管理平台' -# VUE_APP_TITLE = '中建材光子科技有限公司' +VUE_APP_TITLE = '中建材光子科技有限公司' # 接口地址 diff --git a/public/img/gz_login_img.png b/public/img/gz_login_img.png new file mode 100644 index 0000000000000000000000000000000000000000..a04bd500080e34fbe3e05b796083b54299f6d9d3 GIT binary patch literal 10618 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 HlhFSMZF%*J literal 0 HcmV?d00001 diff --git a/public/img/gz_logo.png b/public/img/gz_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..e665c8672e331991479f59fc64496393d80874d4 GIT binary patch literal 1670 zcmV;126_33P)^h|iU_E!X)6hqnyP71oEmCN6Ll{NT6?%)tZ4{aiPra%?IT>A~Y zi$8@#qWJ>^?!O1Kp&o$LV3>)c$8l3hgb*Z8e?aEwF(w;F0Ag+nq352a{;uVP;O-?$ z$(%kjEoHh81m8GH-SXQnPc)^rll?h-;4ourzC*F(2Uf3Q-ofV!Q%xo_O*(naQ(*<8 zlg3KwEGz$enyaUV0*HXWoa}N`S5y4Soj&i(gSw8j{d?5h*ikVzblWl#8`hy{r5nzS zV4-Pv9$Zc9qnlAZo{GVm-$&cyJ5ldnIb+u<3C3fhbzF-w3+P9o`n;$&T!Sppt7inu zi3G`~_Az|&ud@aZyzwWjpZ^k)so8@8?DM^3m#-w=dA4F`_|&_|uYVJ_f3T#ktg9_4 zaeDhJ1}p#TB2D?TMOpC26?xCApSd38>^a;i4POG8zJ4bDa}EGS)9@^qpMPAOY?k!- z-b=k&U=4(ef)rIne7Y@voo|_$_$bj$+Zcc4_mD~#++_KEIC>6b27@#_{Umi?UXGNK zq2IkmY|AdP$JbWZZc>N=!kN+W;z8OMoY(UyJ zZY(~dM(8@`>Xpp-#U6~Rs=~2iN1w#NAo1N#klcR=w*pxG;3gb!(XO*bgx#rMDt5Kx$~1(KYKCJ8=>!-MOw)edis7_CJfK zwm7sb7$6;qGQ9h7x0bq@eAyX+lbLV_CN3O<^C-#!=AHX{GE`&mO+7@G6+fLQJU!`-! zDwL(S;5trjwVnTE-nz9|wL!uMUM3T)MtlF?h*Z7@j=he4_Z=A5w4;6Db0|08Nb+z0z)5FN3=bjGN8rs3&2=7OfnY7(KM7~8cdV)mzEJ~YQh*# z;JGk>_szGdGfcd?4y_CEwlo!jg)6c825>Kq#T{&1KDNp>M}eP`i3? z|NaiLE`-^BH9}QU90xVvC$M21(ll{TyoHdU*VkiqUm$hU61+<~@WkR+pY0%lq;AuC zVo&YGSa20qbrsp3^Tol7j~&8w97dn{HL`Ufbt~@5x!tm;n$tq|*lU++0vZBsZZnzD zQOsRi_{4|Zq|bbSowf0Ib(3nlnudk*srmfPwA{Xo#DzZ0x86p1;J!Tg|LRty5trav Qt^fc407*qoM6N<$g68%*g8%>k literal 0 HcmV?d00001 diff --git a/public/index.html b/public/index.html index 881a32cb..140f0fea 100644 --- a/public/index.html +++ b/public/index.html @@ -32,7 +32,8 @@
<%= VUE_APP_TITLE %>
diff --git a/src/api/model/pm.js b/src/api/model/pm.js index 0242b2a6..1e07a0cf 100644 --- a/src/api/model/pm.js +++ b/src/api/model/pm.js @@ -60,6 +60,14 @@ export default { ); } }, + related: { + name: "获取已下达的所有的兄弟小任务", + req: async function(id){ + return await http.get( + `${config.API_URL}/pm/mtask/${id}/related/` + ); + } + }, submitSameDay:{ name: "提交同一天的该部门下的所有兄弟小任务", req: async function(data){ @@ -69,8 +77,17 @@ export default { ); } }, + submit:{ + name: "提交任务后不可更新日志", + req: async function(data){ + return await http.post( + `${config.API_URL}/pm/mtask/submit/`, + data + ); + } + }, }, - // 生产小任务 + // 生产大任务 utask: { list: { name: "生产任务列表", diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js index d065f48c..f570412e 100644 --- a/src/api/model/wpm.js +++ b/src/api/model/wpm.js @@ -190,13 +190,23 @@ export default { }, //车间库存 wmaterial: { - name: "车间库存", - req: async function(data){ - return await http.get( - `${config.API_URL}/wpm/wmaterial/`, - data - ); - } + list: { + name: "车间库存", + req: async function(data){ + return await http.get( + `${config.API_URL}/wpm/wmaterial/`, + data + ); + } + }, + batchs: { + name: "获取车间出现过的批次号", + req: async function(data){ + return await http.post( + `${config.API_URL}/wpm/wmaterial/batchs/`, + data); + } + }, }, // //值班停机关系 // stsflog: { diff --git a/src/components/ehsSelect/userselect.vue b/src/components/ehsSelect/userselect.vue index 7b8dca8b..b413fd68 100644 --- a/src/components/ehsSelect/userselect.vue +++ b/src/components/ehsSelect/userselect.vue @@ -333,10 +333,19 @@ export default { // }, rowClick(row, column, event){ if(!this.multiple){ + if(this.listIndex!==null){ + data. + this.choseData = row; + this.choseData.listIndex = this.listIndex; + this.$emit("submit", this.choseData); + this.dialoguser=false + }else{ this.choseData = row; this.$emit("submit", this.choseData); this.dialoguser=false } + + } }, //表格选择后回调事件 selectionChange(selection) { diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index 64513a41..43217e7b 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -143,7 +143,7 @@ export default { order: null, loading: false, tableHeight: "100%", - tableParams: Object.assign({}, this.params), + tableParams: this.params, userColumn: [], customColumnShow: false, summary: {}, diff --git a/src/config/route.js b/src/config/route.js index 16fc15ad..3bad0a4d 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -794,7 +794,8 @@ const routes = [ "meta": { "title": "生产一部记录", "icon": "el-icon-cellphone", - "perms": ["wpm"] + "perms": ["wpm"], + "hidden":true }, "component": "wpm/worktaskFlog" }, @@ -1765,7 +1766,7 @@ const routes = [ "meta": { "title": "菜单管理", "icon": "el-icon-fold", - "perms": ["menu"] + "perms": ["menu"] }, "component": "ops/menu" }, @@ -1815,7 +1816,7 @@ const routes = [ "meta": { "title": "配置", "icon": "el-icon-document", - "perms": ["ops"] + "perms": ["sysconfig"] }, "component": "ops/setting" }, @@ -1847,12 +1848,36 @@ const routes = [ }, "component": "bigScreen/index_enm" }, - //光子大屏 + //光子——数据看板 { "path": "/bigScreenP", "name": "bigScreenP", "meta": { - "title": "能管大屏", + "title": "数据看板", + "icon": "el-icon-position", + "perms": ["bigScreenP"], + "fullpage": true, + }, + "component": "bigScreen/index_photon" + }, + //车间看板 + { + "path": "/bigScreenP", + "name": "bigScreenP", + "meta": { + "title": "车间看板", + "icon": "el-icon-position", + "perms": ["bigScreenP"], + "fullpage": true, + }, + "component": "bigScreen/index_photon" + }, + //统计分析 + { + "path": "/bigScreenP", + "name": "bigScreenP", + "meta": { + "title": "统计分析", "icon": "el-icon-position", "perms": ["bigScreenP"], "fullpage": true, diff --git a/src/layout/index.vue b/src/layout/index.vue index a36c6281..bba289a5 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -205,7 +205,7 @@ import setting from './components/setting.vue'; import iframeView from './components/iframeView.vue'; import autoExit from './other/autoExit.js'; - + import data from './../utils/baseJson'; export default { name: 'index', components: { @@ -229,12 +229,15 @@ }, computed:{ baseName(){ - let baseName = this.$TOOL.data.get("BASE_INFO")!==null?this.$TOOL.data.get("BASE_INFO").base.base_name:'智能管理平台'; + let baseInFo = data[data.current]; + // let baseName = this.$TOOL.data.get("BASE_INFO")!==null?this.$TOOL.data.get("BASE_INFO").base.base_name:'智能管理平台'; + let baseName = baseInFo!==null?baseInFo.base.base_name:'智能管理平台'; return baseName; }, baseLogo(){ - let base_logo = this.$TOOL.data.get("BASE_INFO")!==null?this.$TOOL.data.get("BASE_INFO").base.base_logo:'img/logo.png'; - + let baseInFo = data[data.current]; + // let base_logo = this.$TOOL.data.get("BASE_INFO")!==null?this.$TOOL.data.get("BASE_INFO").base.base_logo:'img/logo.png'; + let base_logo = baseInFo!==null?baseInFo.base.base_logo:'img/logo.png'; return base_logo }, ismobile(){ diff --git a/src/utils/baseJson.json b/src/utils/baseJson.json index 5f092b79..7fd238a8 100644 --- a/src/utils/baseJson.json +++ b/src/utils/baseJson.json @@ -5,7 +5,8 @@ "base_name": "托克逊能化绿色建材厂能源管理平台", "base_logo": "/media/default/logo.png", "base_name_short": "托克逊能管", - "base_logo_side": "/media/default/logo_side.jpg" + "base_logo_side": "/media/default/logo_side.jpg", + "name":"enm" }, "apk": { "apk_version": "1.01.44", @@ -17,8 +18,10 @@ "base": { "base_name": "中建材光子科技有限公司", "base_logo": "/media/default/gz_logo.png", + "base_login_img":"/media/default/gz_login_img.png", "base_name_short": "光子科技", - "base_logo_side": "/media/default/logo_side.jpg" + "base_logo_side": "/media/default/logo_side.jpg", + "name":"photon" } } } \ No newline at end of file diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue index 8daa6355..b650c11f 100644 --- a/src/views/bigScreen/index_photon.vue +++ b/src/views/bigScreen/index_photon.vue @@ -259,7 +259,7 @@ export default { const createScene = function () { const scene = new BABYLON.Scene(engine); scene.clearColor = BABYLON.Color3.Black(); //BABYLON.Color3(1, 0, 1); - const ground = BABYLON.MeshBuilder.CreateGround("ground", { width: 50, height: 50 }); + const ground = BABYLON.MeshBuilder.CreateGround("ground", { width: 30, height: 30 }); const groundMaterial = new BABYLON_GRID.GridMaterial("groundMaterial", scene); groundMaterial.majorUnitFrequency = 5; groundMaterial.minorUnitVisibility = 0.5; @@ -272,19 +272,19 @@ export default { const largeGroundMat = new BABYLON.StandardMaterial("largeGroundMat"); largeGroundMat.diffuseTexture = new BABYLON.Texture("url to large ground texture"); - const largeGround = BABYLON.MeshBuilder.CreateGroundFromHeightMap("largeGround", "https://assets.babylonjs.com/environments/villageheightmap.png", {width:50, height:50, subdivisions: 200, minHeight:0, maxHeight: 2}); - largeGround.material = groundMaterial; - largeGround.position.y = -0.1; + // const largeGround = BABYLON.MeshBuilder.CreateGroundFromHeightMap("largeGround", "https://assets.babylonjs.com/environments/villageheightmap.png", {width:50, height:50, subdivisions: 200, minHeight:0, maxHeight: 2}); + // largeGround.material = groundMaterial; + // largeGround.position.y = -0.1; // 加载背景图片 // const backgroundImage = new BABYLON.Layer('', 'img/bj.png', scene, true); - const camera = new BABYLON.ArcRotateCamera("camera", that.initialAlpha, that.initialBeta, that.initialRadius, new BABYLON.Vector3(0, 0, 0)); + const camera = new BABYLON.ArcRotateCamera("camera", that.initialAlpha, that.initialBeta, that.initialRadius, new BABYLON.Vector3(0,-0.2, -0.1)); that.initialTarget = camera.getTarget(); - camera.lowerBetaLimit = Math.PI / 2.6; //无法移动到地面以下 - camera.upperBetaLimit = Math.PI / 2.1; //无法移动到地面以下 + // camera.lowerBetaLimit = Math.PI / 2.6; //无法移动到地面以下 + camera.upperBetaLimit = Math.PI / 2.6; //无法移动到地面以下 camera.attachControl(canvas, true); - camera.maxZ = 200; // 调整适当的值 + camera.maxZ = 100; // 调整适当的值 // 相机限制 camera.lowerRadiusLimit = 2; camera.upperRadiusLimit = 4; @@ -340,7 +340,7 @@ export default { mesh_name.color = 'white'; mesh_name.fontSize = '14px'; mesh_rect.addControl(mesh_name); - var remoteGlbUrl = process.env.VUE_APP_BASEURL + "/media/model/photon.glb"; + var remoteGlbUrl = process.env.VUE_APP_BASEURL + "/media/model/photon1.glb"; BABYLON.SceneLoader.Append(remoteGlbUrl, "", scene, function (scene) { engine.hideLoadingUI() }, diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue index 3add5716..323f3088 100644 --- a/src/views/em/equipment.vue +++ b/src/views/em/equipment.vue @@ -73,7 +73,7 @@ 编辑 @@ -81,7 +81,7 @@ 删除 diff --git a/src/views/em/equipmentc.vue b/src/views/em/equipmentc.vue index aa2cfa95..9fff45dd 100644 --- a/src/views/em/equipmentc.vue +++ b/src/views/em/equipmentc.vue @@ -74,13 +74,13 @@ - + @@ -91,7 +91,6 @@ import { index } from 'd3'; emits: ["success", "closed"], props:{ mtask: { type: String, default: '' }, - materialId: { type: String, default: '' }, }, data() { return { @@ -125,16 +124,19 @@ import { index } from 'd3'; }; }, mounted() { - this.getProcess(); + this.getBatchs(); this.getFormList(); }, methods: { getFormList(){ - this.$API.mtm.route.list.req({page:0,material:this.materialId}).then((res) => { - res.forEach(item=>{ + this.$API.pm.mtask.related.req(this.mtask).then(res=>{ + // debugger; + console.log('工序进度') + console.log(res) + res.forEach(item=>{ let obj = { - process: item.process, - processName: item.process_name, + process: item.mgroup, + processName: item.mgroup_name, count_use:1, count_ok: 1, count_no1: 0, @@ -148,10 +150,12 @@ import { index } from 'd3'; }) }) }, - //获取工序列表 - getProcess(){ - var res = this.$API.mtm.process.list.req({page:0}).then(res=>{ - this.options = res; + //获取车间物料批次号 + getBatchs(){ + let that = this; + this.$API.wpm.wmaterial.batchs.req({belong_dept_name:'6车间'}).then(res=>{ + that.options = res; + console.log(res) }); }, pushRow(){ diff --git a/src/views/wpm/worktask.vue b/src/views/wpm/worktask.vue index 2aa8a3a0..f90cd971 100644 --- a/src/views/wpm/worktask.vue +++ b/src/views/wpm/worktask.vue @@ -1,269 +1,333 @@