From 8ac6ee5db5b6b88e8624b6a524c9a8d275e5157b Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 14 Aug 2024 09:54:11 +0800 Subject: [PATCH 01/28] =?UTF-8?q?fix:=E6=89=93=E5=8D=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AE=BE=E6=88=90=E6=9C=AC=E5=9C=B0=EF=BC=8C=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E7=A8=8B=E6=8A=BD=E6=A3=80=EF=BC=8C?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BFtable=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E8=AE=BE=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/wpm.js | 4 ++-- src/config/route.js | 6 +++--- src/views/mtm/routepack_form.vue | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js index f4d1883a..56f64454 100644 --- a/src/api/model/wpm.js +++ b/src/api/model/wpm.js @@ -369,8 +369,8 @@ export default { prints: { name: "打印", req: async function (data) { - return await http.post(`${config.API_URL}/prints/`, data); - // return await http.post("http://localhost:8080/prints/", data); + // return await http.post(`${config.API_URL}/prints/`, data); + return await http.post("http://localhost:8080/prints/", data); }, }, }; diff --git a/src/config/route.js b/src/config/route.js index b750852b..64f7347a 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1543,14 +1543,14 @@ const routes = [ component: "qm/process", }, { - name: "qmProcess", - path: "/qm/qmProcess", + name: "qmProcess2", + path: "/qm/qmProcess2", meta: { title: "过程抽检", // icon: "el-icon-cellphone", perms: ["ptest"], }, - component: "qm/process", + component: "qm/process2", }, { name: "qmInm", diff --git a/src/views/mtm/routepack_form.vue b/src/views/mtm/routepack_form.vue index b3bbc612..da4ac074 100644 --- a/src/views/mtm/routepack_form.vue +++ b/src/views/mtm/routepack_form.vue @@ -95,7 +95,7 @@ hidePagination hideDo stripe - style="height: 680px" + style="height: 500px" > From 6f0c9b57bdc749f5c388a957ac475d166f05ac83 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 14 Aug 2024 09:54:46 +0800 Subject: [PATCH 02/28] =?UTF-8?q?fix:=E8=BF=87=E7=A8=8B=E6=8A=BD=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qm/process2.vue | 166 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 src/views/qm/process2.vue diff --git a/src/views/qm/process2.vue b/src/views/qm/process2.vue new file mode 100644 index 00000000..ebff0358 --- /dev/null +++ b/src/views/qm/process2.vue @@ -0,0 +1,166 @@ + + From c7bd84f8ab93967ce42c27251438584ac86623b5 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 14 Aug 2024 10:29:15 +0800 Subject: [PATCH 03/28] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/handover.vue | 9 ++-- src/views/wpm_gx/handover_form.vue | 70 ++++++++++++++++++++---------- 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue index 16cf8479..da7f6493 100644 --- a/src/views/wpm_gx/handover.vue +++ b/src/views/wpm_gx/handover.vue @@ -248,15 +248,13 @@ export default { }, mounted() { let that = this; - if(that.mgroupName=="size"){ - // that.params.type=30; + if(that.mgroupName=="size"){//尺寸检验 that.params.material__process__name="一次超洗"; that.apiObj = that.$API.wpm.handover.list; - }else if(that.mgroupName=="facade"){ - // that.params.type=30; + }else if(that.mgroupName=="facade"){//外观检验 that.params.material__process__name="二次超洗"; that.apiObj = that.$API.wpm.handover.list; - }else{ + }else{//工段交接 that.printer_name = localStorage.getItem("printer_name"); that.$API.mtm.mgroup.list .req({ page: 0, search: that.mgroupName }) @@ -265,6 +263,7 @@ export default { that.$message.error("获取工段错误"); return; } + that.$TOOL.data.set('gx_deptID',res[0].belong_dept) that.mgroupId = res[0].id; that.processId = res[0].process; that.processCate = res[0].process_cate; diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index e438445e..e191fbc8 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -75,6 +75,7 @@ v-model="form.send_user" placeholder="交送人" clearable + filterable style="width: 100%" > { + that.userList = res; + }); + }else{ + that.deptID = that.$TOOL.data.get('gx_deptID'); + that.getUserList(); + } + that.getMaterial(); + that.getDeptOptions(); + that.getMgroupOptions(); }, methods: { //获取部门列表 @@ -284,20 +298,23 @@ export default { var req = { mgroupx: that.mgroupId, page: 0, + notok_sign__isnull : 1, + count_xtest__isnull:1 }; if(that.mgroupName=="size"){ req.material__process__name="一次超洗"; }else if(that.mgroupName=="facade"){ req.material__process__name="二次超洗"; - }else{ - if (this.type == 10) { - req.notok_sign__isnull = 1; - } else if (this.type == 20) { - req.notok_sign__isnull = 0;} - else if (this.type == 30) { - req.notok_sign__isnull = 1; - } } + // else{ + // if (this.type == 10) { + // req.notok_sign__isnull = 1; + // } else if (this.type == 20) { + // req.notok_sign__isnull = 0; + // }else if (this.type == 30) { + // req.notok_sign__isnull = 1; + // } + // } this.$API.wpm.wmaterial.list .req(req) @@ -309,7 +326,7 @@ export default { getUserList() { let that = this; this.$API.system.user.list - .req({ mgroup: that.mgroupId, page: 0 }) + .req({ depts: that.deptID, page: 0 }) .then((res) => { that.userList = res; }); @@ -317,11 +334,17 @@ export default { //获取接收工段人员 getUserList2() { let that = this; - this.$API.system.user.list - .req({ mgroup: that.form.recive_mgroup, page: 0 }) + let deptID = ''; + this.mgroupOptions.forEach(item => { + if(item.id==that.form.recive_mgroup){ + deptID = item.belong_dept; + } + this.$API.system.user.list + .req({ depts: deptID, page: 0 }) .then((res) => { that.userList2 = res; }); + }); }, //获取接收部门人员 getUserList3() { @@ -383,8 +406,11 @@ export default { //表单注入数据 setData(data) { Object.assign(this.form, data); - this.getUserList2(); - that.form.recive_dept(); + if(data.type==30){ + this.getUserList3(); + }else{ + this.getUserList2(); + } }, //设置过滤项 setFilters(filters) { From f2df4ddbb0aa19ea26ca578dfc3b76fd786ec41f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 14 Aug 2024 10:47:09 +0800 Subject: [PATCH 04/28] fix: wpm_gx handoverform getuserlist2 bug --- src/views/wpm_gx/handover_form.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index e191fbc8..17503778 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -287,7 +287,7 @@ export default { //获取工段列表 getMgroupOptions() { this.$API.mtm.mgroup.list - .req({ page: 0, type__in: "dept" }) + .req({ page: 0}) .then((res) => { this.mgroupOptions = res; }); @@ -338,12 +338,12 @@ export default { this.mgroupOptions.forEach(item => { if(item.id==that.form.recive_mgroup){ deptID = item.belong_dept; + this.$API.system.user.list + .req({ depts: deptID, page: 0 }) + .then((res) => { + that.userList2 = res; + }); } - this.$API.system.user.list - .req({ depts: deptID, page: 0 }) - .then((res) => { - that.userList2 = res; - }); }); }, //获取接收部门人员 From e38d1d3eef0afc7ea45026b1ed8728447722fb64 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 14 Aug 2024 14:27:38 +0800 Subject: [PATCH 05/28] =?UTF-8?q?fix:=20=E5=85=89=E5=AD=90=E5=A4=A7?= =?UTF-8?q?=E5=B1=8Flight=20intensity=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_photon.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue index 1020ddd3..f44f7dd2 100644 --- a/src/views/bigScreen/index_photon.vue +++ b/src/views/bigScreen/index_photon.vue @@ -1301,7 +1301,7 @@ export default { "light", new BABYLON.Vector3(1, 1, 0) ); - light.intensity = 3; + light.intensity = 1.5; // 全屏GUI const advancedTexture = BABYLON_GUI.AdvancedDynamicTexture.CreateFullscreenUI( From 4371a5dff005cf3d261c73ebd1703df7554996e8 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 14 Aug 2024 16:25:16 +0800 Subject: [PATCH 06/28] =?UTF-8?q?feat:=20=E7=8E=AF=E4=BF=9D=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigScreen/enpComponents/orgwryList.vue | 10 ++- .../bigScreen/enpComponents/pollutant.vue | 70 ++++++++++++++++--- 2 files changed, 64 insertions(+), 16 deletions(-) diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue index 868dd389..b5e02dc9 100644 --- a/src/views/bigScreen/enpComponents/orgwryList.vue +++ b/src/views/bigScreen/enpComponents/orgwryList.vue @@ -69,13 +69,13 @@
排放口及关联设备静态信息
-
+
{{ detailItem.name }} @@ -478,6 +478,7 @@ export default { }) }, resizeChart(name) { + console.log(name) var myChart = echarts.getInstanceByDom( document.getElementById(name) ); @@ -487,10 +488,7 @@ export default { }, addListener() { var that = this; - if (this.resizeTimeout) { - clearTimeout(this.resizeTimeout); - } - this.resizeTimeout = setTimeout(function () { + setTimeout(function () { that.resizeChart("dataChart"); that.resizeChart("dataChart2"); that.resizeChart("dataChart3"); diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue index 08c2181f..70dad411 100644 --- a/src/views/bigScreen/enpComponents/pollutant.vue +++ b/src/views/bigScreen/enpComponents/pollutant.vue @@ -27,15 +27,63 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -188,9 +236,11 @@ diff --git a/src/views/wpm_gx/chengpinpao.vue b/src/views/wpm_gx/chengpinpao.vue new file mode 100644 index 00000000..a6e395e8 --- /dev/null +++ b/src/views/wpm_gx/chengpinpao.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue index da7f6493..df4244e3 100644 --- a/src/views/wpm_gx/handover.vue +++ b/src/views/wpm_gx/handover.vue @@ -259,7 +259,7 @@ export default { that.$API.mtm.mgroup.list .req({ page: 0, search: that.mgroupName }) .then((res) => { - if (res.length != 1) { + if (res.length < 1) { that.$message.error("获取工段错误"); return; } diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue index 7a128e1e..6b38f4f3 100644 --- a/src/views/wpm_gx/inm.vue +++ b/src/views/wpm_gx/inm.vue @@ -177,7 +177,7 @@ export default { that.$API.mtm.mgroup.list .req({ page: 0, search: that.mgroupName }) .then((res) => { - if (res.length != 1) { + if (res.length < 1) { that.$message.error("获取工段错误"); return; } diff --git a/src/views/wpm_gx/jianbo.vue b/src/views/wpm_gx/jianbo.vue index dcb2e739..4ef26c3f 100644 --- a/src/views/wpm_gx/jianbo.vue +++ b/src/views/wpm_gx/jianbo.vue @@ -42,7 +42,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存"], values: "日志", - mgroupName: "减薄", + mgroupName: "减薄A", mgroupId: "", }; }, diff --git a/src/views/wpm_gx/jianbob.vue b/src/views/wpm_gx/jianbob.vue new file mode 100644 index 00000000..eafc95ae --- /dev/null +++ b/src/views/wpm_gx/jianbob.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue index 70498675..8f7236a7 100644 --- a/src/views/wpm_gx/mlogs.vue +++ b/src/views/wpm_gx/mlogs.vue @@ -182,7 +182,7 @@ export default { that.$API.mtm.mgroup.list .req({ page: 0, search: that.mgroupName }) .then((res) => { - if (res.length != 1) { + if (res.length < 1) { that.$message.error("获取工段错误"); return; } diff --git a/src/views/wpm_gx/mopao.vue b/src/views/wpm_gx/pingmo.vue similarity index 98% rename from src/views/wpm_gx/mopao.vue rename to src/views/wpm_gx/pingmo.vue index e983c6ef..1b2a0547 100644 --- a/src/views/wpm_gx/mopao.vue +++ b/src/views/wpm_gx/pingmo.vue @@ -42,7 +42,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存"], values: "日志", - mgroupName: "磨抛", + mgroupName: "平磨", mgroupId: "", }; }, diff --git a/src/views/wpm_gx/saobian.vue b/src/views/wpm_gx/saobian.vue index 00a225f5..cd946423 100644 --- a/src/views/wpm_gx/saobian.vue +++ b/src/views/wpm_gx/saobian.vue @@ -42,7 +42,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存"], values: "日志", - mgroupName: "扫边", + mgroupName: "扫边A", mgroupId: "", }; }, diff --git a/src/views/wpm_gx/saobianb.vue b/src/views/wpm_gx/saobianb.vue new file mode 100644 index 00000000..bdf3145d --- /dev/null +++ b/src/views/wpm_gx/saobianb.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/views/wpm_gx/shaojie.vue b/src/views/wpm_gx/tuihuo.vue similarity index 98% rename from src/views/wpm_gx/shaojie.vue rename to src/views/wpm_gx/tuihuo.vue index 1939edab..cf62c481 100644 --- a/src/views/wpm_gx/shaojie.vue +++ b/src/views/wpm_gx/tuihuo.vue @@ -42,7 +42,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存"], values: "日志", - mgroupName: "烧结", + mgroupName: "退火", mgroupId: "", }; }, diff --git a/src/views/wpm_gx/yicipao.vue b/src/views/wpm_gx/yicipao.vue new file mode 100644 index 00000000..5ec87317 --- /dev/null +++ b/src/views/wpm_gx/yicipao.vue @@ -0,0 +1,62 @@ + + + From 65f450256199bcfc14832a3252ba7257bd0fad69 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 15 Aug 2024 13:57:36 +0800 Subject: [PATCH 11/28] =?UTF-8?q?fix:=E7=99=BD=E6=8A=9B=E7=89=87-->?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20=20=E7=99=BD=E7=89=87=E6=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 6 +++--- src/views/wpm_gx/{baipaopian.vue => baipianpao.vue} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/views/wpm_gx/{baipaopian.vue => baipianpao.vue} (97%) diff --git a/src/config/route.js b/src/config/route.js index 5c1489eb..d00e0bdb 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1402,14 +1402,14 @@ const routes = [ component: "wpm_gx/qiepian", }, { - name: "baipaopian", - path: "/wpm_gx/baipaopian", + name: "baipianpao", + path: "/wpm_gx/baipianpao", meta: { title: "白片抛", // icon: "el-icon-files", perms: ["wpm_bpp"], }, - component: "wpm_gx/baipaopian", + component: "wpm_gx/baipianpao", }, { name: "saobian", diff --git a/src/views/wpm_gx/baipaopian.vue b/src/views/wpm_gx/baipianpao.vue similarity index 97% rename from src/views/wpm_gx/baipaopian.vue rename to src/views/wpm_gx/baipianpao.vue index 53177c7c..310eb320 100644 --- a/src/views/wpm_gx/baipaopian.vue +++ b/src/views/wpm_gx/baipianpao.vue @@ -42,7 +42,7 @@ export default { tableHieght: 200, options: ["日志", "交接记录", "库存"], values: "日志", - mgroupName: "白抛片", + mgroupName: "白片抛", mgroupId: "", }; }, From 7ea7051a885b6cd82dea74b8f57ff479ea5d6ac8 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 15 Aug 2024 13:58:52 +0800 Subject: [PATCH 12/28] =?UTF-8?q?fix:=E6=9B=B4=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=97=B6=E5=8E=BB=E6=8E=89=20=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userCenter/user/pushSettings.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/userCenter/user/pushSettings.vue b/src/views/userCenter/user/pushSettings.vue index 2196f475..1bdf28d5 100644 --- a/src/views/userCenter/user/pushSettings.vue +++ b/src/views/userCenter/user/pushSettings.vue @@ -13,7 +13,7 @@
必须提供当前登录用户密码才能进行更改
- @@ -56,7 +56,7 @@ export default { if (reg1.test(value)) { callback(); }else{ - callback(new Error('请输入包含英文、数字、特殊符号（ @#$%^&.+=! ）的8位以上密码')); + callback(new Error('请输入包含英文、数字、特殊符号（ @#$%^&+=! ）的8位以上密码')); } }} ], From a0853997270e8feeccfaaa03722f783a072ffbc0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 15 Aug 2024 14:07:53 +0800 Subject: [PATCH 13/28] =?UTF-8?q?fix:=20=E8=B6=85=E4=BD=8E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enpComponents/envirqualmonitor.vue | 9 +- .../bigScreen/enpComponents/innerclean.vue | 2 +- .../bigScreen/enpComponents/pollutant.vue | 47 ++++--- .../bigScreen/enpComponents/transport.vue | 17 ++- .../bigScreen/enpComponents/transport_old.vue | 115 ++++++++++++++++++ 5 files changed, 165 insertions(+), 25 deletions(-) create mode 100644 src/views/bigScreen/enpComponents/transport_old.vue diff --git a/src/views/bigScreen/enpComponents/envirqualmonitor.vue b/src/views/bigScreen/enpComponents/envirqualmonitor.vue index 9d5000c9..d11f2d98 100644 --- a/src/views/bigScreen/enpComponents/envirqualmonitor.vue +++ b/src/views/bigScreen/enpComponents/envirqualmonitor.vue @@ -14,7 +14,7 @@
- @@ -28,7 +28,7 @@
- + @@ -83,6 +83,7 @@ export default { data() { return { + tableLoading: false, tableData: [], metricOptions: [ { label: 'PM2.5', value: 'pm25' }, @@ -131,13 +132,15 @@ export default { } else if (that.time_bucket == 'hour') { exec_search = 'enp_edata_hour_nodrain'; } + that.tableLoading = true; that.$API.bi.dataset.exec.req(exec_search, { query: that.query, raise_exception: true }).then(res => { console.log(res.data2.ds0); this.tableData = res.data2.ds0; - }) + that.tableLoading = false; + }).catch(e=>{that.tableLoading = false;}) }, }, diff --git a/src/views/bigScreen/enpComponents/innerclean.vue b/src/views/bigScreen/enpComponents/innerclean.vue index 4cf13841..6bd199c1 100644 --- a/src/views/bigScreen/enpComponents/innerclean.vue +++ b/src/views/bigScreen/enpComponents/innerclean.vue @@ -53,7 +53,7 @@ export default { query: {}, params: { type: 30, tags: 'carwash' }, cateOptions: [ - { id: 'inner_car', name: '场内运输车辆' }, + { id: 'inner_car', name: '厂内运输车辆' }, { id: 'inner_car2', name: '非路道移动机械' }, ], apiObj: this.$API.em.equipment.list, diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue index 70dad411..4330aaac 100644 --- a/src/views/bigScreen/enpComponents/pollutant.vue +++ b/src/views/bigScreen/enpComponents/pollutant.vue @@ -28,56 +28,65 @@ row-key="id" :params="params" :query="query" @row-click="rowClick" @dataChange="updateCount"> - - - + + + + + - + + + + + + + - + - + - + + \ No newline at end of file From 9fba7a1330b93ee10cd35a246b4a57aa2b470172 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 15 Aug 2024 14:56:03 +0800 Subject: [PATCH 14/28] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87t?= =?UTF-8?q?ype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/em/equipment.vue | 2 +- src/views/em/equipment_form.vue | 10 +++++++++- src/views/em/equipmentjc.vue | 2 +- src/views/em/equipmentjk.vue | 2 +- src/views/em/equipmentjl.vue | 2 +- src/views/em/equipmentzl.vue | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue index 96d5d30d..f140eb4f 100644 --- a/src/views/em/equipment.vue +++ b/src/views/em/equipment.vue @@ -91,7 +91,7 @@ - diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue index 56a4e673..94f1d3fb 100644 --- a/src/views/em/equipment_form.vue +++ b/src/views/em/equipment_form.vue @@ -199,6 +199,13 @@ import { genTree } from "@/utils/verificate"; import { iMEnum } from "@/utils/enum"; export default { emits: ["success", "closed"], + props:{ + eqtype:{ + type:String, + default: '' + } + }, + }, data() { return { iMEnum, @@ -211,7 +218,7 @@ export default { show: "查看", }, form: { - type: 10 + type: 10, }, rules: { name: [{ required: true, message: "请输入", trigger: "blur" }], @@ -257,6 +264,7 @@ export default { this.getGroup(); this.getBaseInfo(); this.getCateOptions(); + this.form.type = this.eqtype; }, methods: { getCateOptions() { diff --git a/src/views/em/equipmentjc.vue b/src/views/em/equipmentjc.vue index 16369e08..f1f65989 100644 --- a/src/views/em/equipmentjc.vue +++ b/src/views/em/equipmentjc.vue @@ -91,7 +91,7 @@ - diff --git a/src/views/em/equipmentjk.vue b/src/views/em/equipmentjk.vue index 805a4d26..5c861c27 100644 --- a/src/views/em/equipmentjk.vue +++ b/src/views/em/equipmentjk.vue @@ -91,7 +91,7 @@ - diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue index 89af9e4d..eee230f0 100644 --- a/src/views/em/equipmentjl.vue +++ b/src/views/em/equipmentjl.vue @@ -138,7 +138,7 @@ - \ No newline at end of file + From ffbc69ebab0929afea3da28fb81c5b95cd282fc8 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 15 Aug 2024 16:43:10 +0800 Subject: [PATCH 21/28] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E5=92=8C=E6=A3=80=E5=AE=9A=E8=AE=B0=E5=BD=95=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/em/equipment.vue | 34 +++++++++++++++++++++++----------- src/views/em/equipmentjl.vue | 32 +++++++++++++++++--------------- src/views/wf/ticketdetail.vue | 2 +- 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue index 01c27bfe..f5760a78 100644 --- a/src/views/em/equipment.vue +++ b/src/views/em/equipment.vue @@ -75,7 +75,7 @@