elink-star
/
epmet-work-mp
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'data-page' of http://120.46.222.128:10021/elink-star/epmet-work-mp into work_tab_bar 

# Conflicts:
#	subpages/searchResult/pages/resiInfo/resiInfo.js
work_tab_bar
mk 1 year ago
parent
b1fc2bfc9e 9736e39ad1
commit
810ed957db
12 changed files with 364 additions and 136 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      components/custom-tab-bar/index.js
  2. 1
      pages/resiAndHouse/resiAndHouse.js
  3. 27
      pages/resiAndHouse/resiAndHouse.wxml
  4. 25
      pages/resiAndHouse/resiAndHouse.wxss
  5. 2
      pages/work2/work2.wxml
  6. 7
      subpages/house/pages/housePortrait/component/graph/graph.js
  7. 4
      subpages/house/pages/housePortrait/housePortrait.wxml
  8. 9
      subpages/house/pages/housePortrait/housePortrait.wxss
  9. 18
      subpages/searchResult/pages/resiInfo/component/graph/graph.js
  10. 123
      subpages/searchResult/pages/resiInfo/resiInfo.js
  11. 236
      subpages/searchResult/pages/resiInfo/resiInfo.wxml
  12. 27
      subpages/searchResult/pages/resiInfo/resiInfo.wxss

21
components/custom-tab-bar/index.js
View File

@ -23,14 +23,6 @@ Component({
"selectedIconPath": "/images/home/resiAndHouseSelected.png",
show: true
},
{
"pagePath": "/pages/statistics/statistics",
"text": "数据",
"iconPath": "/images/home/information.png",
"selectedIconPath": "/images/home/informationSelected.png",
show: false
},
{
"pagePath": "/pages/work2/work2",
@ -40,6 +32,15 @@ Component({
show: true
},
{
"pagePath": "/pages/statistics/statistics",
"text": "数据",
"iconPath": "/images/home/information.png",
"selectedIconPath": "/images/home/informationSelected.png",
show: false
},
{
"pagePath": "/pages/mine/mine",
"text": "我的",
@ -63,13 +64,13 @@ Component({
getOwnedRolesOfStaffId(res.data.id).then(res2 => {
app.globalData.user = res.data
this.setData({
"list[2].show": res2.data.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
"list[3].show": res2.data.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
})
})
})
} else {
this.setData({
"list[2].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
"list[3].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
})
}
console.log(app.globalData.roleList, 'userss')

1
pages/resiAndHouse/resiAndHouse.js
View File

@ -386,6 +386,7 @@ Page({
tableData: []
})
this.getTableData()
this.getAllOrgCategoryCount()
},
onClose() {
this.setData({

27
pages/resiAndHouse/resiAndHouse.wxml
View File

@ -31,8 +31,8 @@
<view class="box_16">
<text lines="1" class="text_4">{{cascaderName}}</text>
<view class="image-text_9">
<text lines="1" class="text_5" bind:tap="handelClickShowTree">切换</text>
<image src="../../images/swapHorizontal.png" class="image_8"></image>
<text lines="1" class="text_5" bind:tap="handelClickShowTree">切换</text>
</view>
</view>
<view class="box_17">
@ -55,35 +55,22 @@
</view>
<view class="text-wrapper_9">
<view class="label">信息完整度：</view><view class="value">{{item.synthesizeScore}}</view>
</view>
</view>
<view class="box_19">
<view class="text-wrapper_10">
<text lines="1" class="text_21">国籍：</text>
<text lines="1" class="text_22">{{item.nationalityName || "--"}}</text>
</view>
<view class="text-wrapper_11">
<text lines="1" class="text_23">民族：</text>
<text lines="1" class="text_24">{{item.nationName || '--'}}</text>
</view>
</view>
<view class="text-wrapper_12">
<text lines="1" class="text_25">电话：</text>
<text lines="1" class="text_26">{{item.mobile}}</text>
</view>
<view class="text-wrapper_13">
<text lines="1" class="text_27">证件号</text>
<text lines="1" class="text_28">：</text>
<text lines="1" class="text_29">{{item.idNum}}</text>
</view>
<view class="text-wrapper_12">
<text lines="1" class="text_25">电话：</text>
<text lines="1" class="text_26">{{item.mobile}}</text>
</view>
<view class="text-wrapper_14">
<text lines="1" class="text_30">地址：</text>
<text lines="1" class="text_31">{{item.agencyName || ''}} {{item.homeName || ''}}</text>
</view>
<view class="text-wrapper_15">
<text lines="1" class="text_32">最新更新时间：</text>
<text lines="1" decode="true" class="text_33">{{item.updatedTime|| '--'}}</text>
</view>
</view>
<load-more loadVisible="{{loadMoreVisible}}" loadType="{{loadMoreType}}"></load-more>
<no-data isShow="{{nodata}}" wx:if="{{nodata}}"></no-data>
@ -96,8 +83,8 @@
<text lines="1" class="text_4" bind:tap="handelClickShowTreeFw">{{cascaderNameFw}}</text>
<view class="image-text_9">
<view class="image-text_qh">
<text lines="1" class="text_5" bind:tap="handelClickShowTreeFw">切换</text>
<image src="../../images/swapHorizontal.png" class="image_8"></image>
<text lines="1" class="text_5" bind:tap="handelClickShowTreeFw">切换</text>
</view>
</view>
</view>

25
pages/resiAndHouse/resiAndHouse.wxss
View File

@ -27,7 +27,7 @@ page {
border-radius: 20rpx;
position: absolute;
left: 0rpx;
top: 360rpx;
top: 340rpx;
width: 750rpx;
height: calc(100vh - 460rpx);
overflow: hidden;
@ -84,6 +84,8 @@ page {
justify-content: center;
margin-top: 39rpx;
position: relative;
padding: 0 50rpx;
box-sizing: border-box;
}
.text-wrapper_30>view {
@ -161,7 +163,6 @@ page {
display: flex;
justify-content: center;
align-items: center;
margin-top: 20rpx;
padding-left: 20rpx;
box-sizing: border-box;
}
@ -179,8 +180,8 @@ page {
overflow-wrap: break-word;
color: rgba(51, 51, 51, 1);
font-size: 36rpx;
font-family: PingFang-SC-Bold;
font-weight: 700;
font-family: FZTanHeiS-B-GB;
font-weight: 800;
text-align: left;
white-space: nowrap;
line-height: 52rpx;
@ -188,7 +189,6 @@ page {
flex: 1;
margin-right: 20rpx;
overflow-x: scroll;
}
.image-text_9 {
@ -248,7 +248,7 @@ page {
.box_17 {
width: 649rpx;
margin: 20rpx 0 0 30rpx;
margin: 0rpx 0 0 30rpx;
}
.list_2 {
@ -478,9 +478,9 @@ page {
}
.text-wrapper_9 {
display: flex;
width: 243rpx;
overflow-wrap: break-word;
font-size: 0rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
@ -488,7 +488,12 @@ page {
line-height: 40rpx;
margin: 4rpx 0 0 0;
}
.text-wrapper_9 .label{
color: #999999;
}
.text-wrapper_9 .value{
color: #04b8ad;
}
.text_19 {
width: 243rpx;
height: 28rpx;
@ -1295,8 +1300,8 @@ page {
.box_17 .tabs {
display: flex;
justify-content: start;
justify-content: space-between;
height: 100rpx;
}
.box_17 .tabs .tab_item {

2
pages/work2/work2.wxml
View File

@ -42,7 +42,7 @@
</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="house">
<view>

7
subpages/house/pages/housePortrait/component/graph/graph.js
View File

@ -57,12 +57,6 @@ Component({
getFamilyRelationshipList(params).then(({
data
}) => {
// let index = data.findIndex(item => item.id == this.data.houseId);
// if (index !== -1) {
// const [item] = data.splice(index, 1);
// data.unshift(item);
// }
const rootNode = {};
rootNode["id"] = this.data.houseId;
rootNode["name"] = this.data.houseName;
@ -128,7 +122,6 @@ Component({
},
}))
console.log(nodeList,links,categories);
var option = {

4
subpages/house/pages/housePortrait/housePortrait.wxml
View File

@ -69,10 +69,10 @@
<text class="logs-content-title">操作人：</text>
<text class="logs-content-txt">{{item.operatorName}}</text>
</view>
<view>
<!-- <view>
<text class="logs-content-title">备注：</text>
<text class="logs-content-txt">{{item.resiName}}</text>
</view>
</view> -->
</view>
</view>
</view>

9
subpages/house/pages/housePortrait/housePortrait.wxss
View File

@ -127,12 +127,15 @@
.item-dian {
position: relative;
left: -28rpx;
width: 20rpx;
height: 20rpx;
width: 32rpx;
height: 32rpx;
box-sizing: border-box;
background: #FFFFFF;
border-radius: 50%;
border: 1px solid #3A80E7;
padding: 2rpx;
display: flex;
align-items: center;
justify-content: center;
}
.neidian {

18
subpages/searchResult/pages/resiInfo/component/graph/graph.js
View File

@ -43,6 +43,15 @@ Component({
height: height,
devicePixelRatio: dpr // 像素比
});
let than = this
chart.on('click', function (param) {
if (param.dataType == 'node') {
console.log('点击了节点',param)
than.triggerEvent('clickGraphNode', {data: param.data.data });
} else {
console.log('点击了边',param)
}
})
canvas.setChart(chart);
let params = {
type: "0",
@ -91,9 +100,13 @@ Component({
'category': 0,
'symbolSize': item.id == this.data.resiId ? 50 : 30,
'symbol': symbolUrl,
label: {
'label': {
"position": "bottom"
}
},
'data':{
type:item.type,
id:item.id
},
};
});
@ -119,7 +132,6 @@ Component({
},
}))
console.log(nodeList,links,categories);
var option = {

123
subpages/searchResult/pages/resiInfo/resiInfo.js
View File

@ -524,48 +524,21 @@ Page({
value: 5
}
],
marriageList:[
{
label:"未婚",
value:'weihun'
},
{
label:"初婚",
value:'chuhun'
},
{
label:"离婚",
value:'lihun'
},
{
label:"再婚",
value:'zaihun'
},
{
label:"复婚",
value:'fuhun'
}
],
dicts:{
careerStatusArr:[],
marriageArr:[],
householdSituationArr:[],
houseHolderRelArr:[]
},
password:''
>>>>>>> dfe56009a6df6ddb9f15a1825578dabd99db092e
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
<<<<<<< HEAD
<<<<<<< HEAD
},
=======
this.updateTime();
timerId = setInterval(this.updateTime, 1000);
=======
// this.updateTime();
// timerId = setInterval(this.updateTime, 1000);
>>>>>>> c9cc8f228e3cb654f743b0c7fbabb7d1f813f1c2
onLoad:async function(options) {
await this.getDicts()
if (options.resiId) {
this.setData({
resiId: options.resiId,
@ -574,7 +547,7 @@ Page({
'form.baseInfoDto.mobile':options.mobile,
})
this.getResiInfo()
await this.getResiInfo()
}
// this.data.qqMapWX = new QQMapWX({
// key: 'CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ'
@ -585,15 +558,43 @@ Page({
})
// this.getLastLogs()
},
// updateTime() {
// let date = new Date();
// let hours = date.getHours().toString().padStart(2, '0');
// let minutes = date.getMinutes().toString().padStart(2, '0');
// let seconds = date.getSeconds().toString().padStart(2, '0');
// this.setData({
// currentTime: `${hours}:${minutes}:${seconds}`
// });
// },
getDicts:async function() {
try {
const requests = [
http.post("sys/dict/data/dictlist", {
dictType: "career_status",
}),
http.post("sys/dict/data/dictlist", {
dictType: "marriage",
}),
http.post("sys/dict/data/dictlist", {
dictType: "household_situation",
}),
http.post("sys/dict/data/relationship", {
formCode: "resi_base_info",
}),
];
const dictKeys = [
"careerStatusArr",
"marriageArr",
"householdSituationArr",
"houseHolderRelArr"
]; // 对应的键名
const results = await Promise.all(requests);
results.forEach((result, index) => {
if (result.code === 0) {
this.setData({
[`dicts.${dictKeys[index]}`]: [...result.data]
})
} else {
console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
}
});
} catch (error) {
console.log("获取字典失败: ", error);
}
},
getResiInfo: async function () {
try {
let res = await api.getResiInfo(this.data.resiId);
@ -602,7 +603,7 @@ Page({
res.data.baseInfoDto.categoryInfo.categoryNames = res.data.residentCategoryStr.split(',')
}
if(res.data.familyInfoDto&&res.data.familyInfoDto.marriage){
marriageName = this.data.marriageList.filter(item=>item.value == res.data.familyInfoDto.marriage)[0].label
marriageName = this.data.dicts.marriageArr.filter(item=>item.value == res.data.familyInfoDto.marriage)[0].label
}
// 处理tab
this.setData({
@ -646,17 +647,17 @@ Page({
list.push({
name:'关系图谱',
id:"graph"
})
},
)
this.setData({
tabList: list
})
let arr = this.data.tabList.filter(
(item) =>
item.filledQty > 0 || (
item.name == "拓展信息" ||
item.name == "拓展信息" ||item.name == "居住信息" ||
item.name == "基本信息")
);
let arrs = []
arrs = this.data.originalExpandList.filter((itemA) => {
return arr.some((itemB) => itemB.name === itemA.title);
@ -685,6 +686,18 @@ Page({
expandList: arrs
})
},
clickGraphNode(parm){
if(parm.detail.data.type === 0){
this.setData({
resiId:parm.detail.data.id
})
this.getResiInfo()
}else{
wx.navigateTo({
url: `/subpages/house/pages/housePortrait/housePortrait?resiId=${parm.detail.data.id}`,
})
}
},
getDictName: async function (url, params, value, itemType, opction) {
try {
if (url) {
@ -837,7 +850,6 @@ Page({
}
})
},
>>>>>>> dfe56009a6df6ddb9f15a1825578dabd99db092e
/**
* 生命周期函数--监听页面初次渲染完成
*/
@ -863,17 +875,11 @@ Page({
* 生命周期函数--监听页面卸载
*/
onUnload() {
<<<<<<< HEAD
},
=======
if (timerId) {
clearInterval(timerId);
timerId = null;
}
},
>>>>>>> dfe56009a6df6ddb9f15a1825578dabd99db092e
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
@ -893,8 +899,6 @@ Page({
*/
onShareAppMessage() {
<<<<<<< HEAD
=======
},
gotopage(e) {
wx.navigateTo({
@ -923,6 +927,5 @@ Page({
this.setData({
activeType: e.currentTarget.dataset.index
})
>>>>>>> dfe56009a6df6ddb9f15a1825578dabd99db092e
}
})

236
subpages/searchResult/pages/resiInfo/resiInfo.wxml
View File

@ -1,7 +1,4 @@
<!--subpages/searchResult/pages/resiInfo/resiInfo.wxml-->
<<<<<<< HEAD
<text>subpages/searchResult/pages/resiInfo/resiInfo.wxml</text>
=======
<!-- 基本信息 -->
<view class="card">
<view class="top">
@ -9,7 +6,7 @@
<view class="name">
<view style="font-size: 32rpx;margin-right: 35rpx;">{{form.baseInfoDto.name}}</view>
<view style="font-size: 28rpx;color:#999999 ;">信息完整度：</view>
<view style="color:#04b8ad;">{{form.integrityData.score}}%</view>
<view style="color:#04b8ad;">{{form.integrityData.score}}</view>
</view>
<view class="tags">
<view class="tag" wx:for="{{form.baseInfoDto.categoryInfo.categoryNames}}" wx:key="index">{{item}}</view>
@ -19,11 +16,11 @@
<view class="jm-btn" bind:tap="toAddResi">编辑</view>
</view>
</view>
<view class="form">
<!-- <view class="form">
<view class="form_label">地址：</view>
<view class="form_value"><text >{{form
<view class="form_value"><text>{{form
.resideInfoDtos[0].agencyName}}</text>{{form.resideInfoDtos[0].homeName}}</view>
</view>
</view> -->
<view class="form">
<view class="form_label">创建时间：</view>
<view class="form_value">{{form.baseInfoDto.createdTime}}</view>
@ -33,8 +30,8 @@
<view class="form_value">{{form.baseInfoDto.updatedTime}}</view>
</view>
<view class="tabs">
<view class="tab_item {{activeType === index ? 'border_bto' : ''}}" wx:for="{{tabList}}" bind:tap="handelClickTab" data-item="{{item}}" data-index="{{index}}" wx:key="index" wx:if="{{item.filledQty!=0}}">
{{item.name}} <text style="color:{{item.filledQty!==item.totalQty?'#f27225':'#1ebfb5'}}" wx:if="{{item.filledQty}}">（{{ item.filledQty }}/{{ item.totalQty }}）</text>
<view class="tab_item {{activeType === index ? 'border_bto' : ''}}" wx:for="{{tabList}}" bind:tap="handelClickTab" data-item="{{item}}" data-index="{{index}}" wx:key="index" wx:if="{{item.id=='ext'||item.filledQty!=0 }}">
{{item.name}} <text style="color:{{item.filledQty!==item.totalQty?'#f27225':'#1ebfb5'}}" wx:if="{{item.filledQty ||item.id=='ext'}}">（{{ item.filledQty }}/{{ item.totalQty }}）</text>
</view>
</view>
</view>
@ -43,18 +40,22 @@
<view class="title">基础信息</view>
<view class="info">
<view class="item">
<text class="must">*</text>
<view class="label">国籍：</view>
<View class="value">{{form.baseInfoDto.nationalityName|| '--' }}</View>
</view>
<view class="item">
<text class="must">*</text>
<view class="label">证件类型：</view>
<View class="value">{{idTypeList[form.baseInfoDto.idType].label}}</View>
</view>
<view class="item">
<text class="must">*</text>
<view class="label">证件号：</view>
<View class="value">{{form.baseInfoDto.idNum}}</View>
</view>
<view class="item">
<text class="must">*</text>
<view class="label">联系电话：</view>
<View class="value">{{form.baseInfoDto.mobile}}</View>
</view>
@ -77,12 +78,214 @@
</view>
<view class="item">
<view class="label">婚姻状况：</view>
<View class="value"> {{marriageName}}</View>
<View class="value"> {{marriageName||'--'}}</View>
</view>
<view class="item">
<view class="label">籍贯：</view>
<View class="value">{{form.baseInfoDto.nativePlace}}</View>
<View class="value">{{form.baseInfoDto.nativePlace||'--'}}</View>
</view>
</view>
</view>
<view class="card" id="reside">
<view class="title">居住信息</view>
<view class="info" wx:for="{{form.resideInfoDtos}}" wx:key="index" style="margin-top: 20rpx;">
<view class="item">
<text class="must">*</text>
<view class="label">所属网格：</view>
<View class="value">{{item.gridName|| '--' }}</View>
</view>
<view class="item">
<text class="must">*</text>
<view class="label">所属房屋：</view>
<View class="value">{{item.agencyName}}{{item.homeName }}</View>
</view>
<view class="item">
<text class="must">*</text>
<view class="label">人房关系：</view>
<View class="value">{{
item.resiHouseRel != null
? item.resiHouseRel === 0
? "自住"
: item.resiHouseRel === 1
? "租住"
: "--"
: "--"
}}</View>
</view>
<view class="item">
<text class="must">*</text>
<view class="label">人户状况：</view>
<view class="value" wx:if="{{item.householdSituation && dicts.householdSituationArr}}">
<block wx:for="{{dicts.householdSituationArr}}" wx:for-item="selectItem" wx:key="index">
<block wx:if="{{selectItem.value === item.householdSituation}}">
{{selectItem.label}}
</block>
</block>
</view>
<view wx:else>--</view>
</view>
<view class="item">
<view class="label">户籍所在地：</view>
<View class="value"> {{ item.placeOfDomicile === 'null'?'--':item.placeOfDomicile}}</View>
</view>
<view class="item">
<text class="must">*</text>
<view class="label">与户主关系：</view>
<View class="value"> {{dicts.houseHolderRelArr[item.houseHolderRel].label || "--" }}</View>
</view>
</view>
</view>
<view class="card" id="ext">
<view class="title">拓展信息</view>
<view class="info">
<view class="item">
<view class="label">宗教信仰：</view>
<view class="value">{{
form.religionDto && form.religionDto.religion
? form.religionDto.religion
: "--"
}}</view>
</view>
<view class="item">
<view class="must">*</view>
<view class="label">就业状态：</view>
<View class="value">{{dicts.careerStatusArr[form.workInfoDto.careerStatus].label || '--'}}</View>
</view>
<view class="item" wx:if="{{form.workInfoDto && form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5}}">
<view class="label">工作单位：</view>
<View class="value">{{
form.workInfoDto
? form.workInfoDto.workUnit
? form.workInfoDto.workUnit
: "--"
: "--"
}}</View>
</view>
<view class="item" wx:if="{{ form.unemployedDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)}}">
<view class="label">原工作单位：</view>
<View class="value">{{
form.unemployedDto
? form.unemployedDto.originWorkUnit
? form.unemployedDto.originWorkUnit
: "--"
: "--"
}}</View>
</view>
<view class="item" wx:if="{{form.workInfoDto && form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5}}">
<view class="label">职业：</view>
<View class="value">{{
form.workInfoDto
? form.workInfoDto.occupation
? form.workInfoDto.occupation
: "--"
: "--"
}}</View>
</view>
<view class="item" wx:if="{{ form.unemployedDto && (form.workInfoDto.careerStatus == 0 ||form.workInfoDto.careerStatus == 6)}}">
<view class="label">失业时间：</view>
<View class="value">{{
form.unemployedDto
? form.unemployedDto.unemploymentTime
? form.unemployedDto.unemploymentTime
: "--"
: "--"
}}</View>
</view>
<view class="item" wx:if="{{form.economyDto && form.workInfoDto.careerStatus >= 1 &&form.workInfoDto.careerStatus <= 5}}">
<view class="label">月收入：</view>
<View class="value">{{
form.economyDto
? form.economyDto.monthIncome
? form.economyDto.monthIncome
: "--"
: "--"
}}</View>
</view>
<view class="item" wx:if="{{ form.unemployedDto && (form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)}}">
<view class="label">失业证号：</view>
<View class="value">{{
form.unemployedDto
? form.unemployedDto.unemploymentNum
? form.unemployedDto.unemploymentNum
: "--"
: "--"
}}</View>
</view>
<view class="item" wx:if="{{ form.unemployedDto &&(form.workInfoDto.careerStatus == 0 ||form.workInfoDto.careerStatus == 6)}}">
<view class="label">失业原因：</view>
<View class="value">{{
form.unemployedDto
? form.unemployedDto.unemploymentReason
? form.unemployedDto.unemploymentReason
: "--"
: "--"
}}</View>
</view>
<view class="item" wx:if="{{ form.unemployedDto &&(form.workInfoDto.careerStatus == 0 ||form.workInfoDto.careerStatus == 6)}}">
<view class="label">失业原因：</view>
<View class="value">{{
form.unemployedDto
? form.unemployedDto.employmentNum
? form.unemployedDto.employmentNum
: "--"
: "--"
}}</View>
</view>
<view class="item" wx:if="{{ form.unemployedDto && (form.workInfoDto.careerStatus == 0 ||form.workInfoDto.careerStatus == 6)}}">
<view class="label">技术特长：</view>
<View class="value">{{
form.unemployedDto
? form.unemployedDto.specialSkill
? form.unemployedDto.specialSkill
: "--"
: "--"
}}</View>
</view>
<view class="item" wx:if="{{ form.unemployedDto &&(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6)}}">
<view class="label">是否领取失业金：</view>
<View class="value">{{
form.unemployedDto.unempCompensationFlag != null
? form.unemployedDto.unempCompensationFlag === 0
? "否"
: form.unemployedDto.unempCompensationFlag === 1
? "是"
: "--"
: "--"}}</View>
</view>
<view class="item" wx:if="{{ form.unemployedDto &&(form.workInfoDto.careerStatus == 0 ||form.workInfoDto.careerStatus == 6)}}">
<view class="label">是否就业困难对象：</view>
<View class="value">{{
form.unemployedDto.employmentHardFlag != null
? form.unemployedDto.employmentHardFlag === 0
? "否"
: form.unemployedDto.employmentHardFlag === 1
? "是"
: "--"
: "--"}}</View>
</view>
<view class="item" wx:if="{{ form.workInfoDto &&(form.workInfoDto.careerStatus == 0 ||form.workInfoDto.careerStatus == 6)}}">
<view class="label">劳动就业愿望：</view>
<View class="value">{{
form.workInfoDto
? form.workInfoDto.employmentWish
? form.workInfoDto.employmentWish
: "--"
: "--"}}</View>
</view>
<view class="item">
<view class="label">有无赡养人：</view>
<View class="value">{{form.familyInfoDto &&
form.familyInfoDto.elderlyFlag == 1
? "有"
: form.familyInfoDto &&
form.familyInfoDto.elderlyFlag == 0
? "无"
: "--"}}</View>
</view>
</view>
</view>
@ -98,7 +301,7 @@
</view>
<view class="card" id="graph">
<view class="title">关系图谱</view>
<resi-graph resiId="{{resiId}}"></resi-graph>
<resi-graph resiId="{{resiId}}" bind:clickGraphNode="clickGraphNode"></resi-graph>
</view>
<!-- 走访打卡 -->
@ -117,15 +320,14 @@
<view class="bto_btn">
<button class="btn" hover-class="blue" bind:tap="toEvent">上报诉求</button>
<button class="btn" hover-class="blue" bind:tap="toWebView" wx:if="{{agencyLevel!=='street'}}">
满意度调查</button>
<view class="btn" bind:tap="toEvent">上报诉求</view>
<view class="btn" bind:tap="toWebView" wx:if="{{agencyLevel!=='street'}}">
满意度调查</view>
<!-- -->
<button class="btn blue">走访打卡</button>
<view class="btn blue">走访打卡</view>
</view>
<van-dialog use-slot title="密码验证" show="{{ checkPassword }}" show-cancel-button bind:close="onClosePassword" bind:confirm="onConfirmassword" custom-class="dialog" confirm-button-color="#3974f6">
<view>
<input type="text" bind:input="bindPassword" bind:blur="bindPassword" value="{{password}}" placeholder="请输入密码" password />
</view>
</van-dialog>
>>>>>>> dfe56009a6df6ddb9f15a1825578dabd99db092e

27
subpages/searchResult/pages/resiInfo/resiInfo.wxss
View File

@ -59,12 +59,29 @@ page {
.info .item {
display: flex;
margin-top: 28rpx;
position: relative;
}
.info .item .label {
width: fit-content;
color: #999999;
}
.info .item .value {
flex: 1;
overflow-x: hidden;
}
.must{
font-size: 32rpx;
font-weight: 500;
color: #FF2A00;
position: absolute;
left: -18rpx;
top: 49rpx;
transform: translateY(-50rpx);
}
.punch {
width: 260rpx;
height: 260rpx;
@ -101,14 +118,18 @@ page {
}
.btn {
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
text-align: center;
height: 76rpx;
border-radius: 38rpx;
border-radius: 39rpx;
margin: 30rpx 0;
line-height: 76rpx;
border-radius: 76rpx;
border: 2rpx solid #999999;
border: 1rpx solid #999999;
width: 226rpx;
text-align: center;
}
.blue{

Write Preview
Loading…
Cancel
Save