Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -9,9 +9,9 @@
|
||||
<div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
|
||||
<list-project></list-project>
|
||||
</div>
|
||||
<div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
|
||||
<!-- <div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
|
||||
<list-tracking></list-tracking>
|
||||
</div>
|
||||
</div>-->
|
||||
<div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
|
||||
<list-other></list-other>
|
||||
</div>
|
||||
@@ -68,13 +68,13 @@ export default {
|
||||
name: "listProject"
|
||||
});
|
||||
continue;
|
||||
} else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
|
||||
}/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
|
||||
list.push({
|
||||
label: "重点标准跟踪清单",
|
||||
name: "listTracking"
|
||||
});
|
||||
continue;
|
||||
} else if (entity.id === "5a75523729b04102a565167004d640e9") {
|
||||
}*/ else if (entity.id === "5a75523729b04102a565167004d640e9") {
|
||||
list.push({
|
||||
label: "其他清单",
|
||||
name: "listOther"
|
||||
|
||||
Reference in New Issue
Block a user