Merge branch 'dy' of git.picaiba.com:mt-fe-group/xc-pad into dy

This commit is contained in:
gtz 2024-01-30 16:25:43 +08:00
commit 890f9f4fb7
2 changed files with 26 additions and 4 deletions

View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: Do not edit * @Author: Do not edit
* @Date: 2024-01-09 13:48:42 * @Date: 2024-01-09 13:48:42
* @LastEditTime: 2024-01-30 14:39:35 * @LastEditTime: 2024-01-30 16:23:17
* @LastEditors: DY * @LastEditors: DY
* @Description: * @Description:
--> -->
@ -138,7 +138,12 @@ export default {
value: it.id value: it.id
} }
}) })
console.log('nihjc', temp) if (this.sectionArray.length > 0) {
this.listQuery.sectionId = this.sectionArray[0].value
this.getQuality()
} else {
this.listQuery.sectionId = ''
}
// workshopSectionListByLine({ id: this.listQuery.productionLineId }).then(res => { // workshopSectionListByLine({ id: this.listQuery.productionLineId }).then(res => {
// this.sectionArray = res.data.data.map(item => { // this.sectionArray = res.data.data.map(item => {
// return { // return {
@ -172,10 +177,22 @@ export default {
.rightDiv { .rightDiv {
border-radius: 7px; border-radius: 7px;
height: 72px; height: 72px;
line-height: 72px; line-height: 36px;
width: 140px; width: 140px;
text-align: left;
padding-left: 10px;
overflow: hidden;
-webkit-line-clamp: 2;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-box-pack: center;
/* text-align: justify; */
text-overflow: ellipsis;
/* background-color: #276BFF; */ /* background-color: #276BFF; */
} }
/* .rightDiv::after {
content: "...";
} */
.contain { .contain {
border-radius: 7px 36px 36px 7px; border-radius: 7px 36px 36px 7px;
height: 72px; height: 72px;

View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: Do not edit * @Author: Do not edit
* @Date: 2024-01-09 13:49:03 * @Date: 2024-01-09 13:49:03
* @LastEditTime: 2024-01-30 10:28:52 * @LastEditTime: 2024-01-30 14:59:42
* @LastEditors: DY * @LastEditors: DY
* @Description: * @Description:
--> -->
@ -262,6 +262,11 @@ export default {
return item.id === value return item.id === value
}) })
this.sectionArray = temp[0].children this.sectionArray = temp[0].children
if (this.sectionArray.length > 0) {
this.ruleForm.sectionId = this.sectionArray[0].id
} else {
this.ruleForm.sectionId = ''
}
// workshopSectionListByLine({ id: this.ruleForm.lineId }).then(res => { // workshopSectionListByLine({ id: this.ruleForm.lineId }).then(res => {
// this.sectionArray = res.data.data // this.sectionArray = res.data.data
// }) // })