From 550bc6443b07b69070e69a7a8acff38e0c79d0e9 Mon Sep 17 00:00:00 2001 From: zty Date: Thu, 24 Oct 2024 16:05:12 +0800 Subject: [PATCH 01/17] =?UTF-8?q?feat:=20index=5Fenm=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_enm.vue | 686 ++++++++++++++++++++++++------ 1 file changed, 549 insertions(+), 137 deletions(-) diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue index e44fafe0..e6b1c064 100644 --- a/src/views/bigScreen/index_enm.vue +++ b/src/views/bigScreen/index_enm.vue @@ -18,23 +18,23 @@
- 产量 + 本月熟料产量
- {{ totalData.total_production }} + {{ totalData.shuliao }}
- 实物煤耗 + 本月水泥产量
- {{ totalData.pcoal_consume }} + {{ totalData.cement }}
- 综合电耗 + 本月水泥出厂
- {{ totalData.celec_consume_unit }} + {{ totalData.out_cement }}
@@ -106,6 +106,13 @@ +
+
+
+
压缩空气、用水量
+
+
+
- 导出 - 打印 -
+
+ + +
  • 入库信息单
    -
  • 入库信息单编号
    • -
  • 入库日期
    • -
  • 执行部门-工段
    • -
  • 交送人
    • -
  • 仓库接收人
    • -
  • 仓库
    • -
  • 采购订单
    • -
  • 供应商名称
    • +
  • 入库信息单编号
    • +
  • 入库日期
    • +
  • 执行部门-工段
    • +
  • 交送人
    • +
  • 仓库接收人
    • +
  • 仓库
    • +
  • 采购订单
    • +
  • 供应商名称
  • {{baseData.number}}
    • -
  • {{baseData.submit_time.slice(0,16)}}
    • +
  • {{baseData.inout_date}}
    • +
  • {{baseData.belong_dept_name}}
  • {{baseData.do_user_name}}
  • {{baseData.mio_user_name}}
    • @@ -35,17 +37,17 @@
  • 物料清单
    -
  • 物料名称
    • -
  • 型号
    • -
  • 所在工序
    • -
  • 批次号
    • -
  • 数量
    • +
  • 物料名称
    • + +
  • 所在工序
    • +
  • 批次号
    • +
  • 数量
    -
  • {{ item.material_name }}
    • -
  • {{ item.material_.model }}
    • +
  • {{ item.material_name }}
    • +
  • {{ item.material_.process_name }}
    • -
  • {{ item.batch }}
    • +
  • {{ item.batch }}
  • {{ item.count }}
