From cd3437b03ca0d0912ea42f3697e42292e42c5221 Mon Sep 17 00:00:00 2001 From: limingyu Date: Sat, 30 Mar 2024 16:49:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=88=B1=E7=9A=84?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F=E5=90=8E=E5=8A=A0=E6=B0=94?= =?UTF-8?q?=E6=B3=A1=EF=BC=8C=E9=BC=A0=E6=A0=87=E6=94=BE=E4=B8=8A=E5=8E=BB?= =?UTF-8?q?=E5=90=8E=E6=98=BE=E7=A4=BA=E7=9B=B8=E5=BA=94=E7=9A=84=E6=96=87?= =?UTF-8?q?=E5=AD=97=E6=8F=8F=E8=BF=B0=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/bi/index.html | 124 ++++++++++++++++++++++++++++--------------- 1 file changed, 80 insertions(+), 44 deletions(-) diff --git a/static/bi/index.html b/static/bi/index.html index f4f6f37..f28ab90 100644 --- a/static/bi/index.html +++ b/static/bi/index.html @@ -403,31 +403,37 @@ 本日应检查 -
-
- 待检查 + +
+
+ 待检查 +
+
+ {{listCountDay.denominator-listCountDay.molecule}} +
-
- {{listCountDay.denominator-listCountDay.molecule}} + + +
+
+ 已检查 +
+
+ {{listCountDay.molecule}} +
-
-
-
- 已检查 + + +
+
+ 本日完成率 +
+
+ {{listCountDay.percentage}} + % +
-
- {{listCountDay.molecule}} -
-
-
-
- 本日完成率 -
-
- {{listCountDay.percentage}} - % -
-
+
@@ -438,31 +444,37 @@ 本周应检查
-
-
- 待检查 + +
+
+ 待检查 +
+
+ {{listCountWeek.denominator-listCountWeek.molecule}} +
-
- {{listCountWeek.denominator-listCountWeek.molecule}} + + +
+
+ 已检查 +
+
+ {{listCountWeek.molecule}} +
-
-
-
- 已检查 + + +
+
+ 本周完成率 +
+
+ {{listCountWeek.percentage}} + % +
-
- {{listCountWeek.molecule}} -
-
-
-
- 本周完成率 -
-
- {{listCountWeek.percentage}} - % -
-
+
@@ -473,6 +485,7 @@ 本旬应检查
+
待检查 @@ -481,6 +494,8 @@ {{listCountXun.denominator-listCountXun.molecule}}
+ +
已检查 @@ -489,6 +504,8 @@ {{listCountXun.molecule}}
+ +
本旬完成率 @@ -498,6 +515,7 @@ %
+
@@ -510,6 +528,7 @@ 本月应检查
+
待检查 @@ -518,6 +537,8 @@ {{listCountMonth.denominator-listCountMonth.molecule}}
+ +
已检查 @@ -526,6 +547,8 @@ {{listCountMonth.molecule}}
+ +
本月完成率 @@ -535,6 +558,7 @@ %
+
@@ -545,6 +569,7 @@ 本季应检查
+
待检查 @@ -553,6 +578,8 @@ {{listCountQuarter.denominator-listCountQuarter.molecule}}
+ +
已处理 @@ -561,6 +588,8 @@ {{listCountQuarter.molecule}}
+ +
本季完成率 @@ -570,6 +599,7 @@ %
+
@@ -580,6 +610,7 @@ 本年应检查
+
待检查 @@ -588,6 +619,8 @@ {{listCountYear.denominator-listCountYear.molecule}}
+ +
已检查 @@ -596,6 +629,8 @@ {{listCountYear.molecule}}
+ +
本年完成率 @@ -605,6 +640,7 @@ %
+ From 4d527d05226b1e2e534f170cca83e59b73e1be5a Mon Sep 17 00:00:00 2001 From: songwenxuan <1924103812@qq.com> Date: Mon, 1 Apr 2024 08:36:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=20Bug=20?= =?UTF-8?q?=E5=8D=8A=E6=9C=88=E6=94=BE=E5=9C=A8=E6=AF=8F=E6=9C=88=E4=B8=8A?= =?UTF-8?q?=E9=9D=A2=2014877=20=E8=A7=A3=E5=86=B3=E4=BA=86=20Bug=20?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=92=8C=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=A5=BD=E4=B9=8B=E5=90=8E=20=E5=88=A0=E9=99=A4=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=8F=B3=E4=BE=A7=E7=9A=84=E4=BA=BA=E5=91=98=E4=BC=9A?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=20=E5=BA=94=E8=AF=A5=E5=8F=AA=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=89=E5=88=A0=E9=99=A4=E7=9A=84=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E4=BA=BA=E5=91=98=2014878=20=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E4=BA=86=20Bug=20=E6=96=B0=E5=A2=9E=E6=8A=A5=E9=94=99?= =?UTF-8?q?=2014874?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/components/edit.vue | 32 ++++++++++++++++++- .../firefighting/region/components/edit.vue | 3 +- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/views/firefighting/checklist/components/edit.vue b/src/views/firefighting/checklist/components/edit.vue index 137f116..337fef5 100644 --- a/src/views/firefighting/checklist/components/edit.vue +++ b/src/views/firefighting/checklist/components/edit.vue @@ -1058,7 +1058,37 @@ export default { }, // 移除选中项时触发的事件 handleRemove(selectedItems) { - this.form.USER_ID = [] + console.log(this.form.USER_ID) + const currentUserId = this.form.USER_ID + requestFN( + '/user/listUserByCorp', + { + DEPARTMENT_ID: selectedItems.id + } + ).then((data) => { + const userList = data.userList + if (userList) { + for (let i = 0; i < userList.length; i++) { + for (let j = 0; j < this.form.USER_ID.length; j++) { + if (userList[i].USER_ID === this.form.USER_ID[j]) { + for (let k = 0; k < currentUserId.length; k++) { + if (this.form.USER_ID[j] === currentUserId[k]) { + console.log(this.form.USER_ID[j]) + currentUserId.splice(k, 1) + break + } + } + break + } + } + } + } + this.listLoading = false + // this.peopleList = data.userList + }).catch((e) => { + this.listLoading = false + }) + this.form.USER_ID = currentUserId // 移除选中项时同时移除全部子节点 if (this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.id)) { this.form.INVOLVING_CORPS_DEPART_ID.splice(this.form.INVOLVING_CORPS_DEPART_ID.indexOf(selectedItems.id), 1) diff --git a/src/views/firefighting/region/components/edit.vue b/src/views/firefighting/region/components/edit.vue index 2a2cb57..24c192a 100644 --- a/src/views/firefighting/region/components/edit.vue +++ b/src/views/firefighting/region/components/edit.vue @@ -104,7 +104,8 @@ export default { rules: { FIRE_REGION_NAME: [{ required: true, message: '消防区域不为空', trigger: 'blur' }], DEPARTMENT_ID: [{ required: true, message: '负责部门不为空', trigger: 'blur' }], - FIRE_REGION_CODE: [{ required: true, message: '区域编码不为空', trigger: 'blur' }] + FIRE_REGION_CODE: [{ required: true, message: '区域编码不为空', trigger: 'blur' }], + PHOTO_UPLOAD_METHOD: [{ required: true, message: '区域编码不为空', trigger: 'blur' }] }, formLabelWidth: '120px', OTHERLEVELID: '',