From b7d59880975d3aa75760e764c20c2c4217039c78 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期五, 04 八月 2023 09:17:25 +0800
Subject: [PATCH] 叫应率修改
---
pages/tabBar/notice/detail.vue | 71 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/pages/tabBar/notice/detail.vue b/pages/tabBar/notice/detail.vue
index 28aee18..88939ec 100644
--- a/pages/tabBar/notice/detail.vue
+++ b/pages/tabBar/notice/detail.vue
@@ -35,9 +35,12 @@
</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="display: flex;">
+ <view :style="{ height: directViewUrl ? '360px' : '' }" style="margin-top: 20px;">
<text class="textTop" style="width: 76px;" ><b>附件内容：</b></text>
- <view class="attache" v-if="isAllImg == 'no'">
+ <view style="width: 100%; height: 350px;" v-if="directViewUrl">
+ <iframe :src="directViewUrl" class="frameStyle"></iframe>
+ </view>
+<!-- <view class="attache" v-if="isAllImg == 'no'">
<view v-for="(item, index) in detailData.attachments" :key="index" >
<view style="display: flex;margin-top: 10px;" v-if="item.suffix == 'jpg'|| item.suffix =='jpeg' || item.suffix =='png'">
<image @click="previewSqs(item,index)" :src="item.attachment" style="width: 100rpx; height: 100rpx;margin-left: 5rpx;border: 3px solid #ccc;margin-right: 3px;"></image>
@@ -57,12 +60,7 @@
<u-icon name="attach" color="#2979ff" size="20"></u-icon> {{item.attachementName}}
</view>
</view>
- </view>
-
-<!-- <view style="width: 100%; height: 100px;">
- <iframe :src="" width="100%" height="100%"> </iframe>
</view> -->
-
</view>
<text class="textTop" v-if="detailData.role == 'leader'"><b>信息提交人：</b>{{detailData.infoSubmitterRealName}}</text>
<view class="textTop" v-if="detailData.role == 'leader'">
@@ -83,7 +81,7 @@
<text v-else class="responseStatus"
style='color: rgb(153, 148, 143);'>已驳回</text>
</view>
- <view class="textTop" v-else>
+<!-- <view class="textTop" v-else>
<text ><b>响应状态：</b></text>
<text v-if="detailData.responseStatus == 1" class="responseStatus"
style='background-color:rgb(247, 108, 125);color: white;'>待叫应</text>
@@ -91,7 +89,7 @@
style='background-color:limegreen'>已叫应</text>
<text v-else class="responseStatus"
style='background-color:rgb(247, 108, 125); color: white;'>超时未叫应</text>
- </view>
+ </view> -->
<view v-if="detailData.role == 'leader' && detailData.reviewStatus == 1" class="btn">
<u-button
style="background-color:rgb(6, 202, 23);color: white;width: 180px;"
@@ -111,7 +109,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>
@@ -144,7 +142,10 @@
reviewStatus: null
},
role: '',
- unitType: ''
+ unitType: '',
+ directViewUrl: '',
+ cityMessage: '响应措施反馈',
+ measureData: {}
}
},
onLoad:function(options){
@@ -153,18 +154,8 @@
this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
let test = options.data && JSON.parse(decodeURIComponent(options.data));
this.detailData = test;
- // if(this.detailData.forwardPath){
- // this.detailData.publishingUnit = this.detailData.forwardPath.map((item,index) => {
- // if(index == this.detailData.forwardPath.length){
- // return item
- // }else {
- // return item + '>'
- // }
-
- // })
- // }
+ this.directViewUrl = this.detailData.directViewUrl;
this.unitType = uni.getStorageSync('unittype');
- console.log("this.unitType",this.unitType);
if(this.detailData.role == 'leader' || this.detailData.role == 'infoPeople' ) {
this.detailData.attachments = this.detailData.attachment;
if (this.detailData.attachments){
@@ -190,7 +181,8 @@
}
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 ? '水旱': '森林草原火灾';
+ this.detailData.disaster = test.disasterType == 1 ? '地震': test.disasterType == 2 ? '洪涝' : test.disasterType == 3 ? '气象' : test.disasterType == 4 ? '地质灾害': test.disasterType == 5 ? '水旱': '森林草原火灾';
+ this.getMeasures();
},
methods: {
goBack() {
@@ -198,24 +190,29 @@
url:'./notice/notice'
});
},
- goMeasures() {
+ getMeasures(){
getMeasureDetail({id: this.detailData.id}).then(res => {
if(res.code == 100){
- if(res.data.id){
+ 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 = '响应措施反馈';
}
}
})
-
-
-
+ },
+ 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() {
@@ -383,5 +380,11 @@
box-shadow: 0 3px 12px rgba(33,148,239,0.4);
}
}
+.frameStyle{
+ width: 100%;
+ height: 350px;
+ border: 1px solid #dddddc;
+ margin-top: 5px;
+}
</style>
--
Gitblit v1.9.2