Skip to content

X
xichonght
Commit a01aa7ab authored by miaohaoyun's avatar miaohaoyun
Browse files
Options

Merge branch 'master' into 'mhy' 

Master

See merge request !59
parents 3a9a8cb8 4d435cd3
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 90 deletions
xichongSys/src/views/Core/candode.vue
View file @ a01aa7ab
<template>
<div>
<div>
<el-cascader
:props="{ expandTrigger: 'hover' }"
:props="{ checkStrictly: true }"
clearable
placeholder="请选择镇村"
v-model="value"
:options="options"
size="mini"
@change="handleChange"
></el-cascader>
@change="handleChange"></el-cascader>
</div>
......@@ -29,13 +28,13 @@
handleChange(value) {
this.$emit('childByValue', value)
},
},
created(){
this.$api.getlist.getTown().then((res) => {
this.options=res.data
console.log(res.data)
this.$emit('getTownlength', this.options.length)
}).catch((res) => {
......@@ -43,8 +42,3 @@
}
};
</script>
<style>
.block {
min-width: 200px;
}
</style>
xichongSys/src/views/Intro/Intro.vue
View file @ a01aa7ab
<template>
<el-carousel :interval="100000" type="card" class="carousel" height="70vh" >
<el-carousel :interval="100000000000000000" style="margin-top:30px;" align=center type="card" class="carousel" height="70vh" >
<el-carousel-item class="carousel-item-intro" style="width:85%; height:100%;position:absolute;left:-18%;">
<div class="ddiv1">
<div class="div1" id="echartContainer1">
<div class="div1" height=100% :style="{width: '90%', height: '100%'}" id="echartContainer1">
</div>
<div class="nextpage">
<div class="nextpage" style="margin-top:-50px">
<p style="display:none">{{count}}</p>
<el-button class="gopagediv1" @click="goPageClick1"> 上一页</el-button>
<el-button class="gopagediv1" @click="nextPageClick1"> 下一页</el-button>
<el-button size="mini" class="gopagediv1" @click="goPageClick1"> 上一页</el-button>
<el-button size="mini" class="gopagediv1" @click="nextPageClick1"> 下一页</el-button>
</div>
</div>
</el-carousel-item>
<el-carousel-item class="carousel-item-func" style="width:85%;height:100%;position:absolute;left:-18%">
<!-- <el-carousel-item class="carousel-item-func" style="width:85%;height:100%;position:absolute;left:-18%">
<div class="ddiv2">
<div class="div2" id="echartContainer2" ></div>
</div>
......@@ -19,7 +19,7 @@
</div>
</el-carousel-item>
<el-carousel-item class="carousel-item-env" style="width:85%;height:100%;position:absolute;left:-18%;">
</el-carousel-item>
</el-carousel-item> -->
</el-carousel>
</template>
......@@ -47,7 +47,7 @@
data: ['参保登记', '信息变更','待遇申请','参保注销','补缴保费','升档改办','关系转移']
},
grid: {
top: '30%',
top: '25%',
containLabel: true
},
xAxis: {
......@@ -267,7 +267,7 @@
this.echartzz=JSON.parse(sessionStorage.getItem("lj"));
this.chartinfo(this.chartdata);
}else {
alert('已经到最后一页了');
this.$message.error('已经是最后一页了');
}
},
......@@ -278,7 +278,7 @@
this.chartdata.chartsize=10;
console.log(this.count);
if(this.count<1){
alert('已经第一页了');
this.$message.error('已经是第一页了');
}else{
this.echartzz=JSON.parse(sessionStorage.getItem("lj"));
this.chartinfo(this.chartdata);
......@@ -296,7 +296,7 @@
<style>
.carousel-item-intro {
background-color: #EFF3F4;
background-color:#a3b3b965;
-webkit-border-radius: 25px;
border-radius: 25px;
-moz-border-radius: 15px;
......@@ -325,20 +325,19 @@
height: 90%;
}
.div1{
width:70%;
height:65%;
margin-top: 5%;
}
.nextpage{
}
.ddiv2{
margin: auto;
width: 90%;
height: 90%;
}
.div2{
width:70%;
height:65%;
margin-top: 5%;
}
......
xichongSys/src/views/Myvue/authRecord.vue
View file @ a01aa7ab
......@@ -2,7 +2,7 @@
<div>
<div class="op">
<Candode v-on:childByValue="childByValue"></Candode>
<Candode v-on:childByValue="childByValue" v-on:getTownlength="getTownlength"></Candode>
<!--<div class="add" style="margin-left:0">
<el-select clearable size="mini" @change="handleChange" v-model="town" placeholder="请选择乡/镇">
......@@ -269,71 +269,77 @@ import Candode from "../Core/candode"
},{
value:"2",
label:"企业员工",
}]
}],
townlen:1
}
},
methods: {
childByValue(val){
this.townList=val
},
getTownlength(val){
this.townlen=val
},
//搜索
serch(){
Loading.service();
this.serchs(1)
},
serchs(p){
serchs(p){
if(this.townList =='' && this.townlen == 1){
this.$message.error("请选择镇村！");
return;
}
Loading.service();
var start=""
var end=""
if(this.time){
var d=this.time[0]
var s=this.time[1]
var mon=(parseInt(d.getMonth()) + 1)
var emon=(parseInt(s.getMonth()) + 1)
start = d.getFullYear()+"-"+mon+"-"+d.getDate()
var start=""
var end=""
if(this.time){
var d=this.time[0]
var s=this.time[1]
console.log(d)
var mon=(parseInt(d.getMonth()) + 1)
var emon=(parseInt(s.getMonth()) + 1)
start = d.getFullYear()+"-"+mon+"-"+d.getDate()
end=s.getFullYear()+"-"+emon+"-"+s.getDate()
end=s.getFullYear()+"-"+emon+"-"+s.getDate()
}
var data={
province_name:"四川省",
city_name:"南充市",
county_name:"西充县",
pageSize:10,
page:p,
// town_name:this.town.split(",")[1],
// village_name:this.village.split(",")[1],
town_name: this.townList?this.townList[0]:'',
village_name:this.townList?this.townList[1]:'',
iDCard:this.idcard,
match_state:this.state,
begin_time:start,
end_time:end,
siType:this.cblx,
personName:this.name,
address:this.agemeth,
birthday:this.age
}
Axios.get(baseUrl2+'/search/authentication.do',{
params:data
})
.then(res => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
this.tableData=res.data.obj
this.totals=res.data.page.total_count
})
.catch(err => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
});
}
var data={
province_name:"四川省",
city_name:"南充市",
county_name:"西充县",
pageSize:10,
page:p,
// town_name:this.town.split(",")[1],
// village_name:this.village.split(",")[1],
town_name: this.townList?this.townList[0]:'',
village_name:this.townList?this.townList[1]:'',
iDCard:this.idcard,
match_state:this.state,
begin_time:start,
end_time:end,
siType:this.cblx,
personName:this.name,
address:this.agemeth,
birthday:this.age
}
Axios.get(baseUrl2+'/search/authentication.do',{
params:data
})
.then(res => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
this.tableData=res.data.obj
this.totals=res.data.page.total_count
})
.catch(err => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
});
},
},
//流程
progress(d,s){
......@@ -407,16 +413,13 @@ import Candode from "../Core/candode"
// }
// console.log(this.list)
Axios.get(baseUrl2+'/show/getTownList.do?county_id=511325000000',{
})
.then(res => {
this.list=res.data
})
.catch(err => {
console.log(err);
});
Axios.get(baseUrl2 + '/show/getTownList.do?county_id=511325000000', {})
.then(res => {
this.list = res.data
})
.catch(err => {
console.log(err);
});
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment