Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
dfbc4aa1 by weimo934
Options

Merge remote-tracking branch 'origin/3ddc' into 3ddc

2 parents b47aa493 511b091a
Inline Side-by-side
Showing 4 changed files with 298 additions and 120 deletions
......@@ -61,10 +61,15 @@
padding: 0 18px 0 0;
}
.el-input__icon {
.el-select .el-input__icon {
margin-top: 20px;
}
.el-date-editor .el-input__icon{
margin-top:0px
}
.el-form-item{
margin-bottom:0px !important;
}
.el-select {
display: block;
}
......@@ -77,7 +82,7 @@
.main-foot {
width: 100%;
min-height: 390px;
min-height: 420px;
border: 1px solid #cac8c8;
margin-top: 10px;
}
......@@ -89,9 +94,9 @@
font-size: 16px;
font-weight: bold;
margin: 8px 0;
margin-top: 23px;
margin-top: 10px;
padding-bottom: 4px;
margin-bottom: 15px;
margin-bottom: 10px;
}
.el-table--fit {
......@@ -109,6 +114,17 @@
margin-right: 7px;
outline: 0;
}
.form-title{
font-size: 20px;
color: #cac8c8;
width: 100%;
text-align: center;
margin-top: 10px;
display: block
}
.el-input__inner{
width: 98% !important;
}
</style>
</head>
<body>
......@@ -121,76 +137,182 @@
<!-- 下方区域-->
<el-container>
<el-aside style="width: 60%;margin-right: 10px;min-height:800px;padding-left: 20px;overflow-x: hidden">
<el-form ref="form" :model="form">
<el-row :gutter='5' class="form-row">
<el-col :span="12">
<span class="form-title">违法建设项目认定详情</span>
<div class="title-bar">基本信息</div>
<div>
<el-form ref="basicform" :model="basicform">
<el-row :gutter="5" class="form-row">
<el-col :span="8">
<el-form-item label="项目名称">
<el-input v-model="form.procjectName"></el-input>
<el-input v-model="basicform.xmmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属区域">
<el-select v-model="basicform.ssqy" clearable placeholder="请选择">
<el-option
v-for="item in distictList"
:key="item.ssqy"
:label="item.label"
:value="item.ssqy"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="责任单位">
<el-input v-model="form.dutyUnit"></el-input>
<el-col :span="8">
<el-form-item label="项目位置">
<el-input v-model="basicform.xmwz"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row class="form-row">
<el-form-item label="项目地址">
<el-input v-model="form.procjectAddress"></el-input>
<el-row :gutter="5" class="form-row">
<el-col :span="8">
<el-form-item label="占地面积">
<el-input v-model="basicform.zdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建设时间">
<el-date-picker v-model="basicform.jssj" type="date" placeholder="选择日期" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑结构">
<el-input v-model="basicform.jzjg" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter='5' class="form-row">
<el-col :span="12">
<el-form-item label="任务年份">
<el-input v-model="form.taskYear"></el-input>
<el-row :gutter="5" class="form-row">
<el-col :span="8">
<el-form-item label="建筑面积">
<el-input v-model="basicform.jzmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属区域">
<el-select v-model="form.distict" clearable placeholder="请选择">
<el-col :span="8">
<el-form-item label="使用性质">
<el-input v-model="basicform.syxz"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="责任部门">
<el-input v-model="basicform.zrbm"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="title-bar" style="position: relative;top: 10px; margin-bottom: 10px">认定信息</div>
<div>
<el-form>
<el-row :gutter="5" class="form-row">
<el-col :span="8">
<el-form-item label="违法单位">
<el-input v-model="basicform.wjdw"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="认定函号">
<el-input v-model="basicform.rdhh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="处理类型">
<el-select v-model="basicform.cllx" clearable placeholder="请选择">
<el-option
v-for="item in distictList"
:key="item.distict"
v-for="item in dealList"
:key="item.cllx"
:label="item.label"
:value="item.distict"
:value="item.cllx"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="进展阶段">
<el-select v-model="form.evdlveStage" clearable placeholder="请选择">
<el-row :gutter="5" class="form-row">
<el-col :span="8">
<el-form-item label="违建类型">
<el-select v-model="basicform.wjlx" clearable placeholder="请选择">
<el-option
v-for="item in evdlveStageList"
:key="item.evdlveStage"
v-for="item in WjList"
:key="item.wjlx"
:label="item.label"
:value="item.evdlveStage"
>
</el-option>
:value="item.wjlx"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="认定部门">
<el-input v-model="basicform.rdbm" ></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="牵头部门">
<el-input v-model="basicform.qtbm"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="项目概况">
<el-input type="textarea" v-model="form.procjectOverview"></el-input>
<el-row :gutter="5" class="form-row">
<el-col :span="8">
<el-form-item label="认定时间">
<el-date-picker v-model="basicform.rdsj" type="date" placeholder="选择日期" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注">
<el-input v-model="basicform.bz"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" label="备注">
<el-form-item style="margin-top:40px">
<el-input style="visibility: hidden"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="建设内容">
<el-input type="textarea" v-model="form.content"></el-input>
</el-form>
</div>
<div class="title-bar" style="position: relative;top: 10px; margin-bottom: 15px">整治信息</div>
<el-form>
<el-row :gutter="5" class="form-row">
<el-col :span="8">
<el-form-item label="任务年份">
<el-select v-model="basicform.renf" clearable placeholder="请选择">
<el-option
v-for="item in renfList"
:key="item.value"
:label="item.label"
:value="item.renf"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="整治类型">
<el-select v-model="basicform.zzlx" clearable placeholder="请选择">
<el-option
v-for="item in zzList"
:key="item.zzlx"
:label="item.label"
:value="item.zzlx"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="整治时间">
<el-date-picker v-model="basicform.zzsj" type="date" placeholder="选择日期" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="进展情况">
<el-input type="textarea" v-model="form.progress"></el-input>
<el-row :gutter="5" class="form-row">
<el-col :span="8">
<el-form-item label="整治部门" style="margin-bottom: 2px">
<el-input v-model="basicform.zzbm" ></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="整治概况" style="margin-bottom: 2px">
<el-input v-model="basicform.zzgk" ></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -220,7 +342,9 @@
<div class="main-foot">
<div class="title-bar">相关资料</div>
<div style="padding-left: 5px;">
<button class="btns" @click="clicktitle('图片')">图片</button>
<button class="btns" @click="clicktitle('图片')" style="width: 90px">拆除前照片</button>
<button class="btns" @click="clicktitle('图片')" style="width: 90px">拆除中照片</button>
<button class="btns" @click="clicktitle('图片')" style="width: 90px">拆除后照片</button>
<button class="btns" @click="clicktitle('文档')">文档</button>
<el-upload
style="float:right;"
......@@ -262,11 +386,14 @@
align="center"
></el-table-column>
<el-table-column
prop=""
width="95"
label="操作"
align="center"
></el-table-column>
>
<template slot-scope="scope">
<button class="btns" size="small">删除</button>
</template>
</el-table-column>
</el-table>
<el-table
v-else
......@@ -295,7 +422,11 @@
width="95"
label="操作"
align="center"
></el-table-column>
>
<template slot-scope="scope">
<button class="btns" size="small">删除</button>
</template>
</el-table-column>
</el-table>
</div>
</div>
......
......@@ -26,7 +26,7 @@ var self = new Vue({
methods:{
//数据请求
getData() {
axios.get(CONF_NEWGHSC_SERVERURL + '/wfsj/list',{
axios.get(CONF_NEWGHSC_SERVERURL + '/wfsjrd/list',{
params:{
pageNum:this.pageNum,
pageSize:this.pageSize,
......@@ -57,7 +57,7 @@ var self = new Vue({
this.multipleSelection.forEach(item=>{
params.push(item.id)
})
axios.delete(CONF_NEWGHSC_SERVERURL + '/wfsj/phqgz',{data:params}).then(res=>{
axios.delete(CONF_NEWGHSC_SERVERURL + '/wfsjrd/wfsjrd',{data:params}).then(res=>{
if(res && res.data && res.data.code ==200){
this.$message.success('删除数据成功')
}
......
......@@ -30,64 +30,111 @@ var self = new Vue({
//所属区域list
distictList: [
{
distict: '东关街道',
ssqy: '东关街道',
label: '东关街道'
},
{
distict: '清真巷街道',
ssqy: '清真巷街道',
label: '清真巷街道'
},
{
distict: '大众街街道',
ssqy: '大众街街道',
label: '大众街街道'
}, {
distict: '周家泉街道',
ssqy: '周家泉街道',
label: '周家泉街道'
}, {
distict: '乐家湾镇街道',
ssqy: '乐家湾镇街道',
label: '乐家湾镇街道'
}, {
distict: '韵家口镇街道',
ssqy: '韵家口镇街道',
label: '韵家口镇街道'
},
],
//进展阶段list
evdlveStageList: [
//处理类型list
dealList:[
{
evdlveStage: '前期摸底',
label: '前期摸底'
cllx:'拆除',
label:'拆除',
},
{
evdlveStage: '启动拆迁',
label: '启动拆迁'
cllx:'整改处罚',
label:'整改处罚',
},
{
evdlveStage: '场地平整',
label: '场地平整'
cllx:'没收',
label:'没收',
},
],
//违建类型list
WjList:[
{
evdlveStage: '开工建设',
label: '开工建设'
wjlx:'城乡结合部',
label:'城乡结合部'
},
{
evdlveStage: '工程完工',
label: '工程完工'
wjlx:'屋顶加盖',
label:'屋顶加盖'
},
{
evdlveStage: '分配回迁',
label: '分配回迁'
wjlx:'其他',
label:'其他'
}
],
//任务年份List
renfList:[
{
renf:2020,
label:2020
,
},
{
renf:2019,
label:2019
},
{
renf:2018,
label:2018
}
],
form: {
procjectName: '', //项目名称
procjectAddress: '', //项目地址
taskYear: '', //任务年份
dutyUnit: '', //责任单位
distict: '', //所属区域
evdlveStage: '', // 进展阶段
procjectOverview: '',//项目概况
progress: '',//进展情况
content: '',// 建设类容
//整治类型List
zzList:[
{
zzlx:'已拆除',
label:'已拆除'
},
{
zzlx:'已整改处罚',
label:'已整改处罚'
},
{
zzlx:'已没收',
label:'已没收'
},
],
basicform: {
bz: '', //备注
cllx : '', //处理类型
jssj : '', //建设时间
jzjg : '', //建筑结构
jzmj : '', //建筑面积
qtbm : '', // 牵头部门
rdbm: '',//认定部门
rdhh: '',// 认定函号
rdsj: '',// 认定时间
renf: '',// 任务年份
ssqy: '',// 所属区域
syxz: '',// 使用性质
wjdw: '',// 违建单位
wjlx: '',// 违建类型
xmmc: '',// 项目名称
xmwz: '',// 项目位置
zdmj : '',// 占地面积
zrbm: '',// 责任部门
zzbm: '',// 整治部门
zzgk: '',// 整治概况
zzlx: '',// 整治类型
zzsj: '',// 整治时间
id: null
},
fromsrcid: '',
......@@ -98,39 +145,30 @@ var self = new Vue({
created() {
let srcinfo = window.parent.document.getElementById('iframecontent').src;
this.fromsrcid = srcinfo.split('?')[1].split('=')[1],
this.gissrc = `${CONF_GIS_ONEMAP}/widgets/ProjectManage/OAProjectMap.html?projectid=${this.form.id}`
this.gissrc = `${CONF_GIS_ONEMAP}/widgets/ProjectManage/OAProjectMap.html?projectid=${this.basicform.id}`
},
mounted() {
this.getdetail()
},
methods: {
getdetail() {
axios.get(CONF_NEWGHSC_SERVERURL + '/wfsj/phqgz', {
axios.get(CONF_NEWGHSC_SERVERURL + '/wfsjrd/wfsjrd', {
params: {
id: this.fromsrcid
}
}).then(res => {
if (res && res.data && res.data.code === 200) {
this.form.procjectName = res.data.data.procjectName
this.form.procjectAddress = res.data.data.procjectAddress
this.form.taskYear = res.data.data.taskYear
this.form.dutyUnit = res.data.data.dutyUnit
this.form.distict = res.data.data.distict
this.form.evdlveStage = res.data.data.evdlveStage
this.form.procjectOverview = res.data.data.procjectOverview
this.form.progress = res.data.data.progress
this.form.content = res.data.data.content
this.form.id = res.data.data.id
this.imgtabaledata[0].wjmc=this.form.procjectName+'违法现场(1).jpg'
this.basicform = res.data.data
this.imgtabaledata[0].wjmc=this. basicform.xmmc+'违法现场(1).jpg'
this.imgtabaledata[0].size='5k'
this.imgtabaledata[0].scsj='2020-8-11'
this.imgtabaledata[1].wjmc=this.form.procjectName+'违法现场(2).jpg'
this.imgtabaledata[1].wjmc=this. basicform.xmmc+'违法现场(2).jpg'
this.imgtabaledata[1].size='5k'
this.imgtabaledata[1].scsj='2020-8-11'
this.filetabeldata[0].wjmc=this.form.procjectName+'违法汇总(1).txt'
this.filetabeldata[0].wjmc=this. basicform.xmmc+'违法汇总(1).txt'
this.filetabeldata[0].size='10k'
this.filetabeldata[0].scsj='2020-8-11'
this.filetabeldata[1].wjmc=this.form.procjectName+'违法汇总(2).txt'
this.filetabeldata[1].wjmc=this. basicform.xmmc+'违法汇总(2).txt'
this.filetabeldata[1].size='10k'
this.filetabeldata[1].scsj='2020-8-11'
}
......@@ -159,10 +197,10 @@ var self = new Vue({
clearTimeout(invFlag1)
}
invFlag1 = setTimeout(() => {
if (this.form.id == "") {
if (this. basicform.id == "") {
layer.msg("请先保存！", {icon: 2});
}
if (this.form.id) {
if (this. basicform.id) {
//var openparam = getparam(false);
var openurl = CONF_GIS_ONEMAP + "?type=SP&state=disabled";
// openparam && (openurl += openparam);
......@@ -172,12 +210,7 @@ var self = new Vue({
},
//保存数据
saveData() {
if (this.form.content == "" && this.form.procjectName == '' && this.form.procjectAddress == "" && this.form.taskYear == "" && this.form.dutyUnit == "" && this.form.distict == "" && this.form.evdlveStage == "" && this.form.procjectOverview == "" && this.form.progress == "") {
this.$message.error('请先输入数据进行保存.... ')
return false
}
axios.post(CONF_NEWGHSC_SERVERURL + '/wfsj/phqgz', null, {data: this.form}).then(res => {
axios.post(CONF_NEWGHSC_SERVERURL + '/wfsjrd/wfsjrd', null, {data: this.basicform}).then(res => {
if (res && res.data && res.data.code == 200) {
this.$message.success('新增数据成功')
window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/widget.html';
......
......@@ -138,44 +138,58 @@
width="55">
</el-table-column>
<el-table-column
prop="procjectName"
width="330"
prop="xmmc"
width="400"
label="项目名称"
align="center"
></el-table-column>
<el-table-column
prop="procjectAddress"
prop="xmwz"
label="项目地址"
align="center"
width="450"
width="300"
>
</el-table-column>
<el-table-column
prop="taskYear"
label="任务年份"
prop="ssqy"
label="所属区域"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="dutyUnit"
label="责任单位"
prop="jzmj"
label="建筑面积(平方米)"
align="center"
width="300"
width="200"
>
</el-table-column>
<el-table-column
prop="distict"
label="所属区域"
prop="zdmj"
label="占地面积（平方米）"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="evdlveStage"
label="进展阶段"
prop="wjlx"
label="认定类型"
align="center"
width="150"
>
</el-table-column>
<el-table-column
prop="zrbm"
label="责任部门"
align="center"
width="275"
width="150"
>
</el-table-column>
<el-table-column
prop="rdsj"
label="录入时间"
align="center"
width="200"
>
</el-table-column>
</el-table>
......