zhangzl
/
nsgk_mobile
2
0
Çatalla 0
Kod Konular 0 Değişiklik İstekleri 0 Sürümler 0 Wiki Aktivite
Kaynağa Gözat

Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile 

 Conflicts:
	src/views/homesteadSurvey/list.vue
wulanhaote
庞东旭 3 yıl önce
ebeveyn
6a69c8a50d 358d479baa
işleme
01807b0627
6 değiştirilmiş dosya ile 504 ekleme ve 290 silme
Görünümü Böl
Diff Seçenekleri
İstatistikleri Göster Yama Dosyasını İndir Diff Dosyasını İndir
  1. +2
    -2
      src/App.vue
  2. +2
    -2
      src/components/common/nav_footer.vue
  3. +16
    -3
      src/views/homesteadLogin.vue
  4. +323
    -128
      src/views/homesteadSurvey/add.vue
  5. +156
    -155
      src/views/homesteadSurvey/list.vue
  6. +5
    -0
      src/views/homesteadSurvey/settle.vue

+ 2
- 2
src/App.vue Dosyayı Görüntüle

@@ -47,10 +47,10 @@
</template>

<script>
/*import navFooter from "@/components/common/nav_footer";*/
import navFooter from "@/components/common/nav_footer";
export default {
name: "App",
/*components: { navFooter },*/
components: { navFooter },
data: () => {
return {
// direction: "",


+ 2
- 2
src/components/common/nav_footer.vue Dosyayı Görüntüle

@@ -1,6 +1,6 @@
<template>
<div class="tb-toolbar-container">
<router-link to="/index" class="tab" active-class="active" exact>
<!--<router-link to="/index" class="tab" active-class="active" exact>
<span class="icon"><van-icon name="wap-home-o" size="25" /></span>
<p class="text">首页</p>
</router-link>
@@ -11,7 +11,7 @@
<router-link to="/user" class="tab" active-class="active">
<span class="icon"><van-icon name="contact" size="25" /></span>
<p class="text">我的</p>
</router-link>
</router-link>-->
<!-- <router-link to="/addressBook" class="tab" active-class="active">-->
<!-- <span class="icon"><van-icon name="orders-o" size="20" /></span>-->
<!-- <p class="text">通讯录</p>-->


+ 16
- 3
src/views/homesteadLogin.vue Dosyayı Görüntüle

@@ -49,6 +49,7 @@
</template>
</van-field>
</div>
<van-checkbox style="float: right;margin-top:10px;margin-bottom:10px;margin-left:20px;" v-model="formData.rememberMe" >{{showMessage ? "记住手机号" : "记住密码"}}</van-checkbox>
<div style="margin: 10px 5px 5px;padding:10px">
<van-button block round size="large" :color="formData.username!=''&&formData.password!=''?'#7AC943':'#e2e2e2'" :disabled="formData.username==''||formData.password==''" native-type="submit" @click="handleLogin">登录</van-button>
</div>
@@ -187,10 +188,10 @@ export default {
const password = Cookies.get("password");
const rememberMe = Cookies.get("rememberMe");
this.formData = {
username: username === undefined ? this.formData.username : username,
username: username === undefined ? this.formData.username : Cookies.get("username"),
password:
password === undefined ? this.formData.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
password === undefined ? this.formData.password : decrypt(Cookies.get("password")),
rememberMe: rememberMe === undefined ? false : Boolean(Cookies.get("rememberMe")),
};
},
getSmsCode() {
@@ -239,6 +240,16 @@ export default {
});
return false;
}
// 记住密码
if (this.formData.rememberMe) {
Cookies.set("username", this.formData.username, { expires: 30 });
Cookies.set("password", encrypt(this.formData.password), { expires: 30 });
Cookies.set("rememberMe", this.formData.rememberMe, { expires: 30 });
} else {
Cookies.remove("username");
Cookies.remove("password");
Cookies.remove("rememberMe");
}
this.$store
.dispatch("Login", this.formData)
.then(() => {
@@ -247,6 +258,7 @@ export default {
.catch((error) => {
this.loading = false;
this.getCode();
this.formData.code = null
});
},
getRegisterSmsCode(){
@@ -288,6 +300,7 @@ export default {
}).catch((res)=>{
if(res=='Error: 验证码已失效'){
this.getCode()
this.formData.code = null
}
});
}


+ 323
- 128
src/views/homesteadSurvey/add.vue
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 156
- 155
src/views/homesteadSurvey/list.vue Dosyayı Görüntüle

@@ -139,19 +139,17 @@
v-model="qlrform.qydm"
name="区域代码"
label="区域代码"
required
placeholder="区域代码"
placeholder="禁止修改"
disabled
input-align="right"
:rules="[{ required: true, message: '' }]"
/>
<van-field
v-model="qlrform.suyqrdm"
name="所有权人代码"
label="所有权人代码"
required
placeholder="所有权人代码"
disabled
placeholder="自动生成"
input-align="right"
:rules="[{ required: true, message: '' }]"
/>
<van-field
v-model="qlrform.suyqrmc"
@@ -160,7 +158,7 @@
required
placeholder="所有权人名称"
input-align="right"
:rules="[{ required: true, message: '' }]"
:rules="[{ required: true, message: '所有权人名称不能为空' }]"
/>
<van-field
v-model="qlrform.suyqxzName"
@@ -169,7 +167,7 @@
required
placeholder="所有权性质"
input-align="right"
:rules="[{ required: true, message: '' }]"
:rules="[{ required: true, message: '所有权性质不能为空' }]"
@click="showsuyqxz = true"
/>
<van-field
@@ -192,7 +190,7 @@
required
placeholder="代表人姓名"
input-align="right"
:rules="[{ required: true, message: '' }]"
:rules="[{ required: true, message: '代表人姓名不能为空' }]"
/>
<van-field
v-model="qlrform.dbrzjlx"
@@ -205,7 +203,7 @@
required
placeholder="代表人证件类型"
input-align="right"
:rules="[{ required: true, message: '' }]"
:rules="[{ required: true, message: '代表人证件类型不能为空' }]"
@click="showdbrzjlx = true"
/>
<van-popup v-model="showdbrzjlx" position="bottom" input-align="right">
@@ -232,7 +230,7 @@
label="代表人联系电话"
placeholder="代表人联系电话"
input-align="right"
:rules="[{ required: true, message: '' }]"
:rules="[{ required: true, message: '代表人联系电话不能为空' }]"
/>
<van-field
v-model="qlrform.dbrtxdz"
@@ -241,7 +239,7 @@
required
placeholder="代表人通讯地址"
input-align="right"
:rules="[{ required: true, message: '' }]"
:rules="[{ required: true, message: '代表人通讯地址不能为空' }]"
/>
<van-field
v-model="qlrform.dbryzbm"
@@ -250,7 +248,7 @@
required
placeholder="代表人邮政编码"
input-align="right"
:rules="[{ required: true, message: '' }]"
:rules="[{ required: true, message: '代表人邮政编码不能为空' }]"
/>
<van-field name="radio" label="是否成立农村集体经济组织" required input-align="right">
<template #input>
@@ -354,6 +352,8 @@
placeholder="数据来源"
input-align="right"
@click="showsjly = true"
required
:rules="[{ required: true, message: '数据来源不能为空' }]"
/>
<van-field
v-model="qlrform.sjly"
@@ -388,44 +388,18 @@
</van-search>-->
<div id="mapWrapAll" style="width: 100%;height: 100vh"></div>
<div id="info" style="display: none"></div>
<van-overlay :show="showSearch" @click="closeSearchBox" />
<!--搜索栏目-->
<div class="searchBar_wrap" :style="{bottom : bottomHeight}">
<van-search
v-model="seachText"
show-action
placeholder="请输入宗地或权利人信息"
>
<template #action>
<div id="query">搜索</div>
</template>
</van-search>
<div class="searchBox">
<van-cell center >
<template #title>
<p><van-icon name="manager" /><span>刘茂强</span><span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">已核查</span></p>
</template>
<template #default>
<p style="border: 1px solid #7ac943;color:#7ac943;">查看详情</p>
</template>
<template #label>
<p style="font-size: 0.25rem;color: #666666;">宅基地代码 230381199705255117</p>
<p style="font-size: 0.25rem;color: #666666;">宗地面积 113.87㎡</p>
</template>
</van-cell>

<van-cell center >
<template #title>
<p><van-icon name="manager" /><span>刘茂强</span><span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">已核查</span></p>
</template>
<template #default>
<p style="border: 1px solid #7ac943;color:#7ac943;">查看详情</p>
</template>
<template #label>
<p style="font-size: 0.25rem;color: #666666;">宅基地代码 230381199705255117</p>
<p style="font-size: 0.25rem;color: #666666;">宗地面积 113.87㎡</p>
</template>
</van-cell>
<div class="searchBar_wrap">
<div class="searchBar_area">
<div class="bar_icon"></div>
<div class="bar_ipt">
<input
type="text"
v-model="seachText"
placeholder="请输入宗地或权利人信息"
/>
</div>
<div id="query" class="bar_text">搜索</div>
</div>
</div>
<!--点击房地-显示的搜索--->
@@ -573,7 +547,8 @@
name="所有权人代码"
label="所有权人代码"
placeholder="所有权人代码"
:rules="[{ required: true, message: '' }]"
required
:rules="[{ required: true, message: '所有权人代码不能为空' }]"
/>
<van-field
input-align="right"
@@ -581,7 +556,8 @@
name="农户代码"
label="农户代码"
placeholder="农户代码"
:rules="[{ required: true, message: '' }]"
required
:rules="[{ required: true, message: '农户代码不能为空' }]"
/>
<van-field
input-align="right"
@@ -589,7 +565,8 @@
name="户主姓名"
label="户主姓名"
placeholder="户主姓名"
:rules="[{ required: true, message: '' }]"
required
:rules="[{ required: true, message: '户主姓名不能为空' }]"
/>
<van-field
input-align="right"
@@ -598,7 +575,8 @@
label="户主证件类型"
placeholder="户主证件类型"
required
:rules="[{ required: true, message: '' }]"
readonly
:rules="[{ required: true, message: '户主证件类型不能为空' }]"
@click="showhzzjlx = true"
/>
<van-field
@@ -611,7 +589,8 @@
name="户主证件号码"
label="户主证件号码"
placeholder="户主证件号码"
:rules="[{ required: true, message: '' }]"
required
:rules="[{ required: true, message: '户主证件号码不能为空' }]"
/>
<van-field
input-align="right"
@@ -619,6 +598,8 @@
name="通讯地址"
label="通讯地址"
placeholder="通讯地址"
required
:rules="[{ required: true, message: '通讯地址不能为空' }]"
/>
<van-field
input-align="right"
@@ -626,6 +607,8 @@
name="户内成员数量"
label="户内成员数量"
placeholder="户内成员数量"
required
:rules="[{ required: true, message: '户内成员数量不能为空' }]"
/>
<van-field name="radio" label="婚姻状况" input-align="right">
<template #input>
@@ -634,7 +617,6 @@
</van-radio-group>
</template>
</van-field>

<van-field
input-align="right"
v-model="nhform.phone"
@@ -649,7 +631,8 @@
label="职业"
placeholder="职业"
required
:rules="[{ required: true, message: '' }]"
readonly
:rules="[{ required: true, message: '职业不能为空' }]"
@click="showhzoccupation = true"
/>
<van-field
@@ -663,7 +646,8 @@
label="居住情况"
placeholder="居住情况"
required
:rules="[{ required: true, message: '' }]"
readonly
:rules="[{ required: true, message: '居住情况不能为空' }]"
@click="showhzjzqk = true"
/>
<van-field
@@ -677,7 +661,8 @@
label="在集镇或城市是否有住房"
placeholder="在集镇或城市是否有住房"
required
:rules="[{ required: true, message: '' }]"
readonly
:rules="[{ required: true, message: '在集镇或城市是否有住房不能为空' }]"
@click="showhzjzhcssfyzf = true"
/>
<van-field
@@ -716,6 +701,21 @@
</van-radio-group>
</template>
</van-field>
<van-field
input-align="right"
v-model="nhform.sjlyName"
name="数据来源"
label="数据来源"
placeholder="数据来源"
required
readonly
:rules="[{ required: true, message: '能为空' }]"
@click="showhzsjly = true"
/>
<van-field
v-model="nhform.sjly"
style="display:none"
/>
<van-field
input-align="right"
v-model="nhform.bz"
@@ -732,6 +732,26 @@
</van-form>
</div>
</van-popup>
<!--户主数据来源-->
<van-popup v-model="showhzsjly" position="bottom">
<van-picker
show-toolbar
:columns="sjlyOptions"
value-key="dictLabel"
@confirm="onConfirmhzsjly"
@cancel="showhzsjly = false"
/>
</van-popup>
<!--户内成员数据来源-->
<van-popup v-model="showhncysjly" position="bottom">
<van-picker
show-toolbar
:columns="sjlyOptions"
value-key="dictLabel"
@confirm="onConfirmhncysjly"
@cancel="showhncysjly = false"
/>
</van-popup>
<!--集市或城市是否有住房-->
<van-popup v-model="showhzjzhcssfyzf" position="bottom">
<van-picker
@@ -882,7 +902,8 @@
name="农户代码"
label="农户代码"
placeholder="农户代码"
:rules="[{ required: true, message: '' }]"
required
:rules="[{ required: true, message: '农户代码不能为空' }]"
/>
<van-field
input-align="right"
@@ -890,7 +911,8 @@
name="姓名"
label="姓名"
placeholder="姓名"
:rules="[{ required: true, message: '' }]"
required
:rules="[{ required: true, message: '姓名不能为空' }]"
/>
<van-field
input-align="right"
@@ -898,7 +920,9 @@
name="证件类型"
label="证件类型"
placeholder="证件类型"
:rules="[{ required: true, message: '' }]"
required
:rules="[{ required: true, message: '证件类型不能为空' }]"
readonly
@click="showhncyzjlx = true"
/>
<van-field
@@ -911,7 +935,8 @@
name="与户主关系"
label="与户主关系"
placeholder="与户主关系"
:rules="[{ required: true, message: '' }]"
required
:rules="[{ required: true, message: '与户主关系不能为空' }]"
@click="showhncyyhzgx = true"
/>
<van-field
@@ -924,9 +949,11 @@
name="证件号码"
label="证件号码"
placeholder="证件号码"
:rules="[{ required: true, message: '' }]"
required
:rules="[{ required: true, message: '证件号码不能为空' }]"
/>
<van-field name="radio" label="性别" input-align="right">
<van-field name="radio" label="性别" input-align="right" required
:rules="[{ required: true, message: '性别不能为空' }]">
<template #input>
<van-radio-group v-model="form5.xb" direction="horizontal">
<van-radio name="1">男</van-radio>
@@ -941,7 +968,6 @@
name="联系电话"
label="联系电话"
placeholder="联系电话"
:rules="[{ required: true, message: '' }]"
/>
<van-field name="radio" label="户口类型" input-align="right">
<template #input>
@@ -972,7 +998,6 @@
name="成员备注"
label="成员备注"
placeholder="成员备注"
:rules="[{ required: true, message: '' }]"
@click="showhncycybz = true"
/>
<van-field
@@ -985,7 +1010,6 @@
name="成员备注说明"
label="成员备注说明"
placeholder="成员备注说明"
:rules="[{ required: true, message: '' }]"
/>
<van-field
input-align="right"
@@ -1031,6 +1055,20 @@
</van-radio-group>
</template>
</van-field>
<van-field
input-align="right"
v-model="form5.sjlyName"
name="数据来源"
label="数据来源"
placeholder="数据来源"
required
:rules="[{ required: true, message: '' }]"
@click="showhncysjly = true"
/>
<van-field
v-model="form5.sjly"
style="display:none"
/>
<div style="margin: 16px;">
<van-button round block color="#7AC943" native-type="submit">保存</van-button>
</div>
@@ -1083,7 +1121,8 @@
name: "homesteadList",
data() {
return {
showSearch:false,
showhncysjly:false,
showhzsjly:false,
showhncycybz:false,
showhncyzjlx:false,
showhncyyhzgx:false,
@@ -1194,8 +1233,6 @@
searchBarOperVisbile: false,
//搜索---end
//地图使用 --end

bottomHeight:'0px',
};
},
mounted(){
@@ -1238,18 +1275,6 @@
this.getZjdList();
},
methods: {
closeSearchBox(){
this.showSearch = false ;
var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
document.styleSheets[0].insertRule(
"@keyframes test2" +
"{" +
"0%{bottom: 0px}" +
"100%{bottom: -" + height + "px;}" +
"}"
)
$('.searchBar_wrap').css({'animation':'test2 0.5s ease-in-out 0s 1 alternate forwards','-webkit-animation':'test2 0.5s ease-in-out 0s 1 alternate forwards'});
} ,
// 与户主关系翻译
yhzgxfy(value){
let label
@@ -1342,6 +1367,16 @@
onClickLeft(){
this.$router.push('/homesteadSurvey/index');
},
onConfirmhncysjly(value){
this.form5.sjlyName = value.dictLabel
this.form5.sjly = value.dictValue
this.showhncysjly= false
},
onConfirmhzsjly(value){
this.nhform.sjlyName = value.dictLabel
this.nhform.sjly = value.dictValue
this.showhzsjly= false
},
onConfirmhncycybz(value){
this.form5.cybzName = value.dictLabel
this.form5.cybz = value.dictValue
@@ -1416,7 +1451,11 @@
this.$toast({
icon: 'success', // 找到自己需要的图标
message: '修改成功',
duration:"1000"
duration:"1000",
onClose:function(){
_this.shownh = false
_this.getNh()
}
})
}
);
@@ -1428,7 +1467,11 @@
this.$toast({
icon: 'success', // 找到自己需要的图标
message: '保存成功',
duration:"1000"
duration:"1000",
onClose:function(){
_this.shownh = false
_this.getNh()
}
})
}
);
@@ -1553,7 +1596,9 @@
this.form5 = {}
this.form5.nhdm = this.nhform.nhdm
}else{
let _this = this
this.form5 = item
console.log(item.sjly)
this.jzhcssfyzfOptions.map(res => {
if(res.dictValue == item.jzhcssfyzf){
this.form5.jzhcssfyzfName = res.dictLabel
@@ -1584,6 +1629,11 @@
this.form5.cybzName = res.dictLabel
}
})
this.sjlyOptions.map(res => {
if(res.dictValue == item.sjly){
this.form5.sjlyName = res.dictLabel
}
})
}
},
// 户内成员列表
@@ -1622,6 +1672,11 @@
this.nhform.jzqkName = res.dictLabel
}
})
this.sjlyOptions.map(res => {
if(res.dictValue == item.sjly){
this.nhform.sjlyName = res.dictLabel
}
})
},
getZjdList(){
if(this.active==1){
@@ -1737,12 +1792,6 @@
setTimeout(() => {
this.GetMapsInit();
}, 300);
var that = this;
setTimeout(function () {
var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
console.log($('.searchBox').outerHeight(true)+'px')
that.bottomHeight = -height+'px'
},500)
},
//地图加载 -----start
GetMapsInit() {
@@ -2398,7 +2447,7 @@
*/
var val = that.seachText;
if (val == "") {
that.$toast("请填写查询信息");
alert("请填写查询条件在查询");
} else {
//分类查询查询农地、农房
var difang;
@@ -2406,8 +2455,7 @@
var cql_filter;

console.log(this.$cookies);
// var cun = that.villageDataObj.deptName;
var cun = '';
//var cun = _this.villageDataObj.deptName;

difang = ["zjd_dc:t_house_survey_zjdzd", "zjd_dc:t_house_survey_zrz","zjd_dc:t_house_survey_fsss"];
var tach = 0;
@@ -2601,17 +2649,6 @@
});
map.addLayer(delete_map[i]);
}
console.log($(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true))
that.showSearch = true ;
var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
document.styleSheets[0].insertRule(
"@keyframes test" +
"{" +
"0%{bottom: -" + height + "px;}" +
"100%{bottom: 0px;}" +
"}"
)
$('.searchBar_wrap').css({'animation':'test 0.5s ease-in-out 0s 1 alternate forwards','-webkit-animation':'test 0.5s ease-in-out 0s 1 alternate forwards'});
}
});
//按照查询 定位地图-----------------end
@@ -3871,6 +3908,10 @@
</script>