@@ -119,8 +121,8 @@
  • {{ item.count }}
    • - -
    + +
    • XXX检验结果
    @@ -160,6 +162,7 @@
  • +
    • 厚度
    • 气泡
      • @@ -184,6 +187,99 @@
    • {{baseData.count_n_cpyd}}
    • {{baseData.count_n_cptxd}}
    +
    + +
    +
      +
    • 尺寸检验
      • +
    • 外观检验
      • +
    +
      +
    • 批次号
      • +
    • 总数
      • +
    • 检验数
      • +
    • 检验人
      • +
    • 检验日期
      • +
    • 班次
      • +
    +
      +
    • {{ baseData.material_mame }}
      • +
    • {{ baseData.count_real }}
      • +
    • {{ baseData.count_use }}
      • +
    • {{ baseData.handle_user_name }}
      • +
    • {{ baseData.count_ok }}
      • +
    • {{ baseData.test_time }}
      • +
    +
      +
    • 合格数
      • +
    • 不合格数
      • +
    • +
    • +
    • +
    • +
    +
      +
    • {{ baseData.count_ok }}
      • +
    • {{baseData.count_notok}}
      • +
    • +
    • +
    • +
    • +
    + +
      +
    • 黑圈内径
      • +
    • 黑圈内径圆度
      • +
    • 黑圈外径
      • +
    • 黑圈外径圆度
      • +
    • 产品外径
      • +
    • 产品圆度
      • +
    • 产品同心度
      • +
    • 厚度
      • +
    • 准合格
      • +
    • 圆准
      • +
    + +
      +
    • 脏
      • +
    • 气泡
      • +
    • 水纹
      • +
    • 崩边
      • +
    • 棕边
      • +
    • 棕圈
      • +
    • 划伤
      • +
    • 麻点
      • +
    • 黑圈变形
      • +
    • 倒角
      • +
    • 破损
      • +
    • 蓝圈
      • +
    +
      +
    • {{baseData.count_n_hd}}
      • +
    • {{baseData.count_n_qp}}
      • +
    • {{baseData.count_n_swen}}
      • +
    • {{baseData.count_n_bb}}
      • +
    • {{baseData.count_n_hs}}
      • +
    • {{baseData.count_n_md}}
      • +
    • {{baseData.count_n_xh}}
      • +
    • {{baseData.count_n_cpwj}}
      • +
    • {{baseData.count_n_cpyd}}
      • +
    • {{baseData.count_n_cptxd}}
      • +
    +
      +
    • {{baseData.count_n_hd}}
      • +
    • {{baseData.count_n_qp}}
      • +
    • {{baseData.count_n_swen}}
      • +
    • {{baseData.count_n_bb}}
      • +
    • {{baseData.count_n_hs}}
      • +
    • {{baseData.count_n_md}}
      • +
    • {{baseData.count_n_xh}}
      • +
    • {{baseData.count_n_cpwj}}
      • +
    • {{baseData.count_n_cpyd}}
      • +
    • {{baseData.count_n_cptxd}}
      • +
    • {{baseData.count_n_cptxd}}
      • +
    • {{baseData.count_n_cptxd}}
      • +
    @@ -192,101 +288,155 @@
    • 任务编号
      • -
    • 工艺路线
      • +
    • 所在工段
    • 产品名称
    • 任务总数量
      -
    • 11111111111
      • -
    • CNC
      • -
    • CNC玻璃
      • -
    • 100000
      • +
    • {{ baseData.number }}
      • +
    • {{ baseData.mgroup_name }}
      • +
    • {{ baseData.material_out_name }}
      • +
    • {{ baseData.count }}
    • 任务分解表
      -
    • 子任务编号
    • 人员
    • 数量
    -
      -
    • 11111111101
      • -
    • 张三
      • -
    • 5000
      • +
        +
      • {{ item.handle_user_name }}
        • +
      • {{ item.count }}
    -
    +
    • 日志记录
    • 任务编号
    • 工艺路线
      • -
    • 产品名称
      • -
    • 任务总数
      • +
    • 备注
      • +
      -
    • 11111111111
      • -
    • CNC
      • -
    • CNC玻璃
      • -
    • 100000
      • +
    • {{baseData.mtask_number}}
      • +
    • {{baseData.routepack_name}}
      • +
    • {{baseData.note}}
      • +
    • 物料清单
    -
    -
    1
    +
    +
    {{ index+1 }}
    • 设备编号
    • 操作人
    • 班次
    • 开始时间
      • -
    • 温度
      • -
    • 保温时间
      • -
    • 冷却时间
      • -
    • 预估结束时间
      • -
    • 备注层数
      -
    • TH11101
      • -
    • 张三
      • -
    • 白班
      • -
    • 19：00
      • -
    • 温度
      • -
    • 600
      • -
    • 120
      • -
    • 05：00
      • -
    • 1到10层
      • +
    • {{ item.equipment_name }}
      • +
    • {{ item.handle_user_name }}
      • +
    • {{ item.shift_name }}
      • +
    • {{ item.work_start_time }}
      -
    • 输入物料批次号
      • +
    • 输入物料批次号
    • 领料数量
    • 加工数量
    • 加工前不良数量
      • -
    • 输出物料批次号
      • +
    • 输出物料批次号
    • 合格数量
    • 不合格数量
      • -
    • 不合格原因
      • + +
      -
    • 20241011
      • -
    • 5000
      • -
    • 4000
      • -
    • 10
      • -
    • 20241011-TH01
      • -
    • 3950
      • -
    • 40
      • -
    • 崩边
      • - +
    • {{item.mlogb_full[0].batch}}
      • +
    • {{item.mlogb_full[0].count_use}}
      • +
    • {{item.count_real}}
      • +
    • {{ item.count_pn_jgqbl }}
      • +
    • {{item.mlogb_full[1].batch}}
      • +
    • {{item.count_ok}}
      • +
    • {{item.count_notok}}
      • + +
    +
    +
    +
    + +
    +
      +
    • 日志记录
      • +
    +
      +
    • 工艺路线
      • +
    • 工段
      • +
    • 输入物料
      • +
    • 输出物料
      • +
    • 生产设备
      • +
    • 处理人
      • +
    • 开始时间
      • + +
    +
      +
    • {{baseData.routepack_name}}
      • +
    • {{baseData.mgroup_name}}
      • +
    • {{baseData.material_in_name}}
      • +
    • {{baseData.material_out_name}}
      • +
    • {{baseData.equipment_name}}
      • +
    • {{baseData.handle_user_name}}
      • +
    • {{baseData.work_start_time}}
      • + +
    +
      +
    • 温度
      • +
    • 保温时间
      • +
    • 冷却时间
      • +
    • 预估结束时间
      • +
    • 备注层数
      • +
    +
      +
    • 温度
      • +
    • 600
      • +
    • 120
      • +
    • 05：00
      • +
    • 1到10层
      • +
    +
      +
    • 物料清单
      • +
    + +
    +
    {{ index+1 }}
    +
    +
      +
    • 输入物料批次号
      • +
    • 领料数量
      • +
    • 加工数量
      • +
    • 加工前不良数
      • +
    • 输出物料批次号
      • +
    • 合格数量
      • +
    • 不合格数量
      • +
    +
      +
    • {{item.batch}}
      • +
    • {{item.count_use}}
      • +
    • {{item.count_real}}
      • +
    • {{ item.count_pn_jgqbl }}
      • +
    • {{tableData2[index].batch}}
      • +
    • {{tableData2[index].count_ok}}
      • +
    • {{tableData2[index].count_notok}}
    -
    @@ -303,27 +453,27 @@
  • 备注
      • -
    • 1111
      • -
    • 2222
      • -
    • 3333
      • -
    • 4444
      • -
    • 5555
      • -
    • 6666
      • -
    • 7777
      • +
    • {{ baseData.send_mgroup_name }}
      • +
    • {{ baseData.send_user_name }}
      • +
    • {{ baseData.recive_mgroup_name }}
      • +
    • {{ baseData.recive_user_name }}
      • +
    • {{ baseData.send_date }}
      • +
    • {{ baseData.recive_date }}
      • +
    • {{ baseData.note }}
    • 物料清单
      -
    • 物料名称
      • +
    • 批次号
    • 数量
    -
      -
    • 11111111111
      • -
    • 22222222222
      • -
    • 33333333333
      • +
        + +
      • {{ item.batch }}
        • +
      • {{ item.count }}
    @@ -391,6 +541,8 @@
    + 导出 + 打印 @@ -419,6 +571,12 @@ return []; }, }, + tableData2: { + type: Array, + default: () => { + return []; + }, + }, mgroupId: { type: String, default: "", @@ -431,37 +589,36 @@ data() { return { mainLoading: false, - issave: false, //控制基本信息提交 - search: { - keyword: null, - }, - oplcateCode: 'fire', - operationId: "", - oplId: "", - ticketId:'', + codeVisible:false, + value:'' }; }, mounted() { - let that = this; - this.$nextTick(()=>{}) - - - // 'BARCODE 0,130,"128",108,0,0,2,4,"' + let that = this; + that.printId = that.baseData.id; + that.value = that.type + ":" + that.printId+",url:'/wpm_gx/qiepian'"; + that.codeVisible = true; + // var canvas = document.getElementById("barcode"); + // var context = canvas.getContext("2d"); + // context.clearRect(0, 0, context.width, context.height); + // JsBarcode("#barcode", that.printId, { + // format: "CODE128", + // displayValue: true, + // fontSize: 20, + // lineColor: "#000000", + // }); + }, methods: { handlePrint(){ this.$PRINT("#exportDiv"); + this.$emit('closePrint') }, handleExport() { let exportDiv = document.getElementById('exportDiv') // 需要导出部分页面的id名 this.pdfDownLoader = new PdfLoader(exportDiv, '作业许可证', 'exportDiv') // fileName -->导出文件名, question-table -->防止被截断的class名 this.pdfDownLoader.outPutPdfFn('test'); - }, - //作业人员列表 - getworkerList() { - this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => { - this.workerData = res; - }); + this.$emit('closePrint'); }, }, } @@ -496,5 +653,17 @@ } .export_ulli_title{ text-align: center; + /* color: #ffffff; */ + background-color: #e3e3e3; +} +.export_ulli_h{ + background-color: #e3e3e3; +} +.flex2{ + flex:2 +} +#barcode { + width: 200px; + height: 60px; } From 01500ad0b1e70ae90509597be6e747afb67a559e Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Oct 2024 17:15:05 +0800 Subject: [PATCH 06/17] =?UTF-8?q?fix:=E5=BA=93=E5=AD=98=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E8=AE=B0=E5=BD=95=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue index 1767a17a..252bc387 100644 --- a/src/views/inm/mioitem.vue +++ b/src/views/inm/mioitem.vue @@ -9,7 +9,7 @@
    - 打印 + 打印 {{ mioObj.number @@ -210,7 +210,7 @@ > - + From b56a06d5e6e3391e42e8e013fa7dd10f208694ef Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Oct 2024 17:16:44 +0800 Subject: [PATCH 08/17] =?UTF-8?q?feat:=E6=89=AB=E6=8F=8F=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/template/scan.vue | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/views/template/scan.vue diff --git a/src/views/template/scan.vue b/src/views/template/scan.vue new file mode 100644 index 00000000..46e4d518 --- /dev/null +++ b/src/views/template/scan.vue @@ -0,0 +1,40 @@ + + \ No newline at end of file From 7956d729872bf425e31551289a056004714f6191 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Oct 2024 17:17:31 +0800 Subject: [PATCH 09/17] =?UTF-8?q?feat:=E4=BB=BB=E5=8A=A1=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/mtask_deliver.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/wpm_gx/mtask_deliver.vue b/src/views/wpm_gx/mtask_deliver.vue index ea4332fd..2a814cda 100644 --- a/src/views/wpm_gx/mtask_deliver.vue +++ b/src/views/wpm_gx/mtask_deliver.vue @@ -7,6 +7,7 @@ @closed="$emit('closed')" >
    + 打印 {{ @@ -67,10 +68,15 @@ 提交
    + + + From d07ff31f76247bf9defb4cd914255aa47950fdac Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Oct 2024 17:18:15 +0800 Subject: [PATCH 10/17] =?UTF-8?q?feat:=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/fmlog_detail.vue | 52 +++++++++++++++++++++---------- src/views/wpm_gx/mlog_detail.vue | 20 ++++++++++++ 2 files changed, 55 insertions(+), 17 deletions(-) diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue index 6252bce0..89be414a 100644 --- a/src/views/wpm_gx/fmlog_detail.vue +++ b/src/views/wpm_gx/fmlog_detail.vue @@ -6,23 +6,23 @@ destroy-on-close @closed="$emit('closed')" > - - - - - {{ - fmlogItem.routepack_name - }} - {{ - fmlogItem.mtask_number - }} - {{ - fmlogItem.belong_dept_name - }} - - - - + + + + 打印 + + {{ + fmlogItem.routepack_name + }} + {{ + fmlogItem.mtask_number + }} + {{ + fmlogItem.belong_dept_name + }} + + + + + + diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index 2b9ea28e..650e9599 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -8,6 +8,7 @@ >
    + 打印 {{ mlogItem.routepack_name @@ -385,6 +386,9 @@ > + + +
    @@ -392,6 +396,7 @@ import editDialog from "./mlog_form.vue"; import saveDialog from "./mlogb_form.vue"; import checkDialog from "./mlogb_check.vue"; +import print from "./../setting/print/A4.vue"; export default { props: { mlogId: { @@ -403,6 +408,7 @@ export default { editDialog, saveDialog, checkDialog, + print }, emits: ["success", "closed"], data() { @@ -454,8 +460,11 @@ export default { visible: false, isSaveing: false, options: [], + tableData:[], + tableData2:[], saveInDialog: false, ticketDialog:false, + printVisible:false, setFiltersVisible: false, rules: { count_use: [ @@ -469,11 +478,18 @@ export default { }; }, mounted() { + let that = this; this.getMlogItem(); this.paramsIn.mlog = this.mlogId; this.paramsOut.mlog = this.mlogId; this.apiObj = this.$API.wpm.mlogb.list; this.getInit(); + that.$API.wpm.mlogb.list.req(that.paramsIn).then((res) => { + that.tableData = res; + }) + that.$API.wpm.mlogb.list.req(that.paramsOut).then((res) => { + that.tableData2 = res; + }) }, methods: { open() { @@ -638,6 +654,10 @@ export default { this.selectionFilters = filters; this.setFiltersVisible = true; }, + handlePrint(){ + let that = this; + that.printVisible = true; + }, }, }; From bd873b3b3273f90e428d7ef89a86aabf74d32efb Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Oct 2024 17:18:48 +0800 Subject: [PATCH 11/17] =?UTF-8?q?feat:=E8=BD=A6=E9=97=B4=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/inm.vue | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue index 14368946..0f002568 100644 --- a/src/views/wpm_gx/inm.vue +++ b/src/views/wpm_gx/inm.vue @@ -93,7 +93,7 @@ fixed="right" align="center" width="120" - v-if="mgroupName!=='size'&&mgroupName!=='facade'" + > @@ -208,6 +209,7 @@ export default { process:'', materialType: "wm", visibleDrawer: false, + printer_name:localStorage.getItem("printer_name") }; }, mounted() { @@ -312,6 +314,32 @@ export default { this.dialog.save = false; this.$refs.table.refresh(); }, + //打印物料标签 + printMaterial(row){ + let that = this; + that.$API.cm.labelmat.fromWm.req({tid:row.id}).then((res) => { + console.log(res) + let code = res.code_label; + let str = [ + "SIZE 40 mm,70 mm", + "GAP 7 mm,7 mm", + "CLS", + "REFERENCE 0,0", + 'QRCODE 30,400,H,5,A,0,"' +code +'"', + "WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name, + "WINTEXT 240,550,28,90,0,0,Simhei," + res.batch, + ]; + if(res.notok_sign!==null){ + str.push("WINTEXT 280,550,28,90,0,0,Simhei," +res.notok_sign_name,) + } + str.push("PRINT 1",) + let obj = {}; + obj.printer_commands = str; + obj.printer_name = that.printer_name; + this.$API.wpm.prints.req(obj).then((response) => {}); + }) + + }, }, }; From f02467a88156a6e7aac98786b09974bcbefc3b36 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Oct 2024 17:19:53 +0800 Subject: [PATCH 12/17] =?UTF-8?q?feat:=E8=BD=A6=E9=97=B4=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/inm_record.vue | 35 +++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_gx/inm_record.vue b/src/views/wpm_gx/inm_record.vue index ab7520f8..43164ae6 100644 --- a/src/views/wpm_gx/inm_record.vue +++ b/src/views/wpm_gx/inm_record.vue @@ -264,6 +264,11 @@ show-overflow-tooltip > + + + - + @@ -336,6 +341,7 @@ export default { userOptions: [],//部门执行人 deptOptions: [], mgroupOptions: [], + printer_name:localStorage.getItem("printer_name") }; }, mounted() { @@ -465,9 +471,34 @@ export default { }); }, submitOut() {}, + //打印 handlePrint(){ this.printVisible = true; - },//打印 + }, + //打印物料标签 + printMaterial(row){ + let that = this; + that.$API.cm.labelmat.fromMioitem.req({tid:row.id}).then((res) => { + let code = res.code_label; + let str = [ + "SIZE 40 mm,70 mm", + "GAP 7 mm,7 mm", + "CLS", + "REFERENCE 0,0", + 'QRCODE 30,400,H,5,A,0,"' +code +'"', + "WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name, + "WINTEXT 240,550,28,90,0,0,Simhei," + res.batch, + ]; + if(res.notok_sign!==null){ + str.push("WINTEXT 280,550,28,90,0,0,Simhei," +res.notok_sign_name,) + } + str.push("PRINT 1",) + let obj = {}; + obj.printer_commands = str; + obj.printer_name = that.printer_name; + this.$API.wpm.prints.req(obj).then((response) => {}); + }) + }, //本地更新数据 handleSaveSuccess() { this.$refs.tables.refresh(); From 4acdc9f4cd8eef2b635c59e193a92c625534d3e6 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Oct 2024 17:20:42 +0800 Subject: [PATCH 13/17] =?UTF-8?q?feat:=E5=B7=A5=E6=AE=B5=E4=BA=A4=E6=8E=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/handover.vue | 95 +++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue index 99f86c3c..cc59cead 100644 --- a/src/views/wpm_gx/handover.vue +++ b/src/views/wpm_gx/handover.vue @@ -226,9 +226,13 @@ 保存 + + + From 472a871b90596901a62118790f701cb7726814f3 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Oct 2024 17:22:41 +0800 Subject: [PATCH 15/17] =?UTF-8?q?feat:=E8=BF=87=E7=A8=8B=E6=8A=BD=E6=A3=80?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qm/process2.vue | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/views/qm/process2.vue b/src/views/qm/process2.vue index 41551372..407e80f9 100644 --- a/src/views/qm/process2.vue +++ b/src/views/qm/process2.vue @@ -102,6 +102,16 @@ + + + @@ -111,13 +121,17 @@ @choseChange="choseChange" > + + +     From 9e4ceeec3fc10cb41778e274a6520f76fe8f85e3 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Oct 2024 17:25:59 +0800 Subject: [PATCH 17/17] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=87=AA=E6=A3=80=E8=BF=87=E7=A8=8B=E6=8A=BD=E6=A3=80=E5=92=8C?= =?UTF-8?q?=E5=A4=96=E8=A7=82=E6=A3=80=E9=AA=8C=E6=9D=83=E9=99=90=E5=8F=98?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/src/config/route.js b/src/config/route.js index 55b58253..857c6b9e 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1401,8 +1401,8 @@ const routes = [ // component: "wpm_gx/chart", // }, // { - // name: "printTest", - // path: "/wpm_gx/print", + // name: "prints", + // path: "/wpm_gx/prints", // meta: { // title: "打印测试", // icon: "el-icon-files", @@ -1420,7 +1420,6 @@ const routes = [ // }, // component: "setting/print/A4", // }, - { name: "qiepian", path: "/wpm_gx/qiepian", @@ -1622,13 +1621,23 @@ const routes = [ }, component: "qm/process", }, + { + name: "qmProcess_gx", + path: "/qm/qmProcess_gx", + meta: { + title: "过程自检", + // icon: "el-icon-cellphone", + perms: ["ptest_gx"], + }, + component: "qm/process_gx", + }, { name: "qmProcess2", path: "/qm/qmProcess2", meta: { title: "过程抽检", // icon: "el-icon-cellphone", - perms: ["ptest"], + perms: ["ptest_cj"], }, component: "qm/process2", }, @@ -1678,7 +1687,7 @@ const routes = [ meta: { title: "外观检验", // icon: "el-icon-cellphone", - perms: ["productstest__wg"], + perms: ["productstest_wg"], }, component: "qm/products_wg", }, @@ -3035,6 +3044,18 @@ const routes = [ }, component: "bigScreen/index_photon", }, + //光芯—数据大屏 + // { + // path: "/bigScreengx", + // name: "bigScreengx", + // meta: { + // title: "数据大屏", + // icon: "el-icon-platform", + // perms: ["bigScreengx"], + // fullpage: true, + // }, + // component: "bigScreen/index_gx", + // }, //排放——数据大屏 { path: "/bigScreenEnp",