From d13dc968219a1a6a06096d3966b5460110451ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Tue, 8 Nov 2022 15:11:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E7=BB=86=E8=8A=82=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/config.js                           |   2 +-
 .../projectAdmin/fourEngin/command/center.vue |  23 +++-
 .../fourEngin/command/leftOne.vue             |  18 +--
 .../fourEngin/command/leftThree.vue           |   4 +-
 .../fourEngin/govComp/leftTop.vue             | 113 +++++++++---------
 5 files changed, 83 insertions(+), 77 deletions(-)

diff --git a/public/js/config.js b/public/js/config.js
index 93f5448a..9210af6b 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -18,7 +18,7 @@ var PROJECT = {
 }
 
 
-var PROJECT_TYPE = PROJECT.online_zjsj
+var PROJECT_TYPE = PROJECT.local_test
 
 var headerShow = true; // 是否显示头部
 var tabsShow = true;  // 是否显示tabs
diff --git a/src/views/projectAdmin/fourEngin/command/center.vue b/src/views/projectAdmin/fourEngin/command/center.vue
index e79a5066..f021e6e4 100644
--- a/src/views/projectAdmin/fourEngin/command/center.vue
+++ b/src/views/projectAdmin/fourEngin/command/center.vue
@@ -27,6 +27,7 @@
 
 <script>
 import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
