diff --git a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/index.vue b/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/index.vue
index ddbba8a5..5766a8e8 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/index.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/index.vue
@@ -181,6 +181,14 @@
             v-hasPermi="['build:xmgcgl:edit']"
             >查看预警</el-button
           >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleToList('3', scope.row)"
+            v-hasPermi="['build:xmgcgl:edit']"
+            >建设进度</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -2273,7 +2281,7 @@ export default {
     handleToList (tabNum, row) {
       this.$router.push({
         // path: "/project/special/options",
-        path: "/building/project-regular-list",
+        path: "/building/build/buildProgressWarning-list",
         query: {
           baseDataId: row.id,
           proNo: row.proNo,
diff --git a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/list.vue b/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/list.vue
index 5fb101e1..6887bb8f 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/list.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/list.vue
@@ -1,423 +1,270 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="所属项目" prop="projectName">
-        <el-input
-          v-model="queryParams.data.projectName"
-          placeholder="请输入所属项目"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="项目编码" prop="proCode">
-        <el-input
-          v-model="queryParams.data.proCode"
-          placeholder="请输入项目编码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="项目编号" prop="proNo">
-        <el-input
-          v-model="queryParams.data.proNo"
-          placeholder="请输入项目编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="进度要求" prop="scheduleReq">
-        <el-input
-          v-model="queryParams.data.scheduleReq"
-          placeholder="请输入进度要求"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="执行情况" prop="execEnv">
-        <el-input
-          v-model="queryParams.data.execEnv"
-          placeholder="请输入执行情况"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="填写日期" prop="reportDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.reportDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择填写日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="填报人" prop="reportPerson">
-        <el-input
-          v-model="queryParams.data.reportPerson"
-          placeholder="请输入填报人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="联系人" prop="telLink">
-        <el-input
-          v-model="queryParams.data.telLink"
-          placeholder="请输入联系人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="附件" prop="attachment">
-        <el-input
-          v-model="queryParams.data.attachment"
-          placeholder="请输入附件"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="审核人" prop="applyPerson">
-        <el-input
-          v-model="queryParams.data.applyPerson"
-          placeholder="请输入审核人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="审核日期" prop="applyDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.applyDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择审核日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="审核意见" prop="applyOpinion">
-        <el-input
-          v-model="queryParams.data.applyOpinion"
-          placeholder="请输入审核意见"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="审核状态" prop="status">
-        <el-select v-model="queryParams.data.status" placeholder="请选择审核状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建人" prop="createUid">
-        <el-input
-          v-model="queryParams.data.createUid"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
+    <div style="font-size: 24px;margin-bottom: 16px;">{{ formData.projectName }}</div>
+
+    <el-tabs v-model="activeName" style="margin-bottom: 20px">
+      <el-tab-pane
+        label="设置规则"
+        name="regular"
+      >
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+          <el-form-item label="所属项目" prop="projectName">
+            <el-input
+              v-model="queryParams.data.projectName"
+              placeholder="请输入所属项目"
+              clearable
               size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.createTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新人" prop="updateUid">
-        <el-input
-          v-model="queryParams.data.updateUid"
-          placeholder="请输入更新人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
+              @keyup.enter.native="handleQuery"
+            >
+              <el-button
+                  type="primary"
+                  slot="append"
+                  icon="el-icon-search"
+                  size="small"
+                  @click="handleQuery"
+              ></el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
               type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updateTime">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.updateTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择更新时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['build:warningRule:add']"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['build:warningRule:edit']"
+            >修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['build:warningRule:remove']"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['build:warningRule:export']"
+            >导出</el-button>
+          </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['build:buildProgressWarning:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['build:buildProgressWarning:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['build:buildProgressWarning:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['build:buildProgressWarning:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        <el-table v-loading="loading" :data="warningRuleList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" fixed/>
+          <el-table-column label="序号" type="index" width="50" align="center" fixed/>
 
-    <el-table v-loading="loading" :data="buildProgressWarningList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" fixed/>
-      <el-table-column label="序号" type="index" width="50" align="center" fixed/>
+          <el-table-column label="所属项目" align="center" prop="projectName" min-width="120">
+            <template slot-scope="scope">
+              {{ formData.projectName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
+            <template slot-scope="scope">
+              {{ formData.proCode }}
+            </template>
+          </el-table-column>
+          <el-table-column label="项目编号" align="center" prop="proNo" min-width="120">
+            <template slot-scope="scope">
+              {{ formData.proNo }}
+            </template>
+          </el-table-column>
+          <el-table-column label="进度要求" align="center" prop="scheduleReq" min-width="120"/>
+          <el-table-column label="时间节点" align="center" prop="dateNode" min-width="120"/>
+          <el-table-column label="年度" align="center" prop="conYear" :formatter="yearFormat" min-width="120"/>
+          <el-table-column label="约束条件" align="center" prop="conRule" :formatter="constraintFormat" min-width="120"/>
+          <el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['build:warningRule:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['build:warningRule:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-tab-pane>
+      <el-tab-pane
+        label="查看预警"
+        name="warning"
+      >
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+          <el-form-item label="所属项目" prop="projectName">
+            <el-input
+              v-model="queryParams.data.projectName"
+              placeholder="请输入所属项目"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            >
+              <el-button
+                  type="primary"
+                  slot="append"
+                  icon="el-icon-search"
+                  size="small"
+                  @click="handleQuery"
+              ></el-button>
+            </el-input>
+          </el-form-item>
+          <!-- <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.data.status" placeholder="请选择状态" clearable size="small">
+              <el-option label="请选择字典生成" value="" />
+            </el-select>
+          </el-form-item> -->
+          <el-form-item>
+            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
 
-      <el-table-column label="所属项目" align="center" prop="projectName" min-width="120"/>
-      <el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/>
-      <el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/>
-      <el-table-column label="进度要求" align="center" prop="scheduleReq" min-width="120"/>
-      <el-table-column label="执行情况" align="center" prop="execEnv" min-width="120"/>
-      <el-table-column label="填写日期" align="center" prop="reportDate" min-width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.reportDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="填报人" align="center" prop="reportPerson" min-width="120"/>
-      <el-table-column label="联系人" align="center" prop="telLink" min-width="120"/>
-      <el-table-column label="附件" align="center" prop="attachment" min-width="120"/>
-      <el-table-column label="审核人" align="center" prop="applyPerson" min-width="120"/>
-      <el-table-column label="审核日期" align="center" prop="applyDate" min-width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="审核意见" align="center" prop="applyOpinion" min-width="120"/>
-      <el-table-column label="审核状态" align="center" prop="status" min-width="120"/>
-      <el-table-column label="创建人" align="center" prop="createUid" min-width="120"/>
-      <el-table-column label="创建时间" align="center" prop="createTime" min-width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updateUid" min-width="120"/>
-      <el-table-column label="更新时间" align="center" prop="updateTime" min-width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" min-width="120"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['build:buildProgressWarning:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['build:buildProgressWarning:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table v-loading="loading" :data="warningRuleList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" fixed/>
+          <el-table-column label="序号" type="index" width="50" align="center" fixed/>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+          <el-table-column label="所属项目" align="center" prop="projectName" min-width="120">
+            <template slot-scope="scope">
+              {{ formData.projectName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
+            <template slot-scope="scope">
+              {{ formData.proCode }}
+            </template>
+          </el-table-column>
+          <el-table-column label="项目编号" align="center" prop="proNo" min-width="120">
+            <template slot-scope="scope">
+              {{ formData.proNo }}
+            </template>
+          </el-table-column>
+          <el-table-column label="进度要求" align="center" prop="scheduleReq" min-width="120"/>
+          <el-table-column label="时间节点" align="center" prop="dateNode" min-width="120"/>
+          <el-table-column label="年度" align="center" prop="conYear" :formatter="yearFormat" min-width="120"/>
+          <el-table-column label="约束条件" align="center" prop="conRule" :formatter="constraintFormat" min-width="120"/>
+          <el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['build:warningRule:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['build:warningRule:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-tab-pane>
+      <el-tab-pane
+        label="建设进度"
+        name="build"
+      >
+        <build-proccess :projectInfo="formData" />
+      </el-tab-pane>
+    </el-tabs>
+  
 
-    <!-- 添加或修改建设进度预警对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
+    <!-- 添加或修改进度填报预警管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="所属项目" prop="projectName">
-          <el-input v-model="form.projectName" placeholder="请输入所属项目" />
-        </el-form-item>
-        <el-form-item label="项目编码" prop="proCode">
-          <el-input v-model="form.proCode" placeholder="请输入项目编码" />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="proNo">
-          <el-input v-model="form.proNo" placeholder="请输入项目编号" />
-        </el-form-item>
         <el-form-item label="进度要求" prop="scheduleReq">
           <el-input v-model="form.scheduleReq" placeholder="请输入进度要求" />
         </el-form-item>
-        <el-form-item label="执行情况" prop="execEnv">
-          <el-input v-model="form.execEnv" placeholder="请输入执行情况" />
-        </el-form-item>
-        <el-form-item label="填写日期" prop="reportDate">
-          <el-date-picker clearable size="small" style="width: 100%"
-            v-model="form.reportDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择填写日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="填报人" prop="reportPerson">
-          <el-input v-model="form.reportPerson" placeholder="请输入填报人" />
-        </el-form-item>
-        <el-form-item label="联系人" prop="telLink">
-          <el-input v-model="form.telLink" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="附件" prop="attachment">
-          <el-input v-model="form.attachment" placeholder="请输入附件" />
-        </el-form-item>
-        <el-form-item label="审核人" prop="applyPerson">
-          <el-input v-model="form.applyPerson" placeholder="请输入审核人" />
-        </el-form-item>
-        <el-form-item label="审核日期" prop="applyDate">
-          <el-date-picker clearable size="small" style="width: 100%"
-            v-model="form.applyDate"
+        <el-form-item label="时间节点" prop="dateNode">
+          <el-date-picker
+            v-model="form.dateNode"
             type="date"
+            style="width: 100%;"
+            format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
-            placeholder="选择审核日期">
+            placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="审核意见" prop="applyOpinion">
-          <el-input v-model="form.applyOpinion" placeholder="请输入审核意见" />
-        </el-form-item>
-        <el-form-item label="审核状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="创建人" prop="createUid">
-          <el-input v-model="form.createUid" placeholder="请输入创建人" />
+        <el-form-item label="年度" prop="conYear">
+          <el-select
+            v-model="form.conYear"
+            placeholder="请选择年度"
+            clearable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="dict in yearOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="更新人" prop="updateUid">
-          <el-input v-model="form.updateUid" placeholder="请输入更新人" />
+        <el-form-item label="约束条件" prop="conRule">
+          <el-select
+            v-model="form.conRule"
+            placeholder="请选择约束条件"
+            clearable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="dict in constraintOption"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label="预警描述" prop="ruleMsg">
+          <el-input type="textarea" :rows="5" v-model="form.ruleMsg" placeholder="请输入预警描述" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -429,10 +276,19 @@
 </template>
 
 <script>
-import { listBuildProgressWarning, getBuildProgressWarning, delBuildProgressWarning, addBuildProgressWarning, updateBuildProgressWarning, exportBuildProgressWarning } from "@/api/build/buildProgressWarning";
-
+import { listWarningRule, getWarningRule, delWarningRule, addWarningRule, updateWarningRule, exportWarningRule } from "@/api/build/warningRule";
+import {
+  listInfo,
+  getInfo,
+  delInfo,
+  addInfo,
+  updateInfo,
+  exportInfo,
+} from "@/api/build/projectInfo";
+import BuildProccess from './progress.vue'
 export default {
-  name: "BuildProgressWarning",
+  name: "WarningRule",
+  components: { BuildProccess },
   data() {
     return {
       // 遮罩层
@@ -447,8 +303,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 建设进度预警表格数据
-      buildProgressWarningList: [],
+      // 进度填报预警管理表格数据
+      warningRuleList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -459,52 +315,142 @@ export default {
         pageSize: 10,
         ids:null,
         data:{
-                                                                                projectName: null,
-                                                                    proCode: null,
-                                                                    proNo: null,
-                                                                    scheduleReq: null,
-                                                                    execEnv: null,
-                                                                    reportDate: null,
-                                                                    reportPerson: null,
-                                                                    telLink: null,
-                                                                    attachment: null,
-                                                                    applyPerson: null,
-                                                                    applyDate: null,
-                                                                    applyOpinion: null,
-                                                                    status: null,
-                                                                    createUid: null,
-                                                                    createTime: null,
-                                                                    updateUid: null,
-                                                                    updateTime: null,
-                                                                },
+          projectName: null,
+          proCode: null,
+          proNo: null,
+          scheduleReq: null,
+          dateNode: null,
+          conYear: null,
+          conRule: null,
+          ruleMsg: null,
+          createUid: null,
+          createTime: null,
+          updateUid: null,
+          updateTime: null,
+          status: null
+        },
         // 排序方式
         params: {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-           sortBy: "desc",
-      },
+          sortBy: "desc",
+        },
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        scheduleReq: [
+          {
+            required: true,
+            message: "请输入进度要求",
+            trigger: "blur",
+          },
+        ],
+        dateNode: [
+          {
+            required: true,
+            message: "请输入时间节点",
+            trigger: "change",
+          },
+        ],
+        conYear: [
+          {
+            required: true,
+            message: "请输入年度",
+            trigger: "change",
+          },
+        ],
+        conRule: [
+          {
+            required: true,
+            message: "请输入约束条件",
+            trigger: "change",
+          },
+        ],
+        ruleMsg: [
+          {
+            required: true,
+            message: "请输入预警描述",
+            trigger: "blur",
+          },
+        ],
+      },
+      activeName: 'regular',
+      formData: {},
+      yearOptions: [],
+      constraintOption: []
+    }
+  },
+  watch: {
+    activeName(newVal) {
+      if (newVal === 'warning') {
+        this.queryParams.data.status = 1
+      } else {
+        this.queryParams.data.status = null
       }
-    };
+      this.getList()
+    }
   },
   created() {
+    this.getDictList()
+    this.queryParams.data.proNo = this.$route.query.proNo
+    this.handleJudgeTab()
+    this.getProjectInfo()
     this.getList();
   },
   methods: {
-    /** 查询建设进度预警列表 */
+    // 获取项目详情
+    getProjectInfo() {
+      getInfo(this.$route.query.baseDataId).then((response) => {
+        this.formData = response.data;
+        console.log(this.formData)
+        // console.log(999, this.formData);
+        // listBidInfo(this.queryParams).then((response) => {
+        //   console.log(response);
+        //   // this.formData = response.records[0];
+        // });
+      });
+    },
+    /** 查询进度填报预警管理列表 */
     getList() {
       this.loading = true;
-      listBuildProgressWarning(this.queryParams).then(response => {
-        this.buildProgressWarningList = response.records;
+      listWarningRule(this.queryParams).then(response => {
+        this.warningRuleList = response.records;
         this.total = response.total;
         this.loading = false;
       });
     },
+    // 获取字典信息
+    getDictList() {
+      this.getDicts("sl_year").then((response) => {
+        this.yearOptions = response.data;
+      })
+      this.getDicts("sl_constraint").then((response) => {
+        this.constraintOption = response.data;
+      })
+    },
+    // 菜单状态字典翻译
+    yearFormat(row, column) {
+      return this.selectDictLabel(this.yearOptions, row.conYear);
+    },
+    // 菜单状态字典翻译
+    constraintFormat(row, column) {
+      return this.selectDictLabel(this.constraintOption, row.conRule);
+    },
+    handleJudgeTab() {
+      let tabNum = this.$route.query.tabNum
+      if (tabNum === '1') {
+        this.queryParams.data.status = null
+        this.activeName = 'regular'
+      } else if (tabNum === '2') {
+        this.queryParams.data.status = 1
+        this.activeName = 'warning'
+      } else {
+        this.activeName = 'build'
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -518,20 +464,16 @@ export default {
         proCode: null,
         proNo: null,
         scheduleReq: null,
-        execEnv: null,
-        reportDate: null,
-        reportPerson: null,
-        telLink: null,
-        attachment: null,
-        applyPerson: null,
-        applyDate: null,
-        applyOpinion: null,
-        status: "0",
+        dateNode: null,
+        conYear: null,
+        conRule: null,
+        ruleMsg: null,
         createUid: null,
         createTime: null,
         updateUid: null,
         updateTime: null,
-        remark: null
+        remark: null,
+        status: null
       };
       this.resetForm("form");
     },
@@ -546,20 +488,16 @@ export default {
                                                                             proCode: null,
                                                                             proNo: null,
                                                                             scheduleReq: null,
-                                                                            execEnv: null,
-                                                                            reportDate: null,
-                                                                            reportPerson: null,
-                                                                            telLink: null,
-                                                                            attachment: null,
-                                                                            applyPerson: null,
-                                                                            applyDate: null,
-                                                                            applyOpinion: null,
-                                                                        status: "0",
+                                                                            dateNode: null,
+                                                                            conYear: null,
+                                                                            conRule: null,
+                                                                            ruleMsg: null,
                                                                             createUid: null,
                                                                             createTime: null,
                                                                             updateUid: null,
                                                                             updateTime: null,
-                                                                            remark: null
+                                                                            remark: null,
+                                                                        status: "0"
                                           },
         // 排序方式
         params: {
@@ -591,16 +529,16 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加建设进度预警";
+      this.title = "添加进度填报预警管理";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
-      getBuildProgressWarning(id).then(response => {
+      getWarningRule(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改建设进度预警";
+        this.title = "修改进度填报预警管理";
       });
     },
     /** 提交按钮 */
@@ -608,7 +546,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateBuildProgressWarning(this.form).then(response => {
+            updateWarningRule(this.form).then(response => {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
                 this.open = false;
@@ -616,7 +554,10 @@ export default {
               }
             });
           } else {
-            addBuildProgressWarning(this.form).then(response => {
+            this.form.projectName = this.formData.projectName
+            this.form.proCode = this.formData.proCode
+            this.form.proNo = this.formData.proNo
+            addWarningRule(this.form).then(response => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
                 this.open = false;
@@ -636,7 +577,7 @@ export default {
               cancelButtonText: "取消",
               type: "warning"
             }).then(function() {
-              return delBuildProgressWarning(ids);
+              return delWarningRule(ids);
             }).then(() => {
               this.getList();
               this.msgSuccess("删除成功");
@@ -659,7 +600,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return exportBuildProgressWarning(queryParams);
+          return exportWarningRule(queryParams);
         }).then(response => {
             this.downloadFile(response, true, response.msg);
           // this.download(response.msg);
diff --git a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue b/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue
new file mode 100644
index 00000000..e8c48469
--- /dev/null
+++ b/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue
@@ -0,0 +1,631 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+      <el-form-item label="进度要求" prop="scheduleReq">
+        <el-input
+          v-model="queryParams.data.scheduleReq"
+          placeholder="请输入进度要求"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+          ></el-button>
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['build:buildProgressWarning:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['build:buildProgressWarning:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['build:buildProgressWarning:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['build:buildProgressWarning:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="buildProgressWarningList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" fixed/>
+      <el-table-column label="序号" type="index" width="50" align="center" fixed/>
+
+      <el-table-column label="所属项目" align="center" prop="projectName" min-width="120">
+        <template slot-scope="scope">
+          {{ projectInfo.projectName }}
+        </template>
+      </el-table-column>
+      <el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
+        <template slot-scope="scope">
+          {{ projectInfo.proCode }}
+        </template>
+      </el-table-column>
+      <el-table-column label="项目编号" align="center" prop="proNo" min-width="120">
+        <template slot-scope="scope">
+          {{ projectInfo.proNo }}
+        </template>
+      </el-table-column>
+      <el-table-column label="进度要求" align="center" prop="scheduleReq" min-width="120"/>
+      <el-table-column label="执行情况" align="center" prop="execEnv" min-width="120"/>
+      <el-table-column label="填写日期" align="center" prop="reportDate" min-width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reportDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="填报人" align="center" prop="reportPerson" min-width="120"/>
+      <el-table-column label="联系人" align="center" prop="telLink" min-width="120"/>
+      <el-table-column label="附件" align="center" prop="attachment" min-width="120">
+        <template slot-scope="scope">
+          <div
+            v-for="(item, index) in JSON.parse(
+              scope.row.attachment
+            )"
+            :key="item + index"
+          >
+            <i class="el-icon-document"></i>
+            {{ item.name }}
+            <i
+              class="el-icon-download"
+              @click="downloadFile1(scope, index)"
+              style="cursor: pointer"
+            ></i>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核人" align="center" prop="applyPerson" min-width="120"/>
+      <el-table-column label="审核日期" align="center" prop="applyDate" min-width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核意见" align="center" prop="applyOpinion" min-width="120"/>
+      <el-table-column label="审核状态" align="center" prop="status" :formatter="statusFormat" min-width="120"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['build:buildProgressWarning:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['build:buildProgressWarning:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改建设进度预警对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="填报人" prop="reportPerson">
+          <el-input v-model="form.reportPerson" placeholder="请输入填报人" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="telLink">
+          <el-input v-model="form.telLink" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="执行情况" prop="execEnv">
+          <el-input v-model="form.execEnv" placeholder="请输入执行情况" />
+        </el-form-item>
+        <el-form-item label="填写日期" prop="reportDate">
+          <el-date-picker clearable size="small" style="width: 100%"
+            v-model="form.reportDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择填写日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="进度要求" prop="scheduleReq">
+          <el-input type="textarea" :rows="5" v-model="form.scheduleReq" placeholder="请输入进度要求" />
+        </el-form-item>
+        <el-form-item label="审核人" prop="applyPerson">
+          <el-input v-model="form.applyPerson" placeholder="请输入审核人" />
+        </el-form-item>
+        <el-form-item label="审核日期" prop="applyDate">
+          <el-date-picker clearable size="small" style="width: 100%"
+            v-model="form.applyDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择审核日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="applyOpinion">
+          <el-input type="textarea" :rows="5" v-model="form.applyOpinion" placeholder="请输入审核意见" />
+        </el-form-item>
+        <el-form-item label="审核状态" prop="status">
+          <el-select
+            v-model="form.status"
+            placeholder="请选择审核状态"
+            clearable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="dict in examineStatusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="附件" prop="attachment">
+          <el-upload
+            class="upload-demo"
+            action="thinking/common/upload"
+            :headers="headers"
+            :before-upload="
+              (file) => $fileBeforeUpload(file, 'acceptDocumentFileList')
+            "
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :before-remove="beforeRemove"
+            multiple
+            :on-exceed="handleExceed"
+            :on-success="submitAcceptDocumentUpload"
+            :file-list="acceptDocumentFileList"
+          >
+            <el-button size="small" type="primary" plain>
+              <i class="el-icon-upload el-icon--right"></i>
+              点击上传
+            </el-button>
+            <div slot="tip" class="el-upload__tip">
+              支持jpg/png/pdf/word/excel文件等
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBuildProgressWarning, getBuildProgressWarning, delBuildProgressWarning, addBuildProgressWarning, updateBuildProgressWarning, exportBuildProgressWarning } from "@/api/build/buildProgressWarning";
+import { getFileStream } from "@/api/system/upload";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "BuildProgressWarning",
+  props: {
+    projectInfo: {
+      type: Object,
+      default: true
+    },
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 建设进度预警表格数据
+      buildProgressWarningList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ids:null,
+        data:{
+          projectName: null,
+          proCode: null,
+          proNo: null,
+          scheduleReq: null,
+          execEnv: null,
+          reportDate: null,
+          reportPerson: null,
+          telLink: null,
+          attachment: null,
+          applyPerson: null,
+          applyDate: null,
+          applyOpinion: null,
+          status: null,
+          createUid: null,
+          createTime: null,
+          updateUid: null,
+          updateTime: null,
+      },
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+           sortBy: "desc",
+      },
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        reportPerson: [
+          {
+            required: true,
+            message: "请输入填报人",
+            trigger: "blur",
+          }
+        ],
+        telLink: [
+          {
+            required: true,
+            message: "请输入联系人",
+            trigger: "blur",
+          }
+        ],
+        execEnv: [
+          {
+            required: true,
+            message: "请输入执行情况",
+            trigger: "blur",
+          }
+        ],
+        reportDate: [
+          {
+            required: true,
+            message: "请选择日期",
+            trigger: "change",
+          }
+        ],
+        scheduleReq: [
+          {
+            required: true,
+            message: "请输入进度要求",
+            trigger: "blur",
+          }
+        ],
+        applyPerson: [
+          {
+            required: true,
+            message: "请输入审核人",
+            trigger: "blur",
+          }
+        ],
+        applyDate: [
+          {
+            required: true,
+            message: "请选择审核日期",
+            trigger: "change",
+          }
+        ],
+        applyOpinion: [
+          {
+            required: true,
+            message: "请输入审核意见",
+            trigger: "blur",
+          }
+        ],
+        status: [
+          {
+            required: true,
+            message: "请选择审核状态",
+            trigger: "change",
+          }
+        ],
+      },
+      examineStatusOptions: [],
+      // 请求头
+      headers: {
+        jianwei: "jwtech " + getToken(),
+      },
+      // 文档附件
+      acceptDocumentFileList: [],
+    };
+  },
+  created() {
+    this.queryParams.data.proNo = this.$route.query.proNo
+    this.getDictList()
+    this.getList();
+  },
+  methods: {
+    /** 查询建设进度预警列表 */
+    getList() {
+      this.loading = true;
+      listBuildProgressWarning(this.queryParams).then(response => {
+        this.buildProgressWarningList = response.records;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 获取字典信息
+    getDictList() {
+      this.getDicts("examine_status").then((response) => {
+        this.examineStatusOptions = response.data;
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 菜单状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.examineStatusOptions, row.status);
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        projectName: null,
+        proCode: null,
+        proNo: null,
+        scheduleReq: null,
+        execEnv: null,
+        reportDate: null,
+        reportPerson: null,
+        telLink: null,
+        attachment: null,
+        applyPerson: null,
+        applyDate: null,
+        applyOpinion: null,
+        status: null,
+        createUid: null,
+        createTime: null,
+        updateUid: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    // 查询表单重置
+    resetQueryForm() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+          data:{
+          id: null,
+          projectName: null,
+          proCode: null,
+          proNo: null,
+          scheduleReq: null,
+          execEnv: null,
+          reportDate: null,
+          reportPerson: null,
+          telLink: null,
+          attachment: null,
+          applyPerson: null,
+          applyDate: null,
+          applyOpinion: null,
+          status: null,
+          createUid: null,
+          createTime: null,
+          updateUid: null,
+          updateTime: null,
+          remark: null
+        },
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+           sortBy: "desc",
+        },
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetQueryForm();
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加建设进度预警";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getBuildProgressWarning(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改建设进度预警";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.attachment = JSON.stringify(
+            this.acceptDocumentFileList
+          );
+          if (this.form.id != null) {
+            updateBuildProgressWarning(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            this.form.projectName = this.projectInfo.projectName
+            this.form.proCode = this.projectInfo.proCode
+            this.form.proNo = this.projectInfo.proNo
+            addBuildProgressWarning(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      if(ids){
+            this.$confirm("是否删除选中的数据？", "警告", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(function() {
+              return delBuildProgressWarning(ids);
+            }).then(() => {
+              this.getList();
+              this.msgSuccess("删除成功");
+            }).catch(function() {});
+      }else{
+          this.$message.warning("请选择要删除的数据！！");
+      }
+
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      let message = "是否确认导出所有的数据项?";
+      if(this.ids){
+        message = "是否确认导出选中的数据项?";
+        queryParams.ids = this.ids;
+      }
+      this.$confirm(message, "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportBuildProgressWarning(queryParams);
+        }).then(response => {
+            this.downloadFile(response, true, response.msg);
+          // this.download(response.msg);
+        }).catch(function() {});
+    },
+    // 表格中下载
+    downloadFile1(scope, index) {
+      // console.log(scope);
+      let file = JSON.parse(scope.row.attachment)[index];
+      this.handlePreview(file);
+    },
+    // 点击预览的文件进行下载
+    handlePreview(file) {
+      // console.log(file);
+      getFileStream({ fileName: file.fileName }).then((res) => {
+        const blob = new Blob([res], {
+          // type类型后端返回来的数据中会有，根据自己实际进行修改
+          // 表格下载为 application/xlsx，压缩包为 application/zip等，
+          type: "application/xlsx",
+        }); //excel,pdf等
+        const href = URL.createObjectURL(blob); //创建新的URL表示指定的blob对象
+        const a = document.createElement("a"); //创建a标签
+        a.style.display = "none";
+        a.href = href; // 指定下载链接
+        a.download = file.name; //指定下载文件名
+        a.click(); //触发下载
+        URL.revokeObjectURL(a.href); //释放URL对象
+      });
+    },
+    handleRemove(file, fileList) {
+      // console.log(file, fileList);
+      let index = this.acceptDocumentFileList.findIndex(
+        (item) => item.uid === file.uid
+      );
+      // 删除文件
+      this.acceptDocumentFileList.splice(index, 1);
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    // 上传附件
+    submitAcceptDocumentUpload(_, fileList) {
+      console.log("fileList", fileList);
+      this.acceptDocumentFileList.push({
+        name: fileList.name,
+        fileName: fileList.response.fileName,
+        url: fileList.response.url,
+        uid: fileList.uid,
+      });
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+    @import "@/assets/css/dialog.scss";
+    //::v-deep {
+     //   .el-dialog {
+     //       margin-top: 10vh !important;
+    //    }
+    //}
+</style>