admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flx:提交现场大屏

Browse Source
This commit is contained in:
X_Rian 2024-10-31 19:08:20 +08:00
parent 6016927937
commit 57055359f4
1 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/views/agjtLiveScreen/liveScreen/leftTop.vue
View File

@ -18,9 +18,19 @@
</div> </div>
<div class="lineBox"> <div class="lineBox">
<div class="boxInner1"> <div class="boxInner1">
<span class="aLine">项目名称：</span>
<span class="cLine">{{ item.name || "--" }}</span>
</div>
<div class="boxInner2">
<span class="aLine">项目编号：</span> <span class="aLine">项目编号：</span>
<span class="cLine">{{ item.projectEnterprise.projectNumber || "--" }}</span> <span class="cLine">{{ item.projectEnterprise.projectNumber || "--" }}</span>
</div> </div>
</div>
<div class="lineBox">
<div class="boxInner1">
<span class="aLine">项目经理：</span>
<span class="cLine">{{ item.projectEnterprise.projectManage || "--" }}</span>
</div>
<div class="boxInner2"> <div class="boxInner2">
<span class="aLine">建筑面积：</span> <span class="aLine">建筑面积：</span>
<span v-if="item.projectEnterprise.projectAcreage" <span v-if="item.projectEnterprise.projectAcreage"
@ -31,8 +41,8 @@
</div> </div>
<div class="lineBox"> <div class="lineBox">
<div class="boxInner1"> <div class="boxInner1">
<span class="aLine">项目经理：</span> <span class="aLine">项目类型：</span>
<span class="cLine">{{ item.projectEnterprise.projectManage || "--" }}</span> <span class="cLine">{{ item.projectEnterprise.cbsProjectTypeName || "--" }}</span>
</div> </div>
<div class="boxInner2"> <div class="boxInner2">
<span class="aLine">联系电话：</span> <span class="aLine">联系电话：</span>
@ -41,23 +51,13 @@
</div> </div>
<div class="lineBox"> <div class="lineBox">
<div class="boxInner1"> <div class="boxInner1">
<span class="aLine">项目类型：</span>
<span class="cLine">{{ item.projectEnterprise.cbsProjectTypeName || "--" }}</span>
</div>
<div class="boxInner2">
<span class="aLine">工程类别：</span> <span class="aLine">工程类别：</span>
<span class="cLine">{{ item.projectEnterprise.projectTypeName || "--" }}</span> <span class="cLine">{{ item.projectEnterprise.projectTypeName || "--" }}</span>
</div> </div>
</div> <div class="boxInner2">
<div class="lineBox">
<div class="boxInner1">
<span class="aLine">开工日期：</span> <span class="aLine">开工日期：</span>
<span class="cLine">{{ item.projectEnterprise.startWorkDate || "--" }}</span> <span class="cLine">{{ item.projectEnterprise.startWorkDate || "--" }}</span>
</div> </div>
<div class="boxInner2">
<span class="aLine">竣工日期：</span>
<span class="cLine">{{ item.projectEnterprise.completionDate || "--" }}</span>
</div>
</div> </div>
<div class="lineBox"> <div class="lineBox">
<div class="boxInner1"> <div class="boxInner1">
@ -65,8 +65,8 @@
<span class="cLine">{{ item.projectEnterprise.constructionStageName || "--" }}</span> <span class="cLine">{{ item.projectEnterprise.constructionStageName || "--" }}</span>
</div> </div>
<div class="boxInner2"> <div class="boxInner2">
<span class="aLine">结构类型：</span> <span class="aLine">竣工日期：</span>
<span class="cLine">{{ item.projectEnterprise.structureTypeName || "--" }}</span> <span class="cLine">{{ item.projectEnterprise.completionDate || "--" }}</span>
</div> </div>
</div> </div>
<div class="lineBox"> <div class="lineBox">
@ -75,6 +75,10 @@
<span class="cLine">{{item.projectEnterprise.projectBuildArea || '--'}}</span> <span class="cLine">{{item.projectEnterprise.projectBuildArea || '--'}}</span>
</div> --> </div> -->
<div class="boxInner1"> <div class="boxInner1">
<span class="aLine">结构类型：</span>
<span class="cLine">{{ item.projectEnterprise.structureTypeName || "--" }}</span>
</div>
<div class="boxInner2">
<span class="aLine">工程状态：</span> <span class="aLine">工程状态：</span>
<span class="cLine">{{ <span class="cLine">{{
item.projectEnterprise.bulidStatus == 0 item.projectEnterprise.bulidStatus == 0
@ -207,19 +211,45 @@ async function getCbsProjectInfo() {
}); });
cbsProjectInfo.value = []; cbsProjectInfo.value = [];
peList.map((item: any, i: any) => { peList.map((item: any, i: any) => {
cbsProjectInfo.value.push(item);
let processList = pList.filter((item2: any) => item2.enterpriseId == item.id) || []; let processList = pList.filter((item2: any) => item2.enterpriseId == item.id) || [];
if (processList.length == 0) return; if (processList.length == 0) {
cbsProjectInfo.value.push(item);
return
};
// console.log(555555555, processList); // console.log(555555555, processList);
cbsProjectInfo.value = [ const resultList = item.supplierInfos.map((ele: any) => {
...cbsProjectInfo.value, return [{
{ ...item,
name: ele.cbsName,
projectEnterprise: ele,
},{
id: item.id, id: item.id,
name: item.projectEnterprise.cbsName, name: ele.cbsName,
lbType: 2, lbType: 2,
processList: processList.map((item3: any) => item3) processList: processList.map((item3: any) => item3)
} }];
});
cbsProjectInfo.value = [
...cbsProjectInfo.value,
...resultList.flat(),
]; ];
// [
// ...cbsProjectInfo.value,
// // {
// // id: item.id,
// // name: item.projectEnterprise.cbsName,
// // lbType: 2,
// // processList: processList.map((item3: any) => item3)
// // }
// ...item.supplierInfos.map((ele: any) => {
// return {
// id: item.id,
// name: ele.cbsName,
// lbType: 2,
// processList: processList.map((item3: any) => item3)
// }
// })
// ];
// if (processList.length > 3) { // if (processList.length > 3) {
// let tempList: any = []; // let tempList: any = [];
// processList.map((item3: any, i: any) => { // processList.map((item3: any, i: any) => {