Skip to content

C
civil-front
Commit b9639bdb by 李耀锟
Options

Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front into master 

# Conflicts:
#	src/views/unified/tapSwitch/childWelfare.vue
#	src/views/unified/tapSwitch/provide.vue
parents 2a15e973 febb6153
Showing with 417 additions and 187 deletions
src/api/unified/unified.js
...@@ -136,9 +136,9 @@ export const getFivesYearShjzProvideStats = data => { ...@@ -136,9 +136,9 @@ export const getFivesYearShjzProvideStats = data => {
} }
//低保对象搜索 //低保对象搜索
export const lowIncomeSearch = data => { export const societyHelpSearch = data => {
return request({ return request({
url: 'portal/admin/stats/lowIncomeSearch', url: 'portal/admin/stats/societyHelpSearch',
method: 'POST', method: 'POST',
data data
......
src/views/unified/tapSwitch/childWelfare.vue
...@@ -7,17 +7,33 @@ ...@@ -7,17 +7,33 @@
<el-col :span="24"> </el-col> <el-col :span="24"> </el-col>
<el-col :span="24"> <el-col :span="24">
<div class="wian"> <div class="wian">
<img src="./../../../assets/images/01-左上角.png" alt="" class="topLeft"> <img
<img src="./../../../assets/images/02-右上角.png" alt="" class="topRight"> src="./../../../assets/images/01-左上角.png"
<img src="./../../../assets/images/03-左下角.png" alt="" class="lowerLeft"> alt=""
<img src="./../../../assets/images/04-右下角.png" alt="" class="lowerRight"> class="topLeft"
<div class="titleHead">儿童福利机构汇总</div> />
<img
src="./../../../assets/images/02-右上角.png"
alt=""
class="topRight"
/>
<img
src="./../../../assets/images/03-左下角.png"
alt=""
class="lowerLeft"
/>
<img
src="./../../../assets/images/04-右下角.png"
alt=""
class="lowerRight"
/>
<div class="title">儿童福利机构汇总</div>
<div class="socialOrganizationFlex"> <div class="socialOrganizationFlex">
<div class="textLefts">收养总数</div> <div class="textLefts">收养总数</div>
<div> <div>
<div class="borderBottom"></div> <div class="borderBottom"></div>
<div class="yellowNum"> <div class="yellowNum">
{{ agencyChildStats.adoptChildNum }} {{ agencyChildStats.adoptChildNum || 21341 }}
</div> </div>
<div class="borderTop"></div> <div class="borderTop"></div>
</div> </div>
...@@ -27,7 +43,9 @@ ...@@ -27,7 +43,9 @@
<div class="textLeft">孤儿</div> <div class="textLeft">孤儿</div>
<div> <div>
<div class="borderBottom"></div> <div class="borderBottom"></div>
<div class="textNum">{{ agencyChildStats.orphanNum }}</div> <div class="textNum">
{{ agencyChildStats.orphanNum || 3425 }}
</div>
<div class="borderTop"></div> <div class="borderTop"></div>
</div> </div>
<div class="text">个</div> <div class="text">个</div>
...@@ -37,7 +55,7 @@ ...@@ -37,7 +55,7 @@
<div> <div>
<div class="borderBottom"></div> <div class="borderBottom"></div>
<div class="textNum"> <div class="textNum">
{{ agencyChildStats.factUnadoptedNum }} {{ agencyChildStats.factUnadoptedNum || 7902 }}
</div> </div>
<div class="borderTop"></div> <div class="borderTop"></div>
</div> </div>
...@@ -50,11 +68,27 @@ ...@@ -50,11 +68,27 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<div class="wian"> <div class="wian">
<img src="./../../../assets/images/01-左上角.png" alt="" class="topLeft"> <img
<img src="./../../../assets/images/02-右上角.png" alt="" class="topRight"> src="./../../../assets/images/01-左上角.png"
<img src="./../../../assets/images/03-左下角.png" alt="" class="lowerLeft"> alt=""
<img src="./../../../assets/images/04-右下角.png" alt="" class="lowerRight"> class="topLeft"
<div class="titleHead">机构占比</div> />
<img
src="./../../../assets/images/02-右上角.png"
alt=""
class="topRight"
/>
<img
src="./../../../assets/images/03-左下角.png"
alt=""
class="lowerLeft"
/>
<img
src="./../../../assets/images/04-右下角.png"
alt=""
class="lowerRight"
/>
<div class="title">机构占比</div>
<div id="proportion" class="proportion"></div> <div id="proportion" class="proportion"></div>
</div> </div>
</el-col> </el-col>
...@@ -66,11 +100,27 @@ ...@@ -66,11 +100,27 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24" <el-col :span="24"
><div class="wians"> ><div class="wians">
<img src="./../../../assets/images/01-左上角.png" alt="" class="topLeft"> <img
<img src="./../../../assets/images/02-右上角.png" alt="" class="topRight"> src="./../../../assets/images/01-左上角.png"
<img src="./../../../assets/images/03-左下角.png" alt="" class="lowerLeft"> alt=""
<img src="./../../../assets/images/04-右下角.png" alt="" class="lowerRight"> class="topLeft"
<div class="titleHead">当前选择：广西全区</div> />
<img
src="./../../../assets/images/02-右上角.png"
alt=""
class="topRight"
/>
<img
src="./../../../assets/images/03-左下角.png"
alt=""
class="lowerLeft"
/>
<img
src="./../../../assets/images/04-右下角.png"
alt=""
class="lowerRight"
/>
<div class="title">当前选择：广西全区</div>
<div class="childWelfareMap" id="childWelfareMap"></div> <div class="childWelfareMap" id="childWelfareMap"></div>
<a class="returnInfos" @click="returnInfo">返回上一级</a> <a class="returnInfos" @click="returnInfo">返回上一级</a>
</div> </div>
...@@ -80,11 +130,27 @@ ...@@ -80,11 +130,27 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24" <el-col :span="24"
><div class="wianss"> ><div class="wianss">
<img src="./../../../assets/images/01-左上角.png" alt="" class="topLeft"> <img
<img src="./../../../assets/images/02-右上角.png" alt="" class="topRight"> src="./../../../assets/images/01-左上角.png"
<img src="./../../../assets/images/03-左下角.png" alt="" class="lowerLeft"> alt=""
<img src="./../../../assets/images/04-右下角.png" alt="" class="lowerRight"> class="topLeft"
<div class="titleHead">年度按月份统计</div> />
<img
src="./../../../assets/images/02-右上角.png"
alt=""
class="topRight"
/>
<img
src="./../../../assets/images/03-左下角.png"
alt=""
class="lowerLeft"
/>
<img
src="./../../../assets/images/04-右下角.png"
alt=""
class="lowerRight"
/>
<div class="title">年度按月份统计</div>
<div id="annualStatistics" class="annualStatistics"></div> <div id="annualStatistics" class="annualStatistics"></div>
</div> </div>
</el-col> </el-col>
...@@ -94,42 +160,55 @@ ...@@ -94,42 +160,55 @@
<!-- 右 --> <!-- 右 -->
<el-col :span="6"> <el-col :span="6">
<div class="wiansInfoS"> <div class="wiansInfoS">
<img src="./../../../assets/images/01-左上角.png" alt="" class="topLeft"> <img
<img src="./../../../assets/images/02-右上角.png" alt="" class="topRight"> src="./../../../assets/images/01-左上角.png"
<img src="./../../../assets/images/03-左下角.png" alt="" class="lowerLeft"> alt=""
<img src="./../../../assets/images/04-右下角.png" alt="" class="lowerRight"> class="topLeft"
<div class="wiansInfo"> />
<img
<div class="titleHead">婚姻统计</div> src="./../../../assets/images/02-右上角.png"
<el-input alt=""
type="text" class="topRight"
placeholder="身份证或者姓名查询" />
class="input" <img
v-model="value" src="./../../../assets/images/03-左下角.png"
@change="inputBtn" alt=""
suffix-icon="el-icon-search" class="lowerLeft"
/> />
<el-table <img
:data="tableData" src="./../../../assets/images/04-右下角.png"
stripe alt=""
style="width: 100%; background-color: #051d3f; color: #2177b9" class="lowerRight"
:header-cell-style="{ background: '#082C61', color: '#DAD7DB' }" />
:cell-style="{ background: '#082C61', color: '#DAD7DB' }" <div class="wiansInfo">
> <div class="title">儿童福利机构统计</div>
<el-table-column type="index" label="序号" align="center"> <el-input
</el-table-column> type="text"
<el-table-column prop="name" label="姓名" align="center"> placeholder="身份证或者姓名查询"
</el-table-column> class="input"
<el-table-column prop="address" label="身份证" align="center"> v-model="value"
</el-table-column> @change="inputBtn"
<el-table-column prop="address" label="所在福利院" align="center"> suffix-icon="el-icon-search"
</el-table-column> />
</el-table> <el-table
</div> :data="tableData"
</div> stripe
style="width: 100%; background-color: #051d3f; color: #2177b9"
:header-cell-style="{ background: '#082C61', color: '#DAD7DB' }"
:cell-style="{ background: '#082C61', color: '#DAD7DB' }"
>
<el-table-column type="index" label="序号" align="center">
</el-table-column>
<el-table-column prop="name" label="姓名" align="center">
</el-table-column>
<el-table-column prop="idCard" label="身份证" align="center">
</el-table-column>
<el-table-column prop="fullAddress" label="所在福利院" align="center">
</el-table-column>
</el-table>
</div>
</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</template> </template>
...@@ -150,11 +229,75 @@ export default { ...@@ -150,11 +229,75 @@ export default {
num: 0, num: 0,
tableData: [], tableData: [],
agencyChildStats: {}, agencyChildStats: {},
agencyChildStatsList: {}, agencyChildStatsList: {
agencyNumList: [
"21",
"34",
"45",
"12",
"34",
"54",
"23",
"44",
"79",
"83",
"65",
"21",
"23",
"90",
],
orphanNumList: [
"21",
"34",
"45",
"12",
"34",
"54",
"23",
"44",
"79",
"83",
"65",
"21",
"23",
"90",
],
factUnadoptedNumList: [
"141",
"23",
"41",
"32",
"43",
"104",
"86",
"43",
"93",
"21",
"65",
"123",
"98",
"45",
],
},
agencyUnderChildStatsList: {}, agencyUnderChildStatsList: {},
agencyPercentageStats: [], agencyPercentageStats: [
{ name: "南宁市", value: 321 },
{ name: "柳州市", value: 431 },
{ name: "桂林市", value: 792 },
{ name: "梧州市", value: 876 },
{ name: "北海市", value: 782 },
{ name: "防城港市", value: 452 },
{ name: "钦州市", value: 213 },
{ name: "贵港市", value: 342 },
{ name: "玉林市", value: 231 },
{ name: "百色市", value: 163 },
{ name: "贺州市", value: 530 },
{ name: "河池市", value: 483 },
{ name: "来宾市", value: 104 },
{ name: "崇左市", value: 231 },
],
welfareHomeName: [], welfareHomeName: [],
value:"" value: "",
}; };
}, },
created() { created() {
...@@ -163,7 +306,7 @@ export default { ...@@ -163,7 +306,7 @@ export default {
this.getAgencyUnderChildStatsListFun(); this.getAgencyUnderChildStatsListFun();
this.getAgencyPercentageStatsFun(); this.getAgencyPercentageStatsFun();
this.getMapData("g450000"); //默认展示广西 g450000 this.getMapData("g450000"); //默认展示广西 g450000
this.childSearchFun() this.childSearchFun();
}, },
methods: { methods: {
inputBtn() { inputBtn() {
...@@ -171,13 +314,13 @@ export default { ...@@ -171,13 +314,13 @@ export default {
this.childSearchFun(); this.childSearchFun();
}, },
childSearchFun(){ childSearchFun() {
childSearch({ childSearch({
keyword: this.value, keyword: this.value,
}).then(res =>{ }).then((res) => {
console.log(res,'儿童搜索') console.log(res, "儿童搜索");
this.tableData = res.data this.tableData = res.data;
}) });
}, },
getAgencyChildStatsFun(data) { getAgencyChildStatsFun(data) {
...@@ -609,35 +752,36 @@ export default { ...@@ -609,35 +752,36 @@ export default {
mounted() { mounted() {
setTimeout(() => { setTimeout(() => {
this.annualStatisticsFun(); this.annualStatisticsFun();
this.proportionFun();
}, 1000); }, 1000);
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.lowerLeft{ .lowerLeft {
position:absolute; position: absolute;
width: 10px; width: 10px;
height: 10px; height: 10px;
left: -2px; left: -2px;
bottom: -2px; bottom: -2px;
} }
.lowerRight{ .lowerRight {
position:absolute; position: absolute;
width: 10px; width: 10px;
height: 10px; height: 10px;
right: -2px; right: -2px;
bottom: -2px; bottom: -2px;
} }
.topLeft{ .topLeft {
position:absolute; position: absolute;
width: 10px; width: 10px;
height: 10px; height: 10px;
top: -2px; top: -2px;
left: -2px; left: -2px;
} }
.topRight{ .topRight {
position:absolute; position: absolute;
width: 10px; width: 10px;
height: 10px; height: 10px;
top: -2px; top: -2px;
...@@ -673,7 +817,7 @@ bottom: -2px; ...@@ -673,7 +817,7 @@ bottom: -2px;
} }
.wian { .wian {
border: 1px solid #1A6295; border: 1px solid #1a6295;
position: relative; position: relative;
width: 100%; width: 100%;
height: 400px; height: 400px;
...@@ -681,7 +825,7 @@ bottom: -2px; ...@@ -681,7 +825,7 @@ bottom: -2px;
} }
.wians { .wians {
border: 1px solid #1A6295; border: 1px solid #1a6295;
position: relative; position: relative;
width: 100%; width: 100%;
height: 500px; height: 500px;
...@@ -689,17 +833,17 @@ bottom: -2px; ...@@ -689,17 +833,17 @@ bottom: -2px;
} }
.wianss { .wianss {
border: 1px solid #1A6295; border: 1px solid #1a6295;
position: relative; position: relative;
width: 100%; width: 100%;
height: 300px; height: 300px;
background-color: #082c61; background-color: #082c61;
} }
.wiansInfoS{ .wiansInfoS {
width: 100%; width: 100%;
position: relative; position: relative;
border: 1px solid #1A6295; border: 1px solid #1a6295;
} }
.wiansInfo { .wiansInfo {
width: 100%; width: 100%;
......
src/views/unified/tapSwitch/marriage.vue
...@@ -259,12 +259,15 @@ ...@@ -259,12 +259,15 @@
prop="manName" prop="manName"
label="名称" label="名称"
align="center" align="center"
width="50px" width="60px"
> >
</el-table-column> </el-table-column>
<el-table-column prop="manDomicile" label="所在地" align="center"> <el-table-column prop="manDomicile" label="所在地" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="婚姻状况" align="center"> <el-table-column prop="type" label="婚姻状况" align="center">
<template slot-scope="scope">
{{scope.row.type=='IA'?'结婚':scope.row.type=='IB'?'离婚':scope.row.type=='ICA'?'补办结婚证':scope.row.type=='ICB'?'补办离婚证':'不详'}}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="registerDate" label="时间" align="center"> <el-table-column prop="registerDate" label="时间" align="center">
</el-table-column> </el-table-column>
......
src/views/unified/tapSwitch/mechanism.vue
...@@ -902,7 +902,7 @@ export default { ...@@ -902,7 +902,7 @@ export default {
} }
.children { .children {
width: 100%; width: 100%;
height: 100%; height: 240px;
} }
.mechanismNum { .mechanismNum {
text-align: center; text-align: center;
......
src/views/unified/tapSwitch/provide.vue
...@@ -7,11 +7,27 @@ ...@@ -7,11 +7,27 @@
<el-col :span="24"> </el-col> <el-col :span="24"> </el-col>
<el-col :span="24"> <el-col :span="24">
<div class="wian"> <div class="wian">
<img src="./../../../assets/images/01-左上角.png" alt="" class="topLeft"> <img
<img src="./../../../assets/images/02-右上角.png" alt="" class="topRight"> src="./../../../assets/images/01-左上角.png"
<img src="./../../../assets/images/03-左下角.png" alt="" class="lowerLeft"> alt=""
<img src="./../../../assets/images/04-右下角.png" alt="" class="lowerRight"> class="topLeft"
<div class="titleHead">火化量汇总</div> />
<img
src="./../../../assets/images/02-右上角.png"
alt=""
class="topRight"
/>
<img
src="./../../../assets/images/03-左下角.png"
alt=""
class="lowerLeft"
/>
<img
src="./../../../assets/images/04-右下角.png"
alt=""
class="lowerRight"
/>
<div class="title">火化量汇总</div>
<div class="provideFlex"> <div class="provideFlex">
<div class="text">火化总数</div> <div class="text">火化总数</div>
<div> <div>
...@@ -37,11 +53,27 @@ ...@@ -37,11 +53,27 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<div class="wian"> <div class="wian">
<img src="./../../../assets/images/01-左上角.png" alt="" class="topLeft"> <img
<img src="./../../../assets/images/02-右上角.png" alt="" class="topRight"> src="./../../../assets/images/01-左上角.png"
<img src="./../../../assets/images/03-左下角.png" alt="" class="lowerLeft"> alt=""
<img src="./../../../assets/images/04-右下角.png" alt="" class="lowerRight"> class="topLeft"
<div class="titleHead">火化率统计</div> />
<img
src="./../../../assets/images/02-右上角.png"
alt=""
class="topRight"
/>
<img
src="./../../../assets/images/03-左下角.png"
alt=""
class="lowerLeft"
/>
<img
src="./../../../assets/images/04-右下角.png"
alt=""
class="lowerRight"
/>
<div class="title">火化率统计</div>
<div id="proportion" class="proportion"></div> <div id="proportion" class="proportion"></div>
</div> </div>
</el-col> </el-col>
...@@ -53,11 +85,27 @@ ...@@ -53,11 +85,27 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24" <el-col :span="24"
><div class="wians"> ><div class="wians">
<img src="./../../../assets/images/01-左上角.png" alt="" class="topLeft"> <img
<img src="./../../../assets/images/02-右上角.png" alt="" class="topRight"> src="./../../../assets/images/01-左上角.png"
<img src="./../../../assets/images/03-左下角.png" alt="" class="lowerLeft"> alt=""
<img src="./../../../assets/images/04-右下角.png" alt="" class="lowerRight"> class="topLeft"
<div class="titleHead">当前选择：广西全区</div> />
<img
src="./../../../assets/images/02-右上角.png"
alt=""
class="topRight"
/>
<img
src="./../../../assets/images/03-左下角.png"
alt=""
class="lowerLeft"
/>
<img
src="./../../../assets/images/04-右下角.png"
alt=""
class="lowerRight"
/>
<div class="title">当前选择：广西全区</div>
<div class="provideMap" id="provideMap"></div> <div class="provideMap" id="provideMap"></div>
<a class="returnInfos" @click="returnInfo">返回上一级</a> <a class="returnInfos" @click="returnInfo">返回上一级</a>
</div> </div>
...@@ -67,11 +115,27 @@ ...@@ -67,11 +115,27 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24" <el-col :span="24"
><div class="wianss"> ><div class="wianss">
<img src="./../../../assets/images/01-左上角.png" alt="" class="topLeft"> <img
<img src="./../../../assets/images/02-右上角.png" alt="" class="topRight"> src="./../../../assets/images/01-左上角.png"
<img src="./../../../assets/images/03-左下角.png" alt="" class="lowerLeft"> alt=""
<img src="./../../../assets/images/04-右下角.png" alt="" class="lowerRight"> class="topLeft"
<div class="titleHead">火化区域分析</div> />
<img
src="./../../../assets/images/02-右上角.png"
alt=""
class="topRight"
/>
<img
src="./../../../assets/images/03-左下角.png"
alt=""
class="lowerLeft"
/>
<img
src="./../../../assets/images/04-右下角.png"
alt=""
class="lowerRight"
/>
<div class="title">火化区域分析</div>
<div id="annualStatistics" class="annualStatistics"></div> <div id="annualStatistics" class="annualStatistics"></div>
</div> </div>
</el-col> </el-col>
...@@ -80,60 +144,80 @@ ...@@ -80,60 +144,80 @@
<!-- 右 --> <!-- 右 -->
<el-col :span="6"> <el-col :span="6">
<div class="wiansInfoS"> <div class="wiansInfoS">
<img src="./../../../assets/images/01-左上角.png" alt="" class="topLeft"> <img
<img src="./../../../assets/images/02-右上角.png" alt="" class="topRight"> src="./../../../assets/images/01-左上角.png"
<img src="./../../../assets/images/03-左下角.png" alt="" class="lowerLeft"> alt=""
<img src="./../../../assets/images/04-右下角.png" alt="" class="lowerRight"> class="topLeft"
/>
<div class="wiansInfo"> <img
src="./../../../assets/images/02-右上角.png"
<div class="titleHead">火化信息查询</div> alt=""
<el-input class="topRight"
type="text" />
placeholder="身份证或者姓名查询" <img
class="input" src="./../../../assets/images/03-左下角.png"
v-model="value" alt=""
@change="inputBtn" class="lowerLeft"
suffix-icon="el-icon-search" />
/> <img
<el-table src="./../../../assets/images/04-右下角.png"
:data="tableData" alt=""
stripe class="lowerRight"
style="width: 100%; background-color: #082c61; color: #2177b9" />
fit
:header-cell-style="{ background: '#082C61', color: '#DAD7DB' }" <div class="wiansInfo">
:cell-style="{ background: '#082C61', color: '#DAD7DB' }" <div class="title">火化信息查询</div>
<el-input
type="text"
placeholder="身份证或者姓名查询"
class="input"
v-model="value"
@change="inputBtn"
suffix-icon="el-icon-search"
/>
<el-table
:data="tableData"
stripe
style="width: 100%; background-color: #082c61; color: #2177b9"
fit
:header-cell-style="{ background: '#082C61', color: '#DAD7DB' }"
:cell-style="{ background: '#082C61', color: '#DAD7DB' }"
>
<el-table-column
type="index"
label="序号"
align="center"
width="50px"
> >
<el-table-column </el-table-column>
type="index" <el-table-column
label="序号" prop="siName"
align="center" label="姓名"
width="50px" align="center"
> width="60px"
</el-table-column> >
<el-table-column prop="siName" label="姓名" align="center" width="60px"> </el-table-column>
</el-table-column> <!-- <el-table-column
<!-- <el-table-column
prop="siDeathDate" prop="siDeathDate"
label="所在地" label="所在地"
align="center" align="center"
></el-table-column> --> ></el-table-column> -->
<el-table-column <el-table-column
prop="organName" prop="organName"
label="殡仪馆" label="殡仪馆"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="siCremationTime" prop="siCremationTime"
label="时间" label="时间"
align="center" align="center"
width="50px" width="50px"
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
</el-col> </el-col>
<!-- <br /> <!-- <br />
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -162,7 +246,7 @@ export default { ...@@ -162,7 +246,7 @@ export default {
cremationStats: {}, cremationStats: {},
cremationRateStats: {}, cremationRateStats: {},
cremationStatsList: {}, cremationStatsList: {},
cremation:[] cremation: [],
}; };
}, },
created() { created() {
...@@ -170,7 +254,7 @@ export default { ...@@ -170,7 +254,7 @@ export default {
this.getCremationRateStatsFun(); this.getCremationRateStatsFun();
this.getCremationStatsListFun(); this.getCremationStatsListFun();
this.getMapData("g450000"); //默认展示广西 g450000 this.getMapData("g450000"); //默认展示广西 g450000
this.cremationSearchFun() this.cremationSearchFun();
}, },
methods: { methods: {
inputBtn() { inputBtn() {
...@@ -598,30 +682,29 @@ export default { ...@@ -598,30 +682,29 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.lowerLeft {
.lowerLeft{ position: absolute;
position:absolute; width: 10px;
width: 10px;
height: 10px; height: 10px;
left: -2px; left: -2px;
bottom: -2px; bottom: -2px;
} }
.lowerRight{ .lowerRight {
position:absolute; position: absolute;
width: 10px; width: 10px;
height: 10px; height: 10px;
right: -2px; right: -2px;
bottom: -2px; bottom: -2px;
} }
.topLeft{ .topLeft {
position:absolute; position: absolute;
width: 10px; width: 10px;
height: 10px; height: 10px;
top: -2px; top: -2px;
left: -2px; left: -2px;
} }
.topRight{ .topRight {
position:absolute; position: absolute;
width: 10px; width: 10px;
height: 10px; height: 10px;
top: -2px; top: -2px;
...@@ -708,7 +791,7 @@ bottom: -2px; ...@@ -708,7 +791,7 @@ bottom: -2px;
.wian { .wian {
position: relative; position: relative;
border: 1px solid #1A6295; border: 1px solid #1a6295;
width: 100%; width: 100%;
height: 400px; height: 400px;
background-color: #082c61; background-color: #082c61;
...@@ -716,7 +799,7 @@ bottom: -2px; ...@@ -716,7 +799,7 @@ bottom: -2px;
.wians { .wians {
position: relative; position: relative;
border: 1px solid #1A6295; border: 1px solid #1a6295;
width: 100%; width: 100%;
height: 500px; height: 500px;
background-color: #082c61; background-color: #082c61;
...@@ -724,7 +807,7 @@ bottom: -2px; ...@@ -724,7 +807,7 @@ bottom: -2px;
.wianss { .wianss {
position: relative; position: relative;
border: 1px solid #1A6295; border: 1px solid #1a6295;
width: 100%; width: 100%;
height: 300px; height: 300px;
background-color: #082c61; background-color: #082c61;
...@@ -737,10 +820,10 @@ bottom: -2px; ...@@ -737,10 +820,10 @@ bottom: -2px;
overflow: hidden; overflow: hidden;
overflow-y: scroll; overflow-y: scroll;
} }
.wiansInfoS{ .wiansInfoS {
width: 100%; width: 100%;
position: relative; position: relative;
border: 1px solid #1A6295; border: 1px solid #1a6295;
} }
.wiansInfo::-webkit-scrollbar { .wiansInfo::-webkit-scrollbar {
......
src/views/unified/tapSwitch/socialAssistance.vue
...@@ -153,21 +153,21 @@ ...@@ -153,21 +153,21 @@
<el-table-column prop="address" label="所在地" align="center" > <el-table-column prop="address" label="所在地" align="center" >
</el-table-column> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
prop="name" prop="provideState"
label="类型" label="类型"
align="center" align="center"
width="50px" width="50px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="helpAmount"
label="金额" label="金额"
align="center" align="center"
width="50px" width="50px"
> >
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column
prop="createTime" prop="endProvideDate"
label="时间" label="时间"
align="center" align="center"
width="70px" width="70px"
...@@ -193,7 +193,7 @@ import { ...@@ -193,7 +193,7 @@ import {
getThreeYearShjzProvideStats, getThreeYearShjzProvideStats,
getFivesYearShjzAchieveStats, getFivesYearShjzAchieveStats,
getAreaYearShjzAchieveStats, getAreaYearShjzAchieveStats,
lowIncomeSearch, societyHelpSearch,
getMapData, getMapData,
} from "@/api/unified/unified"; } from "@/api/unified/unified";
export default { export default {
...@@ -218,7 +218,7 @@ export default { ...@@ -218,7 +218,7 @@ export default {
this.getFivesYearShjzAchieveStatsFun(); this.getFivesYearShjzAchieveStatsFun();
this.getAreaYearShjzAchieveStatsFun(); this.getAreaYearShjzAchieveStatsFun();
this.getMapData("g450000"); //默认展示广西 g450000 this.getMapData("g450000"); //默认展示广西 g450000
this.lowIncomeSearchFun(); this.societyHelpSearchFun();
}, },
methods: { methods: {
rowStyle({ row, rowsIndex }) { rowStyle({ row, rowsIndex }) {
...@@ -231,11 +231,11 @@ export default { ...@@ -231,11 +231,11 @@ export default {
inputBtn() { inputBtn() {
console.log(this.value); console.log(this.value);
this.lowIncomeSearchFun(); this.societyHelpSearchFun();
}, },
lowIncomeSearchFun() { societyHelpSearchFun() {
lowIncomeSearch({ societyHelpSearch({
keyword: this.values, keyword: this.values,
}).then((res) => { }).then((res) => {
console.log(res, "低保对象搜索"); console.log(res, "低保对象搜索");
......
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