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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-03-07 10:47:54 +08:00
parent e70e6cedec fc67a9a5e8
commit da85c742d1
8 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+2 -2
View File
@@ -487,8 +487,8 @@
<div>比对条款: {{ itemsNum }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度: {{ similarityDegree }}</div> <div>相似度: {{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+2 -2
View File
@@ -349,8 +349,8 @@
<div>比对条款: {{ itemsNum }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -495,8 +495,8 @@
<div>比对条款: {{ itemsNum }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度: {{ similarityDegree }}</div> <div>相似度: {{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+2 -2
View File
@@ -468,8 +468,8 @@
<div>比对条款: {{ itemsNum }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度: {{ similarityDegree }}</div> <div>相似度: {{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+2 -2
View File
@@ -297,8 +297,8 @@
<div>比对条款: {{ itemsNum }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div> </div>
</el-dialog> </el-dialog>
<Role-tree <Role-tree
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+2 -2
View File
@@ -302,8 +302,8 @@
<div>比对条款: {{ itemsNum }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div> </div>
</el-dialog> </el-dialog>
<loading :loading="loading">加载中...</loading> <loading :loading="loading">加载中...</loading>
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+2 -2
View File
@@ -300,8 +300,8 @@
<div>比对条款: {{ itemsNum }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div> </div>
</el-dialog> </el-dialog>
<loading :loading="loading">加载中...</loading> <loading :loading="loading">加载中...</loading>
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+2
View File
@@ -898,6 +898,7 @@ export default {
lawName: '', // 标准名称/政策名称 lawName: '', // 标准名称/政策名称
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
bpnId: '',
total: 0, total: 0,
quoteIdList: '', quoteIdList: '',
validFlag: '0', validFlag: '0',
@@ -1473,6 +1474,7 @@ export default {
}, },
mounted() { mounted() {
if(this.$route.query.bpnId){ if(this.$route.query.bpnId){
this.bpnId = this.$route.query.bpnId
queryTaskFirst({ queryTaskFirst({
bpnId: this.$route.query.bpnId bpnId: this.$route.query.bpnId
}).then(res => { }).then(res => {