diff --git a/src/views/agjtLiveScreen/liveScreen/leftTop.vue b/src/views/agjtLiveScreen/liveScreen/leftTop.vue index 3bc58a4..8f9931c 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftTop.vue @@ -18,9 +18,19 @@
+ 项目名称: + {{ item.name || "--" }} +
+
项目编号: {{ item.projectEnterprise.projectNumber || "--" }}
+
+
+
+ 项目经理: + {{ item.projectEnterprise.projectManage || "--" }} +
建筑面积:
- 项目经理: - {{ item.projectEnterprise.projectManage || "--" }} + 项目类型: + {{ item.projectEnterprise.cbsProjectTypeName || "--" }}
联系电话: @@ -41,23 +51,13 @@
- 项目类型: - {{ item.projectEnterprise.cbsProjectTypeName || "--" }} -
-
工程类别: {{ item.projectEnterprise.projectTypeName || "--" }}
-
-
-
+
开工日期: {{ item.projectEnterprise.startWorkDate || "--" }}
-
- 竣工日期: - {{ item.projectEnterprise.completionDate || "--" }} -
@@ -65,8 +65,8 @@ {{ item.projectEnterprise.constructionStageName || "--" }}
- 结构类型: - {{ item.projectEnterprise.structureTypeName || "--" }} + 竣工日期: + {{ item.projectEnterprise.completionDate || "--" }}
@@ -75,6 +75,10 @@ {{item.projectEnterprise.projectBuildArea || '--'}}
-->
+ 结构类型: + {{ item.projectEnterprise.structureTypeName || "--" }} +
+
工程状态: {{ item.projectEnterprise.bulidStatus == 0 @@ -207,19 +211,45 @@ async function getCbsProjectInfo() { }); cbsProjectInfo.value = []; peList.map((item: any, i: any) => { - cbsProjectInfo.value.push(item); 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); + const resultList = item.supplierInfos.map((ele: any) => { + return [{ + ...item, + name: ele.cbsName, + projectEnterprise: ele, + },{ + id: item.id, + name: ele.cbsName, + lbType: 2, + processList: processList.map((item3: any) => item3) + }]; + }); cbsProjectInfo.value = [ ...cbsProjectInfo.value, - { - id: item.id, - name: item.projectEnterprise.cbsName, - lbType: 2, - processList: processList.map((item3: any) => item3) - } + ...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) { // let tempList: any = []; // processList.map((item3: any, i: any) => {