+import { getProjectExtendInfoApi }from "@/assets/js/api/baseInfo.js";
 import LeftThree from './leftThree/index.vue'
 
 export default {
@@ -36,14 +37,15 @@ export default {
       projectSn:"",
       // 信息窗体开关
       open: true,
+      contractPrice:"",
       // 信息窗体表单
       informationForm: {
         projectName: { label: '项目名称:', value: '' },
         bulidStatus: { label: '项目状态:', value: '' },
         constructionStage: { label: '形象进度:', value: '' },
-        households:{label: '户数:', value: ''},
+        households:{label: '项目造价:', value: ''},
         // val2:{label: '已完成投资:', value: ''},
-        projectAcreage: { label: '工程面积:', value: '', unit: '' },
+        projectAcreage: { label: '项目面积:', value: '', unit: '' },
         constructionUnit: { label: '建设单位:', value: ''},
         projectAddress: { label: '项目地址:', value: '' },
       },
@@ -77,28 +79,39 @@ export default {
   },
   created() {
     this.projectSn = this.$store.state.projectSn
+    this.getVal()
   },
   mounted(){
-    this.getList()
+    this.$nextTick(()=>{
+      this.getList()
+    })
   },
   methods: {
     /** 查询数据 */
+    getVal(){
+      getProjectExtendInfoApi({ projectSn: this.projectSn,}).then((res)=>{
+        console.log('查看的结果',res)
+        this.contractPrice = res.result.contractPrice
+      })
+    },
     getList() {
       listProjectInfo({ projectSn: this.projectSn }).then(res => {
         console.log('项目信息: ', res)
         const informationForm = this.informationForm
         Object.keys(informationForm).forEach(key => {
-          
           if (key === 'constructionStage') {
             informationForm[key].value = this.constructionStageEnum[res.result[key]]
+          } else if( key === 'households'){
+            informationForm[key].value = this.contractPrice 
           } else if (key === 'bulidStatus') {
             informationForm[key].value = this.projectStatusEnum[res.result[key]]
-          } else {
+          }else {
             informationForm[key].value = res.result[key]
           }
         })
       })
     },
+   
     // 标记点 鼠标移入事件
     // handleMouseenter() {
     //   this.open = true
diff --git a/src/views/projectAdmin/fourEngin/command/leftOne.vue b/src/views/projectAdmin/fourEngin/command/leftOne.vue
index 8c00bbc0..7edf5d72 100644
--- a/src/views/projectAdmin/fourEngin/command/leftOne.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftOne.vue
@@ -17,26 +17,16 @@
 import Card from '../components/Card'
 import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
 
-import { mapState } from 'vuex'
 
 export default {
   components: { Card },
   data: () => ({
-    // 项目信息列表
-    // list: {
-    //   projectAddress: { label: '项目位置', value: ' 建宁路与热河交叉路口' },
-    //   projectAcreage: { label: '用地面积', value: ' 112768.21㎡' },
-    //   constructionUnit: { label: '建设单位', value: ' 中建四局发展(广州天河)有限公司' },
-    //   designUnit: { label: '设计单位', value: ' 中国建筑第四工程局有限公司' },
-    //   exploreUnit: { label: '勘察单位', value: ' 贵州中建建筑科研设计院有限公司' },
-    //   supervisorUnit: { label: '监理单位', value: ' 广州宏元建设工程咨询有限公司' },
-    // },
     list: {
-      projectAddress: { label: '项目位置', value: '' },
-      projectAcreage: { label: '用地面积', value: '' },
+      projectAddress: { label: '项目地址', value: '' },
+      projectAcreage: { label: '项目面积', value: '' },
       constructionUnit: { label: '建设单位', value: '' },
       designUnit: { label: '设计单位', value: '' },
-      exploreUnit: { label: '勘察单位', value: '' },
+      exploreUnit: { label: '业主单位', value: '' },
       supervisorUnit: { label: '监理单位', value: '' },
     },
   }),
@@ -51,7 +41,7 @@ export default {
     /** 查询列表 */
     getList() {
       listProjectInfo({ projectSn: this.projectSn }).then(res => {
-        console.log('项目信息: ', res);
+        console.log('项目信息11111: ', res);
         const list = this.list;
         Object.keys(list).forEach(key => {
           list[key].value = res.result[key];
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree.vue b/src/views/projectAdmin/fourEngin/command/leftThree.vue
index 30ceca76..0bb7eca7 100644
--- a/src/views/projectAdmin/fourEngin/command/leftThree.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree.vue
@@ -90,7 +90,7 @@ export default {
                   if(res.result != null){
                     this.leftList.a.value = res.result.pm25
                   this.leftList.b.value = res.result.pm10
-                  this.leftList.c.value = res.result.noise
+                  this.leftList.c.value = res.result.noise.toFixed(2)
                   this.rightList.temperature.value = res.result.temperature
                   this.rightList.humidity.value = res.result.humidity
                   this.rightList.windSpeed.value = res.result.windspeed
@@ -162,7 +162,7 @@ export default {
 
           width: 77px;
           height: 44px;
-          font-size: 30px;
+          font-size: 24px;
           background-image: url('../assets/images/command-center/block2.png');
         }
 
diff --git a/src/views/projectAdmin/fourEngin/govComp/leftTop.vue b/src/views/projectAdmin/fourEngin/govComp/leftTop.vue
index 101755ac..85ee13ad 100644
--- a/src/views/projectAdmin/fourEngin/govComp/leftTop.vue
+++ b/src/views/projectAdmin/fourEngin/govComp/leftTop.vue
@@ -1,80 +1,83 @@
 <template>
   <Card title="基本信息">
     <div class="contentBox">
-      <p class="row">
-        <span>项目位置:</span>
-        <a>{{list.projectAddress}}</a>
-      </p>
-      <p class="row">
-        <span>用地面积:</span>
-        <a>{{list.projectAcreage}}㎡</a>
-      </p>
-      <p class="row">
-        <span>建设单位:</span>
-        <a>{{list.constructionUnit}}</a>
-      </p>
-      <p class="row">
-        <span>设计单位:</span>
-        <a>{{list.designUnit}}</a>
-      </p>
-      <p class="row">
-        <span>勘察单位:</span>
-        <a>{{list.exploreUnit}}</a>
-      </p>
-      <p class="row">
-        <span>监理单位:</span>
-        <a>{{list.supervisorUnit}}</a>
-      </p>
+      <div class="list">
+          <div class="list-item" v-for="(item, key) in list" :key="key">
+            <span class="label">{{ item.label +' ： '}} </span>
+            <span class="value">{{ item.value }}</span>
+          </div>
+        </div>
     </div>
   </Card>
 </template>
 
 <script>
-import Card from "../components/Card.vue";
+import Card from '../components/Card'
+import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
+
+
 export default {
   components: { Card },
-  data(){
-    return{
-      list:{
-        projectAddress:'建宁路与热河交叉路口',
-        projectAcreage:'112768.21㎡',
-        constructionUnit:"中建四局发展(广州天河)有限公司",
-        designUnit:"中国建筑第四工程局有限公司",
-        exploreUnit:"贵州中建建筑科研设计院有限公司",
-        supervisorUnit:"广州宏元建设工程咨询有限公司",
-      }
-    }
+  data: () => ({
+    list: {
+      projectAddress: { label: '项目地址', value: '' },
+      projectAcreage: { label: '项目面积', value: '' },
+      constructionUnit: { label: '建设单位', value: '' },
+      designUnit: { label: '设计单位', value: '' },
+      exploreUnit: { label: '业主单位', value: '' },
+      supervisorUnit: { label: '监理单位', value: '' },
+    },
+  }),
+  created() {
+    this.projectSn = this.$store.state.projectSn
+    // this.projectSn=localStorage.getItem('sn')
   },
-  created(){
-    // this.getData();
+  mounted(){
+    this.getList()
   },
-  methods:{
-  }
-};
+  methods: {
+    /** 查询列表 */
+    getList() {
+      listProjectInfo({ projectSn: this.projectSn }).then(res => {
+        console.log('项目信息11111: ', res);
+        const list = this.list;
+        Object.keys(list).forEach(key => {
+          list[key].value = res.result[key];
+        })
+      })
+    },
+  },
+}
 </script>
 
 <style lang="less" scoped>
 .contentBox {
+  margin-top: 3%;
   width: 100%;
   height: 90%;
   overflow: auto;
-  margin-top: 1%;
-  .row {
-    height: 35px;
-    line-height: 35px;
-    margin-top: 3px;
-    span {
-      margin-left: 10%;
-      color: white;
-      width: 25%;
+  .list-item {
+      flex: 1;
+      position: relative;
+      display: flex;
+      box-sizing: border-box;
+      padding: 8px 0;
+      width: 100%;
       font-size: 16px;
       font-weight: 500;
-      position: relative;
-    }
-    a {
-      color: white;
-    }
+      cursor: pointer;
+      transition: all 0.3s;
+      white-space: nowrap;
   }
+  .label {
+        box-sizing: border-box;
+        width: 22%;
+        padding-left: 20px;
+      }
+
+      .value {
+        width: 75%;
+      }
 }
 ::-webkit-scrollbar {
  width: 3px;