<style scoped lang="scss">

.closeIcon{

}
.bannerBg{
width: 100%;
color:#fff;
@@ -3904,12 +3945,12 @@
margin:0 10px;
box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
}
/*.van-cell__label{*/
/* color: #969799;*/
/* font-size: 12px;*/
/* line-height: 20px;*/
/* margin:0*/
/*}*/
.van-cell__label{
color: #969799;
font-size: 12px;
line-height: 20px;
margin:0
}
.map_area {
width: 50vw;
height: 50vh;
@@ -4179,56 +4220,15 @@

.searchBar_wrap {
// display: none;
display: flex;
position: fixed;
bottom: 0%;
left: 0;
bottom: 0;
width: 100%;
padding: 0px 16px 0px 13px;
padding: 28px 16px 28px 13px;
background: #fff;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
z-index: 9;

.searchBox{
.van-cell{
/*&:first-child{*/
/* box-shadow: none;*/
/* margin:0;*/
/*}*/
box-shadow: 0px 0px 5px #cccccc;
border-radius: 15PX;
margin-bottom: 0.35rem;
}
.van-cell__title{
flex: 0.8;
p{
color: rgb(34, 183, 242);
.van-icon{
vertical-align: middle;
}
span{
vertical-align: middle;
&:nth-child(3){
font-size: 0.25rem;
border-radius: 5PX;
padding: 5PX 15PX;
margin-left: 50%;
}
}
}
}
.van-cell__value{
flex: 0.2;
p{
font-size: 0.25rem;
display: inline-block;
border-radius: 1rem;
line-height: 1;
padding: 15PX 20PX;
}
}
}

.actionBar_wrap {
display: flex;
position: absolute;
@@ -4236,6 +4236,7 @@
left: 0;
width: 100%;
height: 100%;

background: #fff;
border-top-left-radius: 15px;
border-top-right-radius: 15px;


+ 5
- 0
src/views/homesteadSurvey/settle.vue Dosyayı Görüntüle

@@ -24,6 +24,11 @@
<van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
</template>
</van-cell>
<van-cell title="切换账号" is-link to="/homesteadLogin" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
<template #icon>
<van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
</template>
</van-cell>
</div>
</template>



Yaz Önizleme
Yükleniyor…
İptal
Kaydet