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/detail.vue | 103 +++++++++++++++++++++++++++++++++------------------
1 files changed, 66 insertions(+), 37 deletions(-)
diff --git a/pages/tabBar/notice/detail.vue b/pages/tabBar/notice/detail.vue
index bb956c7..434a482 100644
--- a/pages/tabBar/notice/detail.vue
+++ b/pages/tabBar/notice/detail.vue
@@ -1,5 +1,5 @@
<template>
- <view>
+ <view style="display: flex;flex-direction: column;height: 100%;">
<!-- 自定义导航栏 -->
<view class="navBarBox">
<!-- 状态栏占位 -->
@@ -7,23 +7,28 @@
<!-- 真正的导航栏内容 -->
<view style="display: flex; flex-direction: column;">
<view class="navBar">
- <u-icon name="arrow-left" color="black" size="17" @click="goBack" />
+ <u-icon name="arrow-left" color="black" size="17" style="margin-left: 8px;" @click="goBack" />
<view class="barText">信息详情</view>
+<!-- <view >
+ <u-button type="text" @click="loginOut" style="color: blue;margin-right: 5px;">退出</u-button>
+ </view> -->
</view>
</view>
</view>
<!-- 页面内容 -->
- <view class="detailCard">
+ <view class="detailCard" >
<text style="font-size: 18px;"><b>标题：</b>{{detailData.title}}</text>
- <text class="textTop"><b>类别：</b>{{detailData.disaster}}</text>
- <view style="display: flex;align-items: center;" class="textTop">
- <text><b>级别：</b></text>
- <u-tag
- :color="detailData.warningLevel === 3 ? 'rgb(255, 244, 88)' :detailData.warningLevel === 2 ? 'orange':detailData.warningLevel === 1 ?'red':'blue'"
- :text="detailData.warningLevel === 3 ? '黄色' : detailData.warningLevel === 2 ? '橙色': detailData.warningLevel === 1 ?'红色':'蓝色'"
- :bg-color="detailData.warningLevel === 3 ? 'rgb(254, 255, 230)' :detailData.warningLevel === 2 ? 'rgb(255, 210, 179)':detailData.warningLevel === 1 ?'rgb(255, 128, 128)':'rgb(121, 150, 255)'"
- border-color="white">
- </u-tag>
+ <view class="levelDisaster">
+ <text class="textTop"><b>类别：</b>{{detailData.disaster}}</text>
+ <view style="display: flex;align-items: center;margin-left: 10%" class="textTop">
+ <text><b>级别：</b></text>
+ <u-tag
+ :color="detailData.warningLevel === 3 ? 'rgb(211, 211, 0)' :detailData.warningLevel === 2 ? 'orange':detailData.warningLevel === 1 ?'red':'blue'"
+ :text="detailData.warningLevel === 3 ? '黄色' : detailData.warningLevel === 2 ? '橙色': detailData.warningLevel === 1 ?'红色':'蓝色'"
+ :bg-color="detailData.warningLevel === 3 ? 'rgb(254, 255, 230)' :detailData.warningLevel === 2 ? 'rgb(255, 210, 179)':detailData.warningLevel === 1 ?'rgb(255, 128, 128)':'rgb(121, 150, 255)'"
+ border-color="white">
+ </u-tag>
+ </view>
</view>
<text class="textTop" v-if="detailData.forwardPath" style="display: flex;"><b>发布单位：</b>
<text v-for="(item,index) in detailData.forwardPath">
@@ -35,9 +40,9 @@
</text>
<text class="textTop" v-else><b>发布单位：</b>{{detailData.publishingUnit}}</text>
<text class="textTop"><b>短信内容：</b><i style="background-color: rgb(240, 248, 255);">{{detailData.content}}发布单位：{{detailData.publishingUnit}}</i></text>
- <view :style="{ height: directViewUrl ? '360px' : '' }" style="margin-top: 20px;">
+ <view :style="{ height: directViewUrl ? '560px' : '' }" style="margin-top: 20px;">
<text class="textTop" style="width: 76px;" ><b>附件内容：</b></text>
- <view style="width: 100%; height: 350px;" v-if="directViewUrl">
+ <view style="width: 100%; height: 550px;" v-if="directViewUrl">
<iframe :src="directViewUrl" class="frameStyle"></iframe>
</view>
<!-- <view class="attache" v-if="isAllImg == 'no'">
@@ -62,7 +67,7 @@
</view>
</view> -->
</view>
- <text class="textTop" v-if="detailData.role == 'leader'"><b>信息提交人：</b>{{detailData.infoSubmitterRealName}}</text>
+ <text class="textTop" style="margin-top: 30px;" v-if="detailData.role == 'leader'"><b>信息提交人：</b>{{detailData.infoSubmitterRealName}}</text>
<view class="textTop" v-if="detailData.role == 'leader'">
<text ><b>审核状态：</b></text>
<text v-if="detailData.reviewStatus == 1" class="responseStatus"
@@ -109,7 +114,7 @@
<!-- //村级显示 -->
</view>
<view class="measures" v-if="unitType == 4">
- <u-button class="resBtn" type="primary" @click="goMeasures" v-if="role == '工作人员'">响应措施反馈</u-button>
+ <u-button class="resBtn" type="primary" @click="goMeasures" v-if="role == '工作人员'">{{cityMessage}}</u-button>
</view>
</view>
</template>
@@ -143,7 +148,9 @@
},
role: '',
unitType: '',
- directViewUrl: ''
+ directViewUrl: '',
+ cityMessage: '响应措施反馈',
+ measureData: {}
}
},
onLoad:function(options){
@@ -153,6 +160,7 @@
let test = options.data && JSON.parse(decodeURIComponent(options.data));
this.detailData = test;
this.directViewUrl = this.detailData.directViewUrl;
+ // this.directViewUrl = 'https://huaban.com/'
this.unitType = uni.getStorageSync('unittype');
if(this.detailData.role == 'leader' || this.detailData.role == 'infoPeople' ) {
this.detailData.attachments = this.detailData.attachment;
@@ -180,6 +188,10 @@
console.log("this.isAllImg",this.isAllImg)
console.log("detailData",this.detailData)
this.detailData.disaster = test.disasterType == 1 ? '地震': test.disasterType == 2 ? '洪涝' : test.disasterType == 3 ? '气象' : test.disasterType == 4 ? '地质灾害': test.disasterType == 5 ? '水旱': '森林草原火灾';
+ if(this.unitType == 4 && this.role == '工作人员'){
+ this.getMeasures();
+ }
+
},
methods: {
goBack() {
@@ -187,24 +199,37 @@
url:'./notice/notice'
});
},
- goMeasures() {
+ loginOut() {
+ uni.clearStorageSync();
+ uni.clearStorage();
+ uni.navigateTo({
+ url: '/pages/index/index'
+ })
+ },
+ getMeasures(){
getMeasureDetail({id: this.detailData.id}).then(res => {
if(res.code == 100){
if(res.data.baseMeasures && res.data.baseMeasures.length>0 ){
- console.log('111111')
- uni.navigateTo({
- url: `/pages/tabBar/responsivity/showMeasures?data=` + encodeURIComponent(JSON.stringify(res.data))
- })
+ this.cityMessage = '查看措施反馈';
+ this.measureData = res.data;
}else {
- uni.navigateTo({
- url: `/pages/tabBar/notice/measures?data=` + encodeURIComponent(JSON.stringify(this.detailData))
- })
+ this.cityMessage = '响应措施反馈';
}
- }
+ }else{
+ uni.$u.toast(res.msg)
+ }
})
-
-
-
+ },
+ goMeasures() {
+ if(this.cityMessage == '查看措施反馈' ){
+ uni.navigateTo({
+ url: `/pages/tabBar/responsivity/showMeasures?data=` + encodeURIComponent(JSON.stringify(this.measureData))
+ })
+ }else {
+ uni.navigateTo({
+ url: `/pages/tabBar/notice/measures?data=` + encodeURIComponent(JSON.stringify(this.detailData))
+ })
+ }
},
//审核通过
approved() {
@@ -303,11 +328,12 @@
height: 50px;
display: flex;
flex-direction: row;
- justify-content: center;
+ justify-content: space-around;
align-items: center;
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
}
.barText{
+ flex: 1;
/* margin-left: 20px; */
text-align: center;
width: 85%;
@@ -348,6 +374,7 @@
margin-left: 15px;
}
.detailCard{
+ flex-grow: 1;
display: flex;
flex-direction: column;
background: #fff;
@@ -364,19 +391,21 @@
width: 100%;
}
.measures{
- margin-top: 50px 12px 0;
+ display: flex;
+ justify-content: flex-end;
padding: 0 12px;
-
- .resBtn{
- border-radius: 5px;
- box-shadow: 0 3px 12px rgba(33,148,239,0.4);
- }
+ margin-bottom: 20px ;
+
}
.frameStyle{
width: 100%;
- height: 350px;
+ height: 550px;
border: 1px solid #dddddc;
margin-top: 5px;
}
+.levelDisaster{
+ display: flex;
+ align-items: center;
+}
</style>
--
Gitblit v1.9.2