From 937a9c9c3112646c80fcc9249465392e35f9aebc 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 17:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8E=B7=E5=8F=96=E5=92=8C?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/doc/ExtGantt/Ext甘特图_files/GanttService.js |  6 +++---
 src/views/projectAdmin/fourEngin/command/center.vue |  2 +-
 src/views/projectAdmin/fourEngin/index.vue          | 12 ++++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/public/doc/ExtGantt/Ext甘特图_files/GanttService.js b/public/doc/ExtGantt/Ext甘特图_files/GanttService.js
index ae9ee9ff..9532b367 100644
--- a/public/doc/ExtGantt/Ext甘特图_files/GanttService.js
+++ b/public/doc/ExtGantt/Ext甘特图_files/GanttService.js
@@ -15,10 +15,10 @@ function CreateGantt() {
     gantt.setColumns([
         { header: "", field: "ID", width: 30, cellCls: "mini-indexcolumn", align: "center", allowDrag: true, cellStyle: "cursor:move" },
         // new StatusColumn(),
-        { header: mini.Gantt.Name_Text, field: "Name", width: 200, name: "taskname",
+        { header: mini.Gantt.Name_Text, field: "taskName", width: 200, name: "name",
             editor: { type: "textbox" }
         },
-        { header: mini.Gantt.PredecessorLink_Text, field: "PredecessorLink",
+        { header: mini.Gantt.PredecessorLink_Text, field: "predecessorLink",
             editor: {
                 type: "textbox"
             },
@@ -28,7 +28,7 @@ function CreateGantt() {
                 e.value = gantt.getLinkString(links);
             }
         },
-        { header: mini.Gantt.Duration_Text, field: "Duration",
+        { header: mini.Gantt.Duration_Text, field: "duration",
             editor: {
                 type: "spinner", minValue: 0, maxValue: 1000
             }
diff --git a/src/views/projectAdmin/fourEngin/command/center.vue b/src/views/projectAdmin/fourEngin/command/center.vue
index f021e6e4..4aa5029d 100644
--- a/src/views/projectAdmin/fourEngin/command/center.vue
+++ b/src/views/projectAdmin/fourEngin/command/center.vue
@@ -102,7 +102,7 @@ export default {
           if (key === 'constructionStage') {
             informationForm[key].value = this.constructionStageEnum[res.result[key]]
           } else if( key === 'households'){
-            informationForm[key].value = this.contractPrice 
+            informationForm[key].value =  `${this.contractPrice }万元` 
           } else if (key === 'bulidStatus') {
             informationForm[key].value = this.projectStatusEnum[res.result[key]]
           }else {
diff --git a/src/views/projectAdmin/fourEngin/index.vue b/src/views/projectAdmin/fourEngin/index.vue
index 13395750..62750945 100644
--- a/src/views/projectAdmin/fourEngin/index.vue
+++ b/src/views/projectAdmin/fourEngin/index.vue
@@ -39,23 +39,35 @@
 
 <script>
 import moment from "moment";
+import { getWeatherDataApi } from "@/assets/js/api/environmentManage";
 export default {
   data(){
     return{
       currentTime:"",
       monthAndDay:"",
       weekday:"",
+      cityCode:"",
     }
   },
   created(){
     this.getCurrentDate()
     this.getCurrentTime()
     this.getweekday()
+    if(this.$store.state.currentProDetail!=null){
+      this.cityCode = this.$store.state.currentProDetail.cityCode
+      this.getWeather()
+    }
   },
   methods: {
     handleMenu(path) {
       this.$router.push(path)
     },
+    getWeather(){
+      getWeatherDataApi({ cityid: this.cityCode }).then((res) => {
+       var json = JSON.parse(res.result);
+        console.log('天气',json);
+      });
+    },
     getCurrentTime() {
       const timer = setInterval(() => {
         this.currentTime = moment().format("HH:mm:ss");