From 0b2357a173a2bc52f3532bfcf93ff31daf226231 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 06 九月 2023 14:44:23 +0800
Subject: [PATCH] 导航栏退出登录
---
pages/tabBar/notice/measures.vue | 109 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 82 insertions(+), 27 deletions(-)
diff --git a/pages/tabBar/notice/measures.vue b/pages/tabBar/notice/measures.vue
index b83563c..7aee752 100644
--- a/pages/tabBar/notice/measures.vue
+++ b/pages/tabBar/notice/measures.vue
@@ -12,7 +12,7 @@
</view>
<view class="measureCard">
<view class="first">
- <text style="font-size: 16px;margin-bottom: 20px;">基础措施</text>
+ <text style="font-size: 16px;margin-bottom: 20px;"><text style="color: red;">*</text>基础措施</text>
<u-checkbox-group
v-model="checkboxValue1"
placement="column"
@@ -22,8 +22,8 @@
:customStyle="{marginBottom: '8px'}"
v-for="(item, index) in list"
:key="index"
- :label="item.name"
- :name="item.name"
+ :label="item.measure"
+ :name="item.id"
>
</u-checkbox>
</u-checkbox-group>
@@ -43,18 +43,23 @@
:maxCount="10"
style="margin-top: -10px;"
></u-upload>
- <view class="pic" v-for="item in nameList" :key="index">
- {{item.name}}
+ <view :class="{pic: nameList.length>0}">
+ <view class="picItem" v-for="(item,index) in nameList" :key="index">
+ <image src="../../../static/pic.png">
+ {{item.name}}
+ </view>
</view>
</view>
</view>
<view class="measures">
- <u-button class="measureBtn" type="success">提交</u-button>
+ <u-button class="measureBtn" type="primary" @click="submit">提交</u-button>
</view>
</view>
</template>
<script>
+ import { measureList, submitMeasures, getMeasureDetail } from '@/api/notice.js'
+ import VUE_APP_BASE_URL from '../../../common/constant.js'
export default {
components:{
@@ -64,34 +69,40 @@
statusBarHeight: [],
fileList1: [],
nameList: [],
- checkboxValue1: '',
+ checkboxValue1: [],
measures: "",
type: 'textarea',
border: true,
height: 100,
autoHeight: true,
- list: [
- {
- name: '苹果',
- disabled: false
- },
- {
- name: '香蕉',
- disabled: false
- },
- {
- name: '橙子',
- disabled: false
- }
- ]
+ detailData : {},
+ measureIds : [],
+ baseUrl: VUE_APP_BASE_URL,
+ list: [],
+ showBtn: false
}
},
- onLoad() {
+ onLoad(options) {
+ let test = options.data && JSON.parse(decodeURIComponent(options.data));
+ console.log("test",test)
+ this.detailData = test;
//获取手机状态栏高度
this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
uni.hideTabBar();
+ this.getMeasureList();
},
methods: {
+ getMeasureList() {
+ const param = {
+ pageIndex: 1,
+ pageSize: 10000,
+ }
+ measureList(param).then(res => {
+ if(res.code == 100){
+ this.list = res.data;
+ }
+ }).catch(err=>{})
+ },
goBack() {
uni.navigateBack({
url:'./detail/detail'
@@ -99,7 +110,37 @@
},
checkboxChange(n) {
- console.log('change', n);
+ let finalArr = this.list.filter(item => !(n.indexOf(item.id) < 0));
+ this.measureIds = finalArr.map((item) => {
+ return {id: item.id, baseMeasureContent: item.measure};
+ });
+ console.log('change', this.measureIds);
+ },
+ submit() {
+ if(this.measureIds.length <0) {
+ uni.showToast({
+ icon: "none",
+ title: '请勾选基础措施'
+ });
+ return;
+ }
+ const param = {
+ id: this.detailData.id,
+ baseMeasures: this.measureIds,
+ responseMeasure: this.measures
+ }
+ submitMeasures(param).then(res => {
+ if(res.code == 100){
+ uni.showToast({
+ icon: "none",
+ title: '提交成功'
+ });
+ this.goBack();
+ }else{
+ uni.$u.toast(res.msg)
+ }
+ })
+
},
// 删除图片
deletePic(event) {
@@ -136,11 +177,16 @@
uploadFilePromise(url) {
return new Promise((resolve, reject) => {
let a = uni.uploadFile({
- url: 'http://www.example.com', // 仅为示例，非真实的接口地址
+ url: VUE_APP_BASE_URL + '/attachment/uploadMeasureImage/key',
filePath: url,
name: 'file',
+ header: {
+ 'tk':uni.getStorageSync('tk'),
+ 'uid': uni.getStorageSync('uid')
+ },
formData: {
- user: 'test'
+ id: this.detailData.id,
+ module: 'naturalDisasterPath'
},
success: (res) => {
setTimeout(() => {
@@ -201,7 +247,7 @@
.second{
display: flex;
flex-direction: column;
- margin-top: 50px;
+ margin-top: 30px;
}
.third{
display: flex;
@@ -216,10 +262,19 @@
display: flex;
flex-direction: column;
background-color: rgb(242,242,242);
+ padding: 5px 8px;
+}
+.picItem{
+ font-weight: 500;
margin-top: 5px;
font-size: 14px;
+ display: flex;
+ image{
+ width: 20px;
+ height: 20px;
+ margin-right:3px;
+ }
}
-
.measures{
margin-top: 50px 12px 0;
padding: 0 12px;
--
Gitblit v1.9.2