60606235 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents e5c41a01 7166db5d
......@@ -114,12 +114,12 @@ export function updateQsztByBsm(data) {
})
}
/**x
*修改 宗地,自然幢,户的权属状态
/**
*范围属性变更 点击办理:宗地、自然幢、多幢、户、 bsm\type
*/
export function copyZdjbxx(data) {
export function fwsxbgbl(data) {
return request({
url: '/bg/fwsxbg/copyZdjbxx',
url: '/bg/fwsxbg/fwsxbgDyByBsm',
method: 'post',
data: data
})
......
......@@ -69,6 +69,10 @@ export default {
defaultActive: "",
headTop: [
{
path: "/panel",
select: false,
},
{
path: "/create",
select: false,
},
......@@ -165,6 +169,11 @@ export default {
//mock数据
let list = [
{
name: "首页",
icon: "fa fa-home",
path: "/panel",
},
{
name: "新建",
icon: "fa fa-plus-square",
path: "/create",
......@@ -285,7 +294,7 @@ export default {
}
},
selectTopItems(ind) {
if (ind == 0) {
if (ind == 1) {
//点击新建,弹框
this.dialogVisible = true;
} else {
......
......@@ -61,7 +61,7 @@
<script>
import SearchHead from "../../../../components/searchHead/searchHead";
import { getSearchList } from "../../../../api/search";
import { copyZdjbxx } from "../../../../api/common";
import { fwsxbgbl } from "../../../../api/common";
export default {
name: "",
......@@ -123,35 +123,40 @@ export default {
handleClick(row) {
console.log("fwsxbg");
console.log(row);
var bsm = row.glbsm;
var type;
let path = "";
switch (row.dylx) {
case "zrz":
type = "1";
this.$store.state.zrzbsm = row.glbsm;
path = "/zrz";
break;
case "zd":
type = "0";
this.$store.state.zdbsm = row.glbsm;
path = "/zd";
break;
case "h":
type = "2";
this.$store.state.hbsm = row.glbsm;
break;
default:
break;
}
var params = { id: bsm, type: type };
copyZdjbxx(params)
var params = { bsm: row.glbsm, type: row.dylx };
fwsxbgbl(params)
.then((res) => {
if (res.code == 200) {
this.$message({
message: res.message,
type: "success",
});
var newGlbsm=res.result;
let path = "";
switch (row.dylx) {
case "zrz":
this.$store.state.zrzbsm = newGlbsm;
path = "/zrz";
break;
case "zd":
this.$store.state.zdbsm = newGlbsm;
path = "/zd";
break;
case "dz":
this.$store.state.dzbsm = newGlbsm;
path = "/dz";
break;
default:
break;
}
this.$router.push({
path: path,
query: {
bsm: newGlbsm,
source: 2
}
});
} else {
this.$message({
message: res.message,
......@@ -164,14 +169,8 @@ export default {
message: res.message,
type: "error",
});
});
//this.$router.push({
// path: path,
// query: {
// bsm: row.glbsm,
// source: 2
// }
//});
});
},
},
computed: {},
......
......@@ -12,7 +12,9 @@
:key="index"
@click="handleSelect"
>
<img :src="item.img" alt="" />
<el-badge :value="item.count" :max="99" class="item">
<img :src="item.img" alt="" />
</el-badge>
<span>{{ item.name }}</span>
</div>
</div>
......@@ -20,6 +22,8 @@
<el-card class="panel_right">
<div slot="header" class="clearfix">
<span>快捷入口</span>
<span class="edit" @click="isEdit = true" v-show="!isEdit">编辑</span>
<span class="edit" @click="isEdit = false" v-show="isEdit">完成</span>
</div>
<div class="enter_box">
<div
......@@ -28,44 +32,50 @@
:key="index"
@click="handleSelect"
>
<img :src="item.img" alt="" />
<div class="psr">
<img :src="item.img" alt="" />
<i class="fa fa-times-circle fa-2x" v-show="isEdit && index!=list.length-1" @click="edit(index)" aria-hidden="true"></i>
</div>
<span>{{ item.name }}</span>
</div>
</div>
</el-card>
</div>
<div class="notice" ref="notice">
<el-card>
<el-card class="news">
<div slot="header" class="clearfix">
<span>通知公告</span>
<span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span>
</div>
<el-table
:data="tableData"
:height="tableHeight"
:row-class-name="tableRowClassName"
>
<el-table-column
type="index"
width="300"
align="center"
label="顺序号"
>
</el-table-column>
<el-table-column prop="title" align="left" label="标题">
<el-table-column prop="title" width="500" align="center" label="标题">
</el-table-column>
<el-table-column
prop="date"
width="500"
align="center"
label="发布时间"
>
</el-table-column>
</el-table>
</el-card>
</div>
<div class="pagination">
<el-pagination background layout="prev, pager, next,total" :total="total">
</el-pagination>
<el-card class="download">
<div slot="header" class="clearfix">
<span>相关下载</span>
<span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span>
</div>
<el-table
:data="tableData"
:height="tableHeight"
:row-class-name="tableRowClassName"
>
<el-table-column prop="title" align="center" label="内容名称">
</el-table-column>
</el-table>
</el-card>
</div>
</div>
</template>
......@@ -75,8 +85,8 @@ export default {
data() {
return {
workList: [
{ name: "待办箱", img: require("../../assets/images/dbx.png") },
{ name: "退件箱", img: require("../../assets/images/tjx.png") },
{ name: "待办箱", img: require("../../assets/images/dbx.png"),count:10 },
{ name: "退件箱", img: require("../../assets/images/tjx.png"),count:3 },
],
list: [
{ name: "宗地分割", img: require("../../assets/images/zdfg.png") },
......@@ -86,21 +96,26 @@ export default {
},
{ name: "新办房屋", img: require("../../assets/images/xbfw.png") },
{ name: "重新落宗", img: require("../../assets/images/cxlz.png") },
{ name: "添加", img: require("../../assets/images/cxlz.png") },
],
tableData: [
],
tableHeight: "",
total:0
tableData: [],
tableHeight: 0,
total: 0,
isEdit:false
};
},
mounted() {
this.$nextTick(()=>{
this.$nextTick(() => {
this.tableHeight = this.$refs.notice.offsetHeight - 53;
})
});
},
methods: {
handleSelect() {},
handleSelect() {
//非编辑状态才可以点击
if (!isEdit) {
}
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 !== 0) {
return "even-row";
......@@ -108,31 +123,76 @@ export default {
return "";
}
},
//快捷入口管理
edit(index){
this.$confirm('此操作删除该快捷入口, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.list.splice(index,1);
//调用删除接口 TO DO
this.$message({
type: 'success',
message: '删除成功!'
});
}).catch(() => {
});
}
},
};
</script>
<style rel="stylesheet/less" lang="less">
<style rel="stylesheet/less" scoped lang="less">
.main {
display: flex;
flex-direction: column;
overflow: hidden;
height: 100%;
.clearfix {
span {
color: #6d7278;
float: left;
}
.edit {
color: #9b9b9b;
float: right;
cursor: pointer;
.fa-angle-right{
font-size: 26px;
line-height: 7px;
position: relative;
top: 2px;
}
}
}
.panel {
@flex();
width: 100%;
.panel_left {
width: 45%;
margin-right: @30px;
width: 35%;
margin-right: 20px;
flex: 1;
}
.panel_right {
flex: 1;
width: 65%;
}
.enter_box {
@flex();
div {
cursor: pointer;
flex: 1;
.el-badge{
width: 68px;
height: 68px;
display: block;
margin: 0 auto;
/deep/.el-badge__content{
top: 10px;
right: 14px;
background-color: #fa6400;
}
}
img {
width: 68px;
height: 68px;
......@@ -140,10 +200,32 @@ export default {
margin: 0 auto;
}
span {
color: #6d7278;
display: block;
text-align: center;
margin-top: 10px;
}
.fa-times-circle {
color: #fa6400;
font-size: 24px;
position: absolute;
top: -4px;
right: -10px;
background: #fff;
border-radius: 10px;
box-sizing: border-box;
padding: 1px;
}
}
.psr {
width: 68px;
height: 68px;
display: block;
margin: 0 auto;
img {
width: 68px;
height: 68px;
}
}
}
.el-card__body {
......@@ -151,16 +233,33 @@ export default {
}
}
.notice {
flex: auto;
padding: 0;
box-sizing: border-box;
height: calc(100% - 225px);
@flex();
.news {
float: left;
float: left;
margin-right: 20px;
flex: 1;
/deep/ .el-card__body{
padding: 0;
}
}
.download {
width: 50%;
/deep/ .el-card__body{
padding: 0;
}
}
.el-card__body {
padding: 0;
}
th.is-left {
text-align: center;
}
tr{
background-color: #FBFBFB;
}
}
.pagination {
padding: 18px;
......