diff --git a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js b/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js
index 723e8a17..0b273eea 100644
--- a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js
+++ b/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js
@@ -11,6 +11,18 @@ export function getMachines() {
     }
   })
 }
+// 机床名称
+export function getMachinesStatue(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: ` select COUNT(*) as 是否发货 from [发货管理_发货单明细] left join [发货管理_发货单]
+              on [发货管理_发货单].发货单流水号 = [发货管理_发货单明细].发货单流水号 where 机床流水号 = ${num}`
+    }
+  })
+}
 // 获取组号
 export function getGroups(stepNumber) {
   return request({
@@ -18,8 +30,8 @@ export function getGroups(stepNumber) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
-      param: '机床流水号=' + stepNumber + '=int'
+      name: '车间生产管理工艺_组件状态查询_查询所有组',
+      param: '机床流水号=' + stepNumber
     }
   })
 }
diff --git a/src/api/MarketingCenter/ProjectProgress.js b/src/api/MarketingCenter/ProjectProgress.js
index 2e10e106..1c38e9ac 100644
--- a/src/api/MarketingCenter/ProjectProgress.js
+++ b/src/api/MarketingCenter/ProjectProgress.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-export function initProject() {
+export function search1() {
   return request({
     url: '',
     method: 'post',
@@ -10,3 +10,23 @@ export function initProject() {
     }
   })
 }
+export function search2() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'SELECT count(客户名称) as 客户数量,[省份] FROM [客户关系管理系统_客户_查询数据_MESWOR_视图]where [客户名称是否启用] = 1 group by [省份]'
+    }
+  })
+}
+export function search3() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'SELECT count(客户名称) as 客户数量,[省份] FROM [客户关系管理系统_客户_查询数据_MESWOR_视图]where [客户名称是否启用] = 1 group by [省份]'
+    }
+  })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index fc41e22d..2cb92ad8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
index 7a8a396e..8b9c687d 100644
--- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
+++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
@@ -49,7 +49,7 @@
       </el-col>
       <el-col :span="16">
         <el-card>
-          <div style="background-color: rgb(126,172,237);color: white;margin-top: 5px">{{ 机床图号 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ 机床名称 }}</div>
+          <div :style="{background:MachineColor}" style="color: white;margin-top: 5px">{{ 机床图号 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ 机床名称 }}</div>
           <div style="margin: 10px 0 0 20px;height: 650px;overflow: auto">
             <el-tree
               :data="departmentData"
@@ -59,7 +59,6 @@
               :render-content="renderContent"
               node-key="机床流水号"
               class="selectTree"
-              default-expand-all
               @node-click="onClick"/>
           </div>
         </el-card>
@@ -89,11 +88,12 @@
 </template>
 
 <script>
-import { getMachines, getGroups, selectParts, selectProcedure } from '@/api/ManufacturingCenter/CompletionOfWorkshopComponents'
+import { getMachines, getMachinesStatue, getGroups, selectParts, selectProcedure } from '@/api/ManufacturingCenter/CompletionOfWorkshopComponents'
 
 export default {
   data() {
     return {
+      MachineColor: '',
       MachineValue: '', // 机床号
       Machine: [],
       option: [], // 组号
@@ -133,6 +133,13 @@ export default {
         }
       }).then(() => {
         this.MachineValue = this.Machine[0].value
+        getMachinesStatue(this.MachineValue).then(res => {
+          if (res.data[0].是否发货 === 0) {
+            this.MachineColor = 'rgb(126,172,237)'
+          } else {
+            this.MachineColor = 'green'
+          }
+        })
         this.getTreeData()
       })
     },
@@ -153,6 +160,7 @@ export default {
             isLeaf: false,
             label: response.data[i].组号 + '\xa0\xa0\xa0' + (response.data[i].组件名称 ? response.data[i].组件名称 : ''),
             value: response.data[i].组件流水号,
+            组件完成状态: response.data[i].组件完成状态,
             father: true,
             children: []
           })
@@ -214,7 +222,11 @@ export default {
           }
         }
       } else {
-        return (<span>{node.label}</span>)
+        if (node.data.组件完成状态 === '已完成') {
+          return (<span class='treeNotesComplate'>{node.label}</span>)
+        } else {
+          return (<span class='treeNotesUnComplate'>{node.label}</span>)
+        }
       }
     },
     searchTable1(row) {
diff --git a/src/views/MarketingCenter/ProjectProgress/index.vue b/src/views/MarketingCenter/ProjectProgress/index.vue
index fa17d265..e0e031e4 100644
--- a/src/views/MarketingCenter/ProjectProgress/index.vue
+++ b/src/views/MarketingCenter/ProjectProgress/index.vue
@@ -1,71 +1,288 @@
 <template>
   <div class="app-container">
-    <el-card v-loading="loading">
-      <div id="myChart" :style="{width: '100%', height: '570px', margin: 'auto'}"/>
-    </el-card>
+    <el-row>
+      <el-col :span="12">
+        <el-card v-loading="loading1" style="height: 450px">
+          <span>项目完成进度查询</span>
+          <el-button size="small" type="success" icon="el-icon-search" @click="search1()">查询</el-button>
+          <div id="myChart1" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card v-loading="loading2" style="height: 450px">
+          <span>客户分布图</span>
+          <el-button size="small" type="success" icon="el-icon-search" @click="search2()">查询</el-button>
+          <div id="myChart2" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-card v-loading="loading3" style="height: 450px">
+          <span>年营销金额图表</span>
+          <el-button size="small" type="success" icon="el-icon-search" @click="search3()">查询</el-button>
+          <div id="myChart3" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card v-loading="loading4" style="height: 450px">
+          <span>在执行项目金额及回款</span>
+          <el-button size="small" type="success" icon="el-icon-search" @click="search4()">查询</el-button>
+          <div id="myChart4" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
-import { initProject } from '@/api/MarketingCenter/ProjectProgress'
+import { search1, search2, search3 } from '@/api/MarketingCenter/ProjectProgress'
 import echarts from 'echarts'
 
 export default {
   data() {
     return {
-      loading: false
+      loading1: false,
+      loading2: false,
+      loading3: false,
+      loading4: false
     }
   },
-  mounted() {
-    this.search()
-  },
   methods: {
-    search() {
-      this.loading = true
-      var myChart = echarts.init(document.getElementById('myChart'))
-      myChart.clear()
-      initProject().then(response => {
-        this.loading = false
-        this.drawLine(response.data)
+    // 项目完成进度
+    search1() {
+      this.loading1 = true
+      var myChart1 = echarts.init(document.getElementById('myChart1'))
+      myChart1.clear()
+      search1().then(response => {
+        this.loading1 = false
+        this.drawLine1(response.data)
       })
     },
-    drawLine(data) {
-      this.dataX = []
+    drawLine1(data) {
+      var dataX = []
+      var lineData = []
       for (let i = 0; i < data.length; i++) {
-        this.dataX.push(data[i].项目名称)
+        dataX.push(data[i].项目名称)
+        lineData.push((Math.random() * 100).toFixed(2))
       }
-      var myChart = echarts.init(document.getElementById('myChart'))
-      myChart.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow'
-          }
+      var myChart1 = echarts.init(document.getElementById('myChart1'))
+      myChart1.clear()
+      myChart1.setOption({
+        title: {
+          left: 'center',
+          text: '直方图'
         },
-        dataZoom: { // 实现缩放功能
-          show: true,
-          realtime: true,
-          start: 0,
-          end: 100
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis'
         },
         xAxis: {
           type: 'category',
           name: '项目名称',
-          data: this.dataX,
           axisLabel: {
             interval: 0,
-            rotate: 0,
+            rotate: 40,
             margin: 10
-          }
+          },
+          data: dataX
         },
         yAxis: {
           type: 'value',
-          name: '工时',
+          name: '完成进度(%)',
           min: 0,
           scale: 'true'
-        }
+        },
+        series: [
+          {
+            name: '测量值',
+            type: 'bar',
+            data: lineData,
+            label: {
+              normal: {
+                show: true,
+                position: 'top'
+              }
+            }
+          }
+        ]
+      })
+    },
+    // 客户分布图
+    search2() {
+      this.loading2 = true
+      var myChart2 = echarts.init(document.getElementById('myChart2'))
+      myChart2.clear()
+      search2().then(response => {
+        this.loading2 = false
+        this.drawLine2(response.data)
+      })
+    },
+    drawLine2(data) {
+      var dataX = []
+      var lineData = []
+      for (let i = 0; i < data.length; i++) {
+        dataX.push({
+          value: parseInt(data[i].客户数量),
+          name: data[i].省份
+        })
+        lineData.push(data[i].省份)
+      }
+      var myChart2 = echarts.init(document.getElementById('myChart2'))
+      myChart2.clear()
+      myChart2.setOption({
+        title: {
+          text: '客户分布图',
+          x: 'center'
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          orient: 'vertical',
+          left: 'left',
+          data: lineData
+        },
+        series: [
+          {
+            name: '省份',
+            type: 'pie',
+            radius: '55%',
+            center: ['50%', '60%'],
+            data: dataX,
+            itemStyle: {
+              emphasis: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
+          }
+        ]
+      })
+    },
+    // 年营销金额图表
+    search3() {
+      this.loading2 = true
+      var myChart3 = echarts.init(document.getElementById('myChart3'))
+      myChart3.clear()
+      search3().then(response => {
+        this.loading2 = false
+        this.drawLine3(response.data)
+      })
+    },
+    drawLine3(data) {
+      var dataX = []
+      var lineData = []
+      for (let i = 0; i < data.length; i++) {
+        dataX.push({
+          value: parseInt(data[i].客户数量),
+          name: data[i].省份
+        })
+        lineData.push(data[i].省份)
+      }
+      var myChart3 = echarts.init(document.getElementById('myChart3'))
+      myChart3.clear()
+      myChart3.setOption({
+        title: {
+          text: '客户分布图',
+          x: 'center'
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          orient: 'vertical',
+          left: 'left',
+          data: lineData
+        },
+        series: [
+          {
+            name: '省份',
+            type: 'pie',
+            radius: '55%',
+            center: ['50%', '60%'],
+            data: dataX,
+            itemStyle: {
+              emphasis: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
+          }
+        ]
+      })
+    },
+    search4() {
+      this.loading1 = true
+      var myChart1 = echarts.init(document.getElementById('myChart1'))
+      myChart1.clear()
+      search1().then(response => {
+        this.loading1 = false
+        this.drawLine1(response.data)
+      })
+    },
+    drawLine4(data) {
+      var dataX = []
+      var lineData = []
+      for (let i = 0; i < data.length; i++) {
+        dataX.push(data[i].项目名称)
+        lineData.push((Math.random() * 100).toFixed(2))
+      }
+      var myChart1 = echarts.init(document.getElementById('myChart1'))
+      myChart1.clear()
+      myChart1.setOption({
+        title: {
+          left: 'center',
+          text: '直方图'
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        xAxis: {
+          type: 'category',
+          name: '项目名称',
+          axisLabel: {
+            interval: 0,
+            rotate: 40,
+            margin: 10
+          },
+          data: dataX
+        },
+        yAxis: {
+          type: 'value',
+          name: '完成进度(%)',
+          min: 0,
+          scale: 'true'
+        },
+        series: [
+          {
+            name: '测量值',
+            type: 'bar',
+            data: lineData,
+            label: {
+              normal: {
+                show: true,
+                position: 'top'
+              }
+            }
+          }
+        ]
       })
-      this.loading = false
     }
   }
 }