diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectWarning/index.vue b/jwtech-admin-page/src/views/building/projectInfo/projectWarning/index.vue
index 70e55cc2..ddbba8a5 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectWarning/index.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectWarning/index.vue
@@ -168,16 +168,16 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            icon="el-icon-setting"
+            @click="handleToList('1', scope.row)"
             v-hasPermi="['build:xmgcgl:edit']"
             >设置规则</el-button
           >
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            icon="el-icon-view"
+            @click="handleToList('2', scope.row)"
             v-hasPermi="['build:xmgcgl:edit']"
             >查看预警</el-button
           >
@@ -2270,6 +2270,17 @@ export default {
       //   this.title = "修改项目基本信息管理";
       // });
     },
+    handleToList (tabNum, row) {
+      this.$router.push({
+        // path: "/project/special/options",
+        path: "/building/project-regular-list",
+        query: {
+          baseDataId: row.id,
+          proNo: row.proNo,
+          tabNum
+        }
+      });
+    },
     handleApplyUpdate(row){
       if (row.id){
         this.reset();
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue b/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue
index 875f28b6..4a659bfe 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <div style="font-size: 24px;margin-bottom: 16px;">{{ formData.projectName }}</div>
+
     <el-tabs v-model="activeName" style="margin-bottom: 20px">
       <el-tab-pane
         label="设置规则"
@@ -23,11 +25,6 @@
               ></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>
@@ -80,28 +77,26 @@
           <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"/>
-          <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="dateNode" min-width="120"/>
-          <el-table-column label="年度" align="center" prop="conYear" min-width="120"/>
-          <el-table-column label="约束条件" align="center" prop="conRule" min-width="120"/>
-          <el-table-column label="预警描述" align="center" prop="ruleMsg" 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">
+          <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">
-              <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+              {{ formData.proCode }}
             </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">
+          <el-table-column label="项目编号" align="center" prop="proNo" min-width="120">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+              {{ formData.proNo }}
             </template>
           </el-table-column>
-          <el-table-column label="备注" align="center" prop="remark" min-width="120"/>
-          <el-table-column label="状态" align="center" prop="status" min-width="120"/>
+          <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" min-width="120"/>
+          <el-table-column label="约束条件" align="center" prop="conRule" 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
@@ -159,28 +154,26 @@
           <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"/>
-          <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="dateNode" min-width="120"/>
-          <el-table-column label="年度" align="center" prop="conYear" min-width="120"/>
-          <el-table-column label="约束条件" align="center" prop="conRule" min-width="120"/>
-          <el-table-column label="预警描述" align="center" prop="ruleMsg" 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">
+          <el-table-column label="所属项目" align="center" prop="projectName" min-width="120">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+              {{ formData.projectName }}
             </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">
+          <el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+              {{ formData.proCode }}
             </template>
           </el-table-column>
-          <el-table-column label="备注" align="center" prop="remark" min-width="120"/>
-          <el-table-column label="状态" align="center" prop="status" min-width="120"/>
+          <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" min-width="120"/>
+          <el-table-column label="约束条件" align="center" prop="conRule" 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
@@ -216,15 +209,6 @@
     <!-- 添加或修改进度填报预警管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1200px" 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>
@@ -238,21 +222,7 @@
           <el-input v-model="form.conRule" placeholder="请输入约束条件" />
         </el-form-item>
         <el-form-item label="预警描述" prop="ruleMsg">
-          <el-input v-model="form.ruleMsg" placeholder="请输入预警描述" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createUid">
-          <el-input v-model="form.createUid" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="更新人" prop="updateUid">
-          <el-input v-model="form.updateUid" placeholder="请输入更新人" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" 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-input type="textarea" :rows="5" v-model="form.ruleMsg" placeholder="请输入预警描述" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -265,8 +235,14 @@
 
 <script>
 import { listWarningRule, getWarningRule, delWarningRule, addWarningRule, updateWarningRule, exportWarningRule } from "@/api/build/warningRule";
-import { watch } from "less";
-
+import {
+  listInfo,
+  getInfo,
+  delInfo,
+  addInfo,
+  updateInfo,
+  exportInfo,
+} from "@/api/build/projectInfo";
 export default {
   name: "WarningRule",
   data() {
@@ -321,9 +297,45 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        scheduleReq: [
+          {
+            required: true,
+            message: "请输入进度要求",
+            trigger: "blur",
+          },
+        ],
+        dateNode: [
+          {
+            required: true,
+            message: "请输入时间节点",
+            trigger: "blur",
+          },
+        ],
+        conYear: [
+          {
+            required: true,
+            message: "请输入年度",
+            trigger: "blur",
+          },
+        ],
+        conRule: [
+          {
+            required: true,
+            message: "请输入约束条件",
+            trigger: "blur",
+          },
+        ],
+        ruleMsg: [
+          {
+            required: true,
+            message: "请输入预警描述",
+            trigger: "blur",
+          },
+        ],
       },
-      activeName: 'regular'
-    };
+      activeName: 'regular',
+      formData: {}
+    }
   },
   watch: {
     activeName(newVal) {
@@ -336,9 +348,24 @@ export default {
     }
   },
   created() {
+    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;
@@ -348,6 +375,16 @@ export default {
         this.loading = false;
       });
     },
+    handleJudgeTab() {
+      let tabNum = this.$route.query.tabNum
+      if (tabNum === '1') {
+        this.queryParams.data.status = null
+        this.activeName = 'regular'
+      } else {
+        this.queryParams.data.status = 1
+        this.activeName = 'warning'
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -451,6 +488,9 @@ export default {
               }
             });
           } else {
+            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("新增成功");