From 80c529bdd02da9627bf0b4f5fb6660173450a0bc Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 27 Apr 2024 13:51:43 +0800
Subject: [PATCH] 校园安全

---
 subPackage/school/trouble.vue          |    2 ++
 subPackage/school/clockIn.vue          |    5 +++--
 subPackage/school/troubleAuditList.vue |    3 ++-
 subPackage/task/index.vue              |    4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/subPackage/school/clockIn.vue b/subPackage/school/clockIn.vue
index b98a779..16c077d 100644
--- a/subPackage/school/clockIn.vue
+++ b/subPackage/school/clockIn.vue
@@ -29,11 +29,11 @@
 					<u-input v-model="info.phone" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
 						inputAlign="right"></u-input>
 				</u-form-item>
-				<u-form-item label="学生姓名" prop="realName" borderBottom ref="realName" v-if="info.type != 2">
+				<u-form-item label="学生姓名" prop="realName" borderBottom ref="realName" v-if="info.type == 2">
 					<u-input v-model="info.realName" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
 						inputAlign="right"></u-input>
 				</u-form-item>
-				<u-form-item label="学生班级" prop="gradeAndClass" borderBottom ref="gradeAndClass" v-if="info.type != 2">
+				<u-form-item label="学生班级" prop="gradeAndClass" borderBottom ref="gradeAndClass" v-if="info.type == 2">
 					<u-input v-model="info.gradeAndClass" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
 						inputAlign="right"></u-input>
 				</u-form-item>
@@ -170,6 +170,7 @@
 				this.info.type = 1;
 			} else {
 				this.info.houseCode = uni.getStorageSync("siteInfo").houseCode;
+				this.info.placeName = uni.getStorageSync("siteInfo").name;
 			}
 
 		},
diff --git a/subPackage/school/trouble.vue b/subPackage/school/trouble.vue
index 96dad5f..06e6494 100644
--- a/subPackage/school/trouble.vue
+++ b/subPackage/school/trouble.vue
@@ -136,6 +136,8 @@
 					this.info.houseCode = uni.getStorageSync("siteInfo").houseCode;
 					if (uni.getStorageSync("activeRole").roleAlias == "xyty") {
 						this.$set(this.info, "confirmFlag", 4)
+					} else {
+						this.$set(this.info, "isReporting", 1)
 					}
 					addTroubleReport(this.info).then(res => {
 						this.$showTips("提交成功", "success")
diff --git a/subPackage/school/troubleAuditList.vue b/subPackage/school/troubleAuditList.vue
index 595a0be..660c62c 100644
--- a/subPackage/school/troubleAuditList.vue
+++ b/subPackage/school/troubleAuditList.vue
@@ -147,7 +147,8 @@
 				const params = {
 					name: this.keyWord,
 					confirmFlag: this.tabStatus,
-					type: this.type
+					type: this.type,
+					isReporting: 1
 				}
 				if (this.selectDate.length) {
 					params.startTime = this.selectDate[0],
diff --git a/subPackage/task/index.vue b/subPackage/task/index.vue
index 35d4e54..8e20fda 100644
--- a/subPackage/task/index.vue
+++ b/subPackage/task/index.vue
@@ -236,11 +236,11 @@
 							} else if (i.name.trim() == "无诈申请") {
 								i.count = data.wztj;
 							} else if (i.name.trim() == "校园安全隐患排查") {
-								i.count = data.xyaqyhpc;
+								i.count = data.xyyh;
 							} else if (i.name.trim() == "校园纠纷矛盾") {
 								i.count = data.xyjfmd;
 							} else if (i.name.trim() == "校园安保检查") {
-								i.count = data.xyyh;
+								i.count = data.xyaqyhpc;
 							} else {
 								i.count = data.qbhs;
 							}

--
Gitblit v1.9.3