Browse Source

Merge branch 'lisu_V4.3.1' into data-page-V4.3.1

lisu_V4.3.1
mk 2 years ago
parent
commit
bbf615dd0b
  1. 17
      app.json
  2. BIN
      images/xuncha.png
  3. 5
      pages/work2/work2.js
  4. 4
      pages/work2/work2.wxml
  5. 2
      pages/work2/work2.wxss
  6. 3
      project.config.json
  7. 117
      subpages/securityCheck/securityCheck.js
  8. 4
      subpages/securityCheck/securityCheck.json
  9. 51
      subpages/securityCheck/securityCheck.wxml
  10. 185
      subpages/securityCheck/securityCheck.wxss
  11. 5
      utils/api.js
  12. 4
      utils/config.js

17
app.json

@ -11,8 +11,7 @@
"pages/statistics/statistics",
"pages/resiAndHouse/resiAndHouse",
"pages/setup/setup",
"subpages/house/pages/housePortrait/housePortrait",
"subpages/businessRecord/businessRecord"
"subpages/house/pages/housePortrait/housePortrait"
],
"subPackages": [
{
@ -36,6 +35,20 @@
"pages": [
"pages/InspectionReport/InspectionReport"
]
},
{
"root": "subpages/securityCheck",
"name": "securityCheck",
"pages": [
"securityCheck"
]
},
{
"root": "subpages/qualified",
"name": "qualified",
"pages": [
"qualified"
]
},
{
"root": "subpages/morenews",

BIN
images/xuncha.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

5
pages/work2/work2.js

@ -115,8 +115,9 @@ Page({
})
},
onData(){
wx.switchTab({
url:'../../pages/statistics/statistics'
// wx.switchTab({
wx.navigateTo({
url: '../../subpages/securityCheck/securityCheck'
})
}
// onAddHouse(){

4
pages/work2/work2.wxml

@ -60,13 +60,13 @@
</view>
<view class="section_1-0">
<view class="text-wrapper_7-0">
<text lines="1" class="text_2-0">数据</text>
<text lines="1" class="text_2-0">安检管理</text>
</view>
<view class="content_1" bind:tap="onData">
<view>
<image src="/images/work2/data.png" class="image_15">
</image>
<text lines="1" class="text_13" >数据</text>
<text lines="1" class="text_13" >安检巡查</text>
</view>
</view>

2
pages/work2/work2.wxss

@ -28,7 +28,7 @@
}
.header {
display: flex;
background: #1673ee;
background: #1974ec;
width: 100%;
height: 400rpx;
flex-direction: column;

3
project.config.json

@ -46,7 +46,8 @@
"minifyWXML": true,
"showES6CompileOption": false,
"useCompilerPlugins": false,
"condition": false
"condition": false,
"ignoreUploadUnusedFiles": true
},
"compileType": "miniprogram",
"libVersion": "2.19.4",

117
subpages/securityCheck/securityCheck.js

@ -0,0 +1,117 @@
// subpages/securityCheck/securityCheck.js
import {securityCheckk} from "../../utils/api";
Page({
data: {
pageNo: 1,
pageSize: 10,
id: 0,
waitingCheckStyle: "color: #1974ec;border-bottom: 2px solid blue;",
qualifiedStyle: "",
marsi:[
//
],
flag0Array:[],
flag1Array:[]
},
onLoad(options) {
this.getList()
},
getList() {
securityCheckk({
pageNo: this.data.pageNo,
pageSize: this.data.pageSize,
}).then(({data}) => {
this.setData({
marsi: data.list,
total: data.total
})
this.memem();
console.log("asdsa",this.data.marsi)
});
},
memem() {
this.setData({
flag0Array: this.data.marsi.filter(item => item.checkResultFlag === 0 || item.checkResultFlag == null),
flag1Array: this.data.marsi.filter(item => item.checkResultFlag === 1)
});
},
handelTab(e){
console.log(e);
this.setData({
setlectVal :e.currentTarget.dataset.value
})
},
toggleColor(e) {
console.log(123);
let value = e.currentTarget.dataset.value; // 获取点击选项的值
if (value === "1") {
this.setData({
waitingCheckStyle: "color: blue;border-bottom: 2px solid blue;",
qualifiedStyle: ""
});
} else if (value === "2") {
this.setData({
waitingCheckStyle: "",
qualifiedStyle: "color: blue; border-bottom: 2px solid blue;"
});
}
},
qualifed(){
wx.navigateTo({
url: '../../subpages/qualified/qualified'
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

4
subpages/securityCheck/securityCheck.json

@ -0,0 +1,4 @@
{
"usingComponents": {},
"navigationBarTitleText": "安检巡查"
}

51
subpages/securityCheck/securityCheck.wxml

@ -0,0 +1,51 @@
<!--subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxml-->
<view class="page">
<view class="search">
<view class="filter" bind:tap="toggleColor" data-value="1" style="{{waitingCheckStyle}}">
待复核
</view>
<view class="filter" bind:tap="toggleColor" data-value="2" style="{{qualifiedStyle}}">
已合格
</view>
</view>
<view class="">
<view class="section_5">
<scroll-view scroll-y="{{true}}" scroll-into-view="scrollToHere" wx:if="{{waitingCheckStyle}}" style="width: 100%; height: 90vh;">
<view class="list_1" wx:for="{{flag0Array}}">
<view class="section_1-0" id="scrollToHere">
<view class="title">{{item.name}}</view>
<view class="title_mall">检查时间: {{item.orderDate}}</view>
<view class="title_mall">检查人员: {{item.checkPersons}}</view>
<view class="title_mall">隐患明细:</view>
<view class="title_mall" wx:for="{{item.hiddenDangeList}}" wx:key="index">{{item.hazardDesc}}</view>
<view class="title_mall">拟复查时间: {{item.reviewTime}}</view>
</view>
</view>
<movable-area class="movable-area">
<movable-view class="movable-view" direction="all" x="250" y="300">
<image src="../../images/xuncha.png" class="image-wrapper"></image>
</movable-view>
</movable-area>
</scroll-view>
<scroll-view scroll-y="{{true}}" scroll-into-view="scrollToHere" wx:if="{{qualifiedStyle}}" style="width: 100%; height: 90vh;">
<view class="list_1" wx:for="{{flag1Array}}">
<view class="section_1-0" id="scrollToHere">
<view class="title">{{item.name}}</view>
<view class="title_mall">检查时间: {{item.orderDate}}</view>
<view class="title_mall">检查人员: {{item.checkPersons}}</view>
<view class="title_mall">隐患明细:</view>
<view class="title_mall" wx:for="{{item.hiddenDangeList}}" wx:key="index">{{item.hazardDesc}}</view>
<view class="title_mall">拟复查时间: {{item.reviewTime}}</view>
</view>
</view>
<movable-area class="movable-area">
<movable-view class="movable-view" direction="all" x="250" y="300">
<image src="../../images/xuncha.png" class="image-wrapper"></image>
</movable-view>
</movable-area>
</scroll-view>
</view>
</view>
</view>

185
subpages/securityCheck/securityCheck.wxss

@ -0,0 +1,185 @@
/* subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss */
page{
height: 100vh;
overflow: hidden;
background-color:#f7f7f7 ;
/*定位方式为相对定位 */
position: relative;
display: flex;
/* 按照行排序 */
flex-direction: column;
}
.search{
height: 110rpx;
width: 100%;
padding:0 22rpx;
box-sizing: border-box;
background-color: #fff;
display: flex;
align-items: center;
/* justify-content: space-between; */
padding-top: 20rpx;
box-sizing: border-box;
}
.filter{
margin-left: 10rpx;
margin-right: 40rpx;
}
.box_2 {
background-color: rgba(247,247,247,1.000000);
border-radius: 20rpx;
/* 相对于父级进行定位 */
/* position: absolute; */
left: 0rpx;
/* top: 181rpx; */
width: 750rpx;
height: 1365rpx;
display: flex;
flex-direction: column;
justify-content: flex-end;
}
/* .section_5 {
width: 100%;
height: 1395rpx;
display: flex;
flex-direction: column;
overflow-y: auto;
} */
.section_5 {
width: 100%;
height: 1395rpx;
display: flex;
flex-direction: column;
overflow: hidden;
}
.content_1{
display: flex;
/* flex-direction: row; */
justify-self:center;
margin: 40rpx 0 0 10rpx;
}
.content_1>view{
display: flex;
flex-direction: column;
align-items: center;
width: 250rpx;
height:210rpx;
}
.data{
display: flex;
flex-direction: column;
margin: 40rpx 0 0 10rpx;
}
.data >view{
display: flex;
flex-direction: column;
align-items: center;
width: 303rpx;
height: 200rpx;
}
.house{
display: flex;
justify-content: start;
margin: 40rpx 0 0 10rpx;
}
.house >view{
display: flex;
flex-direction: column;
align-items: center;
width: 303rpx;
height: 200rpx;
}
.image_2 {
width: 158rpx;
height: 56rpx;
margin-left: 332rpx;
}
.list_1 {
/* width: 710rpx; */
/* height: 603rpx; */
/* display: flex; */
/* flex-direction: column; */
/* justify-content: space-between; */
margin: 20rpx 0 0 20rpx;
/* width: 100%; */
}
.section_1-0 {
background-color: rgba(255,255,255,1.000000);
border-radius: 20rpx;
/* height: 410rpx; */
/* width: 710rpx; */
display: flex;
flex-direction: column;
padding-bottom: 10px;
}
.image-wrapper_9-1{
width: 404rpx;
height: 100rpx;
flex-direction: row;
display: flex;
justify-content: space-between;
margin: 40rpx 0 0 59rpx;
}
.text-wrapper_7-0 {
width: 134rpx;
height: 33rpx;
display: flex;
/* row水平排列 */
flex-direction: row;
margin: 29rpx 0 0 29rpx;
}
.text_2-0 {
width: 134rpx;
height: 33rpx;
/* 文本换行 */
overflow-wrap: break-word;
color: rgba(51,51,51,1);
font-size: 34rpx;
font-family: PingFang-SC-Bold;
font-weight: 700;
text-align: left;
white-space: nowrap;
line-height: 42rpx;
}
.title{
margin-top: 20rpx;
font-size: 16px;
font-weight: 550;
margin-left: 30rpx;
}
.title_mall{
margin-top: 20rpx;
font-size: 13px;
opacity: 0.5;
margin-left: 30rpx;
}
.movable-area{
pointer-events:none;
z-index: 100;
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
}
.movable-view{
pointer-events:auto;
height: 50px;
width: 50px;
}
.image-wrapper{
width: 200rpx;
height: 200rpx;
}

5
utils/api.js

@ -76,6 +76,7 @@ module.exports = {
houseResidentChangeRecord,
waitCollectHouseList,
nonIntResiList,
securityCheckk,
overView,
getFamilyRelationshipListByHouseId
}
@ -400,6 +401,10 @@ function waitCollectHouseList(parm){
function nonIntResiList(parm){
return fly.get(`actual/base/residentIntegrity/resiCategoryStats/nonIntResiList`,parm)
}
//安检巡查分页查询
function securityCheckk(parm){
return fly.post(`actual/base/companyInfo/page`,parm)
}
//
function overView(parm){
return fly.get(`actual/base/communityHouse/resiAndHouseCollect/overview`,parm)

4
utils/config.js

@ -5,13 +5,13 @@ module.exports = {
};
function BASEURL() {
return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
// return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
// return 'http://192.168.1.144/api/' //测试环境
// return 'http://219.146.91.110:30801/api/'
// return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
// return 'http://192.168.1.144/api/' //测试环境
// return 'http://219.146.91.110:30801/api/'
return 'http://219.146.91.110:30801/api/'
//return http://219.146.91.110:30801/api //外网
}

Loading…
Cancel
Save