FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_foton_20240430' into 'master'

Browse Source 
Fix foton 20240430

See merge request laws-foton-slrs/foton-laws-system-front!192
This commit is contained in:
王晓勇
2024-06-12 04:21:51 +00:00
parent 564f0d21fc 9ee1e96526
commit 2f8cd98ced
9 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+6 -6
View File
@@ -742,12 +742,12 @@
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this _this: this
}, res => { }, res => {
if (res.data.leftString === '' && res.data.rightString === '') { if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString
this.rightData = res.data.rightString this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString
this.BDmodel = true this.BDmodel = true
this.similarityDegree = res.data.similarityDegree this.similarityDegree = res.data.similarityDegree
} }
@@ -766,14 +766,14 @@
this.PLmodalType = type this.PLmodalType = type
this.PLmodalIndex = index this.PLmodalIndex = index
this.PLmodalTitle = '编辑' this.PLmodalTitle = '编辑'
if (res.data.leftString === '' && res.data.rightString === '') { if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) {
this.BDtext = true this.BDtext = true
} else if (!row.itemsId || !row.itemsId2) { } else if (!row.itemsId || !row.itemsId2) {
this.BDtext = true this.BDtext = true
} else { } else {
this.BDtext = false this.BDtext = false
this.leftData = res.data.leftString this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString
this.rightData = res.data.rightString this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString
this.similarityDegree = res.data.similarityDegree this.similarityDegree = res.data.similarityDegree
} }
this.plForm = { this.plForm = {
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+3 -3
View File
@@ -460,12 +460,12 @@ export default {
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this _this: this
}, res => { }, res => {
if (res.data.leftString === '' && res.data.rightString === '') { if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString
this.rightData = res.data.rightString this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString
this.BDmodel = true this.BDmodel = true
this.similarityDegree = res.data.similarityDegree this.similarityDegree = res.data.similarityDegree
} }
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+6 -6
View File
@@ -761,12 +761,12 @@
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this _this: this
}, res => { }, res => {
if (res.data.leftString === '' && res.data.rightString === '') { if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString
this.rightData = res.data.rightString this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString
this.BDmodel = true this.BDmodel = true
this.similarityDegree = res.data.similarityDegree this.similarityDegree = res.data.similarityDegree
} }
@@ -787,14 +787,14 @@
this.PLmodalType = type this.PLmodalType = type
this.PLmodalIndex = index this.PLmodalIndex = index
this.PLmodalTitle = '编辑' this.PLmodalTitle = '编辑'
if (res.data.leftString === '' && res.data.rightString === '') { if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) {
this.BDtext = true this.BDtext = true
} else if (!row.itemsId || !row.itemsId2) { } else if (!row.itemsId || !row.itemsId2) {
this.BDtext = true this.BDtext = true
} else { } else {
this.BDtext = false this.BDtext = false
this.leftData = res.data.leftString this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString
this.rightData = res.data.rightString this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString
this.similarityDegree = res.data.similarityDegree this.similarityDegree = res.data.similarityDegree
} }
this.plForm = { this.plForm = {
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+3 -1
View File
@@ -645,7 +645,7 @@
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this _this: this
}, res => { }, res => {
if (res.data.leftString === '' && res.data.rightString === '') { if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum this.itemsNum = itemsNum
@@ -689,12 +689,14 @@
}else { }else {
this.leftData = res.data.leftString this.leftData = res.data.leftString
} }
this.leftData = this.leftData.join('')
this.rightData = [] this.rightData = []
if((typeof res.data.rightString) === "string"){ if((typeof res.data.rightString) === "string"){
this.rightData.push(res.data.rightString) this.rightData.push(res.data.rightString)
}else { }else {
this.rightData = res.data.rightString this.rightData = res.data.rightString
} }
this.rightData = this.rightData.join('')
this.similarityDegree = res.data.similarityDegree this.similarityDegree = res.data.similarityDegree
} }
this.itemId = row.id this.itemId = row.id
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+3 -3
View File
@@ -386,12 +386,12 @@
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this _this: this
}, res => { }, res => {
if (res.data.leftString === '' && res.data.rightString === '') { if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString
this.rightData = res.data.rightString this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString
this.BDmodel = true this.BDmodel = true
this.similarityDegree = res.data.similarityDegree this.similarityDegree = res.data.similarityDegree
} }
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+3 -3
View File
@@ -386,12 +386,12 @@
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this _this: this
}, res => { }, res => {
if (res.data.leftString === '' && res.data.rightString === '') { if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString
this.rightData = res.data.rightString this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString
this.BDmodel = true this.BDmodel = true
this.similarityDegree = res.data.similarityDegree this.similarityDegree = res.data.similarityDegree
} }
src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
+3 -3
View File
@@ -389,12 +389,12 @@
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this _this: this
}, res => { }, res => {
if (res.data.leftString === '' && res.data.rightString === '') { if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString
this.rightData = res.data.rightString this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString
this.BDmodel = true this.BDmodel = true
this.similarityDegree = res.data.similarityDegree this.similarityDegree = res.data.similarityDegree
} }
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+3 -3
View File
@@ -388,12 +388,12 @@
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this _this: this
}, res => { }, res => {
if (res.data.leftString === '' && res.data.rightString === '') { if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString
this.rightData = res.data.rightString this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString
this.BDmodel = true this.BDmodel = true
this.similarityDegree = res.data.similarityDegree this.similarityDegree = res.data.similarityDegree
} }
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1 -1
View File
@@ -754,7 +754,7 @@
this.acceptShow = false this.acceptShow = false
this.submitShow = true this.submitShow = true
} }
this.commentForm.commentText3 = data.commentText3 || '' this.$set(this.commentForm, 'commentText3', data.commentText3 || '')
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )