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
Expand all
Inline Side-by-side
Showing 4 changed files with 117 additions and 70 deletions
...@@ -26,7 +26,7 @@ var self = new Vue({ ...@@ -26,7 +26,7 @@ var self = new Vue({
26 methods:{ 26 methods:{
27 //数据请求 27 //数据请求
28 getData() { 28 getData() {
29 axios.get(CONF_NEWGHSC_SERVERURL + '/wfsj/list',{ 29 axios.get(CONF_NEWGHSC_SERVERURL + '/wfsjrd/list',{
30 params:{ 30 params:{
31 pageNum:this.pageNum, 31 pageNum:this.pageNum,
32 pageSize:this.pageSize, 32 pageSize:this.pageSize,
...@@ -57,7 +57,7 @@ var self = new Vue({ ...@@ -57,7 +57,7 @@ var self = new Vue({
57 this.multipleSelection.forEach(item=>{ 57 this.multipleSelection.forEach(item=>{
58 params.push(item.id) 58 params.push(item.id)
59 }) 59 })
60 axios.delete(CONF_NEWGHSC_SERVERURL + '/wfsj/phqgz',{data:params}).then(res=>{ 60 axios.delete(CONF_NEWGHSC_SERVERURL + '/wfsjrd/wfsjrd',{data:params}).then(res=>{
61 if(res && res.data && res.data.code ==200){ 61 if(res && res.data && res.data.code ==200){
62 this.$message.success('删除数据成功') 62 this.$message.success('删除数据成功')
63 } 63 }
......
...@@ -30,64 +30,111 @@ var self = new Vue({ ...@@ -30,64 +30,111 @@ var self = new Vue({
30 //所属区域list 30 //所属区域list
31 distictList: [ 31 distictList: [
32 { 32 {
33 distict: '东关街道', 33 ssqy: '东关街道',
34 label: '东关街道' 34 label: '东关街道'
35 }, 35 },
36 { 36 {
37 distict: '清真巷街道', 37 ssqy: '清真巷街道',
38 label: '清真巷街道' 38 label: '清真巷街道'
39 }, 39 },
40 { 40 {
41 distict: '大众街街道', 41 ssqy: '大众街街道',
42 label: '大众街街道' 42 label: '大众街街道'
43 }, { 43 }, {
44 distict: '周家泉街道', 44 ssqy: '周家泉街道',
45 label: '周家泉街道' 45 label: '周家泉街道'
46 }, { 46 }, {
47 distict: '乐家湾镇街道', 47 ssqy: '乐家湾镇街道',
48 label: '乐家湾镇街道' 48 label: '乐家湾镇街道'
49 }, { 49 }, {
50 distict: '韵家口镇街道', 50 ssqy: '韵家口镇街道',
51 label: '韵家口镇街道' 51 label: '韵家口镇街道'
52 }, 52 },
53 ], 53 ],
54 //进展阶段list 54 //处理类型list
55 evdlveStageList: [ 55 dealList:[
56 { 56 {
57 evdlveStage: '前期摸底', 57 cllx:'拆除',
58 label: '前期摸底' 58 label:'拆除',
59 }, 59 },
60 { 60 {
61 evdlveStage: '启动拆迁', 61 cllx:'整改处罚',
62 label: '启动拆迁' 62 label:'整改处罚',
63 }, 63 },
64 { 64 {
65 evdlveStage: '场地平整', 65 cllx:'没收',
66 label: '场地平整' 66 label:'没收',
67 }, 67 },
68 ],
69 //违建类型list
70 WjList:[
68 { 71 {
69 evdlveStage: '开工建设', 72 wjlx:'城乡结合部',
70 label: '开工建设' 73 label:'城乡结合部'
71 }, 74 },
72 { 75 {
73 evdlveStage: '工程完工', 76 wjlx:'屋顶加盖',
74 label: '工程完工' 77 label:'屋顶加盖'
75 }, 78 },
76 { 79 {
77 evdlveStage: '分配回迁', 80 wjlx:'其他',
78 label: '分配回迁' 81 label:'其他'
82 }
83 ],
84 //任务年份List
85 renfList:[
86 {
87 renf:2020,
88 label:2020
89 ,
79 }, 90 },
91 {
92 renf:2019,
93 label:2019
94 },
95 {
96 renf:2018,
97 label:2018
98 }
80 ], 99 ],
81 form: { 100 //整治类型List
82 procjectName: '', //项目名称 101 zzList:[
83 procjectAddress: '', //项目地址 102 {
84 taskYear: '', //任务年份 103 zzlx:'已拆除',
85 dutyUnit: '', //责任单位 104 label:'已拆除'
86 distict: '', //所属区域 105 },
87 evdlveStage: '', // 进展阶段 106 {
88 procjectOverview: '',//项目概况 107 zzlx:'已整改处罚',
89 progress: '',//进展情况 108 label:'已整改处罚'
90 content: '',// 建设类容 109 },
110 {
111 zzlx:'已没收',
112 label:'已没收'
113 },
114 ],
115 basicform: {
116 bz: '', //备注
117 cllx : '', //处理类型
118 jssj : '', //建设时间
119 jzjg : '', //建筑结构
120 jzmj : '', //建筑面积
121 qtbm : '', // 牵头部门
122 rdbm: '',//认定部门
123 rdhh: '',// 认定函号
124 rdsj: '',// 认定时间
125 renf: '',// 任务年份
126 ssqy: '',// 所属区域
127 syxz: '',// 使用性质
128 wjdw: '',// 违建单位
129 wjlx: '',// 违建类型
130 xmmc: '',// 项目名称
131 xmwz: '',// 项目位置
132 zdmj : '',// 占地面积
133 zrbm: '',// 责任部门
134 zzbm: '',// 整治部门
135 zzgk: '',// 整治概况
136 zzlx: '',// 整治类型
137 zzsj: '',// 整治时间
91 id: null 138 id: null
92 }, 139 },
93 fromsrcid: '', 140 fromsrcid: '',
...@@ -98,39 +145,30 @@ var self = new Vue({ ...@@ -98,39 +145,30 @@ var self = new Vue({
98 created() { 145 created() {
99 let srcinfo = window.parent.document.getElementById('iframecontent').src; 146 let srcinfo = window.parent.document.getElementById('iframecontent').src;
100 this.fromsrcid = srcinfo.split('?')[1].split('=')[1], 147 this.fromsrcid = srcinfo.split('?')[1].split('=')[1],
101 this.gissrc = `${CONF_GIS_ONEMAP}/widgets/ProjectManage/OAProjectMap.html?projectid=${this.form.id}` 148 this.gissrc = `${CONF_GIS_ONEMAP}/widgets/ProjectManage/OAProjectMap.html?projectid=${this.basicform.id}`
102 }, 149 },
103 mounted() { 150 mounted() {
104 this.getdetail() 151 this.getdetail()
105 }, 152 },
106 methods: { 153 methods: {
107 getdetail() { 154 getdetail() {
108 axios.get(CONF_NEWGHSC_SERVERURL + '/wfsj/phqgz', { 155 axios.get(CONF_NEWGHSC_SERVERURL + '/wfsjrd/wfsjrd', {
109 params: { 156 params: {
110 id: this.fromsrcid 157 id: this.fromsrcid
111 } 158 }
112 }).then(res => { 159 }).then(res => {
113 if (res && res.data && res.data.code === 200) { 160 if (res && res.data && res.data.code === 200) {
114 this.form.procjectName = res.data.data.procjectName 161 this.basicform = res.data.data
115 this.form.procjectAddress = res.data.data.procjectAddress 162 this.imgtabaledata[0].wjmc=this. basicform.xmmc+'违法现场(1).jpg'
116 this.form.taskYear = res.data.data.taskYear
117 this.form.dutyUnit = res.data.data.dutyUnit
118 this.form.distict = res.data.data.distict
119 this.form.evdlveStage = res.data.data.evdlveStage
120 this.form.procjectOverview = res.data.data.procjectOverview
121 this.form.progress = res.data.data.progress
122 this.form.content = res.data.data.content
123 this.form.id = res.data.data.id
124 this.imgtabaledata[0].wjmc=this.form.procjectName+'违法现场(1).jpg'
125 this.imgtabaledata[0].size='5k' 163 this.imgtabaledata[0].size='5k'
126 this.imgtabaledata[0].scsj='2020-8-11' 164 this.imgtabaledata[0].scsj='2020-8-11'
127 this.imgtabaledata[1].wjmc=this.form.procjectName+'违法现场(2).jpg' 165 this.imgtabaledata[1].wjmc=this. basicform.xmmc+'违法现场(2).jpg'
128 this.imgtabaledata[1].size='5k' 166 this.imgtabaledata[1].size='5k'
129 this.imgtabaledata[1].scsj='2020-8-11' 167 this.imgtabaledata[1].scsj='2020-8-11'
130 this.filetabeldata[0].wjmc=this.form.procjectName+'违法汇总(1).txt' 168 this.filetabeldata[0].wjmc=this. basicform.xmmc+'违法汇总(1).txt'
131 this.filetabeldata[0].size='10k' 169 this.filetabeldata[0].size='10k'
132 this.filetabeldata[0].scsj='2020-8-11' 170 this.filetabeldata[0].scsj='2020-8-11'
133 this.filetabeldata[1].wjmc=this.form.procjectName+'违法汇总(2).txt' 171 this.filetabeldata[1].wjmc=this. basicform.xmmc+'违法汇总(2).txt'
134 this.filetabeldata[1].size='10k' 172 this.filetabeldata[1].size='10k'
135 this.filetabeldata[1].scsj='2020-8-11' 173 this.filetabeldata[1].scsj='2020-8-11'
136 } 174 }
...@@ -159,10 +197,10 @@ var self = new Vue({ ...@@ -159,10 +197,10 @@ var self = new Vue({
159 clearTimeout(invFlag1) 197 clearTimeout(invFlag1)
160 } 198 }
161 invFlag1 = setTimeout(() => { 199 invFlag1 = setTimeout(() => {
162 if (this.form.id == "") { 200 if (this. basicform.id == "") {
163 layer.msg("请先保存！", {icon: 2}); 201 layer.msg("请先保存！", {icon: 2});
164 } 202 }
165 if (this.form.id) { 203 if (this. basicform.id) {
166 //var openparam = getparam(false); 204 //var openparam = getparam(false);
167 var openurl = CONF_GIS_ONEMAP + "?type=SP&state=disabled"; 205 var openurl = CONF_GIS_ONEMAP + "?type=SP&state=disabled";
168 // openparam && (openurl += openparam); 206 // openparam && (openurl += openparam);
...@@ -172,12 +210,7 @@ var self = new Vue({ ...@@ -172,12 +210,7 @@ var self = new Vue({
172 }, 210 },
173 //保存数据 211 //保存数据
174 saveData() { 212 saveData() {
175 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 == "") { 213 axios.post(CONF_NEWGHSC_SERVERURL + '/wfsjrd/wfsjrd', null, {data: this.basicform}).then(res => {
176 this.$message.error('请先输入数据进行保存.... ')
177 return false
178 }
179
180 axios.post(CONF_NEWGHSC_SERVERURL + '/wfsj/phqgz', null, {data: this.form}).then(res => {
181 if (res && res.data && res.data.code == 200) { 214 if (res && res.data && res.data.code == 200) {
182 this.$message.success('新增数据成功') 215 this.$message.success('新增数据成功')
183 window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/widget.html'; 216 window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/widget.html';
......
...@@ -138,44 +138,58 @@ ...@@ -138,44 +138,58 @@
138 width="55"> 138 width="55">
139 </el-table-column> 139 </el-table-column>
140 <el-table-column 140 <el-table-column
141 prop="procjectName" 141 prop="xmmc"
142 width="330" 142 width="400"
143 label="项目名称" 143 label="项目名称"
144 align="center" 144 align="center"
145 ></el-table-column> 145 ></el-table-column>
146 <el-table-column 146 <el-table-column
147 prop="procjectAddress" 147 prop="xmwz"
148 label="项目地址" 148 label="项目地址"
149 align="center" 149 align="center"
150 width="450" 150 width="300"
151 > 151 >
152 </el-table-column> 152 </el-table-column>
153 <el-table-column 153 <el-table-column
154 prop="taskYear" 154 prop="ssqy"
155 label="任务年份" 155 label="所属区域"
156 align="center" 156 align="center"
157 width="100" 157 width="100"
158 > 158 >
159 </el-table-column> 159 </el-table-column>
160 <el-table-column 160 <el-table-column
161 prop="dutyUnit" 161 prop="jzmj"
162 label="责任单位" 162 label="建筑面积(平方米)"
163 align="center" 163 align="center"
164 width="300" 164 width="200"
165 > 165 >
166 </el-table-column> 166 </el-table-column>
167 <el-table-column 167 <el-table-column
168 prop="distict" 168 prop="zdmj"
169 label="所属区域" 169 label="占地面积（平方米）"
170 align="center" 170 align="center"
171 width="200" 171 width="200"
172 > 172 >
173 </el-table-column> 173 </el-table-column>
174 <el-table-column 174 <el-table-column
175 prop="evdlveStage" 175 prop="wjlx"
176 label="进展阶段" 176 label="认定类型"
177 align="center"
178 width="150"
179 >
180 </el-table-column>
181 <el-table-column
182 prop="zrbm"
183 label="责任部门"
177 align="center" 184 align="center"
178 width="275" 185 width="150"
186 >
187 </el-table-column>
188 <el-table-column
189 prop="rdsj"
190 label="录入时间"
191 align="center"
192 width="200"
179 > 193 >
180 </el-table-column> 194 </el-table-column>
181 </el-table> 195 </el-table>
......