Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
3410b445 by xiaomiao
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 2fc415a7 84bb5b5a
Inline Side-by-side
Showing 20 changed files with 85 additions and 12 deletions
...@@ -67,6 +67,9 @@ export function uploadSjClmx (data) { ...@@ -67,6 +67,9 @@ export function uploadSjClmx (data) {
67 return request({ 67 return request({
68 url: SERVER.SERVERAPI + '/rest/ywbl/clxx/uploadSjClmx', 68 url: SERVER.SERVERAPI + '/rest/ywbl/clxx/uploadSjClmx',
69 method: 'post', 69 method: 'post',
70 headers: {
71 'Content-Type': 'multipart/form-data'
72 },
70 data 73 data
71 }) 74 })
72 } 75 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 09:25:12 4 * @LastEditTime: 2023-06-14 11:10:26
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -127,6 +127,29 @@ ...@@ -127,6 +127,29 @@
127 * @author: renchao 127 * @author: renchao
128 */ 128 */
129 handleViewScan () { 129 handleViewScan () {
130 function dataURLtoBlob (base64String) {
131 const arr = base64String.split(',');
132 if (arr.length !== 2) {
133 throw new Error('Invalid Base64 format');
134 }
135 const mime = arr[0].match(/:(.*?);/)[1];
136 if (!mime) {
137 throw new Error('Cannot retrieve MIME type');
138 }
139 const bstr = atob(arr[1]);
140 const n = bstr.length;
141 const u8arr = new Uint8Array(n);
142 for (let i = 0; i < n; i++) {
143 u8arr[i] = bstr.charCodeAt(i);
144 }
145 return new Blob([u8arr], { type: mime });
146 }
147 function blobToFile (blob) {
148 const options = { type: blob.type };
149 const file = new File([blob], options);
150 return file;
151 }
152
130 let data = { 153 let data = {
131 "filepath": "base64", 154 "filepath": "base64",
132 "rotate": "0", 155 "rotate": "0",
...@@ -136,7 +159,21 @@ ...@@ -136,7 +159,21 @@
136 "quality": "3" 159 "quality": "3"
137 } 160 }
138 axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data)).then((res) => { 161 axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data)).then((res) => {
139 console.log(res.data); 162 let blob = dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64);
163 let file = blobToFile(blob);
164 var formData = new FormData();
165 formData.append('file', file.raw)
166 formData.append("bsmSj", this.previewImg.bsmSj);
167 formData.append("bsmSlsq", this.previewImg.bsmSlsq);
168 uploadSjClmx(formData).then((res) => {
169 if (res.code == 200) {
170 this.$emit('updateList', res.result)
171 this.$message({
172 message: '上传成功!',
173 type: 'success'
174 })
175 }
176 })
140 }) 177 })
141 }, 178 },
142 prev () { 179 prev () {
...@@ -189,8 +226,6 @@ ...@@ -189,8 +226,6 @@
189 this.$refs.upload.clearFiles(); 226 this.$refs.upload.clearFiles();
190 setTimeout(() => { 227 setTimeout(() => {
191 if (length !== this.maxLength) return 228 if (length !== this.maxLength) return
192 console.log(files);
193 // let data = _.cloneDeep(this.previewImg.imgList[this.previewImg.index])
194 var formData = new FormData(); 229 var formData = new FormData();
195 files.forEach(file => { 230 files.forEach(file => {
196 formData.append('file', file.raw) 231 formData.append('file', file.raw)
...@@ -204,10 +239,9 @@ ...@@ -204,10 +239,9 @@
204 message: '上传成功!', 239 message: '上传成功!',
205 type: 'success' 240 type: 'success'
206 }) 241 })
207
208 } 242 }
209 }) 243 })
210 }) 244 }, 0)
211 }, 245 },
212 handleDelete () { 246 handleDelete () {
213 let that = this 247 let that = this
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 09:01:30 4 * @LastEditTime: 2023-06-14 09:47:38
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -201,8 +201,11 @@ ...@@ -201,8 +201,11 @@
201 if (res.data.code == 0) { 201 if (res.data.code == 0) {
202 let data = res.data.IDCardInfo 202 let data = res.data.IDCardInfo
203 row.sqrmc = data.name 203 row.sqrmc = data.name
204 row.zjzl = 1 204 row.zjzl = '1'
205 row.zjh = data.cardID 205 row.zjh = data.cardID
206 row.xb = data.sexCode
207 row.txdz = data.address
208 row.fzjg = data.issueOrgan
206 this.$message({ 209 this.$message({
207 message: '读取成功！', 210 message: '读取成功！',
208 type: 'success' 211 type: 'success'
......
...@@ -320,6 +320,7 @@ export default { ...@@ -320,6 +320,7 @@ export default {
320 var formdata = new FormData(); 320 var formdata = new FormData();
321 formdata.append("bsmSldy", this.propsParam.bsmSldy); 321 formdata.append("bsmSldy", this.propsParam.bsmSldy);
322 formdata.append("djlx", this.propsParam.djlx); 322 formdata.append("djlx", this.propsParam.djlx);
323 formdata.append("isEdit", this.ableOperation);
323 Init(formdata).then((res) => { 324 Init(formdata).then((res) => {
324 if (res.code === 200 && res.result) { 325 if (res.code === 200 && res.result) {
325 this.ruleForm = res.result; 326 this.ruleForm = res.result;
......
...@@ -265,6 +265,7 @@ ...@@ -265,6 +265,7 @@
265 formdata.append("bsmSldy", this.propsParam.bsmSldy); 265 formdata.append("bsmSldy", this.propsParam.bsmSldy);
266 formdata.append("bsmSlsq", this.$route.query.bsmSlsq); 266 formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
267 formdata.append("djlx", this.propsParam.djlx); 267 formdata.append("djlx", this.propsParam.djlx);
268 formdata.append("isEdit", this.ableOperation);
268 Init(formdata).then((res) => { 269 Init(formdata).then((res) => {
269 if (res.code === 200 && res.result) { 270 if (res.code === 200 && res.result) {
270 this.ruleForm = res.result; 271 this.ruleForm = res.result;
......
...@@ -216,6 +216,7 @@ ...@@ -216,6 +216,7 @@
216 var formdata = new FormData(); 216 var formdata = new FormData();
217 formdata.append("bsmSldy", this.propsParam.bsmSldy); 217 formdata.append("bsmSldy", this.propsParam.bsmSldy);
218 formdata.append("djlx", this.propsParam.djlx); 218 formdata.append("djlx", this.propsParam.djlx);
219 formdata.append("isEdit", this.ableOperation);
219 Init(formdata).then((res) => { 220 Init(formdata).then((res) => {
220 if (res.code === 200 && res.result) { 221 if (res.code === 200 && res.result) {
221 this.ruleForm = { 222 this.ruleForm = {
......
...@@ -200,6 +200,7 @@ ...@@ -200,6 +200,7 @@
200 var formdata = new FormData(); 200 var formdata = new FormData();
201 formdata.append("bsmSldy", this.propsParam.bsmSldy); 201 formdata.append("bsmSldy", this.propsParam.bsmSldy);
202 formdata.append("djlx", this.propsParam.djlx); 202 formdata.append("djlx", this.propsParam.djlx);
203 formdata.append("isEdit", this.ableOperation);
203 Init(formdata).then((res) => { 204 Init(formdata).then((res) => {
204 if (res.code === 200 && res.result) { 205 if (res.code === 200 && res.result) {
205 this.ruleForm = { 206 this.ruleForm = {
......
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
81 var formdata = new FormData(); 81 var formdata = new FormData();
82 formdata.append("bsmSldy", this.propsParam.formData.bsmSldy); 82 formdata.append("bsmSldy", this.propsParam.formData.bsmSldy);
83 formdata.append("qllx", this.propsParam.formData.qllx); 83 formdata.append("qllx", this.propsParam.formData.qllx);
84 formdata.append("isEdit", this.ableOperation);
84 getFdcqLSInfo(formdata).then((res) => { 85 getFdcqLSInfo(formdata).then((res) => {
85 if (res.code === 200) { 86 if (res.code === 200) {
86 this.tableData = res.result; 87 this.tableData = res.result;
......
...@@ -165,6 +165,7 @@ export default { ...@@ -165,6 +165,7 @@ export default {
165 formdata.append("bsmSldy", this.propsParam.bsmSldy); 165 formdata.append("bsmSldy", this.propsParam.bsmSldy);
166 formdata.append("djlx", this.propsParam.djlx); 166 formdata.append("djlx", this.propsParam.djlx);
167 formdata.append("bsmSlsq", this.bsmSlsq); 167 formdata.append("bsmSlsq", this.bsmSlsq);
168 formdata.append("isEdit", this.ableOperation);
168 BatchInit(formdata).then((res) => { 169 BatchInit(formdata).then((res) => {
169 if (res.code === 200 && res.result) { 170 if (res.code === 200 && res.result) {
170 this.ruleForm = res.result; 171 this.ruleForm = res.result;
......
...@@ -250,6 +250,7 @@ ...@@ -250,6 +250,7 @@
250 list (bsmSldy) { 250 list (bsmSldy) {
251 var formdata = new FormData(); 251 var formdata = new FormData();
252 formdata.append("bsmSldy", bsmSldy); 252 formdata.append("bsmSldy", bsmSldy);
253 formdata.append("isEdit", this.ableOperation);
253 Init(formdata).then((res) => { 254 Init(formdata).then((res) => {
254 if (res.code === 200 && res.result) { 255 if (res.code === 200 && res.result) {
255 this.ruleForm = { 256 this.ruleForm = {
......
...@@ -204,6 +204,7 @@ ...@@ -204,6 +204,7 @@
204 this.$startLoading(); 204 this.$startLoading();
205 formdata.append("bsmSldy", this.propsParam.bsmSldy); 205 formdata.append("bsmSldy", this.propsParam.bsmSldy);
206 formdata.append("djlx", this.propsParam.djlx); 206 formdata.append("djlx", this.propsParam.djlx);
207 formdata.append("isEdit", this.ableOperation);
207 Init(formdata).then((res) => { 208 Init(formdata).then((res) => {
208 this.$nextTick(() => { 209 this.$nextTick(() => {
209 that.ruleForm = res.result; 210 that.ruleForm = res.result;
......
...@@ -198,6 +198,7 @@ ...@@ -198,6 +198,7 @@
198 this.$startLoading(); 198 this.$startLoading();
199 formdata.append("bsmSldy", this.propsParam.bsmSldy); 199 formdata.append("bsmSldy", this.propsParam.bsmSldy);
200 formdata.append("djlx", this.propsParam.djlx); 200 formdata.append("djlx", this.propsParam.djlx);
201 formdata.append("isEdit", this.ableOperation);
201 Init(formdata).then((res) => { 202 Init(formdata).then((res) => {
202 if (res.code === 200 && res.result) { 203 if (res.code === 200 && res.result) {
203 this.ruleForm = res.result; 204 this.ruleForm = res.result;
......
...@@ -244,6 +244,7 @@ ...@@ -244,6 +244,7 @@
244 var formdata = new FormData(); 244 var formdata = new FormData();
245 formdata.append("bsmSldy", this.propsParam.bsmSldy); 245 formdata.append("bsmSldy", this.propsParam.bsmSldy);
246 formdata.append("djlx", this.propsParam.djlx); 246 formdata.append("djlx", this.propsParam.djlx);
247 formdata.append("isEdit", this.ableOperation);
247 Init(formdata).then((res) => { 248 Init(formdata).then((res) => {
248 this.ruleForm = res.result; 249 this.ruleForm = res.result;
249 this.$endLoading(); 250 this.$endLoading();
......
...@@ -250,6 +250,7 @@ ...@@ -250,6 +250,7 @@
250 this.$startLoading(); 250 this.$startLoading();
251 formdata.append("bsmSldy", this.propsParam.bsmSldy); 251 formdata.append("bsmSldy", this.propsParam.bsmSldy);
252 formdata.append("djlx", this.propsParam.djlx); 252 formdata.append("djlx", this.propsParam.djlx);
253 formdata.append("isEdit", this.ableOperation);
253 Init(formdata).then((res) => { 254 Init(formdata).then((res) => {
254 this.ruleForm = res.result; 255 this.ruleForm = res.result;
255 this.$endLoading(); 256 this.$endLoading();
......
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
161 var formdata = new FormData(); 161 var formdata = new FormData();
162 formdata.append("bsmSldy", this.propsParam.bsmSldy); 162 formdata.append("bsmSldy", this.propsParam.bsmSldy);
163 formdata.append("djlx", this.propsParam.djlx); 163 formdata.append("djlx", this.propsParam.djlx);
164 164 formdata.append("isEdit", this.ableOperation);
165 Init(formdata).then(res => { 165 Init(formdata).then(res => {
166 if (res.code === 200 && res.result) { 166 if (res.code === 200 && res.result) {
167 this.$endLoading(); 167 this.$endLoading();
......
...@@ -165,6 +165,7 @@ ...@@ -165,6 +165,7 @@
165 this.$startLoading(); 165 this.$startLoading();
166 formdata.append("bsmSldy", this.propsParam.bsmSldy); 166 formdata.append("bsmSldy", this.propsParam.bsmSldy);
167 formdata.append("djlx", this.propsParam.djlx); 167 formdata.append("djlx", this.propsParam.djlx);
168 formdata.append("isEdit", this.ableOperation);
168 Init(formdata).then((res) => { 169 Init(formdata).then((res) => {
169 if (res.code === 200 && res.result) { 170 if (res.code === 200 && res.result) {
170 this.$endLoading(); 171 this.$endLoading();
......
...@@ -214,6 +214,7 @@ ...@@ -214,6 +214,7 @@
214 formdata.append("bsmSldy", this.propsParam.bsmSldy); 214 formdata.append("bsmSldy", this.propsParam.bsmSldy);
215 formdata.append("bsmSlsq", this.$route.query.bsmSlsq); 215 formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
216 formdata.append("djlx", this.propsParam.djlx); 216 formdata.append("djlx", this.propsParam.djlx);
217 formdata.append("isEdit", this.ableOperation);
217 Init(formdata).then((res) => { 218 Init(formdata).then((res) => {
218 if (res.code === 200 && res.result) { 219 if (res.code === 200 && res.result) {
219 that.ruleForm = res.result; 220 that.ruleForm = res.result;
......
...@@ -256,6 +256,7 @@ ...@@ -256,6 +256,7 @@
256 formdata.append("bsmSldy", this.propsParam.bsmSldy); 256 formdata.append("bsmSldy", this.propsParam.bsmSldy);
257 formdata.append("bsmSlsq", this.$route.query.bsmSlsq); 257 formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
258 formdata.append("djlx", this.propsParam.djlx); 258 formdata.append("djlx", this.propsParam.djlx);
259 formdata.append("isEdit", this.ableOperation);
259 Init(formdata).then((res) => { 260 Init(formdata).then((res) => {
260 if (res.code === 200 && res.result) { 261 if (res.code === 200 && res.result) {
261 this.ruleForm = res.result; 262 this.ruleForm = res.result;
......
...@@ -68,6 +68,10 @@ class data extends filter { ...@@ -68,6 +68,10 @@ class data extends filter {
68 minWidth: '150' 68 minWidth: '150'
69 }, 69 },
70 { 70 {
71 prop: "gyqk",
72 label: "共有方式",
73 },
74 {
71 prop: "qlrmc", 75 prop: "qlrmc",
72 label: "使用权人", 76 label: "使用权人",
73 }, 77 },
...@@ -81,7 +85,7 @@ class data extends filter { ...@@ -81,7 +85,7 @@ class data extends filter {
81 label: "权利性质", 85 label: "权利性质",
82 }, 86 },
83 { 87 {
84 prop: "mj", 88 prop: "mjmc",
85 width: '100', 89 width: '100',
86 label: "使用权面积", 90 label: "使用权面积",
87 }, 91 },
...@@ -90,6 +94,11 @@ class data extends filter { ...@@ -90,6 +94,11 @@ class data extends filter {
90 label: "土地用途", 94 label: "土地用途",
91 }, 95 },
92 { 96 {
97 prop: "qdjgmc",
98 width: '100',
99 label: "取得价格",
100 },
101 {
93 prop: "zl", 102 prop: "zl",
94 label: "坐落", 103 label: "坐落",
95 minWidth: '150' 104 minWidth: '150'
......
...@@ -86,9 +86,14 @@ class data extends filter { ...@@ -86,9 +86,14 @@ class data extends filter {
86 label: "义务人", 86 label: "义务人",
87 }, 87 },
88 { 88 {
89 prop: "mj", 89 prop: "mjmc",
90 label: "面积", 90 label: "面积",
91 width: '80' 91 width: '130'
92 },
93 {
94 prop: "qlxzmc",
95 label: "权利性质",
96 minWidth: '130'
92 }, 97 },
93 { 98 {
94 prop: "ytmc", 99 prop: "ytmc",
...@@ -96,6 +101,11 @@ class data extends filter { ...@@ -96,6 +101,11 @@ class data extends filter {
96 minWidth: '130' 101 minWidth: '130'
97 }, 102 },
98 { 103 {
104 prop: "qdjgmc",
105 label: "取得价格",
106 minWidth: '80'
107 },
108 {
99 prop: "zl", 109 prop: "zl",
100 label: "坐落", 110 label: "坐落",
101 minWidth: '150' 111 minWidth: '150'
......