From 03780360ace3810bbfb534639098a51564ef0fdb Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 26 Nov 2024 17:51:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=98=AF=E5=90=A6=E5=88=A0=E9=99=A4=E7=9A=84=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/em/equipment.vue | 4 ++-- src/views/em/equipment_form.vue | 8 ++++---- src/views/em/equipmentjc.vue | 4 ++-- src/views/em/equipmentjk.vue | 4 ++-- src/views/em/equipmentjl.vue | 4 ++-- src/views/em/equipmentzl.vue | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue index e8f06114..7be2b8c5 100644 --- a/src/views/em/equipment.vue +++ b/src/views/em/equipment.vue @@ -17,7 +17,7 @@ --> - - + --> diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue index e129be98..095b016c 100644 --- a/src/views/em/equipment_form.vue +++ b/src/views/em/equipment_form.vue @@ -53,7 +53,7 @@ - + @@ -61,18 +61,18 @@ - + - + diff --git a/src/views/em/equipmentjc.vue b/src/views/em/equipmentjc.vue index 24e9bba7..f6a3d09f 100644 --- a/src/views/em/equipmentjc.vue +++ b/src/views/em/equipmentjc.vue @@ -17,7 +17,7 @@ --> - - + --> diff --git a/src/views/em/equipmentjk.vue b/src/views/em/equipmentjk.vue index 1e35dcfd..fd24cc83 100644 --- a/src/views/em/equipmentjk.vue +++ b/src/views/em/equipmentjk.vue @@ -17,7 +17,7 @@ --> - - + --> diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue index da05a704..09becce2 100644 --- a/src/views/em/equipmentjl.vue +++ b/src/views/em/equipmentjl.vue @@ -5,7 +5,7 @@ 新增
- - + -->
diff --git a/src/views/em/equipmentzl.vue b/src/views/em/equipmentzl.vue index 023b62af..983e5f83 100644 --- a/src/views/em/equipmentzl.vue +++ b/src/views/em/equipmentzl.vue @@ -17,7 +17,7 @@ --> - - + --> From ae365ee3830ccbb008fb11b4a669922f4d19bfe5 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 26 Nov 2024 22:23:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E5=A4=96=E5=8D=8F=E5=92=8C?= =?UTF-8?q?=E7=A3=A8=E6=8A=9B=E4=B8=80=E6=AC=A1=E6=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 12 ++++++- src/views/wpm_gx/yicipao.vue | 2 +- src/views/wpm_gx/yicipao2.vue | 64 +++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 src/views/wpm_gx/yicipao2.vue diff --git a/src/config/route.js b/src/config/route.js index c20b2c11..19af7e39 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1523,7 +1523,17 @@ const routes = [ name: "yicipao", path: "/wpm_gx/yicipao", meta: { - title: "一次抛", + title: "外协一次抛", + // icon: "el-icon-cellphone", + perms: ["wpm_ycp"], + }, + component: "wpm_gx/yicipao", + }, + { + name: "yicipao2", + path: "/wpm_gx/yicipao2", + meta: { + title: "磨抛一次抛", // icon: "el-icon-cellphone", perms: ["wpm_ycp"], }, diff --git a/src/views/wpm_gx/yicipao.vue b/src/views/wpm_gx/yicipao.vue index f829510d..6426c2bd 100644 --- a/src/views/wpm_gx/yicipao.vue +++ b/src/views/wpm_gx/yicipao.vue @@ -44,7 +44,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存","入库记录"], values: "日志", - mgroupName: "一次抛", + mgroupName: "外协一次抛", mgroupId: "", }; }, diff --git a/src/views/wpm_gx/yicipao2.vue b/src/views/wpm_gx/yicipao2.vue new file mode 100644 index 00000000..c64e8a6d --- /dev/null +++ b/src/views/wpm_gx/yicipao2.vue @@ -0,0 +1,64 @@ + + + From 3b7458d6839bcddc04aef253f79716d126b2e985 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 26 Nov 2024 22:31:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E5=A4=96=E5=8D=8F=E5=92=8C?= =?UTF-8?q?=E7=A3=A8=E6=8A=9B=E4=B8=80=E6=AC=A1=E6=8A=9B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/route.js b/src/config/route.js index 19af7e39..585629c9 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1537,7 +1537,7 @@ const routes = [ // icon: "el-icon-cellphone", perms: ["wpm_ycp"], }, - component: "wpm_gx/yicipao", + component: "wpm_gx/yicipao2", }, { name: "saobianb", From cea727a691f5f26dd7c8af5a2da03bf71c76878c Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 27 Nov 2024 09:22:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E5=A4=A7=E5=B1=8F=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_gx.vue | 50 ++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue index 57c09b3d..635b22d9 100644 --- a/src/views/bigScreen/index_gx.vue +++ b/src/views/bigScreen/index_gx.vue @@ -161,9 +161,9 @@
-
@@ -172,11 +172,12 @@
宣传公告
-
+
- + +
- 紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查，筑牢“防护网”，紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查，筑牢“防护网” + {{ articleItem.content }}
@@ -383,6 +384,7 @@ BABYLON.DracoCompression.Configuration.decoder.fallbackUrl = "./draco_decoder_gltf.js"; import "babylonjs-loaders"; import "animate.css"; +import baseUrl from "@/config"; const configData={ header : ['物料批次','未加工','进行中','已完成','合格数'], headerBGC : '#0a3f44', @@ -538,6 +540,7 @@ export default { resizeTimeout: null, loadedPercent: 0, percentage: 25, + baseUrl: baseUrl.HOST_URL, updateTime: "2023-08-17 16:00:00", //当前时间 currentTime: "", @@ -686,6 +689,8 @@ export default { options13:{}, options14:{}, options15:{}, + articleList:[], + videoUrl:'', }; }, mounted() { @@ -718,10 +723,11 @@ export default { that.addListener(); that.setIntervalFun(); that.getQulity(); + that.getArticles(); that.myChart = echarts.init(document.getElementById('eqPieChart')); that.myChart.setOption(that.option_eq); let index2 = 0; - this.chartInterval2 = setInterval(function () { + that.chartInterval2 = setInterval(function () { if (index2 < that.option_eq.series.data.length) { that.myChart.dispatchAction({ type: "downplay", @@ -744,6 +750,25 @@ export default { }, 3000); }, methods: { + //获取公告和视频 + getArticles(){ + let that = this; + that.$API.cms.article.list.req({page:0}).then((res) => { + if(res.length>0){ + let articleList = [],videoList = []; + res.forEach((item)=>{ + if(item.video == ''){ + articleList.push(item); + }else{ + videoList.push(item); + } + }) + that.articleList = articleList.slice(0,2); + that.videoUrl = that.baseUrl+videoList[0].video; + } + }) + }, + //获取质量分析饼状图数据 getQulity(){ let that = this; let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth; @@ -798,6 +823,7 @@ export default { } }); }, + //底部轮播定时 setIntervalFun(){ let that = this; that.scrollInterval = setInterval(() => { @@ -811,6 +837,7 @@ export default { document.getElementById("scroll").style.left = lefts +'px'; },6000) }, + //时间 showTime() { this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss"); this.currentWeek = this.$TOOL.dateFormat(new Date(), "week"); @@ -819,6 +846,7 @@ export default { "yyyy年MM月dd日" ); }, + //屏幕监听 addListener() { let that = this; window.addEventListener("resize", function () { @@ -835,6 +863,7 @@ export default { }, 300); // 延迟 300 毫秒，可以根据需要调整 }); }, + //初始化模型容器大小 initDomStyle() { let that = this; // 获取窗口的总高度 @@ -857,6 +886,7 @@ export default { that.engine.resize(); } }, + //更新图表数据 resizeChart(name) { // 根据name resize chart var myChart = echarts.getInstanceByDom( @@ -866,6 +896,7 @@ export default { myChart.resize(); } }, + //获取日任务和日/周/月产量 getTaskNumber(){ let that = this; let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth; @@ -1061,6 +1092,7 @@ export default { deepCopy(obj) { return JSON.parse(JSON.stringify(obj)); }, + //获取所有工段 getMgroup(){ let that = this; that.$API.mtm.mgroup.list.req({page:0}).then((res) => { @@ -1072,6 +1104,7 @@ export default { } }) }, + //获取工序批次数据 getProcessDatas(name,index){ let that = this; let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth; @@ -1099,6 +1132,7 @@ export default { } }); }, + //获取工序近七天的柱状图数据 getProcessCount(name,index){ let that = this; let optionKey = 'options'+index; @@ -1430,6 +1464,12 @@ export default { article{ margin-top: 5px; text-indent: 2em; + display: -webkit-box; + -webkit-line-clamp: 5; /* 限制显示 5 行 */ + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } /deep/ .header-item{ From 29597f1348d0bb25716b42bf15c815018b588ca2 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 27 Nov 2024 09:28:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?#502coding=EF=BC=9A13=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=89=B9=E6=AC=A1=E5=BA=8F=E5=8F=B7=20=E9=A2=84?= =?UTF-8?q?=E5=A4=87=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/f_mlogs_form.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue index a8f1b412..3b3f6e25 100644 --- a/src/views/wpm_gx/f_mlogs_form.vue +++ b/src/views/wpm_gx/f_mlogs_form.vue @@ -59,6 +59,18 @@ +