From cb4fd10ca1a71b908c8b52eba962b3aa39008d1f Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 16 May 2024 15:28:01 +0800
Subject: [PATCH] 校园安全优化
---
subPackage/school/troubleList.vue | 17 ++++++++
pages/home/index.vue | 3 +
subPackage/school/trouble.vue | 36 +++++++++--------
subPackage/school/troubleAuditList.vue | 17 ++++++++
subPackage/school/troubleTaskList.vue | 21 ++++++++--
5 files changed, 72 insertions(+), 22 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 530a2dc..5ba309f 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -263,7 +263,8 @@
</view>
</u-grid-item>
- <u-grid-item @click="navigatorPage('/subPackage/school/securityRecord')">
+ <u-grid-item v-if="roleName == 'mj'"
+ @click="navigatorPage('/subPackage/school/securityRecord')">
<view class="nav-item flex f-d-c a-i-c">
<u-icon name="/static/icon/nav-29.png" width="80rpx" height="80rpx"></u-icon>
<text class="nav-item-text f-26 mt-10">校园安保检查</text>
diff --git a/subPackage/school/trouble.vue b/subPackage/school/trouble.vue
index 344face..e216492 100644
--- a/subPackage/school/trouble.vue
+++ b/subPackage/school/trouble.vue
@@ -85,30 +85,32 @@
},
onLoad(option) {
if (option.type) {
+ uni.setStorageSync("troubleType", option.type)
this.info.type = option.type
- if (option.type == 1) {
- uni.setNavigationBarTitle({
- title: '安全隐患' // 设置为你想要显示的标题
- });
+ }
+ if (uni.getStorageSync('troubleType')) {
+ this.info.type = uni.getStorageSync('troubleType')
+ }
+ if (this.info.type == 1) {
+ uni.setNavigationBarTitle({
+ title: '安全隐患' // 设置为你想要显示的标题
+ });
- } else {
- uni.setNavigationBarTitle({
- title: '纠纷矛盾排查' // 设置为你想要显示的标题
- });
- }
-
+ } else {
+ uni.setNavigationBarTitle({
+ title: '纠纷矛盾排查' // 设置为你想要显示的标题
+ });
}
this.getAllBizDict()
},
- // onShow() {
- // this.curSelectSite = uni.getStorageSync('siteInfo')
- // this.info.addressCode = this.curSelectSite.houseCode
- // },
+ onShow() {
+ if (uni.getStorageSync('troubleType')) {
+ this.info.type = uni.getStorageSync('troubleType')
+ }
+ // this.info.addressCode = this.curSelectSite.houseCode
+ },
methods: {
-
async getAllBizDict() {
-
-
await this.getBizDict('hiddenDangerType', this.troubleTypeList);
},
diff --git a/subPackage/school/troubleAuditList.vue b/subPackage/school/troubleAuditList.vue
index 8891c6e..b993ccb 100644
--- a/subPackage/school/troubleAuditList.vue
+++ b/subPackage/school/troubleAuditList.vue
@@ -33,6 +33,10 @@
<text class="f-28">法人信息</text>
<text class="f-28 c-66">{{ item.legalPerson ? item.legalPerson : '未完善'}}</text>
</view> -->
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">描述</text>
+ <text class="f-28 c-66 remarkText">{{item.remark}}</text>
+ </view>
<view class="item-row flex a-i-c j-c-s-b f-28">
<text>时间</text>
<text class="c-66">{{item.createTime}}</text>
@@ -287,6 +291,19 @@
width: 65%;
text-align: right;
}
+
+ .remarkText {
+ width: 200px;
+ /* 定义容器宽度 */
+ white-space: nowrap;
+ /* 确保文本在一行内显示 */
+ overflow: hidden;
+ /* 隐藏超出容器的文本 */
+ text-overflow: ellipsis;
+ /* 使用点点表示文本的溢出 */
+ text-align: right;
+ /* 文本居中对齐 */
+ }
}
}
</style>
\ No newline at end of file
diff --git a/subPackage/school/troubleList.vue b/subPackage/school/troubleList.vue
index 57ac46d..43aa056 100644
--- a/subPackage/school/troubleList.vue
+++ b/subPackage/school/troubleList.vue
@@ -12,6 +12,10 @@
<u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
</view>
<view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">描述</text>
+ <text class="f-28 c-66 remarkText">{{i.remark}}</text>
+ </view>
+ <view class="item-row flex a-i-c j-c-s-b">
<text class="f-28">时间</text>
<text class="f-28 c-66">{{i.createTime}}</text>
</view>
@@ -106,6 +110,19 @@
.address {
width: 65%;
}
+
+ .remarkText {
+ width: 200px;
+ /* 定义容器宽度 */
+ white-space: nowrap;
+ /* 确保文本在一行内显示 */
+ overflow: hidden;
+ /* 隐藏超出容器的文本 */
+ text-overflow: ellipsis;
+ /* 使用点点表示文本的溢出 */
+ text-align: right;
+ /* 文本居中对齐 */
+ }
}
}
</style>
\ No newline at end of file
diff --git a/subPackage/school/troubleTaskList.vue b/subPackage/school/troubleTaskList.vue
index 475ab71..30ba05b 100644
--- a/subPackage/school/troubleTaskList.vue
+++ b/subPackage/school/troubleTaskList.vue
@@ -29,10 +29,10 @@
:type="findObjValue(item.confirmFlag, tabList).type" plain plainFill></u-tag>
<!-- <u-tag text="审核拒绝" type="error" plain plainFill></u-tag> -->
</view>
- <!-- <view class="item-row flex a-i-c j-c-s-b">
- <text class="f-28">法人信息</text>
- <text class="f-28 c-66">{{ item.legalPerson ? item.legalPerson : '未完善'}}</text>
- </view> -->
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">描述</text>
+ <text class="f-28 c-66 remarkText">{{item.remark}}</text>
+ </view>
<view class="item-row flex a-i-c j-c-s-b f-28">
<text>时间</text>
<text class="c-66">{{item.createTime}}</text>
@@ -273,6 +273,19 @@
width: 65%;
text-align: right;
}
+
+ .remarkText {
+ width: 200px;
+ /* 定义容器宽度 */
+ white-space: nowrap;
+ /* 确保文本在一行内显示 */
+ overflow: hidden;
+ /* 隐藏超出容器的文本 */
+ text-overflow: ellipsis;
+ /* 使用点点表示文本的溢出 */
+ text-align: right;
+ /* 文本居中对齐 */
+ }
}
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3