diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js
index 0e7d903b..5d2a4e92 100644
--- a/src/api/lawEnforcement/index.js
+++ b/src/api/lawEnforcement/index.js
@@ -191,3 +191,12 @@ export function getEndingByCaseId(caseId) {
     method: 'get'
   })
 }
+
+// 查询执法进度历史列表不分页
+export function progressList(query) {
+  return request({
+    url: '/enforce/progress/progressList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/lawEnforcement/case/caseDetail.vue b/src/views/lawEnforcement/case/caseDetail.vue
index 5b05c542..3cf6d138 100644
--- a/src/views/lawEnforcement/case/caseDetail.vue
+++ b/src/views/lawEnforcement/case/caseDetail.vue
@@ -192,7 +192,7 @@
 
         <p class="splcTit">审批流程</p>
         <div class="main_box2">
-          <van-row v-for="(item,index) in historyList">
+          <van-row v-for="(item,index) in historyList" :key="index">
             <van-col :span="4">
               <p class="index">{{index+1}}</p>
               <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
@@ -439,7 +439,7 @@
               <span class="custom-title">检测结果<i class="bgBlue"></i></span>
             </template>
           </van-cell>
-          <div v-for="(item,index) in detectResults">
+          <div v-for="(item,index) in detectResults" :key="index">
             <van-cell title="产品名称" v-model="item.goodsName" />
             <van-cell title="检测报告编号" v-model="item.reportNum" />
             <van-cell title="质量判定" v-model="item.qualityStatus"/>
@@ -480,7 +480,7 @@
 
         <p class="splcTit">审批流程</p>
         <div class="main_box2">
-          <van-row v-for="(item,index) in evidencHistoryList">
+          <van-row v-for="(item,index) in evidencHistoryList" :key="index">
             <van-col :span="4">
               <p class="index">{{index+1}}</p>
               <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
@@ -613,7 +613,7 @@
 
         <p class="splcTit">审批流程</p>
         <div class="main_box2">
-          <van-row v-for="(item,index) in treatHistoryList">
+          <van-row v-for="(item,index) in treatHistoryList" :key="index">
             <van-col :span="4">
               <p class="index">{{index+1}}</p>
               <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
@@ -889,6 +889,7 @@ import {
   getDecisionByCaseId ,
   getExecuteByCaseId ,
   getEndingByCaseId ,
+  progressList ,
 } from "@/api/lawEnforcement/index";
 import law from "@/components/common/law_footer";
 import request from "@/utils/request";
@@ -1170,6 +1171,12 @@ export default {
       decisionEnforcers: [],
       executeEnforcers: [],
       endingEnforcers: [],
+      treatEnforcers: [],
+
+      // 案件执法进度 1:登记 2:勘察 3:立案 4:取证 5:处理 6:裁决 7:执行 8:备案 9:结案字典
+      caseProgressOptions: [],
+      successActive:0, // 当前节点的前一个已完成节点
+      active: 1,  // 当前节点
     };
   },
   created() {
@@ -1202,12 +1209,14 @@ export default {
       applyStatus: "1"
     };
     schemeOptionList(schemeQueryParam).then((response) => {
+      console.log(response)
       this.schemeOptions = response.data;
       this.getInformation();
     });
-    treeselect().then((response) => {
-      this.deptOptions = response.data;
-    });
+    // treeselect().then((response) => {
+    //   this.deptOptions = response.data;
+    // });
+
   },
   methods: {
     getInformation(){
@@ -1225,6 +1234,7 @@ export default {
         this.getDecision();
         this.getExecuteCase();
         this.getEndingForm();
+        this.progressSpeed();
       });
     },
     //勘察表单查询
@@ -1430,6 +1440,72 @@ export default {
       }
     },
 
+    progressSpeed(){
+      console.log(this.form)
+      if(this.form.caseProgress != undefined && this.form !="add"){
+        this.active = this.form.caseProgress;
+        this.successActive = this.form.caseProgress -1;
+
+        if((this.form.caseStatus == "2" || this.form.caseStatus == "3") &&
+          (this.form.caseProgress=="8" || this.form.caseProgress=="9")){
+          this.successActive = this.form.caseProgress;
+        }
+      } else{
+        this.form.caseProgress = undefined;
+      }
+
+      if((this.form.caseStatus == "2" || this.form.caseStatus == "3") &&
+        (this.form.caseProgress=="8" || this.form.caseProgress=="9")){
+        // 已结束备案或者结案阶段的案件,查询显示已保存案件的历史流程节点
+        var progressParam = {
+          "caseId": this.form.id
+        };
+        progressList(progressParam).then(response => {
+          for (var i = 0; i < response.data.length; i++) {
+            var obj={
+              dictLabel:response.data[i].caseProgressName,
+              dictValue:response.data[i].caseProgress
+            }
+            this.caseProgressOptions.push(obj);
+          }
+        });
+      } else if(this.form.caseProgress=="8" && this.form.caseStatus == "1"){
+        // 进行中的案件到达备案阶段显示历史节点和备案节点
+        var progressParam = {
+          "caseId": this.form.id
+        };
+        progressList(progressParam).then(response => {
+          for (var i = 0; i < response.data.length; i++) {
+            var obj = {
+              dictLabel: response.data[i].caseProgressName,
+              dictValue: response.data[i].caseProgress
+            }
+            this.caseProgressOptions.push(obj);
+          }
+          var onrecordObj = {
+            dictLabel: "备案",
+            dictValue: "8"
+          }
+          this.caseProgressOptions.push(onrecordObj);
+        });
+      } else{
+        // 非备案或者结案阶段的案件,显示所有节点判断状态
+        this.getDicts("case_node").then(response => {
+          if (this.form.caseProgress == "9") { // 结案状态
+            for (var i = 0; i < response.data.length; i++) {
+              if (response.data[i].dictValue != "8") { // 如果是结案,步骤条不显示备案
+                this.caseProgressOptions.push(response.data[i]);
+              }
+            }
+          } else{
+            this.caseProgressOptions = response.data;
+          }
+
+        });
+      }
+      console.log(this.caseProgressOptions)
+    },
+
     /** 查询审批历史展示步骤条 */
     getHistoryList(formData,type) {
       if (formData.instanceId != null && formData.instanceId != "") {
diff --git a/src/views/lawEnforcement/scheme/schemeDetail.vue b/src/views/lawEnforcement/scheme/schemeDetail.vue
index 7a03d9ed..6c777a62 100644
--- a/src/views/lawEnforcement/scheme/schemeDetail.vue
+++ b/src/views/lawEnforcement/scheme/schemeDetail.vue
@@ -38,7 +38,7 @@
           <van-col :span="10">执法证号</van-col>
         </van-row>
 
-        <van-row v-for="(item,index) in schemeOption.tenforceSchemeHandlerList">
+        <van-row v-for="(item,index) in schemeOption.tenforceSchemeHandlerList" :key="index">
           <van-col :span="4">{{index+1}}</van-col>
           <van-col :span="10">{{item.name}}</van-col>
           <van-col :span="10">{{item.enforceNum}}</van-col>
@@ -54,7 +54,7 @@
         </template>
       </van-cell>
 
-      <van-row v-for="(item,index) in schemeOption.historicActivityList">
+      <van-row v-for="(item,index) in schemeOption.historicActivityList" :key="index">
         <van-col :span="4">
           <p class="index">{{index+1}}</p>
           <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">