Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
3b0b3407 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents e5b57396 cc616e46 master
Expand all
Inline Side-by-side
Showing 10 changed files with 168 additions and 32 deletions
......@@ -4,7 +4,7 @@
* @LastEditTime: 2023-05-04 11:13:36
*/
const state = {
yjsqOptions: "",
yjsqOptions: {},
}
const mutations = {
......
......@@ -64,7 +64,7 @@ export default {
watch: {
yjsqOptions: {
handler(val) {
this.add(val);
this.add(val.opinion);
},
deep: true,
immediate: true,
......
......@@ -102,7 +102,7 @@ export default {
this.add("");
this.monitor=false
}else{
this.add(val);
this.add(val.opinion);
}
},
deep: true,
......
......@@ -142,7 +142,7 @@
this.defaultNode = getNode(
this.formData.qllx,
{ linShi: 0, xianShi: 0, liShi: 0 },
this.formData.bdcdylx || ""
res.result.bdcdylx|| ""
);
this.sfqdata[0].children.forEach((item, index) => {
if (item.id == this.defaultNode.id) {
......@@ -229,7 +229,6 @@
* @author: renchao
*/
loadComponent (form) {
console.log(form, 'form');
this.componentTag = (r) =>
require.ensure([], () => r(require("@/views/registerBook/" + form)));
},
......
......@@ -40,6 +40,7 @@
.xxTable {
//border-spacing: 1px;
width: 100%;
border-collapse: collapse;
// table-layout: fixed;
tr {
......@@ -59,12 +60,34 @@
top: 0px;
z-index: 3;
margin-top: -2px;
&:after{
content: "";
display: inline-block;
width: 100%;
height: 2px;
background-color: rgb(227, 226, 226);
position: absolute;
bottom: -1px;
left: 0;
z-index: 3;
}
}
tr:nth-child(2) {
position: sticky;
top: 40px;
z-index: 3;
&:after{
content: "";
display: inline-block;
width: 100%;
height: 2px;
background-color: rgb(227, 226, 226);
position: absolute;
bottom: -1px;
left: 0;
z-index: 3;
}
}
tr:nth-child(3) {
......@@ -79,6 +102,28 @@
left: 0;
z-index: 2;
margin-left: -2px;
&:before{
content: "";
display: inline-block;
width: 2px;
height: 43px;
background-color: #e3e2e2;
position: absolute;
top: 0;
left: -2px;
z-index: 3;
}
&:after{
content: "";
display: inline-block;
width: 2px;
height: 43px;
background-color: #e3e2e2;
position: absolute;
top: 0;
right: -2px;
z-index: 3;
}
}
th.linshi,
......@@ -166,27 +211,27 @@
tr {
display: flex;
// display: flex;
}
tr td {
border: 1px solid rgb(227, 226, 226);
border: 2px solid rgb(227, 226, 226);
text-align: center;
height: 40px;
font-size: 13px;
width: 140px;
flex: 1;
// flex: 1;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
min-width: 360px;
// display: flex;
// align-items: center;
// justify-content: center;
min-width: 340px;
z-index: 1;
}
td:first-child{
flex: inherit !important;
width: 200px !important;
min-width: auto !important;
// width: 200px !important;
min-width: 180px !important;
}
>tr:nth-child(odd) td {
background: #f2f2f2;
......
......@@ -144,7 +144,7 @@
* @author: renchao
*/
useCommonOpinion (item) {
store.dispatch('workflow/setOptions', item.opinion);
store.dispatch('workflow/setOptions', item);
this.$popupCacel()
},
//删除常用意见
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-25 09:31:57
* @LastEditTime: 2023-08-25 12:21:10
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -22,6 +22,7 @@
<script>
import { datas } from "../../javascript/zsyl.js";
import { getSlsqBdcqzList } from "@/api/bdcqz.js"
import { log } from 'bpmn-js-token-simulation';
export default {
name: "zsyl",
props: {
......@@ -122,6 +123,18 @@
* @author: renchao
*/
drawTextOnImage () {
function getByteLen (val) {
var len = 0;
for (var i = 0; i < val.length; i++) {
var length = val.charCodeAt(i);
if (length >= 0 && length <= 128) {
len += 1;
} else {
len += 2;
}
}
return len;
}
const canvas = this.$refs.zs;
const context = canvas.getContext('2d');
const image = new Image();
......@@ -145,19 +158,17 @@
context.fillText(this.bdcqz.qllx ? this.bdcqz.qllx : '', 129, 263);
context.fillText(this.bdcqz.qlxz ? this.bdcqz.qlxz : '', 129, 303);
context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 129, 346);
context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386);
// context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
// qlqtzk
const maxWidth = 333; // 最大宽度限制
let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
lines.forEach((line, index) => {
const y = 463 + (index * 40); // 每行文本的垂直位置
// context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386);
let lines6 = this.bdcqz.mj ? this.bdcqz.mj.split(' ') : [];
if (getByteLen(this.bdcqz.mj) > 41) {
lines6.forEach((line, index) => {
const y = 378 + (index * 27); // 每行文本的垂直位置
let currentLine = '';
let arr = [];
for (let word of line) {
const testLine = currentLine + word;
const lineWidth = context.measureText(testLine).width;
if (lineWidth <= maxWidth) {
if (lineWidth <= 330) {
currentLine = testLine;
} else {
arr.push(currentLine);
......@@ -169,6 +180,73 @@
context.fillText(line, 129, y + (index * 20)); // 调整行高
})
})
} else {
lines6.forEach((line, index) => {
const y = 386 + (index * 27); // 每行文本的垂直位置
let currentLine = '';
let arr = [];
for (let word of line) {
const testLine = currentLine + word;
const lineWidth = context.measureText(testLine).width;
if (lineWidth <= 330) {
currentLine = testLine;
} else {
arr.push(currentLine);
currentLine = word;
}
}
arr.push(currentLine);
arr.forEach((line, index) => {
context.fillText(line, 129, y + (index * 20)); // 调整行高
})
})
}
// context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
// 权利其他状态
const maxWidth = 332; // 最大宽度限制
let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
// lines.forEach((line, index) => {
// const y = 463 + (index * 33); // 每行文本的垂直位置
// let currentLine = '';
// let arr = [];
// for (let word of line) {
// const testLine = currentLine + word;
// const lineWidth = context.measureText(testLine).width;
// if (lineWidth <= maxWidth) {
// currentLine = testLine;
// } else {
// arr.push(currentLine);
// currentLine = word;
// }
// }
// arr.push(currentLine);
// arr.forEach((line, index) => {
// context.fillText(line, 129, y + (index * 17)); // 调整行高
// })
// })
for (let i = 0; i < lines.length; i++) {
if (getByteLen(lines[i]) > 41) {
let currentLine = '';
let arr = [];
for (let word of lines[i]) {
const testLine = currentLine + word;
const lineWidth = context.measureText(testLine).width;
if (lineWidth <= maxWidth) {
currentLine = testLine;
} else {
arr.push(currentLine);
currentLine = word;
}
}
arr.push(currentLine);
arr.forEach((line, index) => {
context.fillText(line, 129, 490 + (28 * (i - 1)) + (index * 14)); // 调整行高
})
} else {
context.fillText(lines[i] ? lines[i] : '', 129, 495 + (30 * (i - 1)));
}
}
let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
lines1.forEach((line, index) => {
const y = 100 + (index * 30); // 每行文本的垂直位置
......@@ -190,7 +268,7 @@
})
})
let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
if (lines3.length >= 22) {
if (getByteLen(this.bdcqz.syqx) > 41) {
lines3.forEach((line, index) => {
const y = 423 + (index * 27); // 每行文本的垂直位置
let currentLine = '';
......@@ -198,7 +276,7 @@
for (let word of line) {
const testLine = currentLine + word;
const lineWidth = context.measureText(testLine).width;
if (lineWidth <= 315) {
if (lineWidth <= 330) {
currentLine = testLine;
} else {
arr.push(currentLine);
......@@ -233,7 +311,7 @@
}
let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];
if (lines2.length >= 22) {
if (getByteLen(this.bdcqz.zl) > 41) {
lines2.forEach((line, index) => {
const y = 170 + (index * 20); // 每行文本的垂直位置
let currentLine = '';
......@@ -282,6 +360,19 @@
* @author: renchao
*/
drawTextzmImage () {
function getByteLen (val) {
var len = 0;
for (var i = 0; i < val.length; i++) {
var length = val.charCodeAt(i);
if (length >= 0 && length <= 128) {
len += 1;
} else {
len += 2;
}
}
return len;
}
const canvas = this.$refs.zm;
const context = canvas.getContext('2d');
const image = new Image();
......@@ -399,7 +490,6 @@
context.fillText(line, 775, y + (index * 16)); // 调整行高
})
})
// fj
let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
lines1.forEach((line, index) => {
......
......@@ -93,7 +93,7 @@ export default {
watch: {
yjsqOptions: {
handler(val) {
this.add(val);
this.add(val.opinion);
},
deep: true,
immediate: true,
......
......@@ -107,12 +107,12 @@
<el-row :gutter="10" v-if="ruleForm.fdcq1">
<el-col :span="8">
<el-form-item label="独用土地面积：">
<el-input v-model="ruleForm.fdcq1.dytdmj"></el-input>
<el-input :disabled="!viewEdit" v-model="ruleForm.fdcq1.dytdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分摊土地面积：">
<el-input v-model="ruleForm.fdcq1.fttdmj"></el-input>
<el-input :disabled="!viewEdit" v-model="ruleForm.fdcq1.fttdmj"></el-input>
</el-form-item>
</el-col>
......@@ -120,11 +120,12 @@
<el-form-item label="房地产交易价格：">
<div class="flex">
<el-input
:disabled="!viewEdit"
v-model="ruleForm.fdcq1.fdcjyjg"
style="width: 500%"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select v-model="ruleForm.fdcq1.jedw">
<el-select :disabled="!viewEdit" v-model="ruleForm.fdcq1.jedw">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......@@ -140,6 +141,7 @@
<el-col :span="24">
<el-form-item label="附记：">
<el-input
:disabled="!viewEdit"
v-model="ruleForm.fdcq1.fj"
type="textarea"
maxlength="500"
......