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:
396572590@qq.com
2022-07-20 16:19:58 +08:00
parent 3b3bdd0bae 747fb8ae00
commit 1bdc4d1dff
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/treeSelect/treeSelectNew.vue
+1 -1
View File
@@ -321,7 +321,7 @@
// } // }
//} //}
.common-tree{ .common-tree{
height: 100%; height: 87%;
overflow-y: auto; overflow-y: auto;
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+3 -2
View File
@@ -268,7 +268,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee"> <div v-if="xgdFileMap.length>0 && xgdFileMap[0].id" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span> <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div> </div>
<div v-else> <div v-else>
@@ -825,6 +825,7 @@ export default {
submitType: '', submitType: '',
xgdFileMap: [], xgdFileMap: [],
fbgbjbdFileMap: [], fbgbjbdFileMap: [],
fbgywbdFileMap: [],
bpgFileMap: [], bpgFileMap: [],
ssgFileMap: [], ssgFileMap: [],
zqyjgFileMap: [], zqyjgFileMap: [],
@@ -1141,8 +1142,8 @@ export default {
this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName); this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName); this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName);
this.fbgywbdFileMap=this.assemble(processForm.fbgywbd,processForm.fbgywbdName);
// fbgbjbdFileMap: {}, // fbgbjbdFileMap: {},
this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName); this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName);
// bpgFileMap: {}, // bpgFileMap: {},
src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
+4 -1
View File
@@ -252,7 +252,8 @@ export default {
padding: 0 10% 0 10%; padding: 0 10% 0 10%;
background: #ffffff; background: #ffffff;
font-size: 16px; font-size: 16px;
height: 84%;
overflow-y: auto;
.transition-box-p { .transition-box-p {
line-height: 50px; line-height: 50px;
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
@@ -266,6 +267,8 @@ export default {
display: inline-block; display: inline-block;
color: #7e8083; color: #7e8083;
width: calc(~'100% - 100px'); width: calc(~'100% - 100px');
overflow-y: auto;
overflow-y: auto;
word-break: break-all; word-break: break-all;
white-space: pre-wrap; white-space: pre-wrap;
} }