From 800fecc24038ddc3bde830ca2e55d72165c7de46 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 18 Apr 2024 14:48:08 +0800
Subject: [PATCH] 更新
---
pages/home/index.vue | 12 ++++++++----
subPackage/contradiction/edit.vue | 44 +++++++++++++++++++++++++-------------------
2 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index d7d2ade..c6d2167 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -824,10 +824,10 @@
//初始化
async init() {
this.selectRole = uni.getStorageSync("activeRole")
- this.getSiteList()
+ await this.getSiteList()
await this.getMenuList()
await this.getBanner();
- await this.getNoticeList()
+ this.getNoticeList()
// this.getTaskCount();
},
@@ -835,14 +835,18 @@
getBannerList({
current: 1,
size: 5,
- aoiCode: uni.getStorageSync("siteInfo").aoiCode
+ // aoiCode: uni.getStorageSync("siteInfo").aoiCode
+ aoiCode: this.curSelectSite.aoiCode
}).then(res => {
let data = res.data.records;
if (data.length) {
for (let i of data) {
i.url = `${minioBaseUrl}${i.url}`
}
- this.bannerList = data;
+ this.$nextTick(() => {
+ this.bannerList = data;
+ })
+
}
})
},
diff --git a/subPackage/contradiction/edit.vue b/subPackage/contradiction/edit.vue
index a5ad82b..a5c6dc5 100644
--- a/subPackage/contradiction/edit.vue
+++ b/subPackage/contradiction/edit.vue
@@ -90,22 +90,23 @@
<u-input v-model="info.alarmNum" border="none" type="number" placeholder="请输入报警次数"
placeholderClass="f-28 c-99" inputAlign="right"></u-input>
</u-form-item>
- <u-form-item label="信息来源" prop="source" borderBottom @click="showSourcePicker = true">
+ <u-form-item label="信息来源" prop="source" borderBottom @click="showSourcePicker = true" required>
<u-input v-model="sourceValue" border="none" placeholder="请选择信息来源" placeholderClass="f-28 c-99"
inputAlign="right" disabled disabledColor="#ffffff"></u-input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
- <u-form-item label="纠纷类型" prop="disputeType" borderBottom @click="showDisputeTypePicker = true">
+ <u-form-item label="纠纷类型" prop="disputeType" borderBottom @click="showDisputeTypePicker = true"
+ required>
<u-input v-model="disputeTypeValue" border="none" placeholder="请选择处理情况" placeholderClass="f-28 c-99"
inputAlign="right" disabled disabledColor="#ffffff"></u-input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
- <u-form-item label="纠纷内容" prop="disputeContent" borderBottom ref="disputeContent">
+ <u-form-item label="纠纷内容" prop="disputeContent" borderBottom ref="disputeContent" required>
<u-textarea v-model="info.disputeContent" border="none" placeholder="请输入纠纷内容"
placeholderClass="f-28 c-99" inputAlign="right"></u-textarea>
</u-form-item>
- <u-form-item label="是否有人员受伤:" labelWidth="100" prop="injuryFlag" borderBottom>
+ <u-form-item label="是否有人员受伤:" labelWidth="100" prop="injuryFlag" borderBottom required>
<u-radio-group v-model="info.injuryFlag">
<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in statusList" :key="index"
:label="item.name" :name="item.id">
@@ -116,7 +117,7 @@
<u-textarea v-model="info.injuryDesc" border="none" placeholder="请输入受伤情况"
placeholderClass="f-28 c-99" inputAlign="right"></u-textarea>
</u-form-item>
- <u-form-item label="处理情况" prop="handleResult" @click="showHandleResultPicker = true">
+ <u-form-item label="处理情况" prop="handleResult" @click="showHandleResultPicker = true" required>
<u-input v-model="handleResultValue" border="none" placeholder="请选择处理情况"
placeholderClass="f-28 c-99" inputAlign="right" disabled disabledColor="#ffffff"></u-input>
<u-icon slot="right" name="arrow-right"></u-icon>
@@ -260,7 +261,7 @@
}
],
'info.genderTwo': {
- type: 'string',
+ type: 'number',
required: true,
message: '请选择当事人2性别',
trigger: ['blur', 'change']
@@ -294,31 +295,36 @@
message: '请选择事发位置',
trigger: ['blur', 'change']
}],
- 'info.source': {
- type: 'string',
+ source: [{
+ type: 'number',
required: true,
message: '请选择信息来源',
trigger: ['blur', 'change']
- },
+ }],
alarmNum: [{
- type: 'string',
+ type: 'number',
required: true,
message: '请输入报警次数',
trigger: ['blur', 'change']
}],
- 'info.injuryFlag': {
+ disputeContent: [{
type: 'string',
required: true,
- message: '请选择是否有人员受伤',
+ message: '请输入纠纷内容',
trigger: ['blur', 'change']
- },
-
- // handleResult: [{
- // type: 'string',
- // required: false,
- // message: '请选择处置情况',
+ }],
+ // injuryFlag: [{
+ // type: 'number',
+ // required: true,
+ // message: '请选择是否有人员受伤',
// trigger: ['blur', 'change']
- // }]
+ // }],
+ handleResult: [{
+ type: 'number',
+ required: true,
+ message: '请选择处置情况',
+ trigger: ['blur', 'change']
+ }]
},
desc: "",
title: "",
--
Gitblit v1.9.3