diff --git a/public/factory.glb b/public/factory.glb deleted file mode 100644 index 1138bf8f..00000000 Binary files a/public/factory.glb and /dev/null differ diff --git a/public/img/ly/hzy.png b/public/img/ly/hzy.png new file mode 100644 index 00000000..cac307b3 Binary files /dev/null and b/public/img/ly/hzy.png differ diff --git a/public/img/ly/mm.png b/public/img/ly/mm.png new file mode 100644 index 00000000..fba5047a Binary files /dev/null and b/public/img/ly/mm.png differ diff --git a/public/img/ly/shsps.png b/public/img/ly/shsps.png new file mode 100644 index 00000000..384738a3 Binary files /dev/null and b/public/img/ly/shsps.png differ diff --git a/public/img/ly/ylm.png b/public/img/ly/ylm.png new file mode 100644 index 00000000..2e738d8d Binary files /dev/null and b/public/img/ly/ylm.png differ diff --git a/public/img/ly/yrfd.png b/public/img/ly/yrfd.png new file mode 100644 index 00000000..011edf33 Binary files /dev/null and b/public/img/ly/yrfd.png differ diff --git a/public/ly.glb b/public/ly.glb deleted file mode 100644 index 1497e055..00000000 Binary files a/public/ly.glb and /dev/null differ diff --git a/public/photon_tree.glb b/public/photon_tree.glb deleted file mode 100644 index a6822ca9..00000000 Binary files a/public/photon_tree.glb and /dev/null differ diff --git a/src/App.vue b/src/App.vue index 9fa4c6cf..2f29a496 100644 --- a/src/App.vue +++ b/src/App.vue @@ -298,8 +298,8 @@ export default { color: #ffffff; } .elProgress > .el-progress-circle { - width: 5vw !important; - height: 5vw !important; + width: 9vh !important; + height: 9vh !important; } //排放系统 diff --git a/src/config/route.js b/src/config/route.js index 5ead1323..b7f55fd1 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -2687,7 +2687,7 @@ const routes = [ path: "/bigScreenly", name: "bigScreenly", meta: { - title: "能管大屏ly", + title: "数智大屏", icon: "el-icon-position", perms: ["bigScreenly"], fullpage: true, diff --git a/src/layout/other/404.vue b/src/layout/other/404.vue index f1ac3902..1647130d 100644 --- a/src/layout/other/404.vue +++ b/src/layout/other/404.vue @@ -17,8 +17,14 @@ export default { methods: { gohome(){ - location.href="#/" - }, + let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard; + if (base_dashboard == null || base_dashboard == undefined) { + base_dashboard = '/dashboard' + } + this.$router.replace({ + path: base_dashboard, + }); + }, goback(){ this.$router.go(-1); }, diff --git a/src/views/bigScreen/index_enm_ly.vue b/src/views/bigScreen/index_enm_ly.vue index aacbcc25..09cb95d2 100644 --- a/src/views/bigScreen/index_enm_ly.vue +++ b/src/views/bigScreen/index_enm_ly.vue @@ -2,14 +2,14 @@
- 枣庄 + 凌源 {{ currentDay }}{{ currentWeek }}{{ currentTime }} {{ percentage }}% -

运转率

+

{{ item.name }}

-
{{ item.name }}
-
- -
-
-
-
-
-
余热发电
-
-
-
-
- 当月发电量:{{ - hotData.total_production - }} -
-
-
-
- 吨熟料发电量:{{ - hotData.production_elec_unit - }} -
-
-
-
- 自用电量:{{ - hotData.elec_consume - }} -
+
-
-
-
-
-
-
工序电耗
-
-
-
-
-
- 石灰石破碎 -

- {{ radarSeriesData[0] }} -

-
-
- 原料磨 -

- {{ radarSeriesData[1] }} -

-
-
- 回转窑 -

- {{ radarSeriesData[2] }} -

-
-
- 余热发电 -

- {{ radarSeriesData[3] }} -

-
-
- 煤磨 -

- {{ radarSeriesData[4] }} -

-
-
-
-
-
-
-
-
质量分析
- - 入窑生料 - 出磨熟料 - -
-
-
@@ -287,40 +132,164 @@ prop="code" label="位号" > - + + +
+
+
+
+
+
工序电耗
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
工序 + 电耗kwh +
+ 石灰石破碎 + + {{ radarSeriesData[0] }} +
原料磨 + {{ radarSeriesData[1] }} +
回转窑 + {{ radarSeriesData[2] }} +
余热发电 + {{ radarSeriesData[3] }} +
煤磨 + {{ radarSeriesData[4] }} +
+
+
+
+
+
+
+
质量分析
+ + 入窑生料 + 出磨熟料 + +
+
+
+
+
+
+
余热发电/环保数据
+
+
+
+
+ 当月发电量 +

+ {{ hotData.total_production }} + kwh +

+
+
+
+
+ NOx折算值 +

+ {{ hotData.NOx }} + mg/m³ +

+
+
+
+
+ 吨熟料发电量 +

+ {{ hotData.production_elec_unit }} + kwh +

+
+
+ +
+
+ SO2折算值 +

+ {{ hotData.SO2 }} + mg/m³ +

+
+
+
+
+ 自用电量 +

+ {{ hotData.elec_consume }} + kwh +

+
+
+
+
+ 颗粒物折算值 +

+ {{ hotData.klw }} + mg/m³ +

+
+
+
+
+
\ No newline at end of file + diff --git a/src/views/qm/process.vue b/src/views/qm/process.vue index 506b8453..7a51b071 100644 --- a/src/views/qm/process.vue +++ b/src/views/qm/process.vue @@ -3,7 +3,11 @@
- + + + 选择物料 + + + \ No newline at end of file + this.paramsWm.belong_dept = + this.currentMgroup.belong_dept; + this.paramsWm.material__name__contains = "混料"; + this.paramsWm.count__gte = 1; + this.apiObjWm = this.$API.wpm.wmaterial.list; + + this.$API.system.user.list + .req({ + page: 0, + belong_dept: this.currentMgroup.belong_dept, + }) + .then((res) => { + this.userList = res; + }); + } else { + this.$message.error("未找到工段"); + } + }); + }, + //从生产日志生成交接记录 + addHandover() { + this.getWmaterial(); + this.handoverForm.wm = ""; + this.handoverForm.send_date = ""; + this.handoverForm.send_user = ""; + this.handoverForm.recive_user = ""; //接收人 + this.handoverForm.recive_dept = ""; //接收车间 + this.handoverForm.send_dept = this.currentMgroup.belong_dept; + this.handoverForm.send_mgroup = this.currentMgroup.id; + this.handoverType = "add"; + this.handoverVisible = true; + }, + getWmaterial() { + let obj = {}; + obj.belong_dept = this.currentMgroup.belong_dept; + obj.material__name__contains = "混料"; + obj.page = 0; + obj.count__gte = 1; + this.$API.wpm.wmaterial.list.req(obj).then((res) => { + this.wmaterialList = res; + }); + }, + selectWmChange(item) { + this.handoverForm.count = item.count; + this.handoverForm.count_eweight = item.count_eweight; + this.handoverForm.wm = item.id; + this.handoverForm.send_dept = this.currentMgroup.belong_dept; + this.handoverForm.send_mgroup = this.currentMgroup.id; + this.handoverForm.material = item.material; + this.handoverForm.batch = item.batch; + }, + submitHandover() { + this.$API.wpm.handover.create.req(this.handoverForm).then((res) => { + this.$message.success("创建成功"); + this.handoverVisible = false; + this.$refs.table2.refresh(); + }); + }, + handover_edit(row) { + Object.assign(this.handoverForm, row); + this.getUserList2(row.recive_dept); + this.handoverVisible = true; + }, + handover_delete(row) { + this.$confirm(`确定删除吗?`, "提示", { + type: "warning", + }) + .then(() => { + this.$API.wpm.handover.delete + .req(row.id) + .then((res) => { + this.$message.success("删除成功"); + this.$refs.table2.refresh(); + return res; + }) + .catch((err) => { + return err; + }); + }) + .catch(() => {}); + }, + }, +}; + diff --git a/src/views/wpm/mlog_tui.vue b/src/views/wpm/mlog_tui.vue index 6a7b4589..e1945a60 100644 --- a/src/views/wpm/mlog_tui.vue +++ b/src/views/wpm/mlog_tui.vue @@ -1,389 +1,663 @@ + + + + + + + + +
+ 车间库存 +
+
+ + + 选择物料 + 领料 + 入库 +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + + {{ item.material_name }}---{{ + item.batch + }} + {{ item.count }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取消 + 提交 + + + + + + + \ No newline at end of file + this.$API.system.user.list + .req({ + page: 0, + belong_dept: this.currentMgroup.belong_dept, + }) + .then((res) => { + this.userList = res; + }); + } else { + this.$message.error("未找到工段"); + } + }); + }, + //创建交接记录 + addHandover(row) { + this.getWmaterial(); + this.handoverForm.wm = ""; + this.handoverForm.send_date = ""; + this.handoverForm.send_user = ""; + + this.handoverForm.recive_user = ""; //接收人 + this.handoverForm.recive_dept = ""; //接收车间 + this.handoverForm.send_mgroup = this.currentMgroup.id; + this.handoverType = "add"; + this.handoverVisible = true; + }, + selectWmChange(item) { + this.handoverForm.count = item.count; + this.handoverForm.count_eweight = item.count_eweight; + this.handoverForm.wm = item.id; + this.handoverForm.send_dept = this.currentMgroup.belong_dept; + this.handoverForm.send_mgroup = this.currentMgroup.id; + this.handoverForm.material = item.material; + this.handoverForm.batch = item.batch; + }, + getWmaterial() { + let obj = {}; + obj.belong_dept = this.currentMgroup.belong_dept; + obj.material__process = this.currentMgroup.process; + obj.page = 0; + obj.count__gte = 1; + this.$API.wpm.wmaterial.list.req(obj).then((res) => { + this.wmaterialList = res; + }); + }, + submitHandover() { + this.$API.wpm.handover.create.req(this.handoverForm).then((res) => { + this.$message.success("创建成功"); + this.handoverVisible = false; + this.$refs.table2.refresh(); + }); + }, + handover_edit(row) { + Object.assign(this.handoverForm, row); + this.getUserList2(row.recive_dept); + this.handoverType = "edit"; + this.handoverVisible = true; + }, + handover_delete(row) { + this.$confirm(`确定删除吗?`, "提示", { + type: "warning", + }) + .then(() => { + this.$API.wpm.handover.delete + .req(row.id) + .then((res) => { + this.$message.success("删除成功"); + this.$refs.table2.refresh(); + return res; + }) + .catch((err) => { + return err; + }); + }) + .catch(() => {}); + }, + }, +}; +