diff --git a/src/assets/images/lcbTip.png b/src/assets/images/lcbTip.png
new file mode 100644
index 00000000..217c7229
Binary files /dev/null and b/src/assets/images/lcbTip.png differ
diff --git a/src/assets/js/api/insect.js b/src/assets/js/api/insect.js
index 62644c6c..774b01c3 100644
--- a/src/assets/js/api/insect.js
+++ b/src/assets/js/api/insect.js
@@ -17,5 +17,7 @@ export const getCheckPointApi = data => post('/xmgl/checkingPointInfo/selectPage
 export const editCheckPointApi = data => post('/xmgl/checkingPointInfo/edit', data); // 编辑巡检点记录列表
 export const deleteCheckPointApi = data => post('/xmgl/checkingPointInfo/delete', data); // 删除巡检点记录列表
 
+// 区域
+export const pointAreaApi = data => post('/xmgl/qualityRegion/notTreeList', data); // 删除巡检点记录列表
 
 
diff --git a/src/assets/js/api/progressManagement.js b/src/assets/js/api/progressManagement.js
index 00cccef7..1e5160e4 100644
--- a/src/assets/js/api/progressManagement.js
+++ b/src/assets/js/api/progressManagement.js
@@ -69,5 +69,11 @@ export const getProgressContentPageApi = data => get('xmgl/xzTaskProgressContent
 export const editProgressContentApi = data => post('xmgl/xzTaskProgressContent/edit', data);
 export const deleteProgressContentApi = data => post('xmgl/xzTaskProgressContent/delete', data);
 
+// 里程碑部分
+export const getXzMilestonePageApi = data => get('xmgl/xzMilestone/page', data);
+export const addXzMilestoneApi = data => post('xmgl/xzMilestone/add', data);
+export const editXzMilestoneApi = data => post('xmgl/xzMilestone/edit', data);
+export const deleteXzMilestoneApi = data => post('xmgl/xzMilestone/delete', data);
+export const xzMilestoneDataApi = data => post('xmgl/xzTaskProgress/statsByEnterprise', data);
 
 
diff --git a/src/router/index.js b/src/router/index.js
index f7fe0621..dded732c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2527,6 +2527,14 @@ const routes2 = [
             "@/views/projectFront/progressManagementAg/divisionSubManage.vue",
           ], resolve),
       },
