From f0b16b601c64b76d08e74a579700afb0c675528e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 27 Feb 2024 15:20:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20rpj=5Fshow=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/rpm/rpj_show.vue | 221 ++++++++++++++++--------------------- 1 file changed, 97 insertions(+), 124 deletions(-) diff --git a/src/views/rpm/rpj_show.vue b/src/views/rpm/rpj_show.vue index 8159a60e..768d2f94 100644 --- a/src/views/rpm/rpj_show.vue +++ b/src/views/rpm/rpj_show.vue @@ -14,8 +14,7 @@ {{ form.belong_dept_name }} {{ form.rparty_name }} - 添加成员 @@ -49,7 +48,8 @@ @@ -61,15 +61,14 @@ @@ -100,13 +99,9 @@ - - + :bindEmployee="bindEmployee" @success="showBindBltSuccess" @closed="showBindBltClose"> + + @@ -119,75 +114,52 @@ - - - - - - - - - - - - - 是 - 否 - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + 是 + 否 + + + + + + + + + + + + + + + + + + + + + @@ -208,13 +180,14 @@ export default { }, data() { return { - leaveVisible:false, - workerVisible:false, + certificatesOptions: [], + leaveVisible: false, + workerVisible: false, loading: false, visible: false, isSaveing: false, showBindBlt: false, - btnloading:false, + btnloading: false, state_: { 10: "创建中", 20: "审批中", @@ -228,7 +201,7 @@ export default { 30: "保安保洁服务", 40: "其他", }, - formworker : { + formworker: { duty: "", rcertificates: [], rpj: "", @@ -238,14 +211,14 @@ export default { bindType: 10, bindBtl: null, bindEmployee: '', - logLists:[], + logLists: [], rpjFileList: [], memeberList: [], - remployeeoptions:[], - reason:"", - leaveId:"", - workDialogType:"add", - workDialogTitle:"添加项目成员" + remployeeoptions: [], + reason: "", + leaveId: "", + workDialogType: "add", + workDialogTitle: "添加项目成员" }; }, @@ -310,7 +283,7 @@ export default { }); }, //成员变动操作日志 - getLogs(){ + getLogs() { this.$API.rpm.rpj.logs.req({ rpj: this.form.id, page: 0 }).then((res) => { debugger; this.logLists = res; @@ -327,16 +300,16 @@ export default { this.$API.rpm.rcertificate.list .req({ remployee: this.formworker.remployee, page: 0 }) .then((res) => { - this.certificatesOptions = res; - }); + this.certificatesOptions = res; + }); }, - addWorker(type,row){ + addWorker(type, row) { let that = this; that.workDialogType = type; - if(type=='add'){ + if (type == 'add') { that.workDialogTitle = "添加项目成员"; that.getremployee(); - }else{ + } else { that.workDialogTitle = "项目成员编辑"; that.formworker = row; that.formworker.remployee_name = row.remployee_.name; @@ -346,32 +319,32 @@ export default { } that.workerVisible = true; }, - //提交作业成员信息 - submitWorker() { + //提交作业成员信息 + submitWorker() { let that = this; that.btnloading = true; that.formworker.rpj = that.form.id; - if(that.workDialogType=="add"){ + if (that.workDialogType == "add") { that.$refs.workerForm.validate(async (valid) => { that.$API.rpm.member.create - .req(that.formworker) - .then((res) => { - that.$message.success("项目成员添加成功"); - that.workerVisible = false; - that.btnloading = false; - that.getMemberList(); - }) - .catch((err) => { - this.btnloading = false; - return err; - }); + .req(that.formworker) + .then((res) => { + that.$message.success("项目成员添加成功"); + that.workerVisible = false; + that.btnloading = false; + that.getMemberList(); + }) + .catch((err) => { + this.btnloading = false; + return err; + }); }); - }else{ + } else { let formworker = {}; formworker.is_manager = that.formworker.is_manager; formworker.rcertificates = that.formworker.rcertificates; that.$API.rpm.member.update - .req(that.formworker.id,formworker) + .req(that.formworker.id, formworker) .then((res) => { that.$message.success("项目成员证书添加成功"); that.workerVisible = false; @@ -383,31 +356,31 @@ export default { return err; }); } - + }, - leaveDialog(row){ + leaveDialog(row) { // debugger; this.leaveVisible = true; - this.leaveId=row.id; + this.leaveId = row.id; console.log(this.leaveId) }, - preLeave(){ + preLeave() { // debugger; this.btnloading = true; - if(this.reason!=''){ - this.$API.rpm.member.leave.req(this.leaveId,{reason:this.reason}).then(res=>{ + if (this.reason != '') { + this.$API.rpm.member.leave.req(this.leaveId, { reason: this.reason }).then(res => { this.leaveVisible = false; this.btnloading = false; this.getMemberList(); this.getLogs(); - }).catch(e=>{ + }).catch(e => { this.btnloading = false; }) - }else{ + } else { this.btnloading = false; this.$message.error("请填写离厂原因"); } - + }, }, }; From 7eff5872f6a8756829c4b6ae5ff4fa975df29860 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 27 Feb 2024 16:04:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=99=BA=E8=83=BD=E6=B2=BB=E7=90=86?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigScreen/enpComponents/smarg_trans.vue | 68 ++++++++++++++----- .../enpComponents/smartg_carwash.vue | 32 ++++++--- .../bigScreen/enpComponents/smartg_prod.vue | 68 ++++++++++++++----- 3 files changed, 126 insertions(+), 42 deletions(-) diff --git a/src/views/bigScreen/enpComponents/smarg_trans.vue b/src/views/bigScreen/enpComponents/smarg_trans.vue index be77b469..c80385f0 100644 --- a/src/views/bigScreen/enpComponents/smarg_trans.vue +++ b/src/views/bigScreen/enpComponents/smarg_trans.vue @@ -2,9 +2,9 @@
- - - 查询 + + +
@@ -32,27 +32,47 @@
- - - - + + + + + - + - - + - - @@ -62,7 +82,20 @@ export default { data() { return { apiObj: null, - params: {} + params: { type: 20, has_equipdata: 'yes', cate: 'mtrans' }, + query: {}, + mgroupOptions: [] + } + }, + mounted() { + this.apiObj = this.$API.enp.drain.list + this.getMgroup() + }, + methods: { + getMgroup() { + this.$API.mtm.mgroup.list.req({ page: 0 }).then(res => { + this.mgroupOptions = res + }) } } } @@ -111,4 +144,5 @@ export default { .grayb { background: #cbcbcb -} \ No newline at end of file +} + \ No newline at end of file diff --git a/src/views/bigScreen/enpComponents/smartg_carwash.vue b/src/views/bigScreen/enpComponents/smartg_carwash.vue index edbcbaea..85b3086f 100644 --- a/src/views/bigScreen/enpComponents/smartg_carwash.vue +++ b/src/views/bigScreen/enpComponents/smartg_carwash.vue @@ -6,15 +6,21 @@
洗车行为统计
+
+ + + +
- + + - - - + + @@ -48,9 +54,6 @@ - - xx - @@ -66,10 +69,23 @@ export default { params: {}, apiObj2: null, params2: {}, + stationOptions: [], + query: {} } }, mounted() { this.apiObj = this.$API.enp.carwash; + this.getStations(); + }, + methods: { + getStations() { + this.$API.em.equipment.list.req({ cate__code: 'wstation', page: 0 }).then(res => { + this.stationOptions = res; + }) + }, + handleQuery() { + this.$refs.table.queryData(this.query); + }, } } \ No newline at end of file diff --git a/src/views/bigScreen/enpComponents/smartg_prod.vue b/src/views/bigScreen/enpComponents/smartg_prod.vue index be77b469..c0207c2f 100644 --- a/src/views/bigScreen/enpComponents/smartg_prod.vue +++ b/src/views/bigScreen/enpComponents/smartg_prod.vue @@ -2,9 +2,9 @@
- - - 查询 + + +
@@ -32,27 +32,47 @@
- - - - + + + + + - + - - + - - @@ -62,7 +82,20 @@ export default { data() { return { apiObj: null, - params: {} + params: { type: 20, has_equipdata: 'yes', cate: 'product' }, + query: {}, + mgroupOptions: [] + } + }, + mounted() { + this.apiObj = this.$API.enp.drain.list + this.getMgroup() + }, + methods: { + getMgroup() { + this.$API.mtm.mgroup.list.req({ page: 0 }).then(res => { + this.mgroupOptions = res + }) } } } @@ -111,4 +144,5 @@ export default { .grayb { background: #cbcbcb -} \ No newline at end of file +} + \ No newline at end of file From b5c55075649735167123db469e9558bcb53628b0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 27 Feb 2024 18:21:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=A4=9A=E9=A1=B5=E9=9D=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigScreen/enpComponents/envirmonitor.vue | 10 ++-- src/views/bigScreen/enpComponents/eqments.vue | 10 ++-- .../bigScreen/enpComponents/innerclean.vue | 19 ++++---- .../bigScreen/enpComponents/orgwryList.vue | 22 +++++---- .../bigScreen/enpComponents/pollutant.vue | 12 ++++- .../bigScreen/enpComponents/transport.vue | 46 +++++++++++++------ 6 files changed, 76 insertions(+), 43 deletions(-) diff --git a/src/views/bigScreen/enpComponents/envirmonitor.vue b/src/views/bigScreen/enpComponents/envirmonitor.vue index 6cebf209..46e4df9f 100644 --- a/src/views/bigScreen/enpComponents/envirmonitor.vue +++ b/src/views/bigScreen/enpComponents/envirmonitor.vue @@ -23,17 +23,17 @@ - 查询 +
- + - - - + + + diff --git a/src/views/bigScreen/enpComponents/eqments.vue b/src/views/bigScreen/enpComponents/eqments.vue index 7afd346c..18c1435a 100644 --- a/src/views/bigScreen/enpComponents/eqments.vue +++ b/src/views/bigScreen/enpComponents/eqments.vue @@ -36,13 +36,13 @@ - 查询 +
- + @@ -50,9 +50,9 @@ {{ type_[scope.row.type] }} - - - + + + diff --git a/src/views/bigScreen/enpComponents/innerclean.vue b/src/views/bigScreen/enpComponents/innerclean.vue index 95567dde..7363d914 100644 --- a/src/views/bigScreen/enpComponents/innerclean.vue +++ b/src/views/bigScreen/enpComponents/innerclean.vue @@ -5,19 +5,16 @@ 厂内清洁
-
- 切换地图 - - - -
+ 返回地图
- 车辆总数：0 +
+ 车辆总数：{{ count }} +
@@ -26,7 +23,7 @@ - 查询 +
@@ -52,6 +49,7 @@ export default { data() { return { + count: 0, query: {}, params: { type: 30, tags: 'carwash' }, cateOptions: [ @@ -67,7 +65,10 @@ export default { methods: { handleQuery() { this.$refs.table.queryData(this.query); - } + }, + backtoMap() { + this.$emit('close') + }, } } \ No newline at end of file diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue index 510302ab..f6e3e5c1 100644 --- a/src/views/bigScreen/enpComponents/orgwryList.vue +++ b/src/views/bigScreen/enpComponents/orgwryList.vue @@ -22,19 +22,20 @@
- + - - 查询 + 查询 -->
- - + + @@ -239,9 +240,11 @@ export default { count: 0, apiObj: this.$API.enp.drain.list, params: { type: 10 }, - options: [], + options: [ + { value: '10', label: '主要排放口' }, + { value: '20', label: '次要排放口' } + ], query: { - area: '', search: '' }, searchInputStyle: { @@ -309,6 +312,9 @@ export default { } }, methods: { + handleQuery() { + this.$refs.table.queryData(this.query); + }, updateCount(res, tableData) { this.count = res.count }, diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue index a2aad2d8..ba5ca705 100644 --- a/src/views/bigScreen/enpComponents/pollutant.vue +++ b/src/views/bigScreen/enpComponents/pollutant.vue @@ -9,6 +9,11 @@
+
+ 全厂污染源：{{ count }} +
+
+
@@ -17,7 +22,8 @@ + row-key="id" :params="params" :query="query" @row-click="rowClick" + @dataChange="updateCount"> @@ -215,6 +221,7 @@ import * as echarts from "echarts"; export default { data() { return { + count: 0, eqs: {}, eqc: {}, eqz: {}, @@ -277,6 +284,9 @@ export default { } }, methods: { + updateCount(res, tableData) { + this.count = res.count + }, initTimeNow() { var now = new Date(); let year = now.getFullYear(); // 年份 diff --git a/src/views/bigScreen/enpComponents/transport.vue b/src/views/bigScreen/enpComponents/transport.vue index 1d95316d..b55723db 100644 --- a/src/views/bigScreen/enpComponents/transport.vue +++ b/src/views/bigScreen/enpComponents/transport.vue @@ -5,38 +5,40 @@ 进出厂记录
-
+ + 返回地图
- 车辆总数：0 +
+ 车辆进出次数：{{ count }} +
- - - + + - - 查询 + +
- + @@ -59,12 +61,13 @@ export default { data() { return { query: {}, + count: 0, + timeRange: [], cateOptions: [ { id: 1, name: '货车' }, { id: 2, name: '罐车' }, ], typeOptions: [ - { id: '', name: '全部' }, { id: 1, name: '进厂' }, { id: 2, name: '出厂' } ], @@ -79,15 +82,28 @@ export default { }, timeOptions: ['日', '月', '年'], apiObj: this.$API.enp.vehicle_access, - params: { type: 2 }, + params: {}, } }, methods: { + updateCount(res, tableData) { + this.count = res.count + }, handleQuery() { + if (this.timeRange) { + this.query.access_time__gte = this.timeRange[0] + this.query.access_time__lte = this.timeRange[1] + } else { + this.query.access_time__gte = null + this.query.access_time__lte = null + } this.$refs.table.queryData(this.query); }, timeHandleQuery() { }, carHandleQuery() { }, + backtoMap() { + this.$emit('close') + }, } } \ No newline at end of file