From 45237a5746e794060e48bd172161c08660621d5c Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期二, 08 八月 2023 17:21:18 +0800
Subject: [PATCH] 登陆缓存 样式调整
---
static/we.png | 0
pages/tabBar/information/information.vue | 71 ++++----
static/count1.png | 0
pages/tabBar/firstPage/firstPage.vue | 85 +++++++--
pages/tabBar/notice/notice.vue | 6
pages/tabBar/responsivity/showMeasures.vue | 14
pages.json | 30 +-
static/examine.png | 0
static/pic.png | 0
common/request.js | 7
pages/tabBar/examine/examine.vue | 53 ++++--
pages/tabBar/response/response.vue | 2
pages/tabBar/notice/measures.vue | 22 ++
pages/tabBar/current/current.vue | 24 +--
pages/tabBar/notice/detail.vue | 63 +++++--
static/look.png | 0
manifest.json | 7
pages/tabBar/tabBarIndex.vue | 9
static/right.png | 0
pages/index/index.vue | 37 ++++
20 files changed, 278 insertions(+), 152 deletions(-)
diff --git a/common/request.js b/common/request.js
index ae6e571..b659d38 100644
--- a/common/request.js
+++ b/common/request.js
@@ -31,6 +31,8 @@
});
rejected(res.data.msg);
setTimeout(()=>{
+ uni.clearStorageSync();
+ uni.clearStorage();
uni.navigateTo({
url: '/pages/index/index'
})
@@ -57,6 +59,11 @@
icon: "none",
title: '服务响应失败'
});
+ uni.clearStorageSync();
+ uni.clearStorage();
+ uni.navigateTo({
+ url: '/pages/index/index'
+ })
rejected(err);
}
uni.request(options);
diff --git a/manifest.json b/manifest.json
index a70c77e..a3870ef 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "应急响应",
"appid" : "__UNI__843A1A3",
"description" : "",
- "versionName" : "1.0.0",
- "versionCode" : 1,
+ "versionName" : "1.0.1",
+ "versionCode" : 2,
"transformPx" : false,
"app-plus" : {
/* 5+App特有相关 */
@@ -40,7 +40,8 @@
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
- ]
+ ],
+ "abiFilters" : [ "armeabi-v7a" ]
},
"ios" : {
"dSYMs" : false
diff --git a/pages.json b/pages.json
index a011a0f..6454a2a 100644
--- a/pages.json
+++ b/pages.json
@@ -14,11 +14,11 @@
},
{
"path" : "pages/tabBar/notice/notice",
- "style" :
- {
+ "style" :
+ {
"navigationStyle": "custom",
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true,
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
"app-plus": {
"scrollIndicator": "none",
"pullToRefresh": {
@@ -27,7 +27,7 @@
"style": "circle"
}
}
- }
+ }
},
{
"path" : "pages/tabBar/notice/detail",
@@ -149,11 +149,11 @@
},
{
"path" : "pages/tabBar/examine/examine",
- "style" :
- {
+ "style" :
+ {
"navigationStyle": "custom",
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true,
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
"app-plus": {
"scrollIndicator": "none",
"pullToRefresh": {
@@ -162,7 +162,7 @@
"style": "circle"
}
}
- }
+ }
},
{
"path" : "pages/tabBar/count/count",
@@ -183,11 +183,11 @@
},
{
"path" : "pages/tabBar/current/current",
- "style" :
- {
+ "style" :
+ {
"navigationStyle": "custom",
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true,
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
"app-plus": {
"scrollIndicator": "none",
"pullToRefresh": {
@@ -196,7 +196,7 @@
"style": "circle"
}
}
- }
+ }
},
{
"path" : "pages/tabBar/weather/weather",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f5ae232..dab79d2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -43,8 +43,31 @@
}
},
onShow() {
- uni.clearStorageSync();
- uni.clearStorage();
+ console.log("数据",uni.getStorageSync('name'))
+ if(uni.getStorageSync('name') && uni.getStorageSync('pwd')){
+ // this.form.name = uni.getStorageSync('name');
+ // this.form.pwd = uni.getStorageSync('pwd');
+ if(uni.getStorageSync('roleName') == '工作人员'){
+ this.$store.commit('setRoleId', 'user_other');
+ uni.switchTab({
+ url: '/pages/tabBar/notice/notice'
+ });
+ }else if (uni.getStorageSync('roleName') == '管理员'){
+ this.$store.commit('setRoleId', '');
+ uni.showToast({
+ icon: "none",
+ title: '管理员请使用平台登录'
+ });
+ }else{
+ this.$store.commit('setRoleId', 'user_leader');
+ uni.switchTab({
+ url: '/pages/tabBar/firstPage/firstPage'
+ });
+ }
+ }else{
+ uni.clearStorageSync();
+ uni.clearStorage();
+ }
},
onLoad() {
// this.connect()
@@ -61,6 +84,8 @@
// 'alias': this.phone,
// 'sequence': 1
// })
+ uni.setStorageSync("name", this.form.name);
+ uni.setStorageSync("pwd", this.form.pwd);
uni.setStorageSync("tk", res.data.tk);
uni.setStorageSync("uid",res.data.uid);
uni.setStorageSync('user', res.data);
@@ -83,6 +108,14 @@
url: '/pages/tabBar/firstPage/firstPage'
});
}
+ }else{
+ uni.showToast({
+ icon: "none",
+ title: res.msg
+ });
+ this.form.name = '';
+ this.form.pwd = '';
+ this.isLogining = false;
}
}).catch(err=>{
this.form.name = '';
diff --git a/pages/tabBar/current/current.vue b/pages/tabBar/current/current.vue
index 9cde2da..24a0a5f 100644
--- a/pages/tabBar/current/current.vue
+++ b/pages/tabBar/current/current.vue
@@ -42,7 +42,6 @@
</view>
<view style="display: flex;flex-direction: column;margin-bottom: 55px;">
<view class="examineList">
-<!-- <view class="listContent" v-if="InfoList.length > 0">-->
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="listContent" @scrolltoupper="upper" v-if="InfoList.length > 0"
@scrolltolower="lower" @scroll="scroll" lower-threshold="50">
<view v-for="(item, index) in InfoList" :key="index" class="itemContent" @click="toDetail(item)">
@@ -50,26 +49,18 @@
<text class="tit">[{{item.colorContent}}]{{item.title}}</text><br>
<text class="cont">{{item.content}}</text>
<view class="btnGroup">
-<!-- <u-button -->
-<!-- size="mini" -->
-<!-- style="background-color:rgb(255, 223, 37);color: white;width: 100px;margin: 3px 8px;"-->
-<!-- @click="toDetail(item)"-->
-<!-- >-->
-<!-- 信息详情-->
-<!-- </u-button>-->
+ <text style="font-size: 14px;">发送 {{item.responseSum}} 人，叫应 {{item.responseNum}} 人</text>
<u-button
- size="mini"
- style="background-color:rgb(17, 204, 33);color: white;width: 100px;margin: 0;font-size: 13px"
+ size="medium"
+ style="background-color:rgb(17, 204, 33);color: white;width: 100px;margin: 0;font-size: 13px;height: 30px;"
@click.native.stop="toResponsivity(item)"
>
叫应率 {{item.responsesRate}}
</u-button>
-
</view>
</view>
</view>
</scroll-view>
-<!-- </view>-->
<view v-else>
<u-empty margin-top="40%" text="数据为空" mode="data"></u-empty>
</view>
@@ -177,6 +168,7 @@
this.getInfoList();
},
toDetail(item) {
+ item.responsesRate = item.responsesRate.replace(/%/g, '%25');
uni.navigateTo({
url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(item))
})
@@ -225,7 +217,7 @@
},
lower: function(e) {
if (this.data.pageIndex * this.data.pageSize >= this.total){
- uni.$u.toast('已加载全部数据')
+ // uni.$u.toast('已加载全部数据')
return
}
//并且让页码+1,调用获取数据的方法获取第二页数据
@@ -382,7 +374,7 @@
}
.examineList{
margin-top: 12px;
- height: calc(100vh - 226px);
+ height: calc(100vh - 246px);
overflow: hidden;
overflow-y: scroll;
}
@@ -391,7 +383,7 @@
flex-direction: column;
width: calc(100% - 24px);
margin: 0 12px;
- margin-bottom: 30px;
+ // margin-bottom: 30px;
background: #fff;
border-radius: 5px;
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
@@ -424,7 +416,7 @@
.btnGroup{
width: 100%;
display: flex;
- justify-content: left;
+ justify-content: space-between;
}
}
.buttonCo{
diff --git a/pages/tabBar/examine/examine.vue b/pages/tabBar/examine/examine.vue
index 93a632d..203062d 100644
--- a/pages/tabBar/examine/examine.vue
+++ b/pages/tabBar/examine/examine.vue
@@ -51,26 +51,24 @@
<view class="examineList">
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="listContent" @scrolltoupper="upper" v-if="examineList.length > 0"
@scrolltolower="lower" @scroll="scroll" lower-threshold="50">
- <!-- <view class="listContent" v-if="examineList.length > 0"> -->
- <view v-for="(item, index) in examineList" :key="index" class="itemContent">
- <view class="content" @click="toDetail(item)">
- <text>[{{item.colorContent}}]</text>
- <text>{{item.title}},{{item.content}}</text>
- <view style="float: right; width: 80px;margin-top: -5px;">
- <u-button v-if="item.buttonContent == '已审核通过'" size="mini" class="buttonCo" style="background-color:rgb(17, 204, 33);color: white">
+ <view v-for="(item, index) in examineList" :key="index" class="itemContent" @click="toDetail(item)">
+ <view class="content">
+ <text class="tit">[{{item.colorContent}}]{{item.title}}</text>
+ <view class="btnGroup">
+ <text class="cont">{{item.content}}</text>
+ <u-button v-if="item.buttonContent == '已审核通过'" size="mini" style="background-color:rgb(17, 204, 33);color: white;width: 100px;">
{{item.buttonContent}}
</u-button>
- <u-button v-else-if="item.buttonContent == '已驳回'" size="mini" class="buttonCo" style="background-color:rgb(153, 148, 143);color: white">
+ <u-button v-else-if="item.buttonContent == '已驳回'" size="mini" style="background-color:rgb(153, 148, 143);color: white;width: 100px;">
{{item.buttonContent}}
</u-button>
- <u-button v-else type="error" size="mini" class="buttonCo">
+ <u-button v-else type="error" size="mini" style="width: 100px;">
{{item.buttonContent}}
</u-button>
</view>
</view>
</view>
</scroll-view>
- <!-- </view> -->
<view v-else>
<u-empty margin-top="40%" text="数据为空" mode="data"></u-empty>
</view>
@@ -210,7 +208,7 @@
lower: function(e) {
console.log("111")
if (this.data.pageIndex * this.data.pageSize >= this.total){
- uni.$u.toast('已加载全部数据')
+ // uni.$u.toast('已加载全部数据')
return
}
//并且让页码+1,调用获取数据的方法获取第二页数据
@@ -377,17 +375,40 @@
height: 100%;
}
.itemContent{
- font-size: 16px;
color: #333;
+ font-size: 16px;
margin-top: 15px;
- padding: 0 12px 15px;
+ padding: 0 12px 10px;
border-bottom: 1px solid #ebebeb;
}
.content{
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
+ display: flex;
+ flex-direction: column;
+ // align-items: flex-end;
+ .tit{
+ width: 100%;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+
+ .btnGroup{
+ // float: right;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .cont{
+ width: 100%;
+ font-size: 14px;
+ color: #666;
+ display: block;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ margin-bottom: 6px;
+ }
+ }
}
.buttonCo{
margin-top: 5px;
diff --git a/pages/tabBar/firstPage/firstPage.vue b/pages/tabBar/firstPage/firstPage.vue
index 5bc44b0..b85ba58 100644
--- a/pages/tabBar/firstPage/firstPage.vue
+++ b/pages/tabBar/firstPage/firstPage.vue
@@ -15,32 +15,44 @@
<u-badge type="error" :absolute="true" :offset="[90 + statusBarHeight ,65]" max="99" :value="examineNum" style="line-height: 40px;font-size: 14px;width: 30px;height: 40px;">
</u-badge>
</view>
+ <view class="text">预警审核</view>
+ <view class="eng">WARNING REVIEW</view>
<view class="icon">
- <image src="../../../static/examine.png" class="img"></image>预警审核
+ <view class="heng"></view>
+ <image src="../../../static/examine.png" class="img"></image>
</view>
</view>
<view class="first"
@click="goCurrent"
- style="background-color:rgb(249, 130, 180) ;"
+ style="background-color:rgb(255, 160, 235) ;"
>
+ <view class="text">信息查看</view>
+ <view class="eng">INFORMATION VIEWING</view>
<view class="icon">
- <image src="../../../static/look.png" class="img"></image>信息查看
+ <view class="heng"></view>
+ <image src="../../../static/look.png" class="img"></image>
</view>
</view>
<view class="first"
- style="background-color: rgb(41, 203, 280);"
+ style="background-color: rgb(112,179, 224);"
@click="goWeather"
>
+ <view class="text">实时气象</view>
+ <view class="eng">RWAL TIME WEATHER</view>
<view class="icon">
- <image src="../../../static/we.png" class="img"></image>实时气象
+ <view class="heng"></view>
+ <image src="../../../static/we.png" class="img"></image>
</view>
</view>
<view class="first"
- style="background-color: rgb(11, 246, 158) ;margin-bottom: 35px;"
+ style="background-color: rgb(134, 204, 170) ;margin-bottom: 35px;"
@click="goCount"
>
+ <view class="text">统计分析</view>
+ <view class="eng">STATISTIC ANALYSIS</view>
<view class="icon">
- <image src="../../../static/count.png" class="img"></image>统计分析
+ <view class="heng"></view>
+ <image src="../../../static/count1.png" class="img"></image>
</view>
</view>
@@ -52,12 +64,19 @@
<script>
import tabBar from '../tabBarIndex.vue'
import {getExamine} from '../../../api/examine.js'
+import { Value } from 'sass';
export default {
components:{
tabBar
},
data() {
return {
+ titleList:[
+ {
+ label: '默认排序',
+ value: 1,
+ }
+ ],
page: 'pages/tabBar/firstPage/firstPage',
statusBarHeight: '',
leaderType: 'da',
@@ -71,7 +90,8 @@
reviewStatus: null//1：未审核，2：已审核，3：审核已驳回
}
},
- role: ''
+ role: '',
+ realname:''
}
},
@@ -79,12 +99,14 @@
//获取手机状态栏高度
this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
uni.hideTabBar();
+ this.realname = uni
},
onShow(){
this.role = uni.getStorageSync('roleName');
- console.log("role",this.role)
+ this.realname = uni.getStorageSync('user').realName
+ console.log("role",uni.getStorageSync('user'))
this.getNum();
},
methods: {
@@ -165,34 +187,53 @@
.first{
width: 100%;
height: 110px;
- background-color: red;
- text-align: center;
- line-height: 110px;
- border-radius: 20px;
- background-color: rgb(246,191,170);
+ border-radius: 15px;
+ background-color: rgb(241,161,108);
border: 1px solid lightgrey;
- font-size: 18px;
+
margin-top: 40px;
- color: #2c2c2c;
+
+}
+.text{
+ font-size: 18px;
+ padding-top: 15px;
+ padding-left: 15px;
+ color: #faf9f4;
+ font-family: '宋体';
font-weight: 600;
+}
+.eng{
+ font-size: 14px;
+ padding-left: 15px;
+ color: rgba(250,249,244,0.5);
}
.icon{
display: flex;
- align-items: center;
- justify-content: center;
+ align-items: baseline;
+ justify-content: space-between;
}
.barText{
- text-align: center;
+ /* text-align: center; */
font-size: 16px;
font-weight: 600;
+ flex: 2;
+ margin-left: 45%;
}
.img{
- width: 20px;
- height: 20px;
- margin-right: 6px;
+ width: 45px;
+ height: 45px;
+ margin-right: 16px;
+ margin-bottom: 5px;
+
}
.badge span{
text-align: center;
width: 100%;
}
+.heng{
+ width: 30px;
+ height: 3px;
+ background-color: rgba(230,230,230,0.5);
+ margin-left: 15px;
+}
</style>
\ No newline at end of file
diff --git a/pages/tabBar/information/information.vue b/pages/tabBar/information/information.vue
index da2d350..4a132b5 100644
--- a/pages/tabBar/information/information.vue
+++ b/pages/tabBar/information/information.vue
@@ -14,43 +14,43 @@
</div>
<!-- 页面内容 -->
<view class="contentList">
- <view class="examineList">
<view class="listHead">
<u-checkbox-group >
<u-checkbox v-model="isReadOnly" :checked="isReadOnly" @change="chooseRead"></u-checkbox>只显示审核通过
</u-checkbox-group>
</view>
-<!-- <view class="listContent" v-if="informationList.length > 0">-->
- <scroll-view :scroll-top="scrollTop" scroll-y="true" class="listContent" @scrolltoupper="upper" v-if="informationList.length > 0"
+ <view style="display: flex;flex-direction: column;margin-bottom: 55px;">
+ <view class="examineList">
+ <scroll-view :scroll-top="scrollTop" scroll-y="true" class="listContent" @scrolltoupper="upper" v-if="informationList.length > 0"
@scrolltolower="lower" @scroll="scroll" lower-threshold="50">
<view v-for="(item, index) in informationList" :key="index" class="itemContent">
<view class="content" @click="toDetail(item)">
- <view class="top">
- <view class="textContent">
- <text>[{{item.colorContent}}]</text>
- <text>{{item.title}}</text>
- </view>
- <view class="buttonContent">
- <u-button v-if="item.buttonContent == '审核通过'" size="mini" class="buttonCo" style="background-color:rgb(17, 204, 33);color: white">
- {{item.buttonContent}}
- </u-button>
- <u-button v-else-if="item.buttonContent == '已驳回'" size="mini" class="buttonCo" style="background-color:rgb(153, 148, 143);color: white">
- {{item.buttonContent}}
- </u-button>
- <u-button v-else type="error" size="mini" class="buttonCo">
- {{item.buttonContent}}
- </u-button>
- </view>
- </view>
- <view class="bottom">
- {{item.content}}
- </view>
+ <view class="top">
+ <view class="textContent">
+ <text>[{{item.colorContent}}]</text>
+ <text>{{item.title}}</text>
</view>
- </view>
- </scroll-view>
-<!-- </view>-->
+ <view class="buttonContent">
+ <u-button v-if="item.buttonContent == '审核通过'" size="mini" class="buttonCo" style="background-color:rgb(17, 204, 33);color: white">
+ {{item.buttonContent}}
+ </u-button>
+ <u-button v-else-if="item.buttonContent == '已驳回'" size="mini" class="buttonCo" style="background-color:rgb(153, 148, 143);color: white">
+ {{item.buttonContent}}
+ </u-button>
+ <u-button v-else type="error" size="mini" class="buttonCo">
+ {{item.buttonContent}}
+ </u-button>
+ </view>
+ </view>
+ <view class="bottom">
+ {{item.content}}
+ </view>
+ </view>
+ </view>
+ </scroll-view>
<view v-else>
<u-empty margin-top="40%" text="数据为空" mode="data"></u-empty>
+ </view>
</view>
</view>
</view>
@@ -145,7 +145,7 @@
},
lower: function(e) {
if (this.data.pageIndex * this.data.pageSize >= this.total){
- uni.$u.toast('已加载全部数据')
+ // uni.$u.toast('已加载全部数据')
return
}
//并且让页码+1,调用获取数据的方法获取第二页数据
@@ -199,11 +199,11 @@
.statusBar{
background-color:lightgrey;
}
-.contentList{
- display: flex;
- flex-direction: column;
- padding-bottom: 65px;
-}
+// .contentList{
+// display: flex;
+// flex-direction: column;
+// padding-bottom: 65px;
+// }
.buttonGroup{
margin: 18px 12px;
@@ -274,7 +274,12 @@
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
height: calc(100vh - 162px);
}
-
+.examineList{
+ // margin-top: 12px;
+ height: calc(100vh - 200px);
+ overflow: hidden;
+ overflow-y: scroll;
+}
.itemContent{
font-size: 16px;
diff --git a/pages/tabBar/notice/detail.vue b/pages/tabBar/notice/detail.vue
index 61adef8..2f315aa 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"
@@ -155,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;
@@ -192,6 +198,13 @@
uni.navigateBack({
url:'./notice/notice'
});
+ },
+ loginOut() {
+ uni.clearStorageSync();
+ uni.clearStorage();
+ uni.navigateTo({
+ url: '/pages/index/index'
+ })
},
getMeasures(){
getMeasureDetail({id: this.detailData.id}).then(res => {
@@ -315,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%;
@@ -360,6 +374,7 @@
margin-left: 15px;
}
.detailCard{
+ flex-grow: 1;
display: flex;
flex-direction: column;
background: #fff;
@@ -376,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>
diff --git a/pages/tabBar/notice/measures.vue b/pages/tabBar/notice/measures.vue
index dedf4ce..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"
@@ -43,8 +43,11 @@
:maxCount="10"
style="margin-top: -10px;"
></u-upload>
- <view class="pic" v-for="(item,index) 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>
@@ -244,7 +247,7 @@
.second{
display: flex;
flex-direction: column;
- margin-top: 50px;
+ margin-top: 30px;
}
.third{
display: flex;
@@ -259,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;
diff --git a/pages/tabBar/notice/notice.vue b/pages/tabBar/notice/notice.vue
index d1b723f..c53cff8 100644
--- a/pages/tabBar/notice/notice.vue
+++ b/pages/tabBar/notice/notice.vue
@@ -267,7 +267,7 @@
},
lower: function(e) {
if (this.data.pageIndex * this.data.pageSize >= this.total){
- uni.$u.toast('已加载全部数据')
+ // uni.$u.toast('已加载全部数据')
return
}
//并且让页码+1,调用获取数据的方法获取第二页数据
@@ -422,7 +422,7 @@
.noticeList{
margin-top: 12px;
- height: calc(100vh - 266px);
+ height: calc(100vh - 286px);
overflow: hidden;
overflow-y: scroll;
}
@@ -436,7 +436,7 @@
border-radius: 5px;
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
height: 100%;
- margin-bottom: 30px;
+ // margin-bottom: 30px;
}
.itemContent{
font-size: 16px;
diff --git a/pages/tabBar/response/response.vue b/pages/tabBar/response/response.vue
index 7d70cf9..2823ae1 100644
--- a/pages/tabBar/response/response.vue
+++ b/pages/tabBar/response/response.vue
@@ -120,7 +120,7 @@
},
lower: function(e) {
if (this.data.pageIndex * this.data.pageSize >= this.total){
- uni.$u.toast('已加载全部数据')
+ // uni.$u.toast('已加载全部数据')
return
}
//并且让页码+1,调用获取数据的方法获取第二页数据
diff --git a/pages/tabBar/responsivity/showMeasures.vue b/pages/tabBar/responsivity/showMeasures.vue
index 5f348da..bf5eb51 100644
--- a/pages/tabBar/responsivity/showMeasures.vue
+++ b/pages/tabBar/responsivity/showMeasures.vue
@@ -12,7 +12,7 @@
</view>
<view class="measureCard">
<view class="head">
- <u-form :model="form" ref="uForm" label-width="100px">
+ <u-form :model="form" ref="uForm" label-width="80px">
<u-form-item label="信息标题 :" >{{form.title}}</u-form-item>
<u-form-item label="发布单位 :">{{form.publishingUnit}}</u-form-item>
<u-form-item label="发布时间 :">{{form.publishingTime}}</u-form-item>
@@ -20,18 +20,18 @@
</u-form>
</view>
<view class="first" v-if="measureList">
- <text style="font-size: 16px;margin-bottom: 20px;font-weight: 600;">基础措施</text>
- <view v-for="(item, index) in measureList" :key="index" style="margin-left: 18px;margin-bottom:10px; font-size:16px;">
+ <text style="font-size: 18px;margin-bottom: 20px;font-weight: 600;">基础措施</text>
+ <view v-for="(item, index) in measureList" :key="index" style="margin-left: 18px;margin-bottom:10px; font-size:15px;">
<text style="margin-top: 15px;">{{item}}</text>
</view>
</view>
<view class="second" v-if="measures!=null">
- <text style="font-size: 16px;margin-bottom: 20px;font-weight: 600;">补充措施</text>
+ <text style="font-size: 18px;margin-bottom: 20px;font-weight: 600;">补充措施</text>
<u--textarea style="margin-top: -5px;" v-model="measures" disabled placeholder="请输入内容" ></u--textarea>
</view>
<view class="third">
<view v-for="(item, index) in images" :key="index">
- <u-image @click="previewSqs(item,index)" style="margin: 5px; 5px" width="230rpx" height="230rpx" :src="item.url"></u-image>
+ <u-image @click="previewSqs(item,index)" style="margin: 5px; 5px" width="180rpx" height="180rpx" :src="item.url"></u-image>
</view>
</view>
</view>
@@ -116,7 +116,7 @@
.barText{
/* margin-left: 20px; */
text-align: center;
- width: 85%;
+ width: 90%;
font-size: 16px;
/* text-align: center; */
font-weight: 600;
@@ -149,7 +149,7 @@
.second{
display: flex;
flex-direction: column;
- margin-top: 50px;
+ margin-top: 30px;
}
.third{
display: flex;
diff --git a/pages/tabBar/tabBarIndex.vue b/pages/tabBar/tabBarIndex.vue
index 5a5efdc..f389843 100644
--- a/pages/tabBar/tabBarIndex.vue
+++ b/pages/tabBar/tabBarIndex.vue
@@ -42,12 +42,9 @@
methods: {
click_page(item){
let page = '/' + item;
- uni.switchTab({
- url: page,
- success:function(res){
- console.log(res);
- console.log("成功")
- }
+ console.log("跳转",item)
+ uni.reLaunch({
+ url: page
})
}
}
diff --git a/static/count1.png b/static/count1.png
new file mode 100644
index 0000000..bef55a4
--- /dev/null
+++ b/static/count1.png
Binary files differ
diff --git a/static/examine.png b/static/examine.png
index ba0e766..6f45ca5 100644
--- a/static/examine.png
+++ b/static/examine.png
Binary files differ
diff --git a/static/look.png b/static/look.png
index 03688df..f034451 100644
--- a/static/look.png
+++ b/static/look.png
Binary files differ
diff --git a/static/pic.png b/static/pic.png
new file mode 100644
index 0000000..e1d2c34
--- /dev/null
+++ b/static/pic.png
Binary files differ
diff --git a/static/right.png b/static/right.png
new file mode 100644
index 0000000..98b08da
--- /dev/null
+++ b/static/right.png
Binary files differ
diff --git a/static/we.png b/static/we.png
index 927426d..9972d4e 100644
--- a/static/we.png
+++ b/static/we.png
Binary files differ
--
Gitblit v1.9.2