+      {
+        path: "/project/progressManagementAg/lcbManage",
+        name: "进度管理_里程碑管理",
+        component: (resolve) =>
+          require([
+            "@/views/projectFront/progressManagementAg/lcbManage.vue",
+          ], resolve),
+      },
       {
         path: "/project/progressManagementAg/progressWarning",
         name: "进度管理_进度预警2",
diff --git a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
index 719ce34c..1333e6c4 100644
--- a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
@@ -194,7 +194,7 @@ export default {
         // 质量
         path = "/project/quality/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",
@@ -205,7 +205,7 @@ export default {
         // 安全
         path = "/project/safeSame/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",
diff --git a/src/views/infoCenter/hadRead/componentsModule/dataListData.vue b/src/views/infoCenter/hadRead/componentsModule/dataListData.vue
index 26b9268a..a7f6733c 100644
--- a/src/views/infoCenter/hadRead/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/hadRead/componentsModule/dataListData.vue
@@ -182,7 +182,7 @@ export default {
         // 质量
         path = "/project/quality/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",
@@ -193,7 +193,7 @@ export default {
         // 安全
         path = "/project/safeSame/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",
diff --git a/src/views/infoCenter/notRead/componentsModule/dataListData.vue b/src/views/infoCenter/notRead/componentsModule/dataListData.vue
index eb0a1bc8..f969d53c 100644
--- a/src/views/infoCenter/notRead/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/notRead/componentsModule/dataListData.vue
@@ -183,7 +183,7 @@ export default {
         // 质量
         path = "/project/quality/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",
@@ -194,7 +194,7 @@ export default {
         // 安全
         path = "/project/safeSame/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",
diff --git a/src/views/projectFront/inspecPoint/inspection.vue b/src/views/projectFront/inspecPoint/inspection.vue
index a65f2bce..151be82c 100644
--- a/src/views/projectFront/inspecPoint/inspection.vue
+++ b/src/views/projectFront/inspecPoint/inspection.vue
@@ -169,7 +169,62 @@
               :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
-          <el-form-item label="巡检人员：" prop="inspectUserIds">
+          <el-form-item label="所属区域：" prop="qualityRegionId">
+            <el-select
+              :disabled="cardDialogTitle == '详情'"
+              collapse-tags
+              filterable
+              v-model="cardForm.qualityRegionId"
+              :placeholder="isAdding ? '请选择' : ''"
+              @change="updateArea"
+            >
+              <el-option
+                v-for="item in pointAreaList"
+                :key="item.id"
+                :label="item.regionName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="责任企业：" prop="enterpriseId">
+            <el-select
+              :disabled="cardDialogTitle == '详情'"
+              collapse-tags
+              filterable
+              v-model="cardForm.enterpriseId"
+              multiple
+              :placeholder="isAdding ? '请选择' : ''"
+              @change="changeDutyId"
+            >
+              <el-option
+                v-for="item in enterpriseList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+           <el-form-item label="责任人：" prop="inspectUserIds">
+            <el-select
+              :disabled="cardDialogTitle == '详情'"
+              collapse-tags
+              filterable
+              v-model="cardForm.inspectUserIds"
+              multiple
+              :placeholder="isAdding ? '请选择' : ''"
+            >
+              <el-option
+                v-for="item in chargerList"
+                :key="item.userId + 'inspectUserIds'"
+                :label="item.realName"
+                :value="item.userId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="巡检人员：" prop="inspectUserIds">
             <el-select
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
@@ -186,7 +241,7 @@
               >
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="巡检记录通知人员：" prop="noticeUserIds">
             <el-select
               :disabled="cardDialogTitle == '详情'"
@@ -328,6 +383,7 @@ import {
   addPointApi,
   deletePointApi,
   editPointApi,
+  pointAreaApi
 } from "@/assets/js/api/insect.js";
 import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
 import dynamicForms from "./components/dynamicForms/index.vue"
@@ -339,6 +395,8 @@ export default {
   components: { dynamicForms },
   data() {
     return {
+      chargerList: [],
+      enterpriseList: [],
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 1 * 24 * 3600 * 1000
@@ -355,6 +413,8 @@ export default {
       cardForm: {
         checkingPointName: "",
         position: "",
+        qualityRegionId: "", // 区域ID
+        enterpriseId: "", // 责任企业
         inspectUserIds: "", //检查人
         noticeUserIds: "", //通知人
         startTime: "",
@@ -376,6 +436,12 @@ export default {
         position: [
           { required: true, message: "请输入巡检位置", trigger: "blur" },
         ],
+        qualityRegionId: [
+          { required: true, message: "请选择", trigger: "blur" },
+        ],
+        enterpriseId: [
+          { required: true, message: "请选择", trigger: "blur" },
+        ],
         inspectUserIds: [
           { required: true, message: "请输入检查人员", trigger: "blur" },
         ],
@@ -402,13 +468,55 @@ export default {
       locationList: [],
       formData: [], // 存储动态表单数据
       isAdding: true,
+      pointAreaList: []
     };
   },
   mounted() {
     this.projectSn = this.$store.state.projectSn;
     this.getPointList();
+    this.getPointAreaFn();
   },
   methods: {
+     //切换 整改人
+     changeDutyId(value) {
+      console.log(this.cardForm,777888)
+      if (this.cardForm.enterpriseId.length > 0) {
+        let shouldHavePersonIdList = this.chargerList.map((item) => {
+          if (this.cardForm.enterpriseId.includes(item.enterpriseId)) {
+            return item.userId;
+          }
+        });
+        if(this.cardForm.inspectUserIds){
+          const newArr = this.cardForm.inspectUserIds.filter((item) =>
+            shouldHavePersonIdList.includes(item)
+          );
+          this.cardForm.inspectUserIds = newArr;
+        }
+      } else {
+        this.cardForm.inspectUserIds = "";
+      }
+    },
+    updateArea(){
+      let findItem = this.pointAreaList.find(item => {
+        return item.id == this.cardForm.qualityRegionId
+      })
+      this.cardForm.enterpriseId = "";
+      this.cardForm.inspectUserIds = "";
+      if(findItem){
+        this.chargerList = findItem.systemUsers;
+        this.enterpriseList = findItem.enterpriseInfos;
+      }
+    },
+    // 获取区域列表
+    getPointAreaFn(){
+      let requestData = {
+        projectSn: this.projectSn
+      }
+      pointAreaApi(requestData).then(res => {
+        console.log(res)
+        this.pointAreaList = res.result;
+      })
+    },
     //查看详情
     deilBtn(obj) {
       this.isAdding = false
@@ -431,6 +539,10 @@ export default {
         this.cardForm.inspectUserIds =
           this.cardForm.inspectUserIds.split(',')
       }
+      if (this.cardForm.enterpriseId) {
+        this.cardForm.enterpriseId =
+          this.cardForm.enterpriseId.split(',')
+      }
       if (this.cardForm.noticeUserIds) {
         this.cardForm.noticeUserIds =
           this.cardForm.noticeUserIds.split(',')
@@ -681,6 +793,10 @@ export default {
         this.cardForm.inspectUserIds =
           this.cardForm.inspectUserIds.split(',')
       }
+      if (this.cardForm.enterpriseId) {
+        this.cardForm.enterpriseId =
+          this.cardForm.enterpriseId.split(',')
+      }
       if (this.cardForm.noticeUserIds) {
         this.cardForm.noticeUserIds =
           this.cardForm.noticeUserIds.split(',')
@@ -786,6 +902,7 @@ export default {
           data.createUserId = this.$store.state.userInfo.userId;
           data.createUserName = this.$store.state.userInfo.account;
           data.inspectUserIds = data.inspectUserIds.toString(',');
+          data.enterpriseId = data.enterpriseId.toString(',');
           data.noticeUserIds = data.noticeUserIds.toString(',');
           data.template = JSON.stringify(formTemplate);
           if (this.cardDialogTitle == '新建巡检点') {
diff --git a/src/views/projectFront/progressManagementAg/ganttChart.vue b/src/views/projectFront/progressManagementAg/ganttChart.vue
index df17c79c..75d67b42 100644
--- a/src/views/projectFront/progressManagementAg/ganttChart.vue
+++ b/src/views/projectFront/progressManagementAg/ganttChart.vue
@@ -98,10 +98,10 @@
         <span>项目剩余天数：{{progressData.projectSurplusDayNum || 0}}天</span>
         </div>
       <div class="update-operate">
-        <el-button v-permission="{key: 'gtt_update0verallProjectSchedule', menuPath: '/project/progressManagementAg/projectganttChart'}"  type="primary" size="medium" @click="updateProgressFn(1)" :disabled="![5,10].includes($store.state.userInfo.accountType)"
+        <el-button v-permission="{key: 'gtt_update0verallProjectSchedule', menuPath: '/project/progressManagementAg/ganttChart'}"  type="primary" size="medium" @click="updateProgressFn(1)" :disabled="![5,10].includes($store.state.userInfo.accountType)"
           >更新项目总进度</el-button
         >
-        <el-button v-permission="{key: 'get_updateContractor Progress', menuPath: '/project/progressManagementAg/projectganttChart'}" type="primary" size="medium" @click="updateProgressFn(2)"
+        <el-button v-permission="{key: 'get_updateContractor Progress', menuPath: '/project/progressManagementAg/ganttChart'}" type="primary" size="medium" @click="updateProgressFn(2)"
           >更新承包商进度</el-button
         >
       </div>
diff --git a/src/views/projectFront/progressManagementAg/lcbManage.vue b/src/views/projectFront/progressManagementAg/lcbManage.vue
new file mode 100644
index 00000000..76c4dadc
--- /dev/null
+++ b/src/views/projectFront/progressManagementAg/lcbManage.vue
@@ -0,0 +1,1133 @@
+<template>
+  <div class="fullHeight">
+    <div v-if="type != 'detail'" style="width: 100%;height: 100%;">
+      <div class="content-box">
+        <div class="areaTreeBox" id="videoTreeBox">
+          <div class="areaTreeInner whiteBlock fullHeight">
+            <p class="pageTitle">
+              承包商/厂区列表
+            </p>
+            <div class="area-select">
+              <!-- <el-select
+                v-model="areaSelectVal"
+                placeholder="请选择"
+                style="width: 100%;margin-top: 10px;"
+                size="medium"
+                clearable
+                @change="areaChange"
+              >
+                <el-option
+                  v-for="item in areaList"
+                  :key="item.id"
+                  :label="item.regionName"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select> -->
+              <el-select
+                ref="selectRef"
+                v-model="selectVal"
+                placeholder="请选择"
+                style="width: 100%;margin-top: 10px;"
+                size="medium"
+                clearable
+                @change="selectChange"
+              >
+                <el-option style="height:auto" :value="[]">
+                  <el-tree
+                    :data="areaList"
+                    node-key="id"
+                    ref="groupTree"
+                    :default-expanded-keys="defaultExpandArr"
+                    :props="defaultAreaProps"
+                    :default-expand-all="false"
+                    @node-click="treeAreaClick"
+                  >
+                  </el-tree>
+                </el-option>
+              </el-select>
+            </div>
+            <div class="treeBox">
+              <p class="pageTitle">
+                承包商列表
+              </p>
+              <vue-scroll v-if="level1CompanyData.length > 0">
+                <el-tree
+                  :data="level1CompanyData"
+                  :props="defaultProps"
+                  default-expand-all
+                  node-key="id"
+                  ref="tree"
+                >
+                  <span class="custom-tree-node" slot-scope="{ node, data }">
+                    <span
+                      style="
+                        width: 160px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                        display: inline-block;
+                      "
+                      @click="treeClick(data)"
+                      :class="
+                        data.videoName
+                          ? 'videoName'
+                          : data.projectName
+                          ? 'projectName'
+                          : data.companyType == 2
+                          ? 'companyName2'
+                          : ''
+                      "
+                      :title="node.label"
+                      >{{ node.label }}</span
+                    >
+                  </span>
+                </el-tree>
+              </vue-scroll>
+              <div class="placeholderBox" v-else>
+                <img src="@/assets/images/noData2.png" alt="" srcset="" />
+                <p>{{ $t("message.videoManage.empty") }}</p>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="table-content" style="flex: 1;">
+          <div class="searchBox whiteBlock">
+            <el-form
+              :inline="true"
+              size="medium"
+              :model="queryInfo"
+              class="demo-form-inline"
+            >
+              <!-- <el-form-item label="分部分项工程名称">
+                <el-input
+                  v-model="queryInfo.taskName"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="状态">
+                <el-select v-model="queryInfo.status" placeholder="请选择">
+                  <el-option
+                    v-for="(item, index) in options"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="实际完成日期">
+                <el-date-picker
+                  v-model="daterange"
+                  @change="changeDate"
+                  type="daterange"
+                  :range-separator="$t('message.energyManage.to')"
+                  :start-placeholder="$t('message.energyManage.start')"
+                  :end-placeholder="$t('message.energyManage.end')"
+                  value-format="yyyy-MM-dd"
+                >
+                </el-date-picker>
+              </el-form-item> -->
+              <el-form-item>
+                <!-- <el-button v-permission="{key: 'fbfx_query', menuPath: '/project/progressManagementAg/divisionSubManage'}" type="primary" plain @click="getProgressListData" :disabled="!treeData.id"
+                  >查询</el-button
+                >
+                <el-button v-permission="{key: 'fbfx_refreshi', menuPath: '/project/progressManagementAg/divisionSubManage'}" type="warning" plain @click="refreshBtn" :disabled="!treeData.id"
+                  >刷新</el-button
+                > -->
+                <el-button
+                  v-permission="{key: 'fbfx_add', menuPath: '/project/progressManagementAg/divisionSubManage'}"
+                  class="expintBtn"
+                  size="medium"
+                  type="primary"
+                  :disabled="!treeData.id"
+                  @click="addBefore(1, null)"
+                >
+                  添加里程碑
+                </el-button>
+              </el-form-item>
+              <!-- <el-form-item>
+                <el-button
+                  v-permission="{key: 'fbfx_DownloadTemplate', menuPath: '/project/progressManagementAg/divisionSubManage'}"
+                  class="expintBtn"
+                  size="medium"
+                  type="primary"
+                  :disabled="!treeData.id"
+                  @click="downloadFn(1)"
+                >
+                  <a class="down" :href="downUrl" download>下载模板</a>
+                  下载模板
+                </el-button>
+                <el-button
+                v-permission="{key: 'fbfx_lmport', menuPath: '/project/progressManagementAg/divisionSubManage'}"
+                  size="medium"
+                  type="primary"
+                  :disabled="!treeData.id"
+                  @click="uploadShow = true"
+                  >导入</el-button
+                >
+              </el-form-item> -->
+            </el-form>
+          </div>
+          <div class="table_wrap whiteBlock">
+            <vue-scroll>
+              <el-table
+                height="650"
+                class="tables"
+                :data="listData"
+                lazy
+                row-key="id"
+                default-expand-all
+                :tree-props="{ children: 'children' }"
+              >
+                <el-table-column
+                  width="200"
+                  type="index"
+                  label="序号"
+                >
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  prop="milestoneName"
+                  label="里程碑名称"
+                >
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  prop="milestoneTime"
+                  label="里程碑时间节点"
+                >
+                </el-table-column>
+                <el-table-column width="300" label="操作" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-edit"
+                      @click.native.stop="editBefore(scope.row)"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      size="mini"
+                      type="text"
+                      class="delete-btn"
+                      icon="el-icon-delete"
+                      @click.native.stop="deleteBefore(scope.row)"
+                      >删除</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+            </vue-scroll>
+            <el-pagination
+              class="pagerBox"
+              style="position: absolute; top: 85%; left: 51%"
+              @size-change="SizeChange"
+              @current-change="CurrentChange"
+              :current-page="pagInfo.pageNo"
+              :page-sizes="$store.state.PAGESIZRS"
+              :page-size="pagInfo.pageSize"
+              layout="total, sizes, prev, pager, next"
+              :total="Number(pagInfo.total)"
+              background
+            ></el-pagination>
+          </div>
+        </div>
+      </div>
+      <!-- '新增父子级工程弹框' -->
+      <el-dialog
+        :modal-append-to-body="false"
+        :title="title"
+        :visible.sync="dialogVisible"
+        width="667px"
+        @close="close"
+      >
+        <div class="dialog_content">
+          <el-form
+            ref="addEditForm"
+            label-width="135px"
+            size="medium"
+            class="dialogFormBox"
+            :rules="addEditRules"
+            :model="addForm"
+          >
+            <el-form-item
+              label="里程碑名称"
+              prop="milestoneName"
+            >
+              <el-input
+                v-model="addForm.milestoneName"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="里程碑时间节点" prop="milestoneTime">
+              <el-date-picker
+                v-model="addForm.milestoneTime"
+                type="date"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="dialog-footer">
+          <el-button
+            class="cancleBtn"
+            @click="dialogVisible = false"
+            icon="el-icon-circle-close"
+            size="medium"
+            >取消
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="submitBtn"
+            size="medium"
+            >确定
+          </el-button>
+        </div>
+      </el-dialog>
+      <!-- 导入弹框 -->
+      <el-dialog
+        :modal-append-to-body="false"
+        width="600px"
+        title="导入"
+        :visible.sync="uploadShow"
+        @close="close2"
+      >
+        <div class="questionText">
+          <i
+            style="color: #e1a439; margin-right: 1%"
+            class="el-icon-question"
+          ></i
+          >用户需要先下载excel文件，再将数据填写到Project文件中，选择所需要的一种更新方式，然后通过选择文件按钮上传Project文件，点击确定即可完成分部分项数据更新。
+        </div>
+        <div class="dialogUplod">
+          <div style="margin-top: -15px">
+            现有数据excel下载
+            <el-button size="mini" type="primary" plain @click="downloadFn(2)"
+              >下载</el-button
+            >
+          </div>
+          <div style="margin-left: 64px">
+            <span style="position: absolute">更新方式</span>
+            <el-radio-group
+              style="margin-left: 65px"
+              v-model="radio"
+              @change="handleRadioChange"
+            >
+              <el-radio :label="1">覆盖更新</el-radio>
+              <el-radio :label="2">根据名称替换更新</el-radio>
+            </el-radio-group>
+          </div>
+
+          <div style="margin-left: 2px;margin-top: -15px;">
+            <span style="color: red;margin-right: 5px;">*</span>上传Project文件
+            <el-upload
+              accept=".mpp"
+              v-if="fileName == ''"
+              class="upload-demo expintBtn"
+              name="mppFile"
+              :on-success="handleImportSuccess"
+              :on-change="handleImportChange"
+              :before-upload="beforeUpload"
+              :file-list="fileList"
+              :action="$http.defaults.baseURL + 'xmgl/xzTaskProgress/importData'"
+              :data="{ projectSn: projectSn, type: radio }"
+              :show-file-list="false"
+              :headers="headers"
+            >
+              <el-button size="mini" type="primary" plain>选择</el-button>
+            </el-upload>
+            <span v-else style="color: #5181f6">{{ fileName }}</span>
+          </div>
+        </div>
+        <div class="dialog-footer">
+          <el-button
+            class="cancleBtn"
+            @click="uploadShow = false"
+            icon="el-icon-circle-close"
+            size="medium"
+            >取消
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            size="medium"
+            @click="handleUploadConfirm"
+            >确定
+          </el-button>
+        </div>
+      </el-dialog>
+      <!-- //查看大图 -->
+      <el-dialog :modal-append-to-body="false" :visible.sync="showBigImg">
+        <img width="100%" :src="dialogImageUrl" alt="" />
+      </el-dialog>
+    </div>
+    <detailpage
+      v-if="type == 'detail'"
+      :id="seedId"
+      :rowData="rowData"
+      @closeDetail="closeDetailFn"
+    ></detailpage>
+  </div>
+</template>
+<script>
+import {
+  addXzMilestoneApi,
+  deleteXzMilestoneApi,
+  editXzMilestoneApi,
+  getXzMilestonePageApi
+} from "@/assets/js/api/progressManagement";
+import { getCrewListDataApi } from "@/assets/js/api/dailyCheck";
+import detailpage from "./projectProgressDetail";
+import { getQualityRegionListApi } from "@/assets/js/api/quality.js";
+import { selectHierarchyEnterpriseListApi } from "@/assets/js/api/laborPerson";
+export default {
+  components: {
+    detailpage,
+  },
+  mounted() {},
+  data() {
+    return {
+      addForm: {
+        milestoneName: "",
+        milestoneTime: ""
+      },
+      defaultExpandFormArr: [],
+      defaultExpandArr: [],
+      // 对应的字段
+      defaultAreaProps: {
+        children: "children",
+        label: "regionName",
+      },
+      treeList: [],
+      selectVal: "",
+      selectFormVal: "",
+      defaultProps: {
+        children: "children",
+        label: "enterpriseName",
+      },
+      level1CompanyData: [],
+      areaList: [],
+      areaSelectVal: "",
+      rowData: {},
+      parentTaskName: "", // 用于存储父级taskName
+      options: [
+        {
+          label: "未开始",
+          value: 0,
+        },
+        {
+          label: "进行中",
+          value: 1,
+        },
+        {
+          label: "已完成",
+          value: 2,
+        },
+        // {
+        //   label: '已逾期',
+        //   value: 3
+        // },
+      ],
+      pagInfo: {
+        pageNo: 1, //页数
+        pageSize: 10, //条数
+        total: 0, //总条数
+      },
+      radio: 1,
+      uploadShow: false, //导入弹框
+      dialogType: 1,
+      title: "",
+      daterange: [],
+      fileList: [], //上传文件
+      downUrl: "", //下载文件地址
+      projectSn: "",
+      createUserId: "",
+      listData: [],
+      uploadUrl: "",
+      fileUrl: "",
+      dialogVisible: false, //新增弹窗
+      workerInfo: {
+        taskName: "",
+        startDate: "",
+        finishDate: "",
+        actualStartDate: "",
+        actualFinishDate: "",
+        dutyUserId: "",
+        qualityRegionId: "",
+        enterpriseId: "",
+        enterpriseName: "",
+        progressRatio: "",
+        remark: "",
+        parentId: 0,
+        status: 0,
+      },
+      principalLsit: [], //负责人
+      seedId: "",
+      showTime: false, //工期
+      queryInfo: {
+        taskName: "",
+        status: "",
+        actualStartDate: "",
+        actualFinishDate: "",
+      },
+      type: "add",
+      addEditRules: {
+        milestoneName: [
+          {
+            required: true,
+            message: this.$t("message.personnelPosition.required"),
+            trigger: "blur",
+          },
+        ],
+        milestoneTime: [
+          {
+            required: true,
+            message: this.$t("message.personnelPosition.required"),
+            trigger: "blur",
+          },
+        ]
+      },
+      dialogImageUrl: "",
+      showBigImg: false,
+      times: "",
+      // 时间限制
+      pickerOptions: {
+        // 对象
+        disabledDate: (time) => {
+          let nowData = this.times;
+          nowData = new Date(nowData.setDate(nowData.getDate() - 1));
+          return time > nowData;
+          // return time.getTime() < Date.now()- 1 * 24 * 3600 * 1000;
+        },
+      },
+      fileName: "",
+      treeData: {}
+    };
+  },
+  computed: {
+    headers() {
+      return { Authorization: this.$store.state.userInfo.token };
+    },
+    dateAfter() {
+      // 动态起始时间
+      const startTimestamp = Date.now() * 1 - 24 * 60 * 60 * 1000;
+      const endTimestamp =
+        Date.parse(this.workerInfo.finishDate) * 1 - 24 * 60 * 60 * 1000;
+      return {
+        disabledDate(time) {
+          const timestamp = time.getTime();
+          if (endTimestamp) {
+            if (timestamp >= startTimestamp && timestamp <= endTimestamp) {
+              return false;
+            } else {
+              return true;
+            }
+          } else {
+            return timestamp <= startTimestamp;
+          }
+        },
+      };
+    },
+    dateBefore() {
+      // 动态起始时间
+      // const startTimestamp = Date.parse(this.workerInfo.startDate)
+      const specifiedDate = new Date(this.workerInfo.startDate); // 指定的日期
+      const prevDay = new Date(specifiedDate); // 创建一个新的 Date 对象，使用同样的日期
+      prevDay.setDate(specifiedDate.getDate() - 1); // 将日期设置为前一天的日期
+
+      const lastTime = prevDay.getTime(); // 获取前一天的时间戳
+      // const startTimestamp = new Date(this.workerInfo.startDate)
+      return {
+        disabledDate(time) {
+          const timestamp = time.getTime();
+          if (timestamp > lastTime) {
+            // console.log("计划结束时间",startTimestamp,timestamp)
+            return false;
+          }
+          return true;
+        },
+      };
+    },
+    actualDateBefore() {
+      // 动态起始时间
+      // const startTimestamp = Date.parse(this.workerInfo.startDate)
+      const specifiedDate = new Date(this.workerInfo.actualStartDate); // 指定的日期
+      const prevDay = new Date(specifiedDate); // 创建一个新的 Date 对象，使用同样的日期
+      prevDay.setDate(specifiedDate.getDate() - 1); // 将日期设置为前一天的日期
+
+      const lastTime = prevDay.getTime(); // 获取前一天的时间戳
+      // const startTimestamp = new Date(this.workerInfo.startDate)
+      return {
+        disabledDate(time) {
+          const timestamp = time.getTime();
+          if (timestamp > lastTime) {
+            // console.log("计划结束时间",startTimestamp,timestamp)
+            return false;
+          }
+          return true;
+        },
+      };
+    },
+  },
+
+  created() {
+    this.projectSn = this.$store.state.projectSn;
+    this.createUserId = this.$store.state.userInfo.userId;
+    this.uploadUrl = this.$store.state.UPLOADURL;
+    this.fileUrl = this.$store.state.FILEURL;
+    this.downUrl =
+      this.$http.defaults.baseURL + "xmgl/progressTask/downloadTemplate";
+    this.getCrewListData();
+    this.getPositionList();
+    this.getHierarchyEnterpriseList();
+    this.getTreeList();
+  },
+  methods: {
+    selectFormChange(){
+      if (!val) {
+        this.selectFormVal = "";
+        this.workerInfo.qualityRegionId = "";
+      }
+    },
+    selectChange(val) {
+      console.log(val, 123);
+      if (!val) {
+        this.selectVal = "";
+        this.areaSelectVal = "";
+        this.getProgressListData();
+      }
+    },
+    // 表单树形控件点击
+    treeAreaFormClick(data){
+      if (data.status == 1) {
+        this.$message.warning("无法选中已禁用组织");
+      } else {
+        this.selectFormVal = data.regionName;
+        this.workerInfo.qualityRegionId = data.id;
+        this.$refs.selectFormRef.blur();
+      }
+    },
+    // 树形控件点击
+    treeAreaClick(data) {
+      console.log(data);
+      if (data.status == 1) {
+        this.$message.warning("无法选中已禁用组织");
+      } else {
+        this.selectVal = data.regionName;
+        this.areaSelectVal = data.id;
+        this.$refs.selectRef.blur();
+        this.getProgressListData();
+      }
+    },
+    getTreeList() {
+      selectHierarchyEnterpriseListApi({
+        projectSn: this.$store.state.projectSn,
+      }).then((result) => {
+        if (result.success) {
+          this.treeList = result.result;
+        }
+      });
+    },
+    // 树形控件点击
+    treeClick(data) {
+      console.log(data);
+      this.treeData = data;
+      this.getProgressListData();
+    },
+    // 获取承包商列表
+    getHierarchyEnterpriseList() {
+      let data = {
+        projectSn: this.$store.state.projectSn,
+      };
+      selectHierarchyEnterpriseListApi(data).then((res) => {
+        console.log(res, "承包商列表");
+        if (res.code == 200) {
+          console.log(res);
+          this.level1CompanyData = res.result;
+          if (this.level1CompanyData && this.level1CompanyData.length > 0) {
+            this.$nextTick(() => {
+              this.treeData = this.level1CompanyData[0];
+              this.$refs.tree.setCurrentKey(this.level1CompanyData[0].id);
+              this.getProgressListData();
+            });
+          }
+          // this.enterpriseTreeData = res.result
+        }
+      });
+    },
+    //获取承包商/厂区
+    getPositionList() {
+      let data = {
+        projectSn: this.$store.state.projectSn,
+      };
+      getQualityRegionListApi(data).then((res) => {
+        console.log("res=================", res);
+        if (res.code == 200) {
+          this.areaList = res.result;
+        }
+      });
+    },
+    // 区域更改时
+    areaChange() {
+      this.getProgressListData();
+    },
+    //导入确定提交
+    handleUploadConfirm() {
+      if (this.fileName == "") {
+        this.$message.warning("请先上传文件");
+        return;
+      } else {
+        this.uploadShow = false;
+        this.$message.success("操作成功");
+        this.getProgressListData();
+      }
+    },
+    handleRadioChange(val) {
+      this.radio = val;
+    },
+    //获取列表数据
+    getProgressListData() {
+      let data = {
+        projectSn: this.projectSn,
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        taskName: this.queryInfo.taskName,
+        status: this.queryInfo.status,
+        actualFinishDate_begin: this.queryInfo.actualStartDate,
+        actualFinishDate_end: this.queryInfo.actualFinishDate,
+        enterpriseId: this.treeData.id,
+        qualityRegionId: this.areaSelectVal,
+      };
+      getXzMilestonePageApi(data).then((res) => {
+        if (res.code == 200) {
+          this.listData = res.result.records;
+          this.pagInfo.total = res.result.total;
+        }
+      });
+    },
+    //获取负责人下拉
+    getCrewListData() {
+      let data = {
+        projectSn: this.projectSn,
+      };
+      getCrewListDataApi(data).then((res) => {
+        if (res.code == 200) {
+          this.principalLsit = res.result;
+          console.log("获取负责人下拉", this.principalLsit);
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+    //新增
+    addBefore(addType, value) {
+      if (addType == 1) {
+        this.title = "新增";
+        this.dialogType = 1;
+      }
+      this.addForm = {
+        milestoneName: "",
+        milestoneTime: ""
+      };
+      this.workerInfo.enterpriseId = this.treeData.id
+      this.workerInfo.enterpriseName = this.treeData.enterpriseName
+      this.dialogVisible = true;
+    },
+    // 编辑按钮
+    editBefore(val) {
+      this.dialogType = 2;
+      this.title = "编辑";
+      console.log("当前点击的行", val);
+      this.addForm = JSON.parse(JSON.stringify(val));
+      this.addForm.id = val.id;
+      this.workerInfo.status = val.status;
+      this.dialogVisible = true;
+      this.workerInfo.enterpriseId = this.treeData.id
+      this.workerInfo.enterpriseName = this.treeData.enterpriseName
+      this.selectFormVal = val.qualityRegionName;
+      this.workerInfo.qualityRegionId = val.qualityRegionId;
+      // this.$nextTick(() => {
+      //   this.$refs.groupFormTree.setCurrentKey(val.qualityRegionId);
+      // })
+    },
+    //编辑
+    submitBtn() {
+      this.$refs.addEditForm.validate((valid) => {
+        if (valid) {
+          let data = {
+            milestoneName: this.addForm.milestoneName,
+            milestoneTime: this.addForm.milestoneTime,
+            projectSn: this.projectSn,
+            enterpriseId: this.treeData.id,
+          };
+          if (this.dialogType == 1) {
+            addXzMilestoneApi(data).then((res) => {
+              if (res.code == 200) {
+                this.$message.success(res.message);
+                this.dialogVisible = false;
+                this.getProgressListData();
+              }
+            });
+          } else if (this.dialogType == 2) {
+            data.id = this.addForm.id;
+            editXzMilestoneApi(data).then((res) => {
+              if (res.code == 200) {
+                this.$message.success(res.message);
+                this.dialogVisible = false;
+                this.getProgressListData();
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    //删除
+    deleteBefore(value) {
+      this.$confirm(
+        this.$t("message.quality.deleteHint"),
+        this.$t("message.quality.hint"),
+        {
+          confirmButtonText: this.$t("message.quality.confirm"),
+          cancelButtonText: this.$t("message.quality.cancel"),
+          type: "warning",
+        }
+      )
+        .then(() => {
+          let data = {
+            id: value.id,
+          };
+          deleteXzMilestoneApi(data).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                type: "success",
+                message: this.$t("message.quality.successfullyDelete") + "!",
+              });
+              this.getProgressListData();
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    close() {
+      this.workerInfo = {};
+      this.workerInfo.parentId = 0;
+      this.$nextTick(() => {
+        this.$refs.addEditForm.clearValidate();
+      });
+    },
+    close2() {
+      this.fileName = "";
+      this.radio = 1;
+    },
+    //刷新
+    refreshBtn() {
+      this.daterange = [];
+      this.pagInfo.pageNo = 1;
+      this.pagInfo.pageSize = 10;
+      this.queryInfo = {
+        status: "",
+        actualStartDate: "",
+        actualFinishDate: "",
+        taskName: "",
+      };
+      this.getProgressListData();
+    },
+    SizeChange(val) {
+      this.pagInfo.pageSize = val;
+      this.getProgressListData();
+    },
+    CurrentChange(val) {
+      this.pagInfo.pageNo = val;
+      this.getProgressListData();
+    },
+    //---------------
+    // 点击行查看详情
+    showDetail(row) {
+      this.type = "detail";
+      this.seedId = row.id;
+      this.rowData = row;
+      console.log("查详情", this.rowData);
+    },
+    //关闭详请组件
+    closeDetailFn(val) {
+      this.type = val;
+      this.getHierarchyEnterpriseList();
+    },
+    changeDate() {
+      if (this.daterange) {
+        this.queryInfo.actualStartDate = this.daterange[0];
+        this.queryInfo.actualFinishDate = this.daterange[1];
+      } else {
+        this.queryInfo.actualStartDate = "";
+        this.queryInfo.actualFinishDate = "";
+      }
+    },
+    validateInput() {
+      let value = parseInt(this.workerInfo.progressRatio, 10);
+      if (
+        isNaN(value) ||
+        value < 0 ||
+        value > 100 ||
+        Math.floor(value) !== value
+      ) {
+        this.workerInfo.progressRatio = "";
+      }
+    },
+    time1(val) {
+      console.log("开始时间", val);
+      this.times = val;
+    },
+    time2(val) {
+      console.log("结束时间", val);
+    },
+    // 下载模板
+    downloadFn(type) {
+      if (type == 1) {
+        let data = {
+          type: 1,
+          projectSn: this.projectSn,
+        };
+        fetch(
+          this.$http.defaults.baseURL + "xmgl/xzTaskProgress/downloadTemplate",
+          {
+            method: "get",
+            headers: {
+              Authorization: this.$store.state.userInfo.token,
+              "Content-Type": "application/json", // 设置请求头的内容类型为JSON
+            },
+            // body: JSON.stringify(data) // 将data对象转换为JSON字符串并作为请求体发送
+          }
+        )
+          .then((response) => {
+            // 处理响应
+            if (!response.ok) {
+              throw new Error("下载失败");
+            }
+            return response.blob();
+          })
+          .then((blob) => {
+            // 创建一个下载链接
+            const url = window.URL.createObjectURL(blob);
+            // 创建一个<a>元素
+            const link = document.createElement("a");
+            link.href = url;
+            link.download = "分部分项工程管理模板.mpp"; // 指定下载文件的文件名
+            // 模拟点击下载链接
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+            // 释放URL对象
+            window.URL.revokeObjectURL(url);
+            // 处理导出的文件
+            // 这里可以使用blob对象来获取导出的文件内容或者将其保存到本地
+          })
+          .catch((error) => {
+            // 处理错误
+            console.error(error);
+          });
+      } else {
+        let data = {
+          projectSn: this.projectSn,
+        };
+        fetch(this.$http.defaults.baseURL + "xmgl/xzTaskProgress/exportXls", {
+          method: "post",
+          headers: {
+            Authorization: this.$store.state.userInfo.token,
+            "Content-Type": "application/json", // 设置请求头的内容类型为JSON
+          },
+          body: JSON.stringify(data), // 将data对象转换为JSON字符串并作为请求体发送
+        })
+          .then((response) => {
+            // 处理响应
+            if (!response.ok) {
+              throw new Error("下载失败");
+            }
+            return response.blob();
+          })
+          .then((blob) => {
+            // 创建一个下载链接
+            const url = window.URL.createObjectURL(blob);
+            // 创建一个<a>元素
+            const link = document.createElement("a");
+            link.href = url;
+            link.download = "分部分项工程管理列表.xlsx"; // 指定下载文件的文件名
+            // 模拟点击下载链接
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+            // 释放URL对象
+            window.URL.revokeObjectURL(url);
+            // 处理导出的文件
+            // 这里可以使用blob对象来获取导出的文件内容或者将其保存到本地
+          })
+          .catch((error) => {
+            // 处理错误
+            console.error(error);
+          });
+      }
+    },
+    // 导入成功
+    handleImportSuccess(res) {
+      console.log("导入成功----", res);
+      if (res.code == 200) {
+        this.$message.success("导入成功");
+      } else {
+        this.$message.error(res.message);
+      }
+      console.log("导入", res);
+    },
+    //
+    beforeUpload(file) {
+      console.log("=========", file);
+      this.fileName = file.name;
+    },
+    // 上传mpp文件触发
+    handleImportChange(file, fileList) {
+      console.log("=[====]");
+      // console.log((file, fileList))
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.down {
+  text-decoration: none;
+  color: #fff;
+}
+.expintBtn {
+  display: inline-block !important;
+  margin-right: 10px;
+}
+.table_wrap {
+  height: calc(100% - 98px);
+  overflow: auto;
+  .no-start,.is-pending,.is-finshed{
+    display: inline-block;
+    width: 65px;
+    height: 25px;
+    line-height: 25px;
+    border-radius: 4px;
+    text-align: center;
+  }
+  .no-start{
+    color: #959595;
+    border: 1px solid #959595;
+  }
+  .is-pending{
+    color: #DAB387;
+    border: 1px solid #DAB387;
+  }
+  .is-finshed{
+    color: #1BA035;
+    border: 1px solid #1BA035;
+  }
+}
+.searchBox .el-form-item {
+  margin: 0 5px 0 0;
+}
+.delete-btn {
+  color: #fe6565;
+}
+.dialogUplod {
+  height: 100px;
+  margin-left: 70px;
+  margin-top: 40px;
+  div {
+    margin-bottom: 20px;
+  }
+}
+.treeStyle() {
+  /deep/.el-tree {
+    font-size: 15px;
+    width: 100%;
+    background-color: transparent;
+    .el-tree-node {
+      white-space: normal;
+      &:focus > .el-tree-node__content {
+        background-color: transparent;
+      }
+      &.is-current > .el-tree-node__content {
+        background-color: rgba(81, 129, 246, 0.14);
+        color: #5181f6;
+      }
+    }
+    .el-tree-node__content {
+      // height: 32px;
+      padding: 7px 0;
+      height: auto;
+      line-height: 16px;
+      position: relative;
+      // margin-bottom: 7px;
+      &:hover {
+        background-color: rgba(81, 129, 246, 0.14);
+        color: #5181f6;
+      }
+
+      .videoName {
+        font-size: 14px;
+      }
+      .projectName {
+        font-size: 14px;
+        width: calc(100% - 55px);
+        display: inline-block;
+      }
+      .companyName2 {
+        font-size: 16px;
+        font-weight: bold;
+        display: inline-block;
+        width: 192px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+    .el-tree-node__expand-icon {
+      font-size: 16px;
+      padding: 0 6px;
+      &.is-leaf {
+        color: transparent !important;
+      }
+    }
+    .treeTitle {
+      background-color: #f7f7f7;
+      margin-bottom: 10px;
+    }
+  }
+}
+.content-box {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  .areaTreeBox {
+    display: flex;
+    position: relative;
+    .treeStyle();
+  }
+  .areaTreeInner {
+    //   background-color: rgba(0, 0, 0, 0.7);
+    width: 300px;
+    margin-right: 20px;
+    padding: 20px 15px;
+    height: calc(100% - 40px);
+    display: flex;
+    flex-direction: column;
+    .treeBox {
+      flex: 1;
+      background-color: rgba(216, 216, 216, 0.2);
+      padding-top: 10px;
+      margin-top: 20px;
+    }
+  }
+}
+// 下拉框样式修改
+/deep/.el-select-dropdown__item.hover,.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+  background-color: transparent;
+}
+</style>
diff --git a/src/views/projectFront/progressManagementAg/projectganttChart.vue b/src/views/projectFront/progressManagementAg/projectganttChart.vue
index e938731f..283e16e3 100644
--- a/src/views/projectFront/progressManagementAg/projectganttChart.vue
+++ b/src/views/projectFront/progressManagementAg/projectganttChart.vue
@@ -2,11 +2,11 @@
   <div class="main-box">
     <!-- <div class="areaTreeBox fullHeight" id="videoTreeBox">
       <div class="areaTreeInner whiteBlock fullHeight">
+       
         <p class="pageTitle">
           承包商/厂区列表
         </p>
         <div class="area-select">
-
           <el-select
             ref="selectRef"
             v-model="selectVal"
@@ -77,33 +77,39 @@
     <div class="gantt-box">
       <div class="top-content">
         <div class="top-count">
-        <span>项目总进度：{{progressData.projectTotalProgress || 0}}%</span>
-        <span>承包商进度：{{progressData.enterpriseTotalProgress || 0}}%</span>
+          <span>项目总进度：{{ progressData.projectTotalProgress || 0 }}%</span>
+          <!-- <span>承包商进度：{{progressData.enterpriseTotalProgress || 0}}%</span>
         <span>项目总天数：{{progressData.projectTotalDayNum || 0}}天</span>
-        <span>项目剩余天数：{{progressData.projectSurplusDayNum || 0}}天</span>
+        <span>项目剩余天数：{{progressData.projectSurplusDayNum || 0}}天</span> -->
         </div>
-      <div class="update-operate">
-        <el-button v-permission="{key: 'xmzjd_xmzjd', menuPath: '/project/progressManagementAg/projectganttChart'}" type="primary" size="medium" @click="updateProgressFn(1)" :disabled="![5,10].includes($store.state.userInfo.accountType)"
-          >更新项目总进度</el-button
-        >
-        <el-button v-permission="{key: 'xmzjd_cbsjd', menuPath: '/project/progressManagementAg/projectganttChart'}" type="primary" size="medium" @click="updateProgressFn(2)"
+        <div class="update-operate">
+          <el-button
+            type="primary"
+            size="medium"
+            @click="updateProgressFn(1)"
+            :disabled="![5, 10].includes($store.state.userInfo.accountType)"
+            >更新项目总进度</el-button
+          >
+          <!-- <el-button type="primary" size="medium" @click="updateProgressFn(2)"
           >更新承包商进度</el-button
-        >
-      </div>
+        > -->
+        </div>
       </div>
       <div class="header">
-        <div class="left-content">
+        <!-- 未开始 进行中 已完成 已逾期 4-29 wpf 新增注释 -->
+        <!-- <div class="left-content">
           <div class="item" v-for="(item, index) in headerList" :key="index">
             <div class="color-block" :style="{ background: item.color }"></div>
             <div class="label">{{ item.label }}</div>
           </div>
-        </div>
+        </div> -->
       </div>
+      <!-- 甘特图 -->
       <div class="gantt-chart" v-if="projects.length > 0">
         <div class="table" @scroll="handleScroll">
           <div class="thead">
             <div class="row">
-              <div class="td fixed_1">分部分项工程名称</div>
+              <div class="td fixed_1">供应商名称</div>
               <div class="td fixed_2">开始日期</div>
               <div class="td fixed_3" style="border-right: 1px solid #cbd1df">
                 完成日期
@@ -131,7 +137,7 @@
               class="row-groups"
               :class="{ open: openedIndex === p.id }"
               v-for="(p, i) in projects"
-              :key="p.taskName"
+              :key="p.enterpriseName"
             >
               <div class="row">
                 <div
@@ -161,10 +167,10 @@
                   ></i>
                   <el-tooltip
                     effect="dark"
-                    :content="p.taskName"
+                    :content="p.enterpriseName"
                     placement="top-start"
                   >
-                    <span>{{ p.taskName }}</span>
+                    <span>{{ p.enterpriseName }}</span>
                   </el-tooltip>
                 </div>
 
@@ -209,16 +215,29 @@
                   :style="gantt"
                   v-for="(gantt, index) in p.gantts"
                   :key="index"
-                  :title="p.taskName + ' ' + headerList[p.status].label"
-                  @click="openGanttDialog(p)"
-                ></div>
+                  @click="
+                    openGanttDialog(p, gantt)
+                  "
+                >
+                  <!-- :title="p.enterpriseName + ' ' + headerList[p.status].label" -->
+                  <div class="tip-box" v-for="(item,index) in forTimesFn(p)" :key="index" :style="{top: '10px', left: calcLeft(gantt,forTimesFn(p),index) + 'px'}" v-show="isShowTip(p,index + 1)">
+                    <img src="@/assets/images/lcbTip.png" />
+                    <div class="info-show">
+                      <div class="info-show-title">查看里程碑节点</div>
+                      <div class="info-show-content">
+                        <span>日期：{{isShowDate(p,index + 1)}}</span>
+                        <span>里程碑：{{isShowLcText(p,index + 1)}}</span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
               </div>
               <!-- 第二层 -->
               <div
                 class="children"
                 v-show="openedIndex === p.id"
                 v-for="child in p.children"
-                :key="'child-' + child.taskName"
+                :key="'child-' + child.enterpriseName"
               >
                 <div class="row">
                   <div
@@ -230,7 +249,7 @@
                       class="el-icon-arrow-down"
                       v-if="
                         openedIndexSecond === child.id &&
-                          child.children.length > 0
+                        child.children.length > 0
                       "
                       :style="{
                         visibility:
@@ -253,10 +272,10 @@
                     ></i>
                     <el-tooltip
                       effect="dark"
-                      :content="child.taskName"
+                      :content="child.enterpriseName"
                       placement="top-start"
                     >
-                      <span>{{ child.taskName }}</span>
+                      <span>{{ child.enterpriseName }}</span>
                     </el-tooltip>
                   </div>
                   <div class="td fixed_2">{{ child.startDate }}</div>
@@ -282,7 +301,18 @@
                     :key="index"
                     @mouseenter="(e) => handleHover(e, child)"
                     @mouseleave="handleLeave"
-                  ></div>
+                  >
+                  <div class="tip-box" v-for="(item,index) in forTimesFn(p)" :key="index" :style="{top: '10px', left: calcLeft(gantt,forTimesFn(p),index) + 'px'}" v-show="isShowTip(p,index + 1)">
+                    <img src="@/assets/images/lcbTip.png" />
+                    <div class="info-show">
+                      <div class="info-show-title">查看里程碑节点</div>
+                      <div class="info-show-content">
+                        <span>日期：{{isShowDate(p,index + 1)}}</span>
+                        <span>里程碑：主体结构施工</span>
+                      </div>
+                    </div>
+                  </div>
+                  </div>
                 </div>
 
                 <!-- 第三层 -->
@@ -290,7 +320,7 @@
                   class="children"
                   v-show="openedIndexSecond === child.id"
                   v-for="second in child.children"
-                  :key="'child-' + second.taskName"
+                  :key="'child-' + second.enterpriseName"
                 >
                   <div class="row">
                     <div
@@ -302,7 +332,7 @@
                         class="el-icon-arrow-down"
                         v-if="
                           openedIndexThird === second.id &&
-                            second.children.length > 0
+                          second.children.length > 0
                         "
                         :style="{
                           visibility:
@@ -326,10 +356,10 @@
 
                       <el-tooltip
                         effect="dark"
-                        :content="second.taskName"
+                        :content="second.enterpriseName"
                         placement="top-start"
                       >
-                        <span>{{ second.taskName }}</span>
+                        <span>{{ second.enterpriseName }}</span>
                       </el-tooltip>
                     </div>
 
@@ -356,7 +386,18 @@
                       :key="index"
                       @mouseenter="(e) => handleHover(e, second)"
                       @mouseleave="handleLeave"
-                    ></div>
+                    >
+                    <div class="tip-box" v-for="(item,index) in forTimesFn(p)" :key="index" :style="{top: '10px', left: calcLeft(gantt,forTimesFn(p),index) + 'px'}" v-show="isShowTip(p,index + 1)">
+                    <img src="@/assets/images/lcbTip.png" />
+                    <div class="info-show">
+                      <div class="info-show-title">查看里程碑节点</div>
+                      <div class="info-show-content">
+                        <span>日期：{{isShowDate(p,index + 1)}}</span>
+                        <span>里程碑：主体结构施工</span>
+                      </div>
+                    </div>
+                  </div>
+                  </div>
                   </div>
 
                   <!-- 第四层 -->
@@ -364,7 +405,7 @@
                     class="children"
                     v-show="openedIndexThird === second.id"
                     v-for="third in second.children"
-                    :key="'child-' + third.taskName"
+                    :key="'child-' + third.enterpriseName"
                   >
                     <div class="row">
                       <div
@@ -376,7 +417,7 @@
                           class="el-icon-arrow-down"
                           v-if="
                             openedIndexFourth === third.id &&
-                              third.children.length > 0
+                            third.children.length > 0
                           "
                           :style="{
                             visibility:
@@ -399,10 +440,10 @@
                         ></i>
                         <el-tooltip
                           effect="dark"
-                          :content="third.taskName"
+                          :content="third.enterpriseName"
                           placement="top-start"
                         >
-                          <span>{{ third.taskName }}</span>
+                          <span>{{ third.enterpriseName }}</span>
                         </el-tooltip>
                       </div>
 
@@ -429,7 +470,18 @@
                         :key="index"
                         @mouseenter="(e) => handleHover(e, third)"
                         @mouseleave="handleLeave"
-                      ></div>
+                      >
+                      <div class="tip-box" v-for="(item,index) in forTimesFn(p)" :key="index" :style="{top: '10px', left: calcLeft(gantt,forTimesFn(p),index) + 'px'}" v-show="isShowTip(p,index + 1)">
+                    <img src="@/assets/images/lcbTip.png" />
+                    <div class="info-show">
+                      <div class="info-show-title">查看里程碑节点</div>
+                      <div class="info-show-content">
+                        <span>日期：{{isShowDate(p,index + 1)}}</span>
+                        <span>里程碑：主体结构施工</span>
+                      </div>
+                    </div>
+                  </div>
+                    </div>
                     </div>
 
                     <!-- 第五层 -->
@@ -437,7 +489,7 @@
                       class="children"
                       v-show="openedIndexFourth === third.id"
                       v-for="fouth in third.children"
-                      :key="'child-' + fouth.taskName"
+                      :key="'child-' + fouth.enterpriseName"
                     >
                       <div class="row">
                         <div
@@ -449,7 +501,7 @@
                             class="el-icon-arrow-down"
                             v-if="
                               openedIndexFifth === fouth.id &&
-                                fouth.children.length > 0
+                              fouth.children.length > 0
                             "
                             :style="{
                               visibility:
@@ -472,10 +524,10 @@
                           ></i>
                           <el-tooltip
                             effect="dark"
-                            :content="fouth.taskName"
+                            :content="fouth.enterpriseName"
                             placement="top-start"
                           >
-                            <span>{{ fouth.taskName }}</span>
+                            <span>{{ fouth.enterpriseName }}</span>
                           </el-tooltip>
                         </div>
 
@@ -502,7 +554,18 @@
                           :key="index"
                           @mouseenter="(e) => handleHover(e, fouth)"
                           @mouseleave="handleLeave"
-                        ></div>
+                        >
+                        <div class="tip-box" v-for="(item,index) in forTimesFn(p)" :key="index" :style="{top: '10px', left: calcLeft(gantt,forTimesFn(p),index) + 'px'}" v-show="isShowTip(p,index + 1)">
+                    <img src="@/assets/images/lcbTip.png" />
+                    <div class="info-show">
+                      <div class="info-show-title">查看里程碑节点</div>
+                      <div class="info-show-content">
+                        <span>日期：{{isShowDate(p,index + 1)}}</span>
+                        <span>里程碑：主体结构施工</span>
+                      </div>
+                    </div>
+                  </div>
+                      </div>
                       </div>
 
                       <!-- 第六层 -->
@@ -510,7 +573,7 @@
                         class="children"
                         v-show="openedIndexFifth === fouth.id"
                         v-for="fifth in fouth.children"
-                        :key="'child-' + fifth.taskName"
+                        :key="'child-' + fifth.enterpriseName"
                       >
                         <div class="row">
                           <div
@@ -522,7 +585,7 @@
                               class="el-icon-arrow-down"
                               v-if="
                                 openedIndexSixth === fifth.id &&
-                                  fifth.children.length > 0
+                                fifth.children.length > 0
                               "
                               :style="{
                                 visibility:
@@ -545,10 +608,10 @@
                             ></i>
                             <el-tooltip
                               effect="dark"
-                              :content="fifth.taskName"
+                              :content="fifth.enterpriseName"
                               placement="top-start"
                             >
-                              <span>{{ fifth.taskName }}</span>
+                              <span>{{ fifth.enterpriseName }}</span>
                             </el-tooltip>
                           </div>
                           <div class="td fixed_2">{{ fifth.startDate }}</div>
@@ -574,7 +637,18 @@
                             :key="index"
                             @mouseenter="(e) => handleHover(e, fifth)"
                             @mouseleave="handleLeave"
-                          ></div>
+                          >
+                          <div class="tip-box" v-for="(item,index) in forTimesFn(p)" :key="index" :style="{top: '10px', left: calcLeft(gantt,forTimesFn(p),index) + 'px'}" v-show="isShowTip(p,index + 1)">
+                    <img src="@/assets/images/lcbTip.png" />
+                    <div class="info-show">
+                      <div class="info-show-title">查看里程碑节点</div>
+                      <div class="info-show-content">
+                        <span>日期：{{isShowDate(p,index + 1)}}</span>
+                        <span>里程碑：主体结构施工</span>
+                      </div>
+                    </div>
+                  </div>
+                        </div>
                         </div>
 
                         <!-- 第七层 -->
@@ -582,7 +656,7 @@
                           class="children"
                           v-show="openedIndexSixth === fifth.id"
                           v-for="sixth in fifth.children"
-                          :key="'child-' + sixth.taskName"
+                          :key="'child-' + sixth.enterpriseName"
                         >
                           <div class="row">
                             <div
@@ -594,7 +668,7 @@
                                 class="el-icon-arrow-down"
                                 v-if="
                                   openedIndexSixth === sixth.id &&
-                                    sixth.children.length > 0
+                                  sixth.children.length > 0
                                 "
                                 :style="{
                                   visibility:
@@ -617,10 +691,10 @@
                               ></i>
                               <el-tooltip
                                 effect="dark"
-                                :content="sixth.taskName"
+                                :content="sixth.enterpriseName"
                                 placement="top-start"
                               >
-                                <span>{{ sixth.taskName }}</span>
+                                <span>{{ sixth.enterpriseName }}</span>
                               </el-tooltip>
                             </div>
                             <div class="td fixed_2">{{ sixth.startDate }}</div>
@@ -646,7 +720,18 @@
                               :key="index"
                               @mouseenter="(e) => handleHover(e, sixth)"
                               @mouseleave="handleLeave"
-                            ></div>
+                            >
+                            <div class="tip-box" v-for="(item,index) in forTimesFn(p)" :key="index" :style="{top: '10px', left: calcLeft(gantt,forTimesFn(p),index) + 'px'}" v-show="isShowTip(p,index + 1)">
+                    <img src="@/assets/images/lcbTip.png" />
+                    <div class="info-show">
+                      <div class="info-show-title">查看里程碑节点</div>
+                      <div class="info-show-content">
+                        <span>日期：{{isShowDate(p,index + 1)}}</span>
+                        <span>里程碑：主体结构施工</span>
+                      </div>
+                    </div>
+                  </div>
+                          </div>
                           </div>
 
                           <!-- 第八层 -->
@@ -654,7 +739,7 @@
                             class="children"
                             v-show="openedIndexSeven === sixth.id"
                             v-for="seventh in sixth.children"
-                            :key="'child-' + seventh.taskName"
+                            :key="'child-' + seventh.enterpriseName"
                           >
                             <div class="row">
                               <div
@@ -666,7 +751,7 @@
                                   class="el-icon-arrow-down"
                                   v-if="
                                     openedIndexSeven === seventh.id &&
-                                      seventh.children.length > 0
+                                    seventh.children.length > 0
                                   "
                                   :style="{
                                     visibility:
@@ -689,10 +774,10 @@
                                 ></i>
                                 <el-tooltip
                                   effect="dark"
-                                  :content="seventh.taskName"
+                                  :content="seventh.enterpriseName"
                                   placement="top-start"
                                 >
-                                  <span>{{ seventh.taskName }}</span>
+                                  <span>{{ seventh.enterpriseName }}</span>
                                 </el-tooltip>
                               </div>
                               <div class="td fixed_2">
@@ -722,7 +807,18 @@
                                 :key="index"
                                 @mouseenter="(e) => handleHover(e, seventh)"
                                 @mouseleave="handleLeave"
-                              ></div>
+                              >
+                              <div class="tip-box" v-for="(item,index) in forTimesFn(p)" :key="index" :style="{top: '10px', left: calcLeft(gantt,forTimesFn(p),index) + 'px'}" v-show="isShowTip(p,index + 1)">
+                    <img src="@/assets/images/lcbTip.png" />
+                    <div class="info-show">
+                      <div class="info-show-title">查看里程碑节点</div>
+                      <div class="info-show-content">
+                        <span>日期：{{isShowDate(p,index + 1)}}</span>
+                        <span>里程碑：主体结构施工</span>
+                      </div>
+                    </div>
+                  </div>
+                            </div>
                             </div>
 
                             <!-- 第九层 -->
@@ -730,7 +826,7 @@
                               class="children"
                               v-show="openedIndexEighth === seventh.id"
                               v-for="eighth in seventh.children"
-                              :key="'child-' + eighth.taskName"
+                              :key="'child-' + eighth.enterpriseName"
                             >
                               <div class="row">
                                 <div
@@ -741,7 +837,7 @@
                                     class="el-icon-arrow-down"
                                     v-if="
                                       openedIndexEighth === eighth.id &&
-                                        eighth.children.length > 0
+                                      eighth.children.length > 0
                                     "
                                     :style="{
                                       visibility:
@@ -764,14 +860,14 @@
                                   ></i>
                                   <el-tooltip
                                     effect="dark"
-                                    :content="eighth.taskName"
+                                    :content="eighth.enterpriseName"
                                     placement="top-start"
                                   >
-                                    <span>{{ eighth.taskName }}</span>
+                                    <span>{{ eighth.enterpriseName }}</span>
                                   </el-tooltip>
                                 </div>
                                 <div class="td fixed_2">
-                                  {{ eighth.startDate }}
+                                  {{ eighth.startDate }}1
                                 </div>
                                 <div class="td fixed_3">
                                   {{ eighth.finishDate }}
@@ -797,7 +893,18 @@
                                   :key="index"
                                   @mouseenter="(e) => handleHover(e, eighth)"
                                   @mouseleave="handleLeave"
-                                ></div>
+                                >
+                                <div class="tip-box" v-for="(item,index) in forTimesFn(p)" :key="index" :style="{top: '10px', left: calcLeft(gantt,forTimesFn(p),index) + 'px'}" v-show="isShowTip(p,index + 1)">
+                    <img src="@/assets/images/lcbTip.png" />
+                    <div class="info-show">
+                      <div class="info-show-title">查看里程碑节点</div>
+                      <div class="info-show-content">
+                        <span>日期：{{isShowDate(p,index + 1)}}</span>
+                        <span>里程碑：主体结构施工</span>
+                      </div>
+                    </div>
+                  </div>
+                              </div>
                               </div>
                             </div>
                           </div>
@@ -811,7 +918,7 @@
           </div>
 
           <div class="tooltips" :style="tooltipsStyle">
-            {{ tooltipContent.taskName }}
+            {{ tooltipContent.enterpriseName }}
             <span>
               {{
                 tooltipContent.mppStatus == 0
@@ -839,16 +946,26 @@
     >
       <div class="dialog_content">
         <div class="progress-update">
-          <span>{{updateDialogTitle.substring(2)}}</span>
+          <span>{{ updateDialogTitle.substring(2) }}</span>
           <!-- <el-input
             placeholder="请输入"
             v-model="progressData.projectTotalProgress"
             style="width: 300px;"
             size="medium"
           /> -->
-          <el-input-number v-model="dialogData.totalProgress" :min="0" :max="100" size="medium" :controls="false"></el-input-number>
+          <el-input-number
+            v-model="dialogData.totalProgress"
+            :min="0"
+            :max="100"
+            size="medium"
+            :controls="false"
+          ></el-input-number>
           <span>%</span>
-          <el-button type="primary" icon="el-icon-circle-check" size="medium" @click="confirmUpdate"
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            size="medium"
+            @click="confirmUpdate"
             >{{ $t("message.personnelPosition.determine") }}
           </el-button>
         </div>
@@ -857,21 +974,21 @@
           <el-table
             :data="tableData"
             height="500"
-            style="width: 100%;margin-top: 15px;">
-            <el-table-column
-              prop="updateDate"
-              align="center"
-              label="时间">
+            style="width: 100%; margin-top: 15px"
+          >
+            <el-table-column prop="updateDate" align="center" label="时间">
             </el-table-column>
             <el-table-column
               prop="changeBefore"
               align="center"
-              label="变更前进度">
+              label="变更前进度"
+            >
             </el-table-column>
             <el-table-column
               prop="changeAfter"
               align="center"
-              label="变更后进度">
+              label="变更后进度"
+            >
             </el-table-column>
           </el-table>
         </div>
@@ -881,13 +998,15 @@
 </template>
 
 <script>
-import { getXzParentChildTaskListApi, getCountTaskProgressApi, getCountTaskProgressListApi, updateProgressApi } from "@/assets/js/api/progressManagement";
 import {
-  getQualityRegionListApi
-} from '@/assets/js/api/quality.js'
-import {
-  selectHierarchyEnterpriseListApi
-} from '@/assets/js/api/laborPerson'
+  xzMilestoneDataApi,
+  getCountTaskProgressApi,
+  getCountTaskProgressListApi,
+  updateProgressApi,
+} from "@/assets/js/api/progressManagement";
+import { getQualityRegionListApi } from "@/assets/js/api/quality.js";
+import { selectHierarchyEnterpriseListApi } from "@/assets/js/api/laborPerson";
+import moment from 'moment'
 export default {
   data() {
     return {
@@ -899,9 +1018,9 @@ export default {
       },
       selectVal: "",
       dialogData: {
-        totalProgress: 0
+        totalProgress: 0,
       },
-      updateDialogTitle: '更新项目总进度',
+      updateDialogTitle: "更新项目总进度",
       tableData: [],
       workerInfo: {},
       dialogVisible: false,
@@ -952,14 +1071,16 @@ export default {
         projectSurplusDayNum: 0,
         projectTotalDayNum: 0,
         projectTotalProgress: 0,
-        enterpriseTotalProgress: 0
-      }
+        enterpriseTotalProgress: 0,
+      },
     };
   },
   created() {
     this.searchSn = this.$store.state.projectSn;
     this.getHierarchyEnterpriseList();
     this.getPositionList();
+    this.getDataList();
+    this.getCountFn();
   },
   computed: {
     dates() {
@@ -987,6 +1108,101 @@ export default {
     },
   },
   methods: {
+    calcLeft(obj,sum,index){
+      // console.log(obj,sum,index,123456)
+      // console.log(obj.width.indexOf('px'))
+      // console.log(obj.width.substring(0,obj.width.indexOf('px')))
+      let offsetLeft = obj.width.substring(0,obj.width.indexOf('px')) / sum;
+      return (offsetLeft * index) + offsetLeft;
+    },
+    isShowDate(obj,dayAfter){
+      // 获取当前日期
+      const today = moment(obj.startDate);
+      
+      // 计算2天后的日期
+      const twoDaysLater = today.add(dayAfter, 'days').format('YYYY-MM-DD');
+      return twoDaysLater
+    },
+    isShowLcText(obj,dayAfter){
+      let responseResult = '';
+      // 获取当前日期
+      const today = moment(obj.startDate);
+      
+      // 计算2天后的日期
+      const twoDaysLater = today.add(dayAfter, 'days').format('YYYY-MM-DD');
+      if(obj.xzMilestoneList){
+        obj.xzMilestoneList.map(item => {
+          if(item.milestoneTime == twoDaysLater){
+            responseResult = item.milestoneName;
+          }
+        })
+      } else {
+        responseResult = '';
+      }
+      // if(twoDaysLater == obj.finishDate){
+      //   return true;
+      // } else {
+      //   return false;
+      // }
+      return responseResult;
+    },
+    isShowTip(obj,dayAfter){
+      let responseResult = false;
+      // 获取当前日期
+      const today = moment(obj.startDate);
+      
+      // 计算2天后的日期
+      const twoDaysLater = today.add(dayAfter, 'days').format('YYYY-MM-DD');
+      if(obj.xzMilestoneList){
+        obj.xzMilestoneList.map(item => {
+          if(item.milestoneTime == twoDaysLater){
+            responseResult = true;
+          }
+        })
+      } else {
+        responseResult = false;
+      }
+      // if(twoDaysLater == obj.finishDate){
+      //   return true;
+      // } else {
+      //   return false;
+      // }
+      return responseResult;
+    },
+    openGanttDialog(p, gantt) {
+      // console.log(p, gantt, 666777);
+    },
+    forTimesFn(obj){
+      // console.log(obj, 666);
+      // 两个日期字符串
+      const dateStr1 = obj.startDate;
+      const dateStr2 = obj.finishDate;
+      
+      // 创建两个日期的moment对象
+      const date1 = moment(dateStr1);
+      const date2 = moment(dateStr2);
+      
+      // 计算两个日期之间相差的天数
+      const daysDiff = date2.diff(date1, 'days');
+      
+      console.log(daysDiff); // 输出相差天数
+      return daysDiff;
+    },
+    isShowLc(obj) {
+      console.log(obj, 666);
+      // 两个日期字符串
+      const dateStr1 = obj.startDate;
+      const dateStr2 = obj.finishDate;
+      
+      // 创建两个日期的moment对象
+      const date1 = moment(dateStr1);
+      const date2 = moment(dateStr2);
+      
+      // 计算两个日期之间相差的天数
+      const daysDiff = date2.diff(date1, 'days');
+      
+      console.log(daysDiff); // 输出相差天数
+    },
     selectChange(val) {
       console.log(val, 123);
       if (!val) {
@@ -1008,57 +1224,57 @@ export default {
       }
     },
     // 确认变更项目总进度
-    confirmUpdate(){
+    confirmUpdate() {
       let requestData = {
         projectSn: this.$store.state.projectSn,
         changeAfter: this.dialogData.totalProgress,
-        enterpriseId: this.treeData.id
-      }
-      if(this.updateDialogTitle == "更新项目总进度"){
+        enterpriseId: this.treeData.id,
+      };
+      if (this.updateDialogTitle == "更新项目总进度") {
         requestData.type = 1;
       } else {
         requestData.type = 2;
       }
-      updateProgressApi(requestData).then(res => {
-        if(res.code == 200){
-          this.$message.success("操作成功")
+      updateProgressApi(requestData).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("操作成功");
           this.getUpdateRecord();
           this.getCountFn();
         }
-        console.log(res,'更新进度提示')
-      })
+        console.log(res, "更新进度提示");
+      });
     },
     // 获取变更记录
-    getUpdateRecord(){
+    getUpdateRecord() {
       let requestData = {
         projectSn: this.$store.state.projectSn,
-        enterpriseId: this.treeData.id
-      }
-      if(this.updateDialogTitle == "更新项目总进度"){
+        enterpriseId: this.treeData.id,
+      };
+      if (this.updateDialogTitle == "更新项目总进度") {
         requestData.type = 1;
       } else {
         requestData.type = 2;
       }
-      getCountTaskProgressListApi(requestData).then(res => {
-        console.log(res,'项目总进度123')
+      getCountTaskProgressListApi(requestData).then((res) => {
+        console.log(res, "项目总进度123");
         this.tableData = res.result;
-      })
+      });
     },
     // 获取当前项目总进度
-    getCountFn(){
+    getCountFn() {
       let requestData = {
         projectSn: this.$store.state.projectSn,
-        enterpriseId: this.treeData.id
-      }
-      getCountTaskProgressApi(requestData).then(res => {
-        console.log(res,'统计数据11111')
-        if(res.code == 200 && res.result){
+        enterpriseId: this.treeData.id,
+      };
+      getCountTaskProgressApi(requestData).then((res) => {
+        console.log(res, "统计数据11111");
+        if (res.code == 200 && res.result) {
           this.progressData = res.result;
         }
-      })
+      });
     },
     // 区域更改时
-    areaChange(){
+    areaChange() {
       this.getDataList();
     },
     // 树形控件点击
@@ -1071,63 +1287,63 @@ export default {
     // 获取承包商列表
     getHierarchyEnterpriseList() {
       let data = {
-        projectSn: this.$store.state.projectSn
-      }
-      
+        projectSn: this.$store.state.projectSn,
+      };
       selectHierarchyEnterpriseListApi(data).then((res) => {
-        console.log(res,'承包商列表')
+        console.log(res, "承包商列表");
         if (res.code == 200) {
-          console.log(res)
+          console.log(res);
           this.level1CompanyData = res.result;
-          if(this.level1CompanyData && this.level1CompanyData.length > 0){
+          if (this.level1CompanyData && this.level1CompanyData.length > 0) {
             this.$nextTick(() => {
               this.treeData = this.level1CompanyData[0];
-              this.$refs.tree.setCurrentKey(this.level1CompanyData[0].id)
+              this.$refs.tree.setCurrentKey(this.level1CompanyData[0].id);
               this.getDataList();
               this.getCountFn();
-            })
+            });
           }
           // this.enterpriseTreeData = res.result
         }
-      })
+      });
     },
     //获取承包商/厂区
     getPositionList() {
       let data = {
-        projectSn: this.$store.state.projectSn
-      }
+        projectSn: this.$store.state.projectSn,
+      };
       getQualityRegionListApi(data).then((res) => {
-        console.log('res=================', res);
+        console.log("res=================", res);
         if (res.code == 200) {
-          this.areaList = res.result
-          console.log(this.areaList,135456)
+          this.areaList = res.result;
+          console.log(this.areaList, 135456);
         }
-      })
+      });
     },
     // 更新进度
     updateProgressFn(type) {
-      if(type == 1){
-        this.updateDialogTitle = "更新项目总进度"
-        this.dialogData.totalProgress = this.progressData.projectTotalProgress
+      if (type == 1) {
+        this.updateDialogTitle = "更新项目总进度";
+        this.dialogData.totalProgress = this.progressData.projectTotalProgress;
       } else {
-        this.updateDialogTitle = "更新承包商进度"
-        this.dialogData.totalProgress = this.progressData.enterpriseTotalProgress
+        this.updateDialogTitle = "更新承包商进度";
+        this.dialogData.totalProgress =
+          this.progressData.enterpriseTotalProgress;
       }
-      console.log(this.updateDialogTitle,888999)
+      console.log(this.updateDialogTitle, 888999);
       this.dialogVisible = true;
       this.getUpdateRecord();
     },
     //获取甘特图数据
     getDataList() {
-      getXzParentChildTaskListApi({
+      xzMilestoneDataApi({
         projectSn: this.searchSn,
         qualityRegionId: this.areaSelectVal,
-        enterpriseId: this.treeData.id
+        enterpriseId: this.treeData.id,
       }).then((res) => {
         this.projects = this.dealArr(res.result);
         console.log("获取甘特图数据", this.projects);
         var that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           that.setGantts(that.projects);
         }, 300);
       });
@@ -1203,7 +1419,8 @@ export default {
       projects.map((project) => {
         let { finishDate, id, gantts } = project;
         const gantt = this.getGanttStyle(project);
-        gantt.background = this.colors[project.mppStatus];
+        // gantt.background = this.colors[project.mppStatus];
+        gantt.background = this.colors[0];
         console.log("进入渲染 setGantts -- ", id, gantt);
         if (gantts) {
           gantts.push(gantt);
@@ -1221,10 +1438,7 @@ export default {
     increaseDate(date, delay) {
       const timestamp =
         new Date(date).getTime() + (delay + 1) * 1000 * 60 * 60 * 24;
-      return new Date(timestamp)
-        .toISOString()
-        .replace(/-/g, "-")
-        .slice(0, 10);
+      return new Date(timestamp).toISOString().replace(/-/g, "-").slice(0, 10);
     },
     getDays(date) {
       const year = date.split("-")[0];
@@ -1270,7 +1484,7 @@ export default {
         this.openedIndex = index;
       }
       var that = this;
-      setTimeout(function() {
+      setTimeout(function () {
         // console.log('进入 setTimeoutthis.setGantts', value)
         let arr = [value];
         that.setGantts(arr);
@@ -1285,7 +1499,7 @@ export default {
         this.openedIndexSecond = index;
       }
       var that = this;
-      setTimeout(function() {
+      setTimeout(function () {
         // console.log('进入 setTimeoutthis.setGantts', value)
         let arr = [value];
         that.setGantts(arr);
@@ -1300,7 +1514,7 @@ export default {
         this.openedIndexThird = index;
       }
       var that = this;
-      setTimeout(function() {
+      setTimeout(function () {
         // console.log('进入 setTimeoutthis.setGantts', value)
         let arr = [value];
         that.setGantts(arr);
@@ -1315,7 +1529,7 @@ export default {
         this.openedIndexFourth = index;
       }
       var that = this;
-      setTimeout(function() {
+      setTimeout(function () {
         // console.log('进入 setTimeoutthis.setGantts', value)
         let arr = [value];
         that.setGantts(arr);
@@ -1330,7 +1544,7 @@ export default {
         this.openedIndexFifth = index;
       }
       var that = this;
-      setTimeout(function() {
+      setTimeout(function () {
         // console.log('进入 setTimeoutthis.setGantts', value)
         let arr = [value];
         that.setGantts(arr);
@@ -1345,7 +1559,7 @@ export default {
         this.openedIndexSixth = index;
       }
       var that = this;
-      setTimeout(function() {
+      setTimeout(function () {
         // console.log('进入 setTimeoutthis.setGantts', value)
         let arr = [value];
         that.setGantts(arr);
@@ -1360,7 +1574,7 @@ export default {
         this.openedIndexSeven = index;
       }
       var that = this;
-      setTimeout(function() {
+      setTimeout(function () {
         // console.log('进入 setTimeoutthis.setGantts', value)
         let arr = [value];
         that.setGantts(arr);
@@ -1375,7 +1589,7 @@ export default {
         this.openedIndexEighth = index;
       }
       var that = this;
-      setTimeout(function() {
+      setTimeout(function () {
         // console.log('进入 setTimeoutthis.setGantts', value)
         let arr = [value];
         that.setGantts(arr);
@@ -1421,7 +1635,7 @@ export default {
         display: "block",
       };
       this.tooltipContent = {
-        taskName: item.taskName,
+        enterpriseName: item.enterpriseName,
         mppStatus: item.mppStatus,
       };
       // }
@@ -1534,12 +1748,12 @@ export default {
     padding: 18px;
     background: #ffffff;
     // border-radius: 8px;
-    .top-content{
+    .top-content {
       display: flex;
       align-items: center;
       justify-content: space-between;
-      .top-count{
-        span{
+      .top-count {
+        span {
           margin-right: 50px;
         }
       }
@@ -1651,6 +1865,7 @@ export default {
 
                   .day {
                     flex: 1;
+                    position: relative;
                   }
                 }
               }
@@ -1791,6 +2006,52 @@ export default {
                 width: 20px;
                 height: 14px;
                 background: #557dee;
+                .tip-box{
+                  width: 180px;
+                  height: 150px;
+                  position: absolute;
+                  z-index: 10;
+                }
+                .tip-box:hover{
+                  .info-show{
+                    display: block;
+                  }
+                }
+                .info-show {
+                  width: 180px;
+                  height: 150px;
+                  border: 1px solid #ccc;
+                  background-color: white;
+                  padding: 10px 15px;
+                  position: absolute;
+                  top: -10px;
+                  left: 30px;
+                  z-index: 20;
+                  display: none;
+                  transition: 0.5s;
+                  &-title {
+                    text-align: left;
+                    text-indent: 0.5em;
+                    border-left: 2px solid #0894f0;
+                  }
+                  &-content {
+                    margin-top: 10px;
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: center;
+                    span {
+                      margin-top: 15px;
+                    }
+                  }
+                }
+                img {
+                  width: 20px;
+                  height: 20px;
+                  position: absolute;
+                  top: -22px;
+                  left: 10px;
+                  z-index: 10;
+                }
               }
             }
 
@@ -1835,10 +2096,10 @@ export default {
   display: none;
 }
 // 更新进度弹窗
-.dialog_content{
+.dialog_content {
   padding: 0px;
 }
-/deep/.el-dialog__body{
+/deep/.el-dialog__body {
   padding-left: 0px;
   padding-right: 0px;
 }
@@ -1846,10 +2107,10 @@ export default {
   display: flex;
   align-items: center;
   margin-left: 55px;
-  >span:nth-child(1){
+  > span:nth-child(1) {
     margin-right: 10px;
   }
-  >span:nth-child(3){
+  > span:nth-child(3) {
     margin-left: 5px;
     margin-right: 30px;
   }
@@ -1876,11 +2137,13 @@ export default {
   }
 }
 // 数字输入框的样式
-/deep/.el-input-number .el-input__inner{
+/deep/.el-input-number .el-input__inner {
   text-align: left;
 }
 // 下拉框样式修改
-/deep/.el-select-dropdown__item.hover,.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+/deep/.el-select-dropdown__item.hover,
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
   background-color: transparent;
 }
 </style>