diff --git a/public/glb/photon3.glb b/public/glb/photon3.glb new file mode 100644 index 00000000..f2a4bbfc Binary files /dev/null and b/public/glb/photon3.glb differ diff --git a/src/views/bigScreen/textIndex.vue b/src/views/bigScreen/textIndex.vue index 9fe1cc97..266cc1b0 100644 --- a/src/views/bigScreen/textIndex.vue +++ b/src/views/bigScreen/textIndex.vue @@ -167,7 +167,7 @@ export default { this.initChart(); this.initDomStyle(); this.initFactory(); - }) + }) }, methods: { initDomStyle() { @@ -194,7 +194,6 @@ export default { }, initFactory() { var that = this; - const canvas = document.getElementById("renderCanvas"); // Get the canvas element const engine = new BABYLON.Engine(canvas, true); // Generate the BABYLON 3D engine BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function () { @@ -202,7 +201,6 @@ export default { BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function () { document.getElementById("loadingScreen").style.display = "none"; } - engine.displayLoadingUI(); const createScene = function () { const scene = new BABYLON.Scene(engine); @@ -265,7 +263,6 @@ export default { BABYLON.Animation.CreateAndStartAnimation('at61', camera, 'target', 45, 200, camera.target, that.initialTarget, 0, ease); } }) - // 高亮显示mesh名 const mesh_rect = new BABYLON_GUI.Rectangle('mesh_rect'); mesh_rect.width = "200px"; @@ -274,7 +271,6 @@ export default { mesh_rect.alpha = 0.6; mesh_rect.isVisible = false; advancedTexture.addControl(mesh_rect); - var mesh_name = new BABYLON_GUI.TextBlock('mesh_name'); mesh_name.text = ""; mesh_name.color = 'white'; @@ -284,7 +280,6 @@ export default { BABYLON.SceneLoader.Append('glb/', "photon3.glb", scene, function (scene) { //关闭灯光 // scene.lights[1].setEnabled(false); - // setEnable engine.hideLoadingUI() // for (let key in that.nodesLists) { // // const value = that.nodesLists[key]; @@ -322,18 +317,17 @@ export default { // } // } }, - //进度条 - function (evt) { - var loadedPercent = 0; - if (evt.lengthComputable) { - loadedPercent = parseInt(evt.loaded * 100 / evt.total); - } else { - var dlCount = evt.loaded / (1024 * 1024); - loadedPercent = Math.floor(dlCount * 100.0) / 100.0; - } - that.loadedPercent = loadedPercent; - }) - + //进度条 + function (evt) { + var loadedPercent = 0; + if (evt.lengthComputable) { + loadedPercent = parseInt(evt.loaded * 100 / evt.total); + } else { + var dlCount = evt.loaded / (1024 * 1024); + loadedPercent = Math.floor(dlCount * 100.0) / 100.0; + } + that.loadedPercent = loadedPercent; + }) // 自动旋转checkbox var checkbox = new BABYLON_GUI.Checkbox(); checkbox.width = "20px"; @@ -400,14 +394,13 @@ export default { if (mesh.name == '单身宿舍.005_primitive3') { //单身宿舍.003_primitive3 // 在选中的 mesh 上添加高亮效果 - highlightLayer.addMesh(mesh, new BABYLON.Color3(1, 1, 0.5)); + highlightLayer.addMesh(mesh, new BABYLON.Color3(0.1, 0.9, 0.9)); that.currentLightMesh = mesh; mesh_rect.linkWithMesh(mesh); let name = mesh.name.split('_')[0]; mesh_name.text = name; // mesh_rect.isVisible = true; that.infoVisibel = true; - hl1.addMesh(mesh, new BABYLON.Color3(12 / 255, 250 / 255, 252 / 255), true); hl1.blurVerticalSize = 5; hl1.blurHorizontalSize = 5; @@ -427,7 +420,6 @@ export default { } }); canvas.addEventListener('mousedown', (event) => { - debugger; // 使用 scene.pick 检测鼠标拾取 const pickResult = scene.pick(scene.pointerX, scene.pointerY); if (pickResult.hit) { @@ -453,7 +445,6 @@ export default { } } }); - // checkbox.isChecked = true; //默认开启自动旋转 // scene.onPointerObservable.add((pointerInfo) => { // switch (pointerInfo.type) { @@ -486,14 +477,14 @@ export default { // }) return scene; }; - const scene = createScene(); //Call the createScene function - // scene.debugLayer.show() + scene.debugLayer.show() engine.runRenderLoop(function () { scene.render(); }); this.engine = engine; this.scene = scene; + console.log('scene:',scene) window.addEventListener("resize", function () { engine.resize(); }); diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue index 7c6308ad..32947a6d 100644 --- a/src/views/inm/mioitem.vue +++ b/src/views/inm/mioitem.vue @@ -9,10 +9,10 @@ {{ mioObj.belong_dept_name }} {{ mioObj.do_user_name }} {{ mioObj.create_time }} - {{ mioObj.order_number }} - {{ mioObj.pu_order_number }} - {{ mioObj.supplier_name }}{{ - mioObj.customer_name }} + {{ mioObj.order_number }} + {{ mioObj.supplier_name }} + {{ mioObj.pu_order_number }} + {{mioObj.customer_name }} 提交 @@ -57,7 +57,7 @@ - diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index 3cbd7e68..6743d791 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -6,30 +6,34 @@ @change="selectMaterialChange"> {{ item.number }} - {{ item.name }} + {{ item.name }} - + + + + + + + + {{ item.batch }} {{ item.count }} -- {{ item.warehouse_name }} + float: right; + color: var(--el-text-color-secondary); + font-size: 13px; + ">{{ item.count }} -- {{ item.warehouse_name }} - - - { + that.wbatchOptions = res; + }); + }, getMaterialOptions() { var type = this.form.type var query diff --git a/src/views/mtm/materials_form.vue b/src/views/mtm/materials_form.vue index afa5ded2..5eee8cdc 100644 --- a/src/views/mtm/materials_form.vue +++ b/src/views/mtm/materials_form.vue @@ -14,6 +14,11 @@ + + + + + diff --git a/src/views/pm/mtask.vue b/src/views/pm/mtask.vue index 5caaa9e6..2383c8e8 100644 --- a/src/views/pm/mtask.vue +++ b/src/views/pm/mtask.vue @@ -3,11 +3,11 @@
新增任务 - 任务分解 - 任务下达 + + 任务下达
- + 编辑 - - 终止 删除 @@ -186,8 +184,8 @@ 编辑 - - 终止 + + 终止 删除 @@ -199,7 +197,10 @@ - + +
+ 生产进度 +
- + @@ -339,12 +340,13 @@ export default { visibleRecord:false, tableHeight:null, hideDo:true, - activeName:'8车间', + activeName:'7车间', dataList:[ - {number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:200, count03:300 }, - {number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:250, count03:300 }, + // {number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:200, count03:300 }, + // {number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:250, count03:300 }, ], - columList:['10.15','10.16','10.17'], + // columList:['10.15','10.16','10.17'], + columList:[], selection: [], selectedIds:[], state_: { @@ -426,13 +428,13 @@ export default { this.$confirm(`确定终止该任务吗？`, "提示", { type: "warning", }).then(() => { - // this.$API.pm.utask.delete.req(row.id).then((res) => { - // this.$message.success("删除成功"); - // this.$refs.table7.refresh(); - // return res; - // }).catch((err) => { - // return err; - // }); + this.$API.pm.utask.stop.req(row.id).then((res) => { + this.$message.success("操作成功"); + this.$refs.table10.refresh(); + return res; + }).catch((err) => { + return err; + }); }).catch(() => {}); }, //本地更新数据 @@ -477,13 +479,19 @@ export default { utaskDepuse(){ let that = this; if(that.selectedIds.length>0){ + let ids =that.selectedIds; that.isloading = true; - that.$API.pm.utask.scheduemtasks.req({ids:that.selectedIds}).then(res=>{ - that.$message.success('任务分解成功'); - that.isloading = false; - that.$refs.table7.refresh(); - that.$refs.table8.refresh(); - that.$refs.table10.refresh(); + that.$API.pm.utask.scheduemtasks.req({ids:ids}).then(res=>{ + that.$API.pm.utask.assgin.req({ids:ids}).then(res=>{ + that.$message.success('下达任务成功'); + that.isloading = false; + that.$refs.table7.refresh(); + that.$refs.table8.refresh(); + that.$refs.table10.refresh(); + }).catch(()=>{ + that.isloading = false; + }) + }).catch(()=>{ that.isloading = false; }) diff --git a/src/views/pm/mtask2.vue b/src/views/pm/mtask2.vue index 53fcd542..c423b0f4 100644 --- a/src/views/pm/mtask2.vue +++ b/src/views/pm/mtask2.vue @@ -69,33 +69,6 @@
- @@ -353,13 +326,33 @@ export default { //获取 mtask let that = this; that.tasks.data = []; + let objItem = {}; + objItem.id=row.id; + objItem.type='utask'; + objItem.number=row.number; + objItem.count=row.count; + objItem.text =row.number, + objItem.cate='', + + objItem.duration = 10; + objItem.progress = 1; + objItem.count_ok=row.count_ok; + objItem.count_real=row.count_real; + objItem.count_notok=row.count_notok; + objItem.state =row.state; + objItem.start_date =row.start_date; + objItem.mgroup_name = ''; + objItem.material_name = ''; + objItem.specification = ''; + that.tasks.data.push(objItem) this.$API.pm.mtask.list.req({utask:row.id}).then(res=>{ // console.log(res.results)//获取甘特图数据 let data = res.results; - let arr = []; data.forEach(item=>{ let obj = {}; obj.id=item.id; + obj.type='mtask'; + obj.parent=row.id; obj.number=item.number; obj.count=item.count; obj.text = "一天任务", @@ -379,25 +372,6 @@ export default { that.tasks.data.push(obj) }) console.log(that.tasks.data) - // data.forEach(item=>{ - // let obj = {}; - // let progress = 0; - // progress = item.count_ok/item.count; - // obj.text = "一天任务", - // obj.count_ok=item.count_ok; - // obj.count_real=item.count_real; - // obj.count_notok=item.count_notok; - // obj.start_date=item.start_date; - // obj.end_date=item.end_date; - // obj.state = item.state; - // obj.utask = item.utask; - // obj.mgroup_name = item.mgroup_name; - // obj.material_name = item.material_out_.name; - // obj.specification = item.material_out_.specification; - // arr.push(obj) - // }) - // console.log(arr) - // that.tasks.data = res.results; console.log('tasks:',that.tasks) // 数据解析:将数据解析到gantt列数据中 gantt.parse(that.tasks); diff --git a/src/views/pum/order_form.vue b/src/views/pum/order_form.vue index 29fe77b5..3239a967 100644 --- a/src/views/pum/order_form.vue +++ b/src/views/pum/order_form.vue @@ -79,15 +79,13 @@ export default { loading: false, mode: "add", titleMap: { - add: "新增仓库", - edit: "编辑仓库", - show: "查看仓库", + add: "新增采购订单", + edit: "编辑采购订单", + show: "查看采购订单", }, form: {}, rules: { - name: [{required: true, message: "请输入仓库名称", trigger: "blur"}], - number: [{required: true, message: "请输入仓库编号", trigger: "blur"}], - place: [{required: true, message: "请输入仓库地点", trigger: "blur"}] + number: [{required: true, message: "请输入采购订单编号", trigger: "blur"}] }, visible: false, isSaveing: false, diff --git a/src/views/pum/orderitemplan.vue b/src/views/pum/orderitemplan.vue index 1c90c900..206726d0 100644 --- a/src/views/pum/orderitemplan.vue +++ b/src/views/pum/orderitemplan.vue @@ -1,5 +1,5 @@