From 4a2aa223f93492fe9b9efa46e29c0bb6a3d2f340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Mon, 8 Aug 2022 12:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5):=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectHuScreen/projectHuli/index.vue     | 12 ++--
 .../projectHuli/projectIntro.vue              | 64 +++++++++----------
 2 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/index.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/index.vue
index 3260834c..c2cf5216 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/index.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/index.vue
@@ -82,12 +82,12 @@ export default {
         if (res.code == 200) {
           this.projectData = res.result
           console.log('projectData', this.projectData)
-          if (parseInt(this.projectData.constructionStage) > 4) {
-            this.$refs['stageScroll'].scrollTo(
-              { x: (this.projectData.constructionStage - 4) * 230 },
-              500
-            )
-          }
+          // if (parseInt(this.projectData.constructionStage) > 4) {
+          //   this.$refs['stageScroll'].scrollTo(
+          //     { x: (this.projectData.constructionStage - 4) * 230 },
+          //     500
+          //   )
+          // }
         }
       })
     },
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/projectIntro.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/projectIntro.vue
index cdf3921e..4af9a69e 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/projectIntro.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/projectIntro.vue
@@ -1,15 +1,14 @@
 <template>
 <!-- 项目简介 -->
-  <div class="projectIntro">
-    <span class="titleTxt">{{ title }}</span>
-    <div class="content">
+<Card :title="title">
+     <div class="content">
       <vue-scroll>
         <div class="listItem">
           <!-- 项目名称 -->
           <span class="label">
             {{ $t('message.companyDiagram.entryName1') }}：
           </span>
-          <!-- <span class="value">{{ projectData.projectName }}</span> -->
+          <span class="value">{{ projectData.projectName }}</span>
         </div>
         <div class="listItem">
           <!-- 项目地址 -->
@@ -17,8 +16,8 @@
             {{ $t('message.companyDiagram.projectAddress') }}：
           </span>
           <span class="value">
-            <!-- {{ projectData.provinceName }}{{ projectData.cityName }} -->
-            <!-- {{ projectData.areaName }}{{ projectData.projectAddress }} -->
+            {{ projectData.provinceName }}{{ projectData.cityName }}
+            {{ projectData.areaName }}{{ projectData.projectAddress }}
           </span>
         </div>
         <div class="listItem">
@@ -26,35 +25,35 @@
           <span class="label">
             {{ $t('message.companyDiagram.projectManager') }}：
           </span>
-          <!-- <span class="value">{{ projectData.projectManage }}</span> -->
+          <span class="value">{{ projectData.projectManage }}</span>
         </div>
         <div class="listItem">
           <!-- 联系电话 -->
           <span class="label">
             {{ $t('message.companyDiagram.telPhone') }}：
           </span>
-          <!-- <span class="value">{{ projectData.projectTel }}</span> -->
+          <span class="value">{{ projectData.projectTel }}</span>
         </div>
         <div class="listItem">
           <!-- 建筑面积 -->
           <span class="label">
             {{ $t('message.companyDiagram.buildArea') }}：
           </span>
-          <!-- <span class="value">{{ projectData.projectAcreage }} m²</span> -->
+          <span class="value">{{ projectData.projectAcreage }} m²</span>
         </div>
         <div class="listItem">
           <!-- 开工日期 -->
           <span class="label">
             {{ $t('message.companyDiagram.buildStartTime') }}：
           </span>
-          <!-- <span class="value">{{ projectData.startWorkDate }}</span> -->
+          <span class="value">{{ projectData.startWorkDate }}</span>
         </div>
         <div class="listItem">
           <!-- 项目编号 -->
           <span class="label">
             {{ $t('message.companyDiagram.projectNo') }}：
           </span>
-          <!-- <span class="value">{{ projectData.projectNumber }}</span> -->
+          <span class="value">{{ projectData.projectNumber }}</span>
         </div>
         <div class="listItem">
           <!-- 工程类别 -->
@@ -66,7 +65,7 @@
             v-for="(item, index) in $t('message.companyDiagram.PROJECTTYPE')"
             :key="index"
           >
-            <!-- {{ projectData.projectType == item.id ? item.name : '' }} -->
+            {{ projectData.projectType == item.id ? item.name : '' }}
           </span>
         </div>
         <div class="listItem">
@@ -81,7 +80,7 @@
             )"
             :key="index"
           >
-            <!-- {{ projectData.engineeringPurpose == item.id ? item.name : '' }} -->
+            {{ projectData.engineeringPurpose == item.id ? item.name : '' }}
           </span>
         </div>
         <div class="listItem">
@@ -94,7 +93,7 @@
             v-for="(item, index) in $t('message.companyDiagram.STRUCTURETYPE')"
             :key="index"
           >
-            <!-- {{ projectData.structureType == item.id ? item.name : '' }} -->
+            {{ projectData.structureType == item.id ? item.name : '' }}
           </span>
         </div>
         <div class="listItem">
@@ -107,43 +106,38 @@
             v-for="(item, index) in $t('message.companyDiagram.BUILDSTATUS')"
             :key="index"
           >
-            <!-- {{ projectData.bulidStatus == item.id ? item.name : '' }} -->
+            {{ projectData.bulidStatus == item.id ? item.name : '' }}
           </span>
         </div>
       </vue-scroll>
     </div>
-  </div>
+  </Card>
 </template>
 
 <script>
+import Card from '../components/Card.vue'
 export default {
-  props: ['projectData'],
-  data() {
-    return {
-
-    };
-  },
+components:{Card},
   props: {
     title: {
       type: String,
       default: "default title"
+    },
+    projectData:{
+      type:Array,
+      default: []
     }
-  }
+  },
+    data() {
+    return {
+
+    };
+  },
+
 }
 </script>
 
 <style lang="less" scoped>
-.projectIntro {
-  width: 100%;
-  height: 100%;
-  border: 1px solid #0081c3;
-
-  .titleTxt {
-    font-size: 18px;
-    color: #6ee4f0;
-    margin-top: 5px;
-    margin-left: 5px;
-  }
    .content {
     position: relative;
     padding: 10px 20px;
@@ -156,5 +150,5 @@ export default {
       }
     }
   }
-}
+
 </style>
\ No newline at